Smaller freq changes with encoder on SubghzD and Weather Station (#2106)

* sendpocsag first test
* optimize
* nicer
* overflow

firmware/application/apps/ui_about_simple.cpp

@@ -1,83 +1,93 @@
-#include "ui_about_simple.hpp"
-
-namespace ui {
-AboutView::AboutView(NavigationView& nav) {
-    add_children({&console, &button_ok});
-
-    button_ok.on_select = [&nav](Button&) {
-        nav.pop();
-    };
-
-    console.writeln(STR_COLOR_LIGHT_GREY "List of contributors:");
-    console.writeln("");
-}
-
-void AboutView::update() {
-    if (++timer > 400) {
-        timer = 0;
-
-        switch (++frame) {
-            case 1:
-                // TODO: Generate this automatically from github
-                // https://github.com/portapack-mayhem/mayhem-firmware/graphs/contributors?to=2022-01-01&from=2020-04-12&type=c
-                console.writeln(STR_COLOR_DARK_YELLOW "Mayhem:");
-                console.writeln("eried,euquiq,gregoryfenton");
-                console.writeln("johnelder,jwetzell,nnemanjan00");
-                console.writeln("N0vaPixel,klockee,gullradriel");
-                console.writeln("jamesshao8,ITAxReal,rascafr");
-                console.writeln("mcules,dqs105,strijar");
-                console.writeln("zhang00963,RedFox-Fr,aldude999");
-                console.writeln("East2West,fossum,ArjanOnwezen");
-                console.writeln("vXxOinvizioNxX,teixeluis");
-                console.writeln("Brumi-2021,texasyojimbo");
-                console.writeln("heurist1,intoxsick,ckuethe");
-                console.writeln("notpike,jLynx,zigad");
-                console.writeln("MichalLeonBorsuk,jimilinuxguy");
-                console.writeln("kallanreed,bernd-herzog");
-                break;
-            case 2:
-                console.writeln("NotherNgineer,zxkmm,u-foka");
-                console.writeln("Netro,HTotoo");
-                console.writeln("");
-                break;
-
-            case 3:
-                // https://github.com/portapack-mayhem/mayhem-firmware/graphs/contributors?to=2020-04-12&from=2015-07-31&type=c
-                console.writeln(STR_COLOR_DARK_YELLOW "Havoc:");
-                console.writeln("furrtek,mrmookie,NotPike");
-                console.writeln("mjwaxios,ImDroided,Giorgiofox");
-                console.writeln("F4GEV,z4ziggy,xmycroftx");
-                console.writeln("troussos,silascutler");
-                console.writeln("nickbouwhuis,msoose,leres");
-                console.writeln("joakar,dhoetger,clem-42");
-                console.writeln("brianlechthaler,ZeroChaos-...");
-                console.writeln("");
-                break;
-
-            case 4:
-                // https://github.com/portapack-mayhem/mayhem-firmware/graphs/contributors?from=2014-07-05&to=2015-07-31&type=c
-                console.writeln(STR_COLOR_DARK_YELLOW "PortaPack:");
-                console.writeln("jboone,argilo");
-                console.writeln("");
-                break;
-
-            case 5:
-                // https://github.com/mossmann/hackrf/graphs/contributors
-                console.writeln(STR_COLOR_DARK_YELLOW "HackRF:");
-                console.writeln("mossmann,dominicgs,bvernoux");
-                console.writeln("bgamari,schneider42,miek");
-                console.writeln("willcode,hessu,Sec42");
-                console.writeln("yhetti,ckuethe,smunaut");
-                console.writeln("wishi,mrbubble62,scateu...");
-                console.writeln("");
-                frame = 0;  // Loop
-                break;
-        }
-    }
-}
-
-void AboutView::focus() {
-    button_ok.focus();
-}
-
-} /* namespace ui */
+#include "ui_about_simple.hpp"
+
+namespace ui {
+
+// TODO: Generate this automatically from github
+// Information: a line starting with a '#' will be yellow coloured
+const std::string authors_list[] = {
+    " ",
+    "#   * List of contributors *  ",
+    " ",
+    "#Mayhem:",
+    " ",
+    "eried,euquiq,gregoryfenton",
+    "johnelder,jwetzell,nnemanjan00",
+    "N0vaPixel,klockee,gullradriel",
+    "jamesshao8,ITAxReal,rascafr",
+    "mcules,dqs105,strijar",
+    "zhang00963,RedFox-Fr,aldude999",
+    "East2West,fossum,ArjanOnwezen",
+    "vXxOinvizioNxX,teixeluis",
+    "Brumi-2021,texasyojimbo",
+    "heurist1,intoxsick,ckuethe",
+    "notpike,jLynx,zigad",
+    "MichalLeonBorsuk,jimilinuxguy",
+    "kallanreed,bernd-herzog",
+    "NotherNgineer,zxkmm,u-foka",
+    "Netro,HTotoo",
+    " ",
+    "#Havoc:",
+    " ",
+    "furrtek,mrmookie,NotPike",
+    "mjwaxios,ImDroided,Giorgiofox",
+    "F4GEV,z4ziggy,xmycroftx",
+    "troussos,silascutler",
+    "nickbouwhuis,msoose,leres",
+    "joakar,dhoetger,clem-42",
+    "brianlechthaler,ZeroChaos-...",
+    " ",
+    "#PortaPack:",
+    " ",
+    "jboone,argilo",
+    " ",
+    "#HackRF:",
+    " ",
+    "mossmann,dominicgs,bvernoux",
+    "bgamari,schneider42,miek",
+    "willcode,hessu,Sec42",
+    "yhetti,ckuethe,smunaut",
+    "wishi,mrbubble62,scateu..."};
+
+AboutView::AboutView(NavigationView& nav) {
+    add_children({&menu_view,
+                  &button_ok});
+
+    button_ok.on_select = [&nav](Button&) {
+        nav.pop();
+    };
+
+    menu_view.on_left = [this]() {
+        button_ok.focus();
+    };
+
+    menu_view.on_right = [this]() {
+        button_ok.focus();
+    };
+
+    for (const std::string& authors_line : authors_list) {
+        // if it's starting with #, it's a title and we have to substract the '#' and paint yellow
+        if (authors_line.size() > 0) {
+            if (authors_line[0] == '#') {
+                menu_view.add_item(
+                    {authors_line.substr(1, authors_line.size() - 1),
+                     ui::Color::yellow(),
+                     nullptr,
+                     nullptr});
+            } else {
+                menu_view.add_item(
+                    {authors_line,
+                     ui::Color::white(),
+                     nullptr,
+                     nullptr});
+            }
+        }
+    }
+}
+
+void AboutView::focus() {
+    menu_view.focus();
+    // put focus on first text line
+    menu_view.set_highlighted(1);
+}
+
+} /* namespace ui */

firmware/application/apps/ui_about_simple.hpp

@@ -12,25 +12,16 @@ class AboutView : public View {
     AboutView(NavigationView& nav);
     void focus() override;
     std::string title() const override { return "About"; };
-    int32_t timer{180};
-    short frame{0};
 
    private:
-    void update();
-
-    Console console{
-        {0, 10, 240, 240}};
+    MenuView menu_view{
+        {0, 0, 240, 240},
+        true};
 
     Button button_ok{
         {240 / 3, 270, 240 / 3, 24},
         "OK",
     };
-
-    MessageHandlerRegistration message_handler_update{
-        Message::ID::DisplayFrameSync,
-        [this](const Message* const) {
-            this->update();
-        }};
 };
 }  // namespace ui
 

