In progress ...

This commit is contained in:
Bertrand Songis
2019-02-06 19:12:20 +01:00
parent 8f9fcca0c4
commit dfd12ff978
9 changed files with 155 additions and 17 deletions
+4 -3
View File
@@ -139,8 +139,9 @@ void setupPulsesPXX(uint8_t port)
void setupPulsesPXX2(uint8_t module)
{
if (module == INTERNAL_MODULE) {
modulePulsesData[module].pxx2.setupFrame(module);
intmoduleSendNextFrame();
if (modulePulsesData[module].pxx2.setupFrame(module)) {
intmoduleSendNextFrame();
}
}
#if 0
@@ -292,7 +293,7 @@ void sendPulses(uint8_t port, uint8_t protocol)
case PROTOCOL_CHANNELS_PXX2:
setupPulsesPXX2(port);
scheduleNextMixerCalculation(port, PXX2_PERIOD);
scheduleNextMixerCalculation(port, moduleSettings[port].mode == MODULE_MODE_SPECTRUM ? 1 : PXX2_PERIOD);
break;
#if defined(MULTIMODULE)
+4 -3
View File
@@ -73,13 +73,14 @@ enum ModuleSettingsMode
MODULE_MODE_NORMAL,
MODULE_MODE_RANGECHECK,
MODULE_MODE_BIND,
MODULE_MODE_REGISTER
MODULE_MODE_REGISTER,
MODULE_MODE_SPECTRUM,
};
PACK(struct ModuleSettings {
uint8_t protocol:5;
uint8_t protocol:4;
uint8_t paused:1;
uint8_t mode:2;
uint8_t mode:3;
uint16_t counter;
});
+47 -5
View File
@@ -55,7 +55,7 @@ void Pxx2Pulses::setupChannelsFrame(uint8_t module)
addChannels(module, flag0 & PXX2_FLAG0_FAILSAFE, 1);
}
void Pxx2Pulses::setupRegisterFrame(uint8_t module)
bool Pxx2Pulses::setupRegisterFrame(uint8_t module)
{
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_REGISTER);
@@ -68,9 +68,11 @@ void Pxx2Pulses::setupRegisterFrame(uint8_t module)
else {
Pxx2Transport::addByte(0);
}
return true; // TODO not always
}
void Pxx2Pulses::setupBindFrame(uint8_t module)
bool Pxx2Pulses::setupBindFrame(uint8_t module)
{
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_BIND);
@@ -87,18 +89,56 @@ void Pxx2Pulses::setupBindFrame(uint8_t module)
Pxx2Transport::addByte(g_model.modelRegistrationID[i]);
}
}
return true; // TODO not always
}
void Pxx2Pulses::setupFrame(uint8_t module)
bool Pxx2Pulses::setupSpectrumAnalyser(uint8_t module)
{
addFrameType(PXX2_TYPE_C_POWER_METER, PXX2_TYPE_ID_SPECTRUM);
Pxx2Transport::addByte(0x00);
uint32_t fq = 2500000000;
Pxx2Transport::addByte(fq);
Pxx2Transport::addByte(fq >> 8);
Pxx2Transport::addByte(fq >> 16);
Pxx2Transport::addByte(fq >> 24);
uint32_t span = 10000;
Pxx2Transport::addByte(span);
Pxx2Transport::addByte(span >> 8);
Pxx2Transport::addByte(span >> 16);
Pxx2Transport::addByte(span >> 24);
uint32_t bandwidth = 10000;
Pxx2Transport::addByte(bandwidth);
Pxx2Transport::addByte(bandwidth >> 8);
Pxx2Transport::addByte(bandwidth >> 16);
Pxx2Transport::addByte(bandwidth >> 24);
static bool done = false;
if (done)
return false;
done = true;
return true;
}
bool Pxx2Pulses::setupFrame(uint8_t module)
{
initFrame();
bool result = true;
uint8_t mode = moduleSettings[module].mode;
if (mode == MODULE_MODE_REGISTER)
setupRegisterFrame(module);
result = setupRegisterFrame(module);
else if (mode == MODULE_MODE_BIND)
setupBindFrame(module);
result = setupBindFrame(module);
else if (mode == MODULE_MODE_SPECTRUM)
result = setupSpectrumAnalyser(module);
else
setupChannelsFrame(module);
@@ -116,4 +156,6 @@ void Pxx2Pulses::setupFrame(uint8_t module)
#endif
endFrame();
return result;
}
+7 -3
View File
@@ -31,6 +31,8 @@
#define PXX2_TYPE_ID_SPORT 0xFE
#define PXX2_TYPE_C_POWER_METER 0x02
#define PXX2_TYPE_ID_POWER_METER 0x01
#define PXX2_TYPE_ID_SPECTRUM 0x02
#define PXX2_TYPE_C_OTA 0xFE
@@ -123,15 +125,17 @@ class Pxx2Transport: public DataBuffer<uint8_t, 64>, public PxxCrcMixin {
class Pxx2Pulses: public PxxPulses<Pxx2Transport> {
public:
void setupFrame(uint8_t module);
bool setupFrame(uint8_t module);
protected:
void setupRegisterFrame(uint8_t module);
bool setupRegisterFrame(uint8_t module);
void setupBindFrame(uint8_t module);
bool setupBindFrame(uint8_t module);
void setupChannelsFrame(uint8_t module);
bool setupSpectrumAnalyser(uint8_t module);
void addHead()
{
// send 7E, do not CRC