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

[PXX2] Telemetry bit added

Browse source
This commit is contained in:
Bertrand Songis 2019-03-18 10:54:07 +01:00
parent 57a2a5c8c7
commit 2e81b2ca50
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1980,7 +1980,7 @@ void menuModelReceiverOptions(event_t event)
} }
#if defined(SIMU) #if defined(SIMU)
reusableBuffer.receiverSetup.state = 0xFF; reusableBuffer.receiverSetup.state = RECEIVER_SETTINGS_OK;
#endif #endif
if (reusableBuffer.receiverSetup.state == RECEIVER_SETTINGS_OK || get_tmr10ms() < reusableBuffer.receiverSetup.dirtyTimeout) { if (reusableBuffer.receiverSetup.state == RECEIVER_SETTINGS_OK || get_tmr10ms() < reusableBuffer.receiverSetup.dirtyTimeout) {
@ -1991,7 +1991,7 @@ void menuModelReceiverOptions(event_t event)
switch (i) { switch (i) {
case ITEM_RECEIVER_TELEMETRY: 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) { if (attr && checkIncDec_Ret) {
reusableBuffer.receiverSetup.dirty = true; reusableBuffer.receiverSetup.dirty = true;
} }

2
radio/src/opentx.h
View file

@ -1148,7 +1148,7 @@ union ReusableBuffer
tmr10ms_t updateTime; tmr10ms_t updateTime;
uint8_t receiverId; uint8_t receiverId;
uint8_t channelMapping[24]; uint8_t channelMapping[24];
uint8_t telemetryEnabled; uint8_t telemetryDisabled;
uint8_t pwmRate; uint8_t pwmRate;
uint8_t dirty; uint8_t dirty;
} receiverSetup; } receiverSetup;

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

@ -155,6 +155,8 @@ void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module)
flag0 |= PXX2_RX_SETTINGS_FLAG0_WRITE; flag0 |= PXX2_RX_SETTINGS_FLAG0_WRITE;
Pxx2Transport::addByte(flag0); Pxx2Transport::addByte(flag0);
uint8_t flag1 = 0; uint8_t flag1 = 0;
if (reusableBuffer.receiverSetup.telemetryDisabled)
flag1 |= PXX2_RX_SETTINGS_FLAG1_TELEMETRY_DISABLED;
if (reusableBuffer.receiverSetup.pwmRate) if (reusableBuffer.receiverSetup.pwmRate)
flag1 |= PXX2_RX_SETTINGS_FLAG1_FASTPWM; flag1 |= PXX2_RX_SETTINGS_FLAG1_FASTPWM;
Pxx2Transport::addByte(flag1); Pxx2Transport::addByte(flag1);

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

@ -44,9 +44,11 @@
#define PXX2_CHANNELS_FLAG0_FAILSAFE (1 << 6) #define PXX2_CHANNELS_FLAG0_FAILSAFE (1 << 6)
#define PXX2_CHANNELS_FLAG0_RANGECHECK (1 << 7) #define PXX2_CHANNELS_FLAG0_RANGECHECK (1 << 7)
#define PXX2_RX_SETTINGS_FLAG0_WRITE (1 << 6) #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_FLAG1_TELEMETRY_DISABLED (1 << 7)
#define PXX2_RX_SETTINGS_FLAG1_READONLY (1 << 6)
#define PXX2_RX_SETTINGS_FLAG1_FASTPWM (1 << 4)
enum PXX2RegisterSteps { enum PXX2RegisterSteps {
REGISTER_START, REGISTER_START,