[PXX2] Share frame sent

This commit is contained in:
Bertrand Songis
2019-03-13 18:19:41 +01:00
parent 1aed951571
commit eb64bc85e7
3 changed files with 8 additions and 13 deletions
+3 -4
View File
@@ -1361,11 +1361,10 @@ void menuModelSetup(event_t event)
} }
else { else {
if (event == EVT_KEY_BREAK(KEY_ENTER)) { if (event == EVT_KEY_BREAK(KEY_ENTER)) {
moduleSettings[moduleIdx].mode ^= MODULE_MODE_SHARE; moduleSettings[moduleIdx].mode = MODULE_MODE_SHARE;
reusableBuffer.moduleSetup.pxx2.shareReceiverIndex = receiverIdx; reusableBuffer.moduleSetup.pxx2.shareReceiverIndex = receiverIdx;
}
if (moduleSettings[moduleIdx].mode == MODULE_MODE_NORMAL) {
s_editMode = 0; s_editMode = 0;
POPUP_INFORMATION("Model shared");
} }
} }
} }
@@ -1373,7 +1372,7 @@ void menuModelSetup(event_t event)
break; break;
#endif #endif
#if defined(PCBSKY9X) #if defined(PCBSKY9X)
case ITEM_MODEL_EXTRA_MODULE_BIND: case ITEM_MODEL_EXTRA_MODULE_BIND:
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
case ITEM_MODEL_INTERNAL_MODULE_NPXX2_BIND: case ITEM_MODEL_INTERNAL_MODULE_NPXX2_BIND:
+2 -7
View File
@@ -224,13 +224,8 @@ void Pxx2Pulses::setupShareMode(uint8_t module)
{ {
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RX_SETTINGS); addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RX_SETTINGS);
Pxx2Transport::addByte(0xC0); Pxx2Transport::addByte(PXX2_RX_SETTINGS_FLAG0_WRITE + reusableBuffer.moduleSetup.pxx2.shareReceiverIndex);
Pxx2Transport::addByte(PXX2_RX_SETTINGS_FLAG1_SHARE);
Pxx2Transport::addByte(0x40);
for(uint8_t i=0; i < 24 ; i++) {
Pxx2Transport::addByte(i);
}
moduleSettings[module].mode = MODULE_MODE_NORMAL; moduleSettings[module].mode = MODULE_MODE_NORMAL;
} }
+3 -2
View File
@@ -43,10 +43,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_FLAG1_SHARE (1 << 6)
#define PXX2_RX_SETTINGS_FLAG1_FASTPWM (1 << 4) #define PXX2_RX_SETTINGS_FLAG1_FASTPWM (1 << 4)
#define PXX2_RECV_OPTION_MASK_TELEMETRY 0x00 // TODO : update when defined #define PXX2_RECV_OPTION_MASK_TELEMETRY 0x00 // TODO : update when defined
enum PXX2RegisterSteps { enum PXX2RegisterSteps {
REGISTER_START, REGISTER_START,
REGISTER_RX_NAME_RECEIVED, REGISTER_RX_NAME_RECEIVED,
@@ -64,7 +65,7 @@ enum PXX2BindSteps {
enum PXX2ReceiverStatus { enum PXX2ReceiverStatus {
RECEIVER_SETTINGS_READ = 0x00, RECEIVER_SETTINGS_READ = 0x00,
RECEIVER_SETTINGS_OK, RECEIVER_SETTINGS_OK,
RECEIVER_SETTINGS_WRITE = 0x40 RECEIVER_SETTINGS_WRITE = PXX2_RX_SETTINGS_FLAG0_WRITE
}; };
extern ModuleFifo intmoduleFifo; extern ModuleFifo intmoduleFifo;