diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index ee185a907..8ce031250 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1980,7 +1980,7 @@ void menuModelReceiverOptions(event_t event) } #if defined(SIMU) - reusableBuffer.receiverSetup.state = 0xFF; + reusableBuffer.receiverSetup.state = RECEIVER_SETTINGS_OK; #endif if (reusableBuffer.receiverSetup.state == RECEIVER_SETTINGS_OK || get_tmr10ms() < reusableBuffer.receiverSetup.dirtyTimeout) { @@ -1991,7 +1991,7 @@ void menuModelReceiverOptions(event_t event) switch (i) { case ITEM_RECEIVER_TELEMETRY: - reusableBuffer.receiverSetup.telemetryEnabled = editCheckBox(reusableBuffer.receiverSetup.telemetryEnabled, RECEIVER_OPTIONS_2ND_COLUMN, y, "Telemetry", attr, event); + reusableBuffer.receiverSetup.telemetryDisabled = editCheckBox(reusableBuffer.receiverSetup.telemetryDisabled, RECEIVER_OPTIONS_2ND_COLUMN, y, "Telem. disabled", attr, event); if (attr && checkIncDec_Ret) { reusableBuffer.receiverSetup.dirty = true; } diff --git a/radio/src/opentx.h b/radio/src/opentx.h index fcf7f00a5..90f66ee62 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -1148,7 +1148,7 @@ union ReusableBuffer tmr10ms_t updateTime; uint8_t receiverId; uint8_t channelMapping[24]; - uint8_t telemetryEnabled; + uint8_t telemetryDisabled; uint8_t pwmRate; uint8_t dirty; } receiverSetup; diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp index a0b61eb28..a46793d8b 100644 --- a/radio/src/pulses/pxx2.cpp +++ b/radio/src/pulses/pxx2.cpp @@ -155,6 +155,8 @@ void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module) flag0 |= PXX2_RX_SETTINGS_FLAG0_WRITE; Pxx2Transport::addByte(flag0); uint8_t flag1 = 0; + if (reusableBuffer.receiverSetup.telemetryDisabled) + flag1 |= PXX2_RX_SETTINGS_FLAG1_TELEMETRY_DISABLED; if (reusableBuffer.receiverSetup.pwmRate) flag1 |= PXX2_RX_SETTINGS_FLAG1_FASTPWM; Pxx2Transport::addByte(flag1); diff --git a/radio/src/pulses/pxx2.h b/radio/src/pulses/pxx2.h index beae30fb0..e9a18a47b 100644 --- a/radio/src/pulses/pxx2.h +++ b/radio/src/pulses/pxx2.h @@ -44,9 +44,11 @@ #define PXX2_CHANNELS_FLAG0_FAILSAFE (1 << 6) #define PXX2_CHANNELS_FLAG0_RANGECHECK (1 << 7) -#define PXX2_RX_SETTINGS_FLAG0_WRITE (1 << 6) -#define PXX2_RX_SETTINGS_FLAG1_FASTPWM (1 << 4) -#define PXX2_RECV_OPTION_MASK_TELEMETRY 0x00 // TODO : update when defined +#define PXX2_RX_SETTINGS_FLAG0_WRITE (1 << 6) + +#define PXX2_RX_SETTINGS_FLAG1_TELEMETRY_DISABLED (1 << 7) +#define PXX2_RX_SETTINGS_FLAG1_READONLY (1 << 6) +#define PXX2_RX_SETTINGS_FLAG1_FASTPWM (1 << 4) enum PXX2RegisterSteps { REGISTER_START,