GET / SET RX SETTINGS now working
This commit is contained in:
+19
-12
@@ -147,19 +147,26 @@ void Pxx2Pulses::setupRegisterFrame(uint8_t module)
|
||||
|
||||
void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module)
|
||||
{
|
||||
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RX_SETTINGS);
|
||||
Pxx2Transport::addByte(reusableBuffer.receiverSetup.state + reusableBuffer.receiverSetup.receiverId);
|
||||
uint8_t flag1 = 0;
|
||||
if (reusableBuffer.receiverSetup.pwmRate)
|
||||
flag1 |= PXX2_RX_SETTINGS_FLAG1_FASTPWM;
|
||||
Pxx2Transport::addByte(flag1);
|
||||
uint8_t channelsCount = sentModuleChannels(module);
|
||||
for (int i = 0; i < channelsCount; i++) {
|
||||
Pxx2Transport::addByte(reusableBuffer.receiverSetup.channelMapping[i]);
|
||||
if (reusableBuffer.receiverSetup.timeout) {
|
||||
if (get_tmr10ms() > reusableBuffer.receiverSetup.timeout) {
|
||||
reusableBuffer.receiverSetup.timeout = 0;
|
||||
moduleSettings[module].mode = MODULE_MODE_NORMAL;
|
||||
}
|
||||
setupChannelsFrame(module);
|
||||
}
|
||||
else {
|
||||
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RX_SETTINGS);
|
||||
Pxx2Transport::addByte(reusableBuffer.receiverSetup.state + reusableBuffer.receiverSetup.receiverId);
|
||||
uint8_t flag1 = 0;
|
||||
if (reusableBuffer.receiverSetup.pwmRate)
|
||||
flag1 |= PXX2_RX_SETTINGS_FLAG1_FASTPWM;
|
||||
Pxx2Transport::addByte(flag1);
|
||||
uint8_t channelsCount = sentModuleChannels(module);
|
||||
for (int i = 0; i < channelsCount; i++) {
|
||||
Pxx2Transport::addByte(reusableBuffer.receiverSetup.channelMapping[i]);
|
||||
}
|
||||
reusableBuffer.receiverSetup.timeout = get_tmr10ms() + 30/*300ms*/;
|
||||
}
|
||||
reusableBuffer.receiverSetup.timeout = get_tmr10ms() + 20/*200ms*/;
|
||||
reusableBuffer.receiverSetup.state = RECEIVER_WAITING_RESPONSE;
|
||||
moduleSettings[module].mode = MODULE_MODE_NORMAL;
|
||||
}
|
||||
|
||||
void Pxx2Pulses::setupBindFrame(uint8_t module)
|
||||
|
||||
@@ -55,16 +55,18 @@ enum PXX2RegisterSteps {
|
||||
};
|
||||
|
||||
enum PXX2BindSteps {
|
||||
BIND_START,
|
||||
BIND_RX_NAME_SELECTED,
|
||||
BIND_WAIT,
|
||||
BIND_OK
|
||||
BIND_START,
|
||||
BIND_RX_NAME_SELECTED,
|
||||
BIND_WAIT,
|
||||
BIND_OK
|
||||
};
|
||||
|
||||
enum PXX2ReceiverStatus {
|
||||
RECEIVER_WAITING_RESPONSE,
|
||||
RECEIVER_OK
|
||||
RECEIVER_SETTINGS_READ = 0x00,
|
||||
RECEIVER_SETTINGS_OK,
|
||||
RECEIVER_SETTINGS_WRITE = 0x40
|
||||
};
|
||||
|
||||
extern ModuleFifo intmoduleFifo;
|
||||
extern ModuleFifo extmoduleFifo;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user