Get/SET Receiver settings frame
This commit is contained in:
@@ -206,30 +206,6 @@ static const int8_t maxChannelsXJT[] = { 0, 8, 0, 4 }; // relative to 8!
|
||||
constexpr int8_t MAX_TRAINER_CHANNELS_M8 = MAX_TRAINER_CHANNELS - 8;
|
||||
constexpr int8_t MAX_EXTRA_MODULE_CHANNELS_M8 = 8; // only 16ch PPM
|
||||
|
||||
inline uint8_t getPinOuput(uint8_t receiverIdx, uint8_t pin)
|
||||
{
|
||||
if (pin < 12) {
|
||||
return ((g_model.receiverData[receiverIdx].channelMapping0 >> (pin * 5)) & 0x1F);
|
||||
}
|
||||
else {
|
||||
pin -= 12;
|
||||
return ((g_model.receiverData[receiverIdx].channelMapping1 >> (pin * 5)) & 0x1F);
|
||||
}
|
||||
}
|
||||
|
||||
inline void setPinOuput(uint8_t receiverIdx, uint8_t pin, uint8_t chan)
|
||||
{
|
||||
if (pin < 12) {
|
||||
g_model.receiverData[receiverIdx].channelMapping0 = BF_SET<uint64_t>(g_model.receiverData[receiverIdx].channelMapping0, chan, pin * 5, 5);
|
||||
}
|
||||
else {
|
||||
pin -= 12;
|
||||
g_model.receiverData[receiverIdx].channelMapping1 = BF_SET<uint64_t>(g_model.receiverData[receiverIdx].channelMapping1, chan, pin * 5, 5);
|
||||
}
|
||||
g_model.receiverData[receiverIdx].dirty = 1;
|
||||
storageDirty(EE_MODEL);
|
||||
}
|
||||
|
||||
inline int8_t maxModuleChannels_M8(uint8_t idx)
|
||||
{
|
||||
if (isExtraModule(idx))
|
||||
|
||||
@@ -74,6 +74,7 @@ enum ModuleSettingsMode
|
||||
MODULE_MODE_NORMAL,
|
||||
MODULE_MODE_SPECTRUM_ANALYSER,
|
||||
MODULE_MODE_GET_HARDWARE_INFO,
|
||||
MODULE_MODE_RECEIVER_SETTINGS,
|
||||
MODULE_MODE_BEEP_FIRST,
|
||||
MODULE_MODE_REGISTER = MODULE_MODE_BEEP_FIRST,
|
||||
MODULE_MODE_BIND,
|
||||
|
||||
@@ -140,9 +140,15 @@ void Pxx2Pulses::setupRegisterFrame(uint8_t module)
|
||||
}
|
||||
}
|
||||
|
||||
void Pxx2Pulses::setupSetRxParamsFrame(uint8_t module, uint8_t receiverSlot)
|
||||
void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module)
|
||||
{
|
||||
|
||||
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RX_SETTINGS);
|
||||
Pxx2Transport::addByte(reusableBuffer.receiverSetup.state + reusableBuffer.receiverSetup.receiverId);
|
||||
Pxx2Transport::addByte(0x0);
|
||||
for (int i=0; i<24; i++) {
|
||||
Pxx2Transport::addByte(reusableBuffer.receiverSetup.channelMapping[i]);
|
||||
}
|
||||
// TODO moduleSettings[module].mode = MODULE_MODE_NORMAL;
|
||||
}
|
||||
|
||||
void Pxx2Pulses::setupBindFrame(uint8_t module)
|
||||
@@ -151,7 +157,6 @@ void Pxx2Pulses::setupBindFrame(uint8_t module)
|
||||
if (get_tmr10ms() > reusableBuffer.moduleSetup.pxx2.bindWaitTimeout) {
|
||||
moduleSettings[module].mode = MODULE_MODE_NORMAL;
|
||||
reusableBuffer.moduleSetup.pxx2.bindStep = BIND_OK;
|
||||
setupSetRxParamsFrame(module, reusableBuffer.moduleSetup.pxx2.bindReceiverSlot);
|
||||
POPUP_INFORMATION(STR_BIND_OK);
|
||||
}
|
||||
return;
|
||||
@@ -199,7 +204,7 @@ void Pxx2Pulses::setupSpectrumAnalyser(uint8_t module)
|
||||
|
||||
void Pxx2Pulses::setupShareMode(uint8_t module)
|
||||
{
|
||||
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RX_SETUP);
|
||||
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RX_SETTINGS);
|
||||
|
||||
Pxx2Transport::addByte(0xC0);
|
||||
|
||||
@@ -220,6 +225,8 @@ void Pxx2Pulses::setupFrame(uint8_t module)
|
||||
|
||||
if (mode == MODULE_MODE_GET_HARDWARE_INFO)
|
||||
setupHardwareInfoFrame(module);
|
||||
else if (mode == MODULE_MODE_RECEIVER_SETTINGS)
|
||||
setupReceiverSettingsFrame(module);
|
||||
else if (mode == MODULE_MODE_REGISTER)
|
||||
setupRegisterFrame(module);
|
||||
else if (mode == MODULE_MODE_BIND)
|
||||
|
||||
@@ -29,7 +29,8 @@
|
||||
#define PXX2_TYPE_ID_REGISTER 0x01
|
||||
#define PXX2_TYPE_ID_BIND 0x02
|
||||
#define PXX2_TYPE_ID_CHANNELS 0x03
|
||||
#define PXX2_TYPE_ID_RX_SETUP 0x05
|
||||
#define PXX2_TYPE_ID_TX_SETTINGS 0x04
|
||||
#define PXX2_TYPE_ID_RX_SETTINGS 0x05
|
||||
#define PXX2_TYPE_ID_HW_INFO 0x06
|
||||
#define PXX2_TYPE_ID_TELEMETRY 0xFE
|
||||
|
||||
@@ -112,7 +113,7 @@ class Pxx2Pulses: public PxxPulses<Pxx2Transport> {
|
||||
|
||||
void setupShareMode(uint8_t module);
|
||||
|
||||
void setupSetRxParamsFrame(uint8_t module, uint8_t receiverSlot);
|
||||
void setupReceiverSettingsFrame(uint8_t module);
|
||||
|
||||
void setupChannelsFrame(uint8_t module);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user