Learn ic fix (#2253)

* WIP

* Fixed merge

* Added test code

* WIP

* Clean up

* add reset learned params

* ui fix

* ui fix2

* Updated func

* Fixed english

* WIP

* WIP testing

* Added new debug app

* Got new app for debug

* Got new app for debug

* Got one full page showing

* Got app working with all reg

* Got app working with all reg

* Got full hex showing

* Fixed dp

* Fixed dp

* Moved entities

* Enabled apps again

* SHow battery debug if ic

* WIP

* Refactored further

* WIP

* Refactor and clean up

* Refactor and clean up

* fix warning, add tte/ttf, add cycles counter.

* wip

* morse tx to ext app

* fix morse crash

* fix ui

* Updated wording

* WIP

* WIP

* Updated to display hours and minutes

---------

Co-authored-by: HTotoo <ttotoo@gmail.com>

firmware/application/external/blespam/main.cpp

@@ -76,7 +76,7 @@ __attribute__((section(".external_app.app_blespam.application_information"), use
     /*.icon_color = */ ui::Color::yellow().v,
     /*.menu_location = */ app_location_t::TX,
 
-    /*.m4_app_tag = portapack::spi_flash::image_tag_afsk_rx */ {'P', 'B', 'T', 'T'},
+    /*.m4_app_tag = portapack::spi_flash::image_tag_btle_tx */ {'P', 'B', 'T', 'T'},
     /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
 };
 }

firmware/application/external/external.cmake

@@ -88,6 +88,11 @@ set(EXTCPPSRC
 	#adsbtx
 	external/adsbtx/main.cpp
 	external/adsbtx/ui_adsb_tx.cpp
+
+	
+	#morse_tx
+	external/morse_tx/main.cpp
+	external/morse_tx/ui_morse.cpp
 )
 
 set(EXTAPPLIST
@@ -112,4 +117,5 @@ set(EXTAPPLIST
 	tpmsrx
 	protoview
 	adsbtx
+	morse_tx
 )

firmware/application/external/external.ld

@@ -44,6 +44,7 @@ MEMORY
     ram_external_app_tpmsrx(rwx) : org = 0xADC30000, len = 32k
     ram_external_app_protoview(rwx) : org = 0xADC40000, len = 32k
     ram_external_app_adsbtx(rwx) : org = 0xADC50000, len = 32k
+    ram_external_app_morse_tx(rwx) : org = 0xADC60000, len = 32k
 }
 
 SECTIONS
@@ -176,4 +177,11 @@ SECTIONS
     } > ram_external_app_adsbtx
 
 
+   .external_app_morse_tx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_morse_tx.application_information));
+        *(*ui*external_app*morse_tx*);
+    } > ram_external_app_morse_tx
+
+
 }

firmware/application/external/morse_tx/main.cpp

@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2023 Bernd Herzog
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui.hpp"
+#include "ui_morse.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::morse_tx {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<MorseView>();
+}
+}  // namespace ui::external_app::morse_tx
+
+extern "C" {
+
+__attribute__((section(".external_app.app_morse_tx.application_information"), used)) application_information_t _application_information_morse_tx = {
+    /*.memory_location = */ (uint8_t*)0x00000000,
+    /*.externalAppEntry = */ ui::external_app::morse_tx::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+
+    /*.app_name = */ "Morse",
+    /*.bitmap_data = */ {
+        0x00,
+        0x00,
+        0xFE,
+        0x7F,
+        0xFF,
+        0xFF,
+        0xBB,
+        0xD0,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0x0B,
+        0xE1,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xEB,
+        0xD0,
+        0xFF,
+        0xFF,
+        0xFE,
+        0x7F,
+        0x70,
+        0x00,
+        0x30,
+        0x00,
+        0x10,
+        0x00,
+        0x00,
+        0x00,
+    },
+    /*.icon_color = */ ui::Color::green().v,
+    /*.menu_location = */ app_location_t::TX,
+
+    /*.m4_app_tag = portapack::spi_flash::image_tag_tones */ {'P', 'T', 'O', 'N'},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
+};
+}

firmware/application/external/morse_tx/ui_morse.cpp

