Skip to content

Commit 48e4cad

Browse files
author
Pascal Langer
committed
JJRC345: add RTH on CH7
1 parent 53f58ce commit 48e4cad

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

Multiprotocol/JJRC345_nrf24l01.ino

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
enum JJRC345_FLAGS {
3232
// flags going to packet[8]
33-
//JJRC345_FLAG_FLIP = 0x80,
3433
JJRC345_FLAG_HEADLESS = 0x40,
34+
JJRC345_FLAG_RTH = 0x80,
3535
};
3636

3737
static uint8_t __attribute__((unused)) JJRC345_convert_channel(uint8_t num)
@@ -92,7 +92,9 @@ static void __attribute__((unused)) JJRC345_send_packet()
9292
}
9393
packet[3] = (packet[4] >= 0xB7) ? 0x0e : 0x0a; // Some throttle flag. 0A when Thr <= B6, 0E when Thr >= B7, sometimes 06 when moving Ele/Ail
9494

95-
packet[8] = GET_FLAG(CH6_SW,JJRC345_FLAG_HEADLESS); // Headless mode: 00 normal, 40 headless. Rudder trim, 00 when not used, 01..1F when trimmed left, 20..3F
95+
packet[8] = 0x00 // Rudder trim, 00 when not used, 01..1F when trimmed left, 20..3F
96+
| GET_FLAG(CH6_SW,JJRC345_FLAG_HEADLESS) // Headless mode: 00 normal, 40 headless
97+
| GET_FLAG(CH7_SW,JJRC345_FLAG_RTH); // RTH: 80 active
9698
packet[9] = 0; // Elevator trim, 00 when not used, 20..25 when trimmed up, 0..1F when trimmed down
9799
packet[10] = 0x40; // Aileron trim, 40 when not used, 40..5F when trimmed left, 61..7F when trimmed right
98100

Protocols_Details.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,9 +1101,9 @@ ARM|
11011101
## JJRC345 - *71*
11021102
Model: JJRC345
11031103

1104-
CH1|CH2|CH3|CH4|CH5|CH6
1105-
---|---|---|---|---|---
1106-
A|E|T|R|FLIP|HEADLESS
1104+
CH1|CH2|CH3|CH4|CH5|CH6|CH7
1105+
---|---|---|---|---|---|---
1106+
A|E|T|R|FLIP|HEADLESS|RTH
11071107

11081108
## KF606 - *49*
11091109
Model: KF606

0 commit comments

Comments
 (0)