diff --git a/Multiprotocol/FX_nrf24l01.ino b/Multiprotocol/FX_nrf24l01.ino index fadef47..fd86f1c 100644 --- a/Multiprotocol/FX_nrf24l01.ino +++ b/Multiprotocol/FX_nrf24l01.ino @@ -85,12 +85,12 @@ static void __attribute__((unused)) FX_send_packet() val = trim_ch==0 ? 0x20 : (convert_channel_8b(trim_ch + CH6) >> 2); // no trim on Throttle packet[4] = val; // Trim for channel x 0C..20..34 packet[5] = (trim_ch << 4) // channel x << 4 - | GET_FLAG(CH5_SW, 0x01) // DR toggle swich: 0 small throw, 1 large throw + | GET_FLAG(CH5_SW, 0x01) // DR toggle swich: 0 small throw, 1 large throw / Q560 acrobatic // FX9630 =>0:6G small throw, 1:6G large throw, 2:3D // QIDI-550=>0:3D, 1:6G, 2:Torque | (Channel_data[CH6] < CHANNEL_MIN_COMMAND ? 0x00 : (Channel_data[CH6] > CHANNEL_MAX_COMMAND ? 0x04 : 0x02)); if(sub_protocol == FX_Q560) - packet[5] |= GET_FLAG(CH7_SW, 0x10); + packet[5] |= GET_FLAG(CH7_SW, 0x10); // Q560 LED flag conflicting with trim_ch... } else // FX816 and FX620 { diff --git a/Protocols_Details.md b/Protocols_Details.md index af86b74..4527758 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -98,7 +98,7 @@ CFlie|38|CFlie||||||||NRF24L01| [FrskyX2](Protocols_Details.md#FRSKYX2---64)|64|CH_16|CH_8|EU_16|EU_8|Cloned|Cloned_8|||CC2500| [Frsky_RX](Protocols_Details.md#FRSKY_RX---55)|55|Multi|CloneTX|EraseTX|CPPM|||||CC2500| [Futaba/SFHSS](Protocols_Details.md#Futaba---21)|21|SFHSS||||||||CC2500| -[FX](Protocols_Details.md#FX---58)|28|816|620|9630||||||NRF24L01| +[FX](Protocols_Details.md#FX---58)|28|816|620|9630|Q560|||||NRF24L01| [FY326](Protocols_Details.md#FY326---20)|20|FY326|FY319|||||||NRF24L01| [GD00X](Protocols_Details.md#GD00X---47)|47|GD_V1*|GD_V2*|||||||NRF24L01|XN297L [GW008](Protocols_Details.md#GW008---32)|32|||||||||NRF24L01|XN297 @@ -1745,14 +1745,14 @@ FX9630 and FX9603 Gyro: -100%=6G small throw, 0%=6G large throw, +100%=3D QIDI-550 Gyro: -100%=3D, 0%=6G, +100%=Torque -### Sub_protocol Q560 - *2* +### Sub_protocol Q560 - *3* Model: QIDI-560 CH1|CH2|CH3|CH4|CH5|CH6|CH7 ---|---|---|---|---|---|--- A|E|T|R|FLIP|GYRO|LEDs -FLIP and LEDs are toggle channels meaning that -100% to +100% is a command and +100% to -100% is also a command +FLIP is a toggle channels meaning that -100% to +100% is a command and +100% to -100% is also a command Gyro: -100%=6G, 0%=3D+Gyro, +100%=3D