@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui_morse.hpp"
+
+#include "portapack.hpp"
+#include "baseband_api.hpp"
+#include "hackrf_gpio.hpp"
+#include "portapack_shared_memory.hpp"
+#include "ui_textentry.hpp"
+#include "string_format.hpp"
+
+#include <cstring>
+#include <stdio.h>
+
+using namespace portapack;
+using namespace morse;
+using namespace hackrf::one;
+
+namespace ui::external_app::morse_tx {
+
+static WORKING_AREA(ookthread_wa, 256);
+
+static msg_t ookthread_fn(void* arg) {
+    uint32_t v = 0, delay = 0;
+    uint8_t* message_symbols = shared_memory.bb_data.tones_data.message;
+    uint8_t symbol;
+    MorseView* arg_c = (MorseView*)arg;
+
+    chRegSetThreadName("ookthread");
+
+    for (uint32_t i = 0; i < arg_c->symbol_count; i++) {
+        if (chThdShouldTerminate()) break;
+
+        symbol = message_symbols[i];
+
+        v = (symbol < 2) ? 1 : 0;  // TX on for dot or dash, off for pause
+        delay = morse_symbols[symbol];
+
+        if (hackrf_r9) {           // r9 has a common PIN 54 for MODE CONTROL TX / RX,  <=r6 has two independent MODE CONTROL pins (TX and RX)
+            gpio_r9_rx.write(!v);  // in hackrf r9 opposite logic "0" means tx , "1" rx = no tx)
+        } else {
+            gpio_og_tx.write(v);  // in hackrf <=r6, "1" means tx , "0" no tx.
+        }
+
+        arg_c->on_tx_progress(i, false);
+
+        chThdSleepMilliseconds(delay * arg_c->time_unit_ms);
+    }
+
+    if (hackrf_r9) {          // r9 has a common PIN 54 for MODE CONTROL TX / RX,  <=r6 has two independent MODE CONTROL pins (TX and RX)
+        gpio_r9_rx.write(1);  // Hackrf_r9 , common pin,  rx="1" (we ensure TX is off)  / tx="0"
+    } else {
+        gpio_og_tx.write(0);  // Hackrf <=r6 independent TX / RX  pins ,now touching the tx pin ==> Ensure TX is off
+    }
+
+    arg_c->on_tx_progress(0, true);
+    chThdExit(0);
+
+    return 0;
+}
+
+static msg_t loopthread_fn(void* arg) {
+    MorseView* arg_c = (MorseView*)arg;
+    uint32_t wait = arg_c->loop;
+
+    chRegSetThreadName("loopthread");
+
+    for (uint32_t i = 0; i < wait; i++) {
+        if (chThdShouldTerminate()) break;
+
+        arg_c->on_loop_progress(i, false);
+        chThdSleepMilliseconds(1000);
+    }
+
+    arg_c->on_loop_progress(0, true);
+    chThdExit(0);
+
+    return 0;
+}
+
+void MorseView::on_set_text(NavigationView& nav) {
+    text_prompt(nav, buffer, 28);
+}
+
+void MorseView::focus() {
+    button_message.focus();
+}
+
+MorseView::~MorseView() {
+    transmitter_model.disable();
+    baseband::shutdown();
+}
+
+void MorseView::paint(Painter&) {
+    message = buffer;
+    text_message.set(message);
+    update_tx_duration();
+}
+
+bool MorseView::start_tx() {
+    // Re-generate message, just in case
+    update_tx_duration();
+
+    if (!symbol_count) {
+        nav_.display_modal("Error", "Message too long,\nmust be < 256 symbols.");
+        return false;
+    }
+
+    progressbar.set_max(symbol_count);
+    // By experimental spectrum measurment, we left exactly same TX LPF settings as previous fw 1.7.4,  TX LPF= 1M75 (min).
+    transmitter_model.set_baseband_bandwidth(1'750'000);  // Min TX LPF .already tested in FM morse max tone 9,999k , max dev 150khz
+    transmitter_model.enable();
+
+    baseband::set_tones_config(transmitter_model.channel_bandwidth(), 0, symbol_count, false, false);
+
+    if (mode_cw) {
+        ookthread = chThdCreateStatic(ookthread_wa, sizeof(ookthread_wa), NORMALPRIO + 10, ookthread_fn, this);
+    }
+
+    return true;
+}
+
+void MorseView::update_tx_duration() {
+    uint32_t duration_ms;
+
+    time_unit_ms = 1200 / speed;
+    symbol_count = morse_encode(message, time_unit_ms, tone, &time_units);
+
+    if (symbol_count) {
+        duration_ms = time_units * time_unit_ms;
+        text_tx_duration.set(to_string_dec_uint(duration_ms / 1000) + "." + to_string_dec_uint((duration_ms / 100) % 10, 1) + "s   ");
+    } else {
+        text_tx_duration.set("-");  // Error
+    }
+}
+
+void MorseView::on_tx_progress(const uint32_t progress, const bool done) {
+    if (done) {
+        transmitter_model.disable();
+        progressbar.set_value(0);
+
+        if (loop && run) {
+            text_tx_duration.set("wait");
+            progressbar.set_max(loop);
+            progressbar.set_value(0);
+
+            if (loopthread) {
+                chThdRelease(loopthread);
+                loopthread = nullptr;
+            }
+
+            loopthread = chThdCreateFromHeap(NULL, 1024, NORMALPRIO, loopthread_fn, this);
+        } else {
+            tx_view.set_transmitting(false);
+        }
+    } else
+        progressbar.set_value(progress);
+}
+
+void MorseView::on_loop_progress(const uint32_t progress, const bool done) {
+    if (done) {
+        start_tx();
+    } else
+        progressbar.set_value(progress);
+}
+
+void MorseView::set_foxhunt(size_t i) {
+    message = foxhunt_codes[i - 1];
+    buffer = message.c_str();
+    text_message.set(message);
+    update_tx_duration();
+}
+
+MorseView::MorseView(
+    NavigationView& nav)
+    : nav_(nav) {
+    // baseband::run_image(portapack::spi_flash::image_tag_tones);
+    baseband::run_prepared_image(portapack::memory::map::m4_code.base());
+
+    add_children({&labels,
+                  &checkbox_foxhunt,
+                  &field_foxhunt,
+                  &field_speed,
+                  &field_tone,
+                  &options_modulation,
+                  &options_loop,
+                  &text_tx_duration,
+                  &text_message,
+                  &button_message,
+                  &progressbar,
+                  &tx_view});
+
+    // Default settings
+    field_speed.set_value(speed);
+    field_tone.set_value(tone);
+    options_modulation.set_by_value(mode_cw);
+    options_loop.set_by_value(loop);
+    checkbox_foxhunt.set_value(foxhunt_mode);
+    field_foxhunt.set_value(foxhunt_code);
+
+    checkbox_foxhunt.on_select = [this](Checkbox&, bool value) {
+        foxhunt_mode = value;
+
+        if (foxhunt_mode)
+            set_foxhunt(foxhunt_code);
+    };
+
+    field_foxhunt.on_change = [this](int32_t value) {
+        foxhunt_code = value;
+
+        if (foxhunt_mode)
+            set_foxhunt(foxhunt_code);
+    };
+
+    options_modulation.on_change = [this](size_t i, int32_t value) {
+        (void)i;  // avoid unused warning
+        mode_cw = (bool)value;
+    };
+
+    options_loop.on_change = [this](size_t i, uint32_t value) {
+        (void)i;  // avoid unused warning
+        loop = value;
+    };
+
+    field_speed.on_change = [this](int32_t value) {
+        speed = value;
+        update_tx_duration();
+    };
+
+    field_tone.on_change = [this](int32_t value) {
+        tone = value;
+    };
+
+    button_message.on_select = [this, &nav](Button&) {
+        this->on_set_text(nav);
+    };
+
+    tx_view.on_edit_frequency = [this, &nav]() {
+        auto new_view = nav.push<FrequencyKeypadView>(transmitter_model.target_frequency());
+        new_view->on_changed = [this](rf::Frequency f) {
+            transmitter_model.set_target_frequency(f);
+        };
+    };
+
+    tx_view.on_start = [this]() {
+        if (start_tx()) {
+            run = true;
+            tx_view.set_transmitting(true);
+        }
+    };
+
+    tx_view.on_stop = [this]() {
+        run = false;
+        if (ookthread) chThdTerminate(ookthread);
+
+        if (loopthread) {
+            chThdTerminate(loopthread);
+            chThdWait(loopthread);
+            loopthread = nullptr;
+        }
+
+        transmitter_model.disable();
+        baseband::kill_tone();
+        tx_view.set_transmitting(false);
+    };
+}
+
+}  // namespace ui::external_app::morse_tx