firmware/application/apps/ui_pocsag_tx.cpp

@@ -42,6 +42,32 @@ POCSAGTXView::~POCSAGTXView() {
     baseband::shutdown();
 }
 
+void POCSAGTXView::on_remote(const PocsagTosendMessage data) {
+    // check if still sending or not
+    size_t tmp = 0;
+    if (data.baud == 1200) tmp = 1;
+    if (data.baud == 2400) tmp = 2;
+    options_bitrate.set_selected_index(tmp);
+    tmp = 0;
+    options_type.set_selected_index(data.type);
+    if (data.function == 'B') tmp = 1;
+    if (data.function == 'C') tmp = 2;
+    if (data.function == 'D') tmp = 3;
+    options_function.set_selected_index(tmp);
+    options_phase.set_selected_index(data.phase == 'P' ? 0 : 1);
+    field_address.set_value(data.addr);
+    message = (char*)data.msg;
+    text_message.set(message);
+    options_bitrate.dirty();
+    options_type.dirty();
+    options_function.dirty();
+    options_phase.dirty();
+    field_address.dirty();
+    text_message.dirty();
+    tx_view.focus();
+    start_tx();
+}
+
 void POCSAGTXView::on_tx_progress(const uint32_t progress, const bool done) {
     if (done) {
         transmitter_model.disable();

firmware/application/apps/ui_pocsag_tx.hpp

@@ -76,6 +76,7 @@ class POCSAGTXView : public View {
 
     void on_set_text(NavigationView& nav);
     void on_tx_progress(const uint32_t progress, const bool done);
+    void on_remote(const PocsagTosendMessage data);
     bool start_tx();
 
     Labels labels{
@@ -142,6 +143,13 @@ class POCSAGTXView : public View {
             const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
             this->on_tx_progress(message.progress, message.done);
         }};
+
+    MessageHandlerRegistration message_handler_tx_remote{
+        Message::ID::PocsagTosend,
+        [this](const Message* const p) {
+            const auto message = *reinterpret_cast<const PocsagTosendMessage*>(p);
+            this->on_remote(message);
+        }};
 };
 
 } /* namespace ui */

firmware/application/apps/ui_subghzd.cpp

@@ -81,7 +81,7 @@ SubGhzDView::SubGhzDView(NavigationView& nav)
         recent.clear();
         recent_entries_view.set_dirty();
     };
