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

1 byte flash saved :)

Browse source
This commit is contained in:
Bertrand Songis 2019-02-06 09:13:31 +01:00
parent e6961585d7
commit ed1d01e33a
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1040,13 +1040,13 @@ void menuModelSetup(event_t event)
lcdDrawTextAlignedLeft(y, "Receiver"); lcdDrawTextAlignedLeft(y, "Receiver");
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, "[Add]", attr); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, "[Add]", attr);
if (attr && s_editMode>0) { if (attr && s_editMode>0) {
if(g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[0].enabled) { if (g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[0].enabled) {
g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[1].enabled = 0x01; g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[1].enabled = 0x01;
memcpy(&g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[1].channelMapping, "\x01\x23\x45\x67\x89\xAB\xCD\xEF", 8); //default map 1-1 16-16 memcpy(&g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[1].channelMapping, DEFAULT_CHANNEL_MAPPING, sizeof(uint64_t));
} }
else { else {
g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[0].enabled = 0x01; g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[0].enabled = 0x01;
memcpy(&g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[0].channelMapping, "\x01\x23\x45\x67\x89\xAB\xCD\xEF", 8); //default map 1-1 16-16 memcpy(&g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[0].channelMapping, DEFAULT_CHANNEL_MAPPING, sizeof(uint64_t));
} }
s_editMode = 0; s_editMode = 0;
} }

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

@ -38,6 +38,8 @@
#define PXX2_FLAG0_FAILSAFE (1 << 6) #define PXX2_FLAG0_FAILSAFE (1 << 6)
const uint8_t DEFAULT_CHANNEL_MAPPING[] = {0x12, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF};
class ModuleFifo : public Fifo<uint8_t, 32> { class ModuleFifo : public Fifo<uint8_t, 32> {
public: public:
bool getFrame(uint8_t * frame) bool getFrame(uint8_t * frame)

6
radio/src/telemetry/telemetry.cpp
View file

@ -77,6 +77,12 @@ void processRegisterFrame(uint8_t module, uint8_t * frame)
// RX_ID follows, we discard it for now // RX_ID follows, we discard it for now
moduleSettings[module].counter = REGISTER_COUNTER_ID_RECEIVED; moduleSettings[module].counter = REGISTER_COUNTER_ID_RECEIVED;
} }
else if (frame[3] == 0x01) {
// PASSWORD follows, we check it is good
if (memcmp(&frame[4], g_model.modelRegistrationID, LEN_REGISTRATION_ID) == 0) {
moduleSettings[module].counter = REGISTER_COUNTER_PASSWORD_RECEIVED;
}
}
} }
void processRadioFrame(uint8_t module, uint8_t * frame) void processRadioFrame(uint8_t module, uint8_t * frame)