Added bitrate option for POCSAG baseband, PWMRSSI frequency option

Split SD card wiper app
Cleanup for -Weffc++
This commit is contained in:
furrtek
2017-01-16 08:40:17 +00:00
parent 5e40669cbc
commit e4abcea9a3
23 changed files with 314 additions and 190 deletions
+7 -6
View File
@@ -30,6 +30,7 @@
#include <functional>
#include <algorithm>
#include "pocsag_packet.hpp"
#include "baseband_packet.hpp"
#include "ert_packet.hpp"
#include "tpms_packet.hpp"
@@ -546,17 +547,17 @@ class PWMRSSIConfigureMessage : public Message {
public:
constexpr PWMRSSIConfigureMessage(
const bool enabled,
const uint32_t freq,
const uint32_t synth_div,
const int32_t avg
) : Message { ID::PWMRSSIConfigure },
enabled(enabled),
freq(freq),
synth_div(synth_div),
avg(avg)
{
}
const bool enabled;
const uint32_t freq;
const uint32_t synth_div;
const int32_t avg;
};
@@ -678,13 +679,13 @@ public:
class POCSAGConfigureMessage : public Message {
public:
constexpr POCSAGConfigureMessage(
const uint32_t rate
const pocsag::BitRate bitrate
) : Message { ID::POCSAGConfigure },
rate(rate)
bitrate(bitrate)
{
}
const uint32_t rate;
const pocsag::BitRate bitrate;
};
class ADSBConfigureMessage : public Message {
+8 -7
View File
@@ -34,13 +34,14 @@ namespace pocsag {
enum BitRate : uint32_t {
UNKNOWN,
FSK512,
FSK1200,
FSK2400
FSK512 = 512,
FSK1200 = 1200,
FSK2400 = 2400
};
enum PacketFlag : uint32_t {
NORMAL,
IDLE,
TIMED_OUT,
TOO_LONG
};
@@ -81,17 +82,17 @@ public:
}
void clear() {
for (size_t c = 0; c < 16; c++)
for (uint32_t c = 0; c < 16; c++)
codewords[c] = 0;
bitrate_ = UNKNOWN;
flag_ = NORMAL;
}
private:
BitRate bitrate_;
PacketFlag flag_;
BitRate bitrate_ { UNKNOWN };
PacketFlag flag_ { NORMAL };
uint32_t codewords[16];
Timestamp timestamp_;
Timestamp timestamp_ { };
};
} /* namespace pocsag */