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

Fix pinmap

Browse source
This commit is contained in:
3djc 2019-03-08 11:54:09 +01:00
parent e33579f305
commit af70f8f2f6
6 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1943,7 +1943,7 @@ void menuModelPinmap(event_t event)
lcdInvertLine(0); lcdInvertLine(0);
if (event == EVT_ENTRY || (reusableBuffer.receiverSetup.state == 0x00 && get_tmr10ms() >= reusableBuffer.receiverSetup.updateTime)) { if (event == EVT_ENTRY || (reusableBuffer.receiverSetup.state == 0x00 && get_tmr10ms() >= reusableBuffer.receiverSetup.updateTime)) {
reusableBuffer.receiverSetup.updateTime = get_tmr10ms() + 100/*1s*/; reusableBuffer.receiverSetup.updateTime = get_tmr10ms() + 500/*5s*/;
reusableBuffer.receiverSetup.timeout = 0; reusableBuffer.receiverSetup.timeout = 0;
moduleSettings[reusableBuffer.receiverSetup.moduleIdx].mode = MODULE_MODE_RECEIVER_SETTINGS; moduleSettings[reusableBuffer.receiverSetup.moduleIdx].mode = MODULE_MODE_RECEIVER_SETTINGS;
} }

2
radio/src/io/frsky_pxx2.h
View file

@ -25,7 +25,7 @@
#define PXX2_BAUDRATE 230400 #define PXX2_BAUDRATE 230400
#define PXX2_PERIOD 4 // 4ms #define PXX2_PERIOD 4 // 4ms
#define PXX2_FRAME_MAXLENGTH 32 #define PXX2_FRAME_MAXLENGTH 64
class ModuleFifo : public Fifo<uint8_t, PXX2_FRAME_MAXLENGTH> { class ModuleFifo : public Fifo<uint8_t, PXX2_FRAME_MAXLENGTH> {
public: public:

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

@ -149,8 +149,7 @@ void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module)
reusableBuffer.receiverSetup.timeout = 0; reusableBuffer.receiverSetup.timeout = 0;
moduleSettings[module].mode = MODULE_MODE_NORMAL; moduleSettings[module].mode = MODULE_MODE_NORMAL;
} }
#warning "TODO send channels during the timeout" setupChannelsFrame(module);
//setupChannelsFrame(module);
} }
else { else {
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RX_SETTINGS); addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RX_SETTINGS);
@ -159,7 +158,7 @@ void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module)
for (int i = 0; i < 24; i++) { for (int i = 0; i < 24; i++) {
Pxx2Transport::addByte(reusableBuffer.receiverSetup.channelMapping[i]); Pxx2Transport::addByte(reusableBuffer.receiverSetup.channelMapping[i]);
} }
reusableBuffer.receiverSetup.timeout = get_tmr10ms() + 10/*100ms*/; reusableBuffer.receiverSetup.timeout = get_tmr10ms() + 20/*200ms*/;
} }
} }

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

@ -99,6 +99,7 @@ void processReceiverSettingsFrame(uint8_t module, uint8_t * frame)
} }
reusableBuffer.receiverSetup.state = 0xFF; reusableBuffer.receiverSetup.state = 0xFF;
moduleSettings[module].mode = MODULE_MODE_NORMAL;
} }
void processRegisterFrame(uint8_t module, uint8_t * frame) void processRegisterFrame(uint8_t module, uint8_t * frame)

1
radio/src/translations.cpp
View file

@ -710,6 +710,7 @@ const char STR_RX_NAME[] = TR_RX_NAME;
#if defined(PCBTARANIS) || defined(DSM2) #if defined(PCBTARANIS) || defined(DSM2)
const char STR_MODULE_RANGE[] = TR_MODULE_RANGE; const char STR_MODULE_RANGE[] = TR_MODULE_RANGE;
const char STR_RECEIVER_OPTIONS[] = TR_RECEIVER_OPTIONS;
const char STR_DEL_BUTTON[] = TR_DEL_BUTTON; const char STR_DEL_BUTTON[] = TR_DEL_BUTTON;
#endif #endif

1
radio/src/translations.h
View file

@ -976,6 +976,7 @@ extern const char STR_JITTER_FILTER[];
#if defined(PCBTARANIS) || defined(DSM2) #if defined(PCBTARANIS) || defined(DSM2)
extern const char STR_MODULE_RANGE[]; extern const char STR_MODULE_RANGE[];
extern const char STR_RECEIVER_OPTIONS[];
extern const char STR_DEL_BUTTON[]; extern const char STR_DEL_BUTTON[];
#endif #endif