PXX2 pxx2SetRxParams started

This commit is contained in:
Bertrand Songis
2019-03-07 16:48:43 +01:00
parent 2c454e8156
commit 68df083394
7 changed files with 18 additions and 5 deletions
+2 -1
View File
@@ -421,7 +421,8 @@ PACK(struct ReceiverData {
uint64_t channelMapping1:60; // 12 last channels
uint8_t used:1;
uint8_t telemetry:1;
uint8_t spare:2;
uint8_t dirty:1;
uint8_t spare:1;
char name[PXX2_LEN_RX_NAME];
});
+2 -2
View File
@@ -64,8 +64,8 @@ extern int8_t checkIncDec_Ret; // global helper vars
extern int8_t s_editMode; // global editmode
// checkIncDec flags
#define EE_GENERAL 0x01
#define EE_MODEL 0x02
// we leave room for EE_MODEL and EE_GENERAL
#define NO_INCDEC_MARKS 0x04
#define INCDEC_SWITCH 0x08
#define INCDEC_SOURCE 0x10
+1 -2
View File
@@ -93,8 +93,7 @@ extern int8_t checkIncDec_Ret; // global helper vars
extern int8_t s_editMode; // global editmode
// checkIncDec flags
#define EE_GENERAL 0x01
#define EE_MODEL 0x02
// we leave room for EE_MODEL and EE_GENERAL
#define NO_INCDEC_MARKS 0x04
#define INCDEC_SWITCH 0x08
#define INCDEC_SOURCE 0x10
+3
View File
@@ -485,4 +485,7 @@ PACK(union u_int8int16_t {
int16_t word;
});
#define EE_GENERAL 0x01
#define EE_MODEL 0x02
#endif // _MYEEPROM_H_
+2
View File
@@ -226,6 +226,8 @@ inline void setPinOuput(uint8_t receiverIdx, uint8_t pin, uint8_t chan)
pin -= 12;
g_model.receiverData[receiverIdx].channelMapping1 = BF_SET<uint64_t>(g_model.receiverData[receiverIdx].channelMapping1, chan, pin * 5, 5);
}
g_model.receiverData[receiverIdx].dirty = 1;
storageDirty(EE_MODEL);
}
inline int8_t maxModuleChannels_M8(uint8_t idx)
+6
View File
@@ -140,12 +140,18 @@ void Pxx2Pulses::setupRegisterFrame(uint8_t module)
}
}
void Pxx2Pulses::setupSetRxParamsFrame(uint8_t module, uint8_t receiverSlot)
{
}
void Pxx2Pulses::setupBindFrame(uint8_t module)
{
if (reusableBuffer.moduleSetup.pxx2.bindStep == BIND_WAIT) {
if (get_tmr10ms() > reusableBuffer.moduleSetup.pxx2.bindWaitTimeout) {
moduleSettings[module].mode = MODULE_MODE_NORMAL;
reusableBuffer.moduleSetup.pxx2.bindStep = BIND_OK;
setupSetRxParamsFrame(module, reusableBuffer.moduleSetup.pxx2.bindReceiverSlot);
POPUP_INFORMATION(STR_BIND_OK);
}
return;
+2
View File
@@ -112,6 +112,8 @@ class Pxx2Pulses: public PxxPulses<Pxx2Transport> {
void setupShareMode(uint8_t module);
void setupSetRxParamsFrame(uint8_t module, uint8_t receiverSlot);
void setupChannelsFrame(uint8_t module);
void setupSpectrumAnalyser(uint8_t module);