Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Fixes for binary options handling

Browse source
This commit is contained in:
3djc 2019-03-11 08:05:54 +01:00
parent 9fb471b8cb
commit e9d54852b9
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/gui/128x64/model_setup.cpp
View file

@ -1957,7 +1957,7 @@ void menuModelReceiverOptions(event_t event)
case ITEM_RECEIVER_TELEMETRY:
previousValue = reusableBuffer.receiverSetup.telemetryEnabled;
reusableBuffer.receiverSetup.telemetryEnabled = editCheckBox(reusableBuffer.receiverSetup.telemetryEnabled, RECEIVER_OPTIONS_2ND_COLUMN, y,
"Telemetry", attr, event);
"Telemetry", attr, event) & PXX2_RECV_OPTION_MASK_TELEMETRY;
if (previousValue != reusableBuffer.receiverSetup.telemetryEnabled)
changed = true;
break;
@ -1965,7 +1965,7 @@ void menuModelReceiverOptions(event_t event)
case ITEM_RECEIVER_PWM_RATE:
previousValue = reusableBuffer.receiverSetup.pwmRate;
reusableBuffer.receiverSetup.pwmRate = editCheckBox(reusableBuffer.receiverSetup.pwmRate, RECEIVER_OPTIONS_2ND_COLUMN, y, "9ms PWM", attr, event);
reusableBuffer.receiverSetup.pwmRate = editCheckBox(reusableBuffer.receiverSetup.pwmRate, RECEIVER_OPTIONS_2ND_COLUMN, y, "9ms PWM", attr, event) & PXX2_RECV_OPTION_MASK_FASTPWM;
if (previousValue != reusableBuffer.receiverSetup.telemetryEnabled)
changed = true;
break;

4
radio/src/pulses/pxx2.cpp
View file

@ -148,7 +148,9 @@ void Pxx2Pulses::setupReceiverSetSettingsFrame(uint8_t module)
Pxx2Transport::addByte(0x40 + reusableBuffer.receiverSetup.receiverId);
uint8_t flag1 = 0;
if (reusableBuffer.receiverSetup.pwmRate)
flag1 |= 0x10;
flag1 |= PXX2_RECV_OPTION_MASK_FASTPWM;
if (reusableBuffer.receiverSetup.telemetryEnabled)
flag1 |= PXX2_RECV_OPTION_MASK_TELEMETRY;
Pxx2Transport::addByte(flag1);
for (int i = 0; i < 24; i++) {
Pxx2Transport::addByte(reusableBuffer.receiverSetup.channelMapping[i]);

3
radio/src/pulses/pxx2.h
View file

@ -42,6 +42,9 @@
#define PXX2_FLAG0_FAILSAFE (1 << 6)
#define PXX2_RECV_OPTION_MASK_FASTPWM 0x10
#define PXX2_RECV_OPTION_MASK_TELEMETRY 0x00 // Todo : update when defined
const uint8_t DEFAULT_CHANNEL_MAPPING[] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF};
const uint8_t CH9TO16_CHANNEL_MAPPING[] = {0x89, 0xAB, 0xCD, 0xEF, 0x01, 0x23, 0x45, 0x67};