Merge branch 'master' into gps-sim

This commit is contained in:
Erwin Ried
2020-04-20 10:51:20 +02:00
committed by GitHub
29 changed files with 2928 additions and 137 deletions

View File

@@ -78,6 +78,8 @@ public:
AFSKRxConfigure = 22,
StatusRefresh = 23,
SamplerateConfig = 24,
BTLERxConfigure = 25,
NRFRxConfigure = 26,
TXProgress = 30,
Retune = 31,
@@ -722,6 +724,46 @@ public:
const bool trigger_word;
};
class BTLERxConfigureMessage : public Message {
public:
constexpr BTLERxConfigureMessage(
const uint32_t baudrate,
const uint32_t word_length,
const uint32_t trigger_value,
const bool trigger_word
) : Message { ID::BTLERxConfigure },
baudrate(baudrate),
word_length(word_length),
trigger_value(trigger_value),
trigger_word(trigger_word)
{
}
const uint32_t baudrate;
const uint32_t word_length;
const uint32_t trigger_value;
const bool trigger_word;
};
class NRFRxConfigureMessage : public Message {
public:
constexpr NRFRxConfigureMessage(
const uint32_t baudrate,
const uint32_t word_length,
const uint32_t trigger_value,
const bool trigger_word
) : Message { ID::NRFRxConfigure },
baudrate(baudrate),
word_length(word_length),
trigger_value(trigger_value),
trigger_word(trigger_word)
{
}
const uint32_t baudrate;
const uint32_t word_length;
const uint32_t trigger_value;
const bool trigger_word;
};
class PitchRSSIConfigureMessage : public Message {
public:
constexpr PitchRSSIConfigureMessage(

View File

@@ -68,8 +68,11 @@ private:
constexpr image_tag_t image_tag_acars { 'P', 'A', 'C', 'A' };
constexpr image_tag_t image_tag_adsb_rx { 'P', 'A', 'D', 'R' };
constexpr image_tag_t image_tag_afsk_rx { 'P', 'A', 'F', 'R' };
constexpr image_tag_t image_tag_btle_rx { 'P', 'B', 'T', 'R' };
constexpr image_tag_t image_tag_nrf_rx { 'P', 'N', 'R', 'R' };
constexpr image_tag_t image_tag_ais { 'P', 'A', 'I', 'S' };
constexpr image_tag_t image_tag_am_audio { 'P', 'A', 'M', 'A' };
constexpr image_tag_t image_tag_am_tv { 'P', 'A', 'M', 'T' };
constexpr image_tag_t image_tag_capture { 'P', 'C', 'A', 'P' };
constexpr image_tag_t image_tag_ert { 'P', 'E', 'R', 'T' };
constexpr image_tag_t image_tag_nfm_audio { 'P', 'N', 'F', 'M' };