portapack-mayhem/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2026-09-08 15:59:08 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Morse rx further development (#2959)

Browse Source 
* filters OK, radio configurations set

* all modes are working, noise still needs work, especially in FM. A baseband enum is also needed

* audio and decoding fixed, clipping and the baseband enum are still missing
This commit is contained in:
Pezsma
2026-02-03 22:25:52 +01:00
committed by GitHub
parent 6739b43914
commit a44a00acf0
6 changed files with 483 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/application/external/morse_radio/ui_morse_radio.cpp
Vendored
+40 -9
View File
@@ -17,6 +17,7 @@ MorseRadioView::MorseRadioView(ui::NavigationView& nav)
&txt_last,
&txt_speed,
&txt_freq,
&txt_clip,
&options_mode,
&btn_clear,
&console_text,
@@ -39,9 +40,9 @@ MorseRadioView::MorseRadioView(ui::NavigationView& nav)
receiver_model.enable();
options_mode.on_change = [this](size_t, int32_t value) {
current_mode = (uint8_t)value;
current_mode = static_cast<ModulationMode>((uint8_t)value);
morse_decoder_.resetLearning();
if (current_mode == 0) {
if (current_mode == ModulationMode::FM) {
receiver_model.set_am_configuration(4);
receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio);
field_squelch.set_style(Theme::getInstance()->option_active);
@@ -49,21 +50,26 @@ MorseRadioView::MorseRadioView(ui::NavigationView& nav)
receiver_model.set_squelch_level(field_squelch.value());
audio::set_rate(audio::Rate::Hz_24000);
} else {
audio::set_rate(audio::Rate::Hz_12000);
receiver_model.set_modulation(ReceiverModel::Mode::AMAudio);
receiver_model.set_am_configuration(current_mode + 7);
if (current_mode == ModulationMode::AM || current_mode == ModulationMode::DSB)
receiver_model.set_am_configuration(7);
else if (current_mode == ModulationMode::USB)
receiver_model.set_am_configuration(9);
else // LSB
receiver_model.set_am_configuration(10);
receiver_model.set_squelch_level(0);
field_squelch.set_style(Theme::getInstance()->fg_dark);
field_squelch.set_focusable(false);
audio::set_rate(audio::Rate::Hz_12000);
}
baseband::set_moreserx_config(current_mode);
baseband::set_moreserx_config(static_cast<uint8_t>(current_mode));
};
field_squelch.set_value(receiver_model.squelch_level(), false); // will be sent later, no need to send 2x
field_squelch.on_change = [this](int32_t v) {
if (current_mode == 0)
if (current_mode == ModulationMode::FM)
receiver_model.set_squelch_level(v);
};
options_mode.set_selected_index(current_mode, true);
options_mode.set_selected_index(static_cast<int32_t>(current_mode), true);
auto vol = field_volume.value(); // audio volume fix
field_volume.set_value(0);
@@ -105,9 +111,30 @@ void MorseLogger::init_daily_log(const std::filesystem::path& log_dir) {
void MorseLogger::radio_set_log(uint8_t current_mode) {
int64_t freq = receiver_model.target_frequency();
std::string mode_str;
switch (static_cast<MorseRadioView::ModulationMode>(current_mode)) {
case MorseRadioView::ModulationMode::AM:
mode_str = "AM";
break;
case MorseRadioView::ModulationMode::FM:
mode_str = "FM";
break;
case MorseRadioView::ModulationMode::DSB:
mode_str = "DSB";
break;
case MorseRadioView::ModulationMode::USB:
mode_str = "USB";
break;
case MorseRadioView::ModulationMode::LSB:
mode_str = "LSB";
break;
default:
mode_str = "???";
break;
}
std::string header = "Freq:" + to_string_rounded_freq(freq, 4);
header += "MHz, ";
header += "RX MODE:" + std::string(current_mode == 0 ? "CW/FM" : (current_mode == 1 ? "USB" : "LSB"));
header += "RX MODE:" + mode_str;
header += "\r\nMessage:";
log_file.write_raw(header);
}
@@ -152,6 +179,8 @@ MorseRadioView::~MorseRadioView() {
void MorseRadioView::focus() {
field_frequency.focus();
txt_clip.set_style(Theme::getInstance()->fg_red);
txt_clip.hidden(true);
}
void MorseRadioView::check_for_timeout() {
@@ -205,6 +234,8 @@ int32_t MorseRadioView::ProcessSignal(int32_t sig_time_us) {
void MorseRadioView::on_data(const MorseRXDataMessage* message) {
int32_t r;
txt_clip.hidden(!message->clipped);
for (uint8_t i = 0; i <= message->state_cnt; ++i) {
r = ProcessSignal(message->state_durations[i]);
auto result = morse_decoder_.handleInput((r != 0) ? r : 0);
@@ -212,7 +243,7 @@ void MorseRadioView::on_data(const MorseRXDataMessage* message) {
last_activity_time = chTimeNow(); // start reset timer on valid input
writeCharToConsole(result.text, result.confidence);
if (logger && save_log) {
time_stamp = logger->on_packet(result.text, time_stamp, current_mode);
time_stamp = logger->on_packet(result.text, time_stamp, static_cast<uint8_t>(current_mode));
}
float dah_time = morse_decoder_.getCurrentTimeUnit() * 3.0f;
if (dah_time > 0) {
firmware/application/external/morse_radio/ui_morse_radio.hpp
Vendored
+12 -3
View File
@@ -64,6 +64,14 @@ class MorseLogger {
class MorseRadioView : public ui::View {
public:
enum class ModulationMode : uint8_t {
AM = 0,
FM = 1,
DSB = 2,
USB = 3,
LSB = 4
};
MorseRadioView(ui::NavigationView& nav);
~MorseRadioView();
std::string title() const override {
@@ -83,12 +91,12 @@ class MorseRadioView : public ui::View {
RxRadioState radio_state_{};
std::unique_ptr<MorseLogger> logger{};
uint8_t current_mode{0}; // 0=CW/FM, 1=USB, 2=LSB
ModulationMode current_mode = ModulationMode::AM;
app_settings::SettingsManager settings_{
"rx_morese_radio",
app_settings::Mode::RX,
{{"cwmode"sv, &current_mode}}};
{{"cwmode"sv, reinterpret_cast<uint8_t*>(&current_mode)}}};
RxFrequencyField field_frequency{
{UI_POS_X(0), UI_POS_Y(0)},
@@ -115,6 +123,7 @@ class MorseRadioView : public ui::View {
ui::Text txt_speed{{UI_POS_X(23), UI_POS_Y(1), UI_POS_WIDTH(3), UI_POS_HEIGHT(1)}, "??"};
ui::Text txt_last{{UI_POS_X(12), UI_POS_Y(4), UI_POS_WIDTH_REMAINING(12), UI_POS_HEIGHT(1)}, ""};
ui::Text txt_freq{{UI_POS_X(21), UI_POS_Y(2), UI_POS_WIDTH(5), UI_POS_HEIGHT(1)}, "??"};
ui::Text txt_clip{{UI_POS_X(15), UI_POS_Y(3), UI_POS_WIDTH(5), UI_POS_HEIGHT(1)}, "clipping"};
ui::Console console_text{{UI_POS_X(0), UI_POS_Y(5), UI_POS_MAXWIDTH, UI_POS_HEIGHT_REMAINING(7)}};
ui::Labels labels{
{{UI_POS_X(0), UI_POS_Y(1)}, "Squelch:", Theme::getInstance()->fg_light->foreground},
@@ -127,7 +136,7 @@ class MorseRadioView : public ui::View {
ui::OptionsField options_mode{
{UI_POS_X(9), UI_POS_Y(2)},
5,
{{"CW/FM", 0}, {"USB", 1}, {"LSB", 2}}};
{{"AM", 0}, {"FM", 1}, {"DSB", 2}, {"USB", 3}, {"LSB", 4}}};
Checkbox chk_log{{UI_POS_X(0), UI_POS_Y(2)}, 12, "Log", false};
ui::Button btn_clear{{UI_POS_X(0), UI_POS_Y_BOTTOM(2), UI_POS_WIDTH(6), UI_POS_HEIGHT(1)}, "CLR"};