piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add support for latest FrSky receivers (#4077)

Browse Source 
Co-authored-by: Bertrand Songis <bsongis@gmail.com>
Co-authored-by: raphaelcoeffic <raphael.coeffic@frafos.com>
This commit is contained in:
3djc
2023-10-09 19:22:57 +10:00
committed by GitHub
co-authored by Bertrand Songis raphaelcoeffic
parent d684930cc9
commit 5fd22612aa
12 changed files with 410 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/pulses/pxx2.cpp
+92 -34
View File
@@ -80,44 +80,100 @@ bool isPXX2ModuleOptionAvailable(uint8_t modelId, uint8_t option)
}
/* Receiver options order:
* - OTA (0x01)
* - 2.4G (0x01)
* - 900M (0x02)
* - OTA to update self (0x04)
* - OTA to update sensors (0x08)
* - Tandem Receiver (0x10)
* - Twin Receiver (0x20)
* - Dynamic Telemetry Port (0x40)
*/
static const uint8_t PXX2ReceiverOptions[] = {
#if defined(SIMU)
0b11111111, // None = display all options on SIMU
0b11111111, // None = display all options on SIMU
#else
0b00000000, // None = display all options on SIMU
0b00000000, // None
#endif
0b11111110, // X8R
0b11111110, // RX8R
0b11111110, // RX8R-PRO
0b11111111, // RX6R
0b11111111, // RX4R
0b11111111, // G-RX8
0b11111111, // G-RX6
0b11111110, // X6R
0b11111110, // X4R
0b11111110, // X4R-SB
0b11111110, // XSR
0b11111110, // XSR-M
0b11111111, // RXSR
0b11111110, // S6R
0b11111110, // S8R
0b11111110, // XM
0b11111110, // XM+
0b11111110, // XMR
0b11111110, // R9
0b11111110, // R9-SLIM
0b11111110, // R9-SLIM+
0b11111110, // R9-MINI
0b11111110, // R9-MM
0b11111111, // R9-STAB+OTA
0b11111111, // R9-MINI+OTA
0b11111111, // R9-MM+OTA
0b11111111, // R9-SLIM+OTA
0b11111111, // ARCHER-X
0b11111111, // R9MX
0b11111111, // R9SX
0b00000001, // X8R
0b00000001, // RX8R
0b00000001, // RX8R-PRO
0b00001001, // RX6R, flash sensors by OTA
0b00001001, // RX4R, flash sensors by OTA
0b00001001, // G-RX8, flash sensors by OTA
0b00001001, // G-RX6, flash sensors by OTA
0b00000001, // X6R
0b00000001, // X4R
0b00000001, // X4R-SB
0b00000001, // XSR
0b00000001, // XSR-M
0b00001001, // RXSR, flash sensors by OTA
0b00000001, // S6R
0b00000001, // S8R
0b00000001, // XM
0b00000001, // XM+
0b00000001, // XMR
0b00000010, // R9
0b00000010, // R9-SLIM
0b00000010, // R9-SLIM+
0b00000010, // R9-MINI
0b00000010, // R9-MM
0b00001110, // R9-STAB+OTA, flash self + sensors by OTA
0b00001110, // R9-MINI+OTA, flash self + sensors by OTA
0b00001110, // R9-MM+OTA, flash self + sensors by OTA
0b00001110, // R9-SLIM+OTA, flash self + sensors by OTA
0b00001101, // ARCHER-X, flash self + sensors by OTA
0b00001110, // R9MX, flash self + sensors by OTA
0b00001110, // R9SX, flash self + sensors by OTA
0b00010100, // TDMX, flash self by OTA
0b01010100, // TDR18, flash self by OTA
0b01010100, // TDR10, flash self by OTA
0b00010100, // TDR6, flash self by OTA
0b01010100, // TDR12
0b01010100, // TDSR12
0b01010100, // TDSR18
0b00010100, // 0x26
0b00010100,
0b00010100,
0b00010100,
0b00010100, // 0x2A
0b00010100,
0b00010100,
0b00010100,
0b00010100,
0b00010100, // 0x2F
0b00010100, // reserve 0x23 ~ 0x30 for TD Receivers
0b00100100, // TWMX, flash self by OTA
0b01100100, // TWSR12, flash self by OTA
0b01100100, // TWR12, flash self by OTA
0b00100100, // TWGR6, flash self by OTA
0b00100100, // TWGR8
0b00100100, // TWR6
0b00100100, // TWR8
0b00100100, // TWGR6FB
0b00100100, // TWR6FB
0b00100100, // 0x3A
0b00100100,
0b00100100,
0b00100100,
0b00100100,
0b00100100, // reserve 0x38 ~ 0x3F for TW Receivers
0b01001101, // SR10-plus
0b01001101, // R10-plus
0b00001101, // GR8-plus
0b00001101, // R8-plus
0b00001101, // SR8-plus
0b00001101, // GR6-plus
0b00001101, // R6-plus
0b00001101, // R6M (ESC DC)
0b00001101, // RS-plus
0b00001101, // RS Mini
0b00001101, // R6FB
0b00001101, // GR6FB
0b01001101, // SR12-plus
0b01001101, // R12-plus
0b00001101, // R6 Mini E
0b00001101, // SR6 Mini
0b00001101, // SR6 Mini E
};
uint8_t getPXX2ReceiverOptions(uint8_t modelId)
@@ -413,10 +469,12 @@ void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module, int16_t* channels, u
flag1 |= PXX2_RX_SETTINGS_FLAG1_ENABLE_PWM_CH5_CH6;
if (reusableBuffer.hardwareAndSettings.receiverSettings.fport2)
flag1 |= PXX2_RX_SETTINGS_FLAG1_FPORT2;
if (reusableBuffer.hardwareAndSettings.receiverSettings.sbus24)
flag1 |= PXX2_RX_SETTINGS_FLAG1_SBUS24;
Pxx2Transport::addByte(flag1);
uint8_t outputsCount = min<uint8_t>(24, reusableBuffer.hardwareAndSettings.receiverSettings.outputsCount);
for (int i = 0; i < outputsCount; i++) {
Pxx2Transport::addByte(min<uint8_t>(23, reusableBuffer.hardwareAndSettings.receiverSettings.outputsMapping[i]));
Pxx2Transport::addByte(reusableBuffer.hardwareAndSettings.receiverSettings.outputsMapping[i]);
}
}
reusableBuffer.hardwareAndSettings.receiverSettings.timeout = get_tmr10ms() + 200/*next try in 2s*/;