Powermeter added
This commit is contained in:
@@ -38,12 +38,6 @@
|
||||
extern uint8_t dsm2BindTimer;
|
||||
#endif
|
||||
|
||||
#if defined(PXX)
|
||||
#define IS_PXX_PROTOCOL(protocol) (protocol==PROTO_PXX)
|
||||
#else
|
||||
#define IS_PXX_PROTOCOL(protocol) (0)
|
||||
#endif
|
||||
|
||||
#if defined(DSM2)
|
||||
#define IS_DSM2_PROTOCOL(protocol) (protocol>=PROTOCOL_CHANNELS_DSM2_LP45 && protocol<=PROTOCOL_CHANNELS_DSM2_DSMX)
|
||||
#else
|
||||
@@ -73,6 +67,7 @@ enum ModuleSettingsMode
|
||||
{
|
||||
MODULE_MODE_NORMAL,
|
||||
MODULE_MODE_SPECTRUM_ANALYSER,
|
||||
MODULE_MODE_POWER_METER,
|
||||
MODULE_MODE_GET_HARDWARE_INFO,
|
||||
MODULE_MODE_RECEIVER_SETTINGS,
|
||||
MODULE_MODE_BEEP_FIRST,
|
||||
@@ -84,8 +79,9 @@ enum ModuleSettingsMode
|
||||
|
||||
PACK(struct ModuleSettings {
|
||||
uint8_t protocol:4;
|
||||
uint8_t mode:4;
|
||||
uint8_t paused:1;
|
||||
uint8_t mode:3;
|
||||
uint8_t spare:7;
|
||||
uint16_t counter;
|
||||
});
|
||||
|
||||
|
||||
@@ -212,14 +212,30 @@ void Pxx2Pulses::setupSpectrumAnalyser(uint8_t module)
|
||||
addFrameType(PXX2_TYPE_C_POWER_METER, PXX2_TYPE_ID_SPECTRUM);
|
||||
Pxx2Transport::addByte(0x00);
|
||||
|
||||
reusableBuffer.spectrum.fq = 2440000000; // 2440MHz
|
||||
Pxx2Transport::addWord(reusableBuffer.spectrum.fq);
|
||||
reusableBuffer.spectrumAnalyser.freq = 2440000000; // 2440MHz
|
||||
Pxx2Transport::addWord(reusableBuffer.spectrumAnalyser.freq);
|
||||
|
||||
reusableBuffer.spectrum.span = 40000000; // 40MHz
|
||||
Pxx2Transport::addWord(reusableBuffer.spectrum.span);
|
||||
reusableBuffer.spectrumAnalyser.span = 40000000; // 40MHz
|
||||
Pxx2Transport::addWord(reusableBuffer.spectrumAnalyser.span);
|
||||
|
||||
reusableBuffer.spectrum.step = 100000; // 100KHz
|
||||
Pxx2Transport::addWord(reusableBuffer.spectrum.step);
|
||||
reusableBuffer.spectrumAnalyser.step = 100000; // 100KHz
|
||||
Pxx2Transport::addWord(reusableBuffer.spectrumAnalyser.step);
|
||||
}
|
||||
|
||||
|
||||
void Pxx2Pulses::setupPowerMeter(uint8_t module)
|
||||
{
|
||||
if (moduleSettings[module].counter > 1000) {
|
||||
moduleSettings[module].counter = 1002;
|
||||
return;
|
||||
}
|
||||
|
||||
moduleSettings[module].counter = 1002;
|
||||
|
||||
addFrameType(PXX2_TYPE_C_POWER_METER, PXX2_TYPE_ID_POWER_METER);
|
||||
Pxx2Transport::addByte(0x00);
|
||||
|
||||
Pxx2Transport::addWord(reusableBuffer.powerMeter.freq);
|
||||
}
|
||||
|
||||
void Pxx2Pulses::setupShareMode(uint8_t module)
|
||||
@@ -248,6 +264,9 @@ void Pxx2Pulses::setupFrame(uint8_t module)
|
||||
case MODULE_MODE_SPECTRUM_ANALYSER:
|
||||
setupSpectrumAnalyser(module);
|
||||
break;
|
||||
case MODULE_MODE_POWER_METER:
|
||||
setupPowerMeter(module);
|
||||
break;
|
||||
case MODULE_MODE_SHARE:
|
||||
setupShareMode(module);
|
||||
break;
|
||||
|
||||
@@ -129,6 +129,8 @@ class Pxx2Pulses: public PxxPulses<Pxx2Transport> {
|
||||
|
||||
void setupSpectrumAnalyser(uint8_t module);
|
||||
|
||||
void setupPowerMeter(uint8_t module);
|
||||
|
||||
void addHead()
|
||||
{
|
||||
// send 7E, do not CRC
|
||||
|
||||
Reference in New Issue
Block a user