-    field_frequency.set_step(100000);
+    field_frequency.set_step(10000);
 
     const Rect content_rect{0, header_height, screen_width, screen_height - header_height};
     recent_entries_view.set_parent_rect(content_rect);

firmware/application/apps/ui_weatherstation.cpp

@@ -105,7 +105,7 @@ WeatherView::WeatherView(NavigationView& nav)
         recent.clear();
         recent_entries_view.set_dirty();
     };
-    field_frequency.set_step(100000);
+    field_frequency.set_step(10000);
 
     options_temperature.on_change = [this](size_t, int32_t i) {
         weather_units_fahr = (bool)i;

firmware/application/ui/ui_menu.cpp

@@ -251,8 +251,12 @@ bool MenuView::on_key(const KeyEvent key) {
         case KeyEvent::Down:
             return set_highlighted(highlighted_item + 1);
 
-        case KeyEvent::Select:
         case KeyEvent::Right:
+            if (on_right) {
+                on_right();
+            }
+            [[fallthrough]];
+        case KeyEvent::Select:
             if (menu_items[highlighted_item].on_select) {
                 menu_items[highlighted_item].on_select(key);
             }

firmware/application/ui/ui_menu.hpp

@@ -75,6 +75,7 @@ class MenuItemView : public Widget {
 class MenuView : public View {
    public:
     std::function<void(void)> on_left{};
+    std::function<void(void)> on_right{};
     std::function<void(void)> on_highlight{nullptr};
 
     MenuView(Rect new_parent_rect = {0, 0, screen_width, screen_height - 16},

firmware/application/usb_serial_shell.cpp

@@ -1053,6 +1053,84 @@ static void cmd_settingsreset(BaseSequentialStream* chp, int argc, char* argv[])
     chprintf(chp, "ok\r\n");
 }
 
+static void cmd_sendpocsag(BaseSequentialStream* chp, int argc, char* argv[]) {
+    const char* usage = "usage: sendpocsag <addr> <msglen> [baud] [type] [function] [phase] \r\n";
+    (void)argv;
+    if (argc < 2) {
+        chprintf(chp, usage);
+        return;
+    }
+    uint64_t addr = atol(argv[0]);
+    int msglen = atoi(argv[1]);  // without minimum limit, since addr only don't send anything
+    if (msglen > 30 || msglen < 0) {
+        chprintf(chp, "error, msglen max is 30\r\n");
+        return;
+    }
+
+    int baud = 1200;
+    if (argc >= 3) {
+        baud = atoi(argv[2]);
+        if (baud != 512 && baud != 1200 && baud != 2400) {
+            chprintf(chp, "error, baud can only be 512, 1200 or 2400\r\n");
+            return;
+        }
+    }
+
+    int type = 2;
+    if (argc >= 4) {
+        type = atoi(argv[3]);
+        if (type > 2 || type < 0) {
+            chprintf(chp, "error, type can be 0 (ADDRESS_ONLY) 1 (NUMERIC_ONLY) 2 (ALPHANUMERIC)\r\n");
+            return;
+        }
+    }
+
+    char function = 'D';
+    if (argc >= 5) {
+        function = *argv[4];
+        if (function < 'A' && function > 'D') {
+            chprintf(chp, "error, function can be A, B, C or D\r\n");
+            return;
+        }
+    }
+
+    char phase = 'P';
+    if (argc >= 6) {
+        phase = *argv[5];
+        if (phase != 'P' && phase != 'N') {
+            chprintf(chp, "error, phase can be P or N\r\n");
+            return;
+        }
+    }
+
+    uint8_t msg[31] = {0};
+    if (msglen > 0) {
+        chprintf(chp, "send %d bytes\r\n", msglen);
+        do {
+            size_t bytes_to_read = msglen > USB_BULK_BUFFER_SIZE ? USB_BULK_BUFFER_SIZE : msglen;
+            size_t bytes_read = chSequentialStreamRead(chp, &msg[0], bytes_to_read);
+            if (bytes_read != bytes_to_read)
+                return;
+            msglen -= bytes_read;
+        } while (msglen > 0);
+    }
+
+    auto evtd = getEventDispatcherInstance();
+    if (!evtd) return;
+    auto top_widget = evtd->getTopWidget();
+    if (!top_widget) return;
+    auto nav = static_cast<ui::SystemView*>(top_widget)->get_navigation_view();
+    if (!nav) return;
+    if (!nav->StartAppByName("pocsagtx")) {
+        chprintf(chp, "error starting pocsagtx\r\n");
+        return;
+    }
+    chThdSleepMilliseconds(1000);  // wait for app to start
+    PocsagTosendMessage message{(uint16_t)baud, (uint8_t)type, function, phase, (uint8_t)msglen, msg, addr};
+    EventDispatcher::send_message(message);
+    chprintf(chp, "ok\r\n");
+}
+
 static const ShellCommand commands[] = {
     {"reboot", cmd_reboot},
     {"dfu", cmd_dfu},
@@ -1083,6 +1161,7 @@ static const ShellCommand commands[] = {
     {"radioinfo", cmd_radioinfo},
     {"pmemreset", cmd_pmemreset},
     {"settingsreset", cmd_settingsreset},
+    {"sendpocsag", cmd_sendpocsag},
     {NULL, NULL}};
 
 static const ShellConfig shell_cfg1 = {

firmware/common/message.hpp

@@ -122,6 +122,7 @@ class Message {
         OrientationData = 64,
         EnvironmentData = 65,
         AudioBeep = 66,
+        PocsagTosend = 67,
         MAX
     };
 
@@ -1379,4 +1380,33 @@ class AudioBeepMessage : public Message {
     uint32_t sample_rate = 24000;
     uint32_t duration_ms = 100;
 };
+
+class PocsagTosendMessage : public Message {
+   public:
+    constexpr PocsagTosendMessage(
+        uint16_t baud = 1200,
+        uint8_t type = 2,
+        char function = 'D',
+        char phase = 'N',
+        uint8_t msglen = 0,
+        uint8_t msg[31] = {0},
+        uint64_t addr = 0)
+        : Message{ID::PocsagTosend},
+          baud{baud},
+          type{type},
+          function{function},
+          phase{phase},
+          msglen{msglen},
+          addr{addr} {
+        memcpy(this->msg, msg, 31);
+    }
+    uint16_t baud = 1200;
+    uint8_t type = 2;
+    char function = 'D';
+    char phase = 'N';
+    uint8_t msglen = 0;
+    uint8_t msg[31] = {0};
+    uint64_t addr = 0;
+};
+
 #endif /*__MESSAGE_H__*/