TX options added

This commit is contained in:
Bertrand Songis
2019-03-21 17:54:32 +01:00
parent 2d3f268b09
commit e43ad9adc6
10 changed files with 348 additions and 97 deletions
+1
View File
@@ -69,6 +69,7 @@ enum ModuleSettingsMode
MODULE_MODE_SPECTRUM_ANALYSER,
MODULE_MODE_POWER_METER,
MODULE_MODE_GET_HARDWARE_INFO,
MODULE_MODE_MODULE_SETTINGS,
MODULE_MODE_RECEIVER_SETTINGS,
MODULE_MODE_BEEP_FIRST,
MODULE_MODE_REGISTER = MODULE_MODE_BEEP_FIRST,
+34 -9
View File
@@ -154,27 +154,49 @@ void Pxx2Pulses::setupRegisterFrame(uint8_t module)
}
}
void Pxx2Pulses::setupModuleSettingsFrame(uint8_t module)
{
if (get_tmr10ms() > reusableBuffer.moduleSettings.timeout) {
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_TX_SETTINGS);
uint8_t flag0 = 0;
if (reusableBuffer.moduleSettings.state == PXX2_SETTINGS_WRITE)
flag0 |= PXX2_TX_SETTINGS_FLAG0_WRITE;
Pxx2Transport::addByte(flag0);
if (reusableBuffer.moduleSettings.state == PXX2_SETTINGS_WRITE) {
uint8_t flag1 = reusableBuffer.moduleSettings.rfProtocol << 4;
if (reusableBuffer.moduleSettings.externalAntenna)
flag1 |= PXX2_TX_SETTINGS_FLAG1_EXTERNAL_ANTENNA;
Pxx2Transport::addByte(flag1);
Pxx2Transport::addByte(reusableBuffer.moduleSettings.txPower);
}
reusableBuffer.moduleSettings.timeout = get_tmr10ms() + 200/*next try in 2s*/;
}
else {
setupChannelsFrame(module);
}
}
void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module)
{
if (get_tmr10ms() > reusableBuffer.receiverSetup.timeout) {
if (get_tmr10ms() > reusableBuffer.receiverSettings.timeout) {
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RX_SETTINGS);
uint8_t flag0 = reusableBuffer.receiverSetup.receiverId;
if (reusableBuffer.receiverSetup.state == RECEIVER_SETTINGS_WRITE)
uint8_t flag0 = reusableBuffer.receiverSettings.receiverId;
if (reusableBuffer.receiverSettings.state == PXX2_SETTINGS_WRITE)
flag0 |= PXX2_RX_SETTINGS_FLAG0_WRITE;
Pxx2Transport::addByte(flag0);
if (reusableBuffer.receiverSetup.state == RECEIVER_SETTINGS_WRITE) {
if (reusableBuffer.receiverSettings.state == PXX2_SETTINGS_WRITE) {
uint8_t flag1 = 0;
if (reusableBuffer.receiverSetup.telemetryDisabled)
if (reusableBuffer.receiverSettings.telemetryDisabled)
flag1 |= PXX2_RX_SETTINGS_FLAG1_TELEMETRY_DISABLED;
if (reusableBuffer.receiverSetup.pwmRate)
if (reusableBuffer.receiverSettings.pwmRate)
flag1 |= PXX2_RX_SETTINGS_FLAG1_FASTPWM;
Pxx2Transport::addByte(flag1);
uint8_t outputsCount = min<uint8_t>(16, reusableBuffer.receiverSetup.outputsCount);
uint8_t outputsCount = min<uint8_t>(16, reusableBuffer.receiverSettings.outputsCount);
for (int i = 0; i < outputsCount; i++) {
Pxx2Transport::addByte(reusableBuffer.receiverSetup.outputsMapping[i]);
Pxx2Transport::addByte(reusableBuffer.receiverSettings.outputsMapping[i]);
}
}
reusableBuffer.receiverSetup.timeout = get_tmr10ms() + 200/*next try in 2s*/;
reusableBuffer.receiverSettings.timeout = get_tmr10ms() + 200/*next try in 2s*/;
}
else {
setupChannelsFrame(module);
@@ -262,6 +284,9 @@ void Pxx2Pulses::setupFrame(uint8_t module)
case MODULE_MODE_GET_HARDWARE_INFO:
setupHardwareInfoFrame(module);
break;
case MODULE_MODE_MODULE_SETTINGS:
setupModuleSettingsFrame(module);
break;
case MODULE_MODE_RECEIVER_SETTINGS:
setupReceiverSettingsFrame(module);
break;
+18 -3
View File
@@ -50,6 +50,9 @@
#define PXX2_RX_SETTINGS_FLAG1_READONLY (1 << 6)
#define PXX2_RX_SETTINGS_FLAG1_FASTPWM (1 << 4)
#define PXX2_TX_SETTINGS_FLAG0_WRITE (1 << 6)
#define PXX2_TX_SETTINGS_FLAG1_EXTERNAL_ANTENNA (1 << 3)
enum PXX2RegisterSteps {
REGISTER_START,
REGISTER_RX_NAME_RECEIVED,
@@ -65,9 +68,9 @@ enum PXX2BindSteps {
};
enum PXX2ReceiverStatus {
RECEIVER_SETTINGS_READ,
RECEIVER_SETTINGS_WRITE,
RECEIVER_SETTINGS_OK
PXX2_SETTINGS_READ,
PXX2_SETTINGS_WRITE,
PXX2_SETTINGS_OK
};
extern ModuleFifo intmoduleFifo;
@@ -123,6 +126,8 @@ class Pxx2Pulses: public PxxPulses<Pxx2Transport> {
void setupShareMode(uint8_t module);
void setupModuleSettingsFrame(uint8_t module);
void setupReceiverSettingsFrame(uint8_t module);
void setupChannelsFrame(uint8_t module);
@@ -192,4 +197,14 @@ class Pxx2Pulses: public PxxPulses<Pxx2Transport> {
}
};
union PXX2Version
{
uint16_t data;
struct {
uint8_t major;
uint8_t minor:4;
uint8_t revision:4;
};
};
#endif