firmware/application/external/morse_tx/ui_morse.hpp

@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __MORSE_TX_H__
+#define __MORSE_TX_H__
+
+#include "ui.hpp"
+#include "ui_widget.hpp"
+#include "ui_navigation.hpp"
+#include "ui_transmitter.hpp"
+#include "app_settings.hpp"
+#include "radio_state.hpp"
+#include "portapack.hpp"
+#include "message.hpp"
+#include "volume.hpp"
+#include "audio.hpp"
+#include "morse.hpp"
+
+#include <ch.h>
+
+using namespace morse;
+
+namespace ui::external_app::morse_tx {
+
+class MorseView : public View {
+   public:
+    MorseView(NavigationView& nav);
+    ~MorseView();
+
+    MorseView(const MorseView&) = delete;
+    MorseView(MorseView&&) = delete;
+    MorseView& operator=(const MorseView&) = delete;
+    MorseView& operator=(MorseView&&) = delete;
+
+    void focus() override;
+    void paint(Painter& painter) override;
+
+    void on_tx_progress(const uint32_t progress, const bool done);
+    void on_loop_progress(const uint32_t progress, const bool done);
+
+    std::string title() const override { return "Morse TX"; };
+
+    uint32_t time_unit_ms{0};
+    size_t symbol_count{0};
+    uint32_t loop{0};
+
+   private:
+    NavigationView& nav_;
+    std::string message{};
+    uint32_t time_units{0};
+
+    TxRadioState radio_state_{
+        0 /* frequency */,
+        1750000 /* bandwidth */,
+        1536000 /* sampling rate */
+    };
+
+    std::string buffer{"PORTAPACK"};
+    bool mode_cw{true};
+    bool foxhunt_mode{false};
+    uint32_t foxhunt_code{1};
+    uint32_t speed{15};
+    uint32_t tone{700};
+    app_settings::SettingsManager settings_{
+        "tx_morse",
+        app_settings::Mode::TX,
+        {
+            {"message"sv, &buffer},
+            {"foxhunt"sv, &foxhunt_mode},
+            {"foxhunt_code"sv, &foxhunt_code},
+            {"speed"sv, &speed},
+            {"tone"sv, &tone},
+            {"mode_cw"sv, &mode_cw},
+            {"loop"sv, &loop},
+        }};
+
+    bool start_tx();
+    void update_tx_duration();
+    void on_set_text(NavigationView& nav);
+    void set_foxhunt(size_t i);
+
+    Thread* ookthread{nullptr};
+    Thread* loopthread{nullptr};
+    bool run{false};
+
+    Labels labels{
+        {{4 * 8, 6 * 8}, "Speed:   wps", Theme::getInstance()->fg_light->foreground},
+        {{4 * 8, 8 * 8}, "Tone:    Hz", Theme::getInstance()->fg_light->foreground},
+        {{4 * 8, 10 * 8}, "Modulation:", Theme::getInstance()->fg_light->foreground},
+        {{4 * 8, 12 * 8}, "Loop:", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 25 * 8}, "TX will last", Theme::getInstance()->fg_light->foreground}};
+
+    Checkbox checkbox_foxhunt{
+        {4 * 8, 16},
+        8,
+        "Foxhunt:"};
+    NumberField field_foxhunt{
+        {17 * 8, 16 + 4},
+        2,
+        {1, 11},
+        1,
+        ' '};
+
+    NumberField field_speed{
+        {10 * 8, 6 * 8},
+        3,
+        {10, 45},
+        1,
+        ' '};
+
+    NumberField field_tone{
+        {9 * 8, 8 * 8},
+        4,
+        {100, 9999},
+        20,
+        ' '};
+
+    OptionsField options_modulation{
+        {15 * 8, 10 * 8},
+        2,
+        {{"CW", true},
+         {"FM", false}}};
+
+    OptionsField options_loop{
+        {9 * 8, 12 * 8},
+        6,
+        {{"Off", 0},
+         {"5 sec", 5},
+         {"10 sec", 10},
+         {"30 sec", 30},
+         {"1 min", 60},
+         {"3 min", 180},
+         {"5 min", 300}}};
+
+    Text text_tx_duration{
+        {14 * 8, 25 * 8, 4 * 8, 16},
+        "-"};
+
+    Text text_message{
+        {1 * 8, 15 * 8, 28 * 8, 16},
+        ""};
+
+    Button button_message{
+        {1 * 8, 17 * 8, 12 * 8, 28},
+        "Set message"};
+
+    ProgressBar progressbar{
+        {2 * 8, 28 * 8, 208, 16}};
+
+    TransmitterView tx_view{
+        16 * 16,
+        10000,
+        12};
+
+    MessageHandlerRegistration message_handler_tx_progress{
+        Message::ID::TXProgress,
+        [this](const Message* const p) {
+            const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
+            this->on_tx_progress(message.progress, message.done);
+        }};
+};
+
+}  // namespace ui::external_app::morse_tx
+
+#endif /*__MORSE_TX_H__*/