Skip to content

Commit 61a1c37

Browse files
committed
Fix FrskyX failsafe hold/no pulse inversion
1 parent 1fb2a38 commit 61a1c37

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

Multiprotocol/Multiprotocol.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define VERSION_MAJOR 1
2020
#define VERSION_MINOR 2
2121
#define VERSION_REVISION 1
22-
#define VERSION_PATCH_LEVEL 79
22+
#define VERSION_PATCH_LEVEL 80
2323

2424
//******************
2525
// Protocols
@@ -405,8 +405,8 @@ enum MultiPacketTypes
405405
#define IS_WAIT_BIND_off ( ( protocol_flags2 & _BV(7) ) ==0 )
406406

407407
// Failsafe
408-
#define FAILSAFE_CHANNEL_HOLD 2047
409-
#define FAILSAFE_CHANNEL_NOPULSES 0
408+
#define FAILSAFE_CHANNEL_HOLD 0
409+
#define FAILSAFE_CHANNEL_NOPULSES 2047
410410

411411
//********************
412412
//** Debug messages **
@@ -574,7 +574,7 @@ enum {
574574
#define AFHDS2A_EEPROM_OFFSET 50 // RX ID, 4 bytes per model id, end is 50+64=114
575575
#define BUGS_EEPROM_OFFSET 114 // RX ID, 2 bytes per model id, end is 114+32=146
576576
#define BUGSMINI_EEPROM_OFFSET 146 // RX ID, 2 bytes per model id, end is 146+32=178
577-
#define FRSKYX_RX_EEPROM_OFFSET 178 // TX ID + channels, 50 bytes per model, end is 178+200=378
577+
#define FRSKYX_RX_EEPROM_OFFSET 178 // (3) TX ID + (47) channels + (1) freq_tune, 51 bytes per model, end is 178+51=229
578578
//#define CONFIG_EEPROM_OFFSET 210 // Current configuration of the multimodule
579579

580580
//****************************************
@@ -877,7 +877,6 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p --
877877
878878
*No* usual frsky byte stuffing and without start/stop byte (0x7e)
879879
880-
881880
Type 0x04 Spektrum telemetry data
882881
data[0] TX RSSI
883882
data[1-15] telemetry data

Multiprotocol/Multiprotocol.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1473,7 +1473,7 @@ void update_serial_data()
14731473
uint16_t temp=((*((uint32_t *)p))>>dec)&0x7FF;
14741474
#ifdef FAILSAFE_ENABLE
14751475
if(failsafe)
1476-
Failsafe_data[i]=temp; //value range 0..2047, 0=no pulses, 2047=hold
1476+
Failsafe_data[i]=temp; //value range 0..2047, 0=hold, 2047=no pulses
14771477
else
14781478
#endif
14791479
Channel_data[i]=temp; //value range 0..2047, 0=-125%, 2047=+125%

0 commit comments

Comments
 (0)