V2.0.0 setup (#1908)

* Update past_version.txt

* Update version.txt

.github/workflows/past_version.txt

@@ -1 +1 @@
-v1.9.0
+v1.9.1

.github/workflows/version.txt

@@ -1 +1 @@
-v1.9.1
+v2.0.0

firmware/application/apps/ui_debug.cpp

@@ -323,6 +323,11 @@ bool ControlsSwitchesWidget::on_key(const KeyEvent key) {
     return true;
 }
 
+bool ControlsSwitchesWidget::on_encoder(const EncoderEvent delta) {
+    last_delta = delta;
+    return true;
+}
+
 void ControlsSwitchesWidget::paint(Painter& painter) {
     const auto pos = screen_pos();
 
@@ -405,6 +410,8 @@ void ControlsSwitchesWidget::paint(Painter& painter) {
 
         switches_event >>= 1;
     }
+
+    painter.draw_string({5 * 8, 12 * 16}, Styles::light_grey, to_string_dec_int(last_delta, 3));
 }
 
 void ControlsSwitchesWidget::on_frame_sync() {
@@ -450,6 +457,17 @@ DebugPeripheralsMenuView::DebugPeripheralsMenuView(NavigationView& nav) {
     set_max_rows(2);  // allow wider buttons
 }
 
+/* DebugReboot **********************************************/
+
+DebugReboot::DebugReboot(NavigationView& nav) {
+    (void)nav;
+
+    LPC_RGU->RESET_CTRL[0] = (1 << 0);
+
+    while (1)
+        __WFE();
+}
+
 /* DebugMenuView *********************************************************/
 
 DebugMenuView::DebugMenuView(NavigationView& nav) {
@@ -465,6 +483,7 @@ DebugMenuView::DebugMenuView(NavigationView& nav) {
         {"Peripherals", ui::Color::dark_cyan(), &bitmap_icon_peripherals, [&nav]() { nav.push<DebugPeripheralsMenuView>(); }},
         {"Pers. Memory", ui::Color::dark_cyan(), &bitmap_icon_memory, [&nav]() { nav.push<DebugPmemView>(); }},
         //{ "Radio State",	ui::Color::white(),	nullptr,	[&nav](){ nav.push<NotImplementedView>(); } },
+        {"Reboot", ui::Color::dark_cyan(), &bitmap_icon_setup, [&nav]() { nav.push<DebugReboot>(); }},
         {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [&nav]() { nav.push<SDCardDebugView>(); }},
         {"Temperature", ui::Color::dark_cyan(), &bitmap_icon_temperature, [&nav]() { nav.push<TemperatureView>(); }},
         {"Touch Test", ui::Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<DebugScreenTest>(); }},

firmware/application/apps/ui_debug.hpp

@@ -252,18 +252,21 @@ class ControlsSwitchesWidget : public Widget {
         Rect parent_rect)
         : Widget{parent_rect},
           key_event_mask(0),
-          long_press_key_event_mask{0} {
+          long_press_key_event_mask{0},
+          last_delta{0} {
         set_focusable(true);
     }
 
     void on_show() override;
     bool on_key(const KeyEvent key) override;
+    bool on_encoder(const EncoderEvent delta) override;
 
     void paint(Painter& painter) override;
 
    private:
     uint8_t key_event_mask;
     uint8_t long_press_key_event_mask;
+    EncoderEvent last_delta;
 
     MessageHandlerRegistration message_handler_frame_sync{
         Message::ID::DisplayFrameSync,
@@ -285,6 +288,7 @@ class DebugControlsView : public View {
    private:
     Labels labels{
         {{8 * 8, 1 * 16}, "Controls State", Color::white()},
+        {{0 * 8, 11 * 16}, "Dial:", Color::grey()},
         {{0 * 8, 14 * 16}, "Long-Press Mode:", Color::grey()}};
 
     ControlsSwitchesWidget switches_widget{
@@ -420,6 +424,11 @@ class DebugPeripheralsMenuView : public BtnGridView {
     std::string title() const override { return "Peripherals"; };
 };
 
+class DebugReboot : public BtnGridView {
+   public:
+    DebugReboot(NavigationView& nav);
+};
+
 class DebugMenuView : public BtnGridView {
    public:
     DebugMenuView(NavigationView& nav);

firmware/application/apps/ui_settings.cpp

@@ -44,6 +44,7 @@ namespace fs = std::filesystem;
 
 #include "string_format.hpp"
 #include "ui_styles.hpp"
+#include "ui_font_fixed_8x16.hpp"
 #include "cpld_update.hpp"
 #include "config_mode.hpp"
 
@@ -612,6 +613,8 @@ SetPersistentMemoryView::SetPersistentMemoryView(NavigationView& nav) {
             [this](bool choice) {
                 if (choice) {
                     pmem::cache::defaults();
+                    // Refresh status bar
+                    send_system_refresh();
                 }
             });
     };
@@ -755,7 +758,7 @@ void SetConfigModeView::focus() {
     button_save.focus();
 }
 
-/* FakeBrightnessView ************************************/
+/* SetFakeBrightnessView ************************************/
 
 SetFakeBrightnessView::SetFakeBrightnessView(NavigationView& nav) {
     add_children({&labels,
@@ -783,6 +786,53 @@ void SetFakeBrightnessView::focus() {
     button_save.focus();
 }
 
+/* SetMenuColorView ************************************/
+
+void SetMenuColorView::paint_sample() {
+    Color c = Color(field_red_level.value(), field_green_level.value(), field_blue_level.value());
+    button_sample.set_bg_color(c);
+}
+
+SetMenuColorView::SetMenuColorView(NavigationView& nav) {
+    add_children({&labels,
+                  &button_sample,
+                  &field_red_level,
+                  &field_green_level,
+                  &field_blue_level,
+                  &button_save,
+                  &button_cancel});
+
+    button_sample.set_focusable(false);
+
+    Color c = pmem::menu_color();
+    field_red_level.set_value(c.r());
+    field_green_level.set_value(c.g());
+    field_blue_level.set_value(c.b());
+    paint_sample();
+
+    const auto color_changed_fn = [this](int32_t) {
+        paint_sample();
+    };
+    field_red_level.on_change = color_changed_fn;
+    field_green_level.on_change = color_changed_fn;
+    field_blue_level.on_change = color_changed_fn;
+
+    button_save.on_select = [&nav, this](Button&) {
+        Color c = Color(field_red_level.value(), field_green_level.value(), field_blue_level.value());
+        pmem::set_menu_color(c);
+        send_system_refresh();
+        nav.pop();
+    };
+
+    button_cancel.on_select = [&nav, this](Button&) {
+        nav.pop();
+    };
+}
+
+void SetMenuColorView::focus() {
+    button_save.focus();
+}
+
 /* SettingsMenuView **************************************/
 
 SettingsMenuView::SettingsMenuView(NavigationView& nav) {
@@ -804,6 +854,7 @@ SettingsMenuView::SettingsMenuView(NavigationView& nav) {
         {"User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui, [&nav]() { nav.push<SetUIView>(); }},
         {"QR Code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [&nav]() { nav.push<SetQRCodeView>(); }},
         {"Brightness", ui::Color::dark_cyan(), &bitmap_icon_brightness, [&nav]() { nav.push<SetFakeBrightnessView>(); }},
+        {"Menu Color", ui::Color::dark_cyan(), &bitmap_icon_brightness, [&nav]() { nav.push<SetMenuColorView>(); }},
     });
     set_max_rows(2);  // allow wider buttons
 }

firmware/application/apps/ui_settings.hpp

@@ -588,7 +588,7 @@ class SetEncoderDialView : public View {
     NumberField field_encoder_rate_multiplier{
         {20 * 8, 12 * 16},
         2,
-        {1, 10},
+        {1, 15},
         1,
         ' '};
 
@@ -731,6 +731,64 @@ class SetFakeBrightnessView : public View {
     };
 };
 
+class SetMenuColorView : public View {
+   public:
+    SetMenuColorView(NavigationView& nav);
+
+    void focus() override;
+
+    std::string title() const override { return "Menu Color"; };
+
+   private:
+    void paint_sample();
+
+    Labels labels{
+        {{3 * 8, 1 * 16}, "Menu Button Color Scheme", Color::light_grey()},
+        {{2 * 8, 8 * 16}, "Red Level:", Color::light_grey()},
+        {{2 * 8, 9 * 16}, "Green Level:", Color::light_grey()},
+        {{2 * 8, 10 * 16}, "Blue Level:", Color::light_grey()},
+    };
+
+    NewButton button_sample{
+        {8 * 8, 4 * 16, 14 * 8, 3 * 16},
+        "New Color",
+        &bitmap_icon_brightness,
+    };
+
+    NumberField field_red_level{
+        {15 * 8, 8 * 16},
+        3,
+        {8, 248},
+        8,
+        ' ',
+    };
+
+    NumberField field_green_level{
+        {15 * 8, 9 * 16},
+        3,
+        {8, 248},
+        8,
+        ' ',
+    };
+
+    NumberField field_blue_level{
+        {15 * 8, 10 * 16},
+        3,
+        {8, 248},
+        8,
+        ' ',
+    };
+
+    Button button_save{
+        {2 * 8, 16 * 16, 12 * 8, 32},
+        "Save"};
+
+    Button button_cancel{
+        {16 * 8, 16 * 16, 12 * 8, 32},
+        "Cancel",
+    };
+};
+
 class SettingsMenuView : public BtnGridView {
    public:
     SettingsMenuView(NavigationView& nav);

firmware/application/apps/ui_text_editor.cpp

@@ -427,6 +427,9 @@ TextEditorView::TextEditorView(NavigationView& nav)
             &text_size,
         });
 
+    text_position.set_style(&Styles::bg_dark_blue);
+    text_size.set_style(&Styles::bg_dark_blue);
+
     viewer.set_font_zoom(enable_zoom);
 
     viewer.on_select = [this]() {

firmware/application/external/pacman/ui_pacman.cpp

@@ -33,23 +33,27 @@ void PacmanView::paint(Painter& painter) {
     }
 
     auto switches_raw = swizzled_switches() & ((1 << (int)Switch::Right) | (1 << (int)Switch::Left) | (1 << (int)Switch::Down) | (1 << (int)Switch::Up) | (1 << (int)Switch::Sel) | (1 << (int)Switch::Dfu));
+    auto switches_debounced = get_switches_state().to_ulong();
 
     // For the Select (Start/Pause) button, wait for release to avoid repeat
     uint8_t buttons_to_wait_for = (1 << (int)Switch::Sel);
     if (wait_for_button_release) {
-        if ((switches_raw & buttons_to_wait_for) == 0)
+        if ((switches_debounced & buttons_to_wait_for) == 0)
             wait_for_button_release = false;
-        switches_raw &= ~buttons_to_wait_for;
+        switches_debounced &= ~buttons_to_wait_for;
     } else {
-        if (switches_raw & buttons_to_wait_for)
+        if (switches_debounced & buttons_to_wait_for)
             wait_for_button_release = true;
     }
 
+    // For the directional buttons, use the raw inputs for fastest response time
     but_RIGHT = (switches_raw & (1 << (int)Switch::Right)) != 0;
     but_LEFT = (switches_raw & (1 << (int)Switch::Left)) != 0;
     but_DOWN = (switches_raw & (1 << (int)Switch::Down)) != 0;
     but_UP = (switches_raw & (1 << (int)Switch::Up)) != 0;
-    but_A = (switches_raw & (1 << (int)Switch::Sel)) != 0;
+
+    // For the pause button, use the debounced input to avoid glitches, and OR in the value to make sure that we don't clear it before it's seen
+    but_A |= (switches_debounced & (1 << (int)Switch::Sel)) != 0;
 
     _game.Step();
 }

firmware/application/ui/ui_btngrid.cpp

@@ -127,6 +127,7 @@ void BtnGridView::add_item(GridItem new_item) {
 
 void BtnGridView::update_items() {
     size_t i = 0;
+    Color bg_color = portapack::persistent_memory::menu_color();
 
     if ((menu_items.size()) > (displayed_max + offset)) {
         more = true;
@@ -147,6 +148,7 @@ void BtnGridView::update_items() {
             item->set_text(menu_items[i + offset].text);
             item->set_bitmap(menu_items[i + offset].bitmap);
             item->set_color(menu_items[i + offset].color);
+            item->set_bg_color(bg_color);
             item->on_select = menu_items[i + offset].on_select;
             item->set_dirty();
         }
@@ -171,15 +173,19 @@ bool BtnGridView::set_highlighted(int32_t new_value) {
     if (((uint32_t)new_value > offset) && ((new_value - offset) >= displayed_max)) {
         // Shift BtnGridView up
         highlighted_item = new_value;
-        offset += rows_;
+        // rounding up new offset to next multiple of rows
+        offset = new_value - displayed_max + rows_;
+        offset -= (offset % rows_);
         update_items();
-        set_dirty();
+        // refresh whole screen (display flickers) only if scrolling last row up and a blank button is needed at the bottom
+        if ((new_value + rows_ >= item_count) && (item_count % rows_) != 0)
+            set_dirty();
     } else if ((uint32_t)new_value < offset) {
         // Shift BtnGridView down
         highlighted_item = new_value;
         offset = (new_value / rows_) * rows_;
         update_items();
-        set_dirty();
+        // no need to set_dirty() here since all buttons have been repainted
     } else {
         // Just update highlight
         highlighted_item = new_value;

firmware/application/ui/ui_styles.cpp

@@ -86,6 +86,12 @@ const Style Styles::bg_blue{
     .foreground = Color::white(),
 };
 
+const Style Styles::bg_dark_blue{
+    .font = font::fixed_8x16,
+    .background = Color::dark_blue(),
+    .foreground = Color::white(),
+};
+
 const Style Styles::light_grey{
     .font = font::fixed_8x16,
     .background = Color::black(),

firmware/application/ui/ui_styles.hpp

@@ -58,6 +58,9 @@ class Styles {
     /* Blue background. */
     static const Style bg_blue;
 
+    /* Dark blue background. */
+    static const Style bg_dark_blue;
+
     /* Light grey foreground. */
     static const Style light_grey;
 

firmware/common/portapack_persistent_memory.cpp

@@ -31,6 +31,7 @@
 #include "memory_map.hpp"
 #include "portapack.hpp"
 #include "string_format.hpp"
+#include "ui.hpp"
 #include "ui_styles.hpp"
 #include "ui_painter.hpp"
 #include "ui_flash_utility.hpp"
@@ -46,6 +47,7 @@
 #include <hal.h>
 
 using namespace std;
+using namespace ui;
 
 namespace portapack {
 namespace persistent_memory {
@@ -229,7 +231,9 @@ struct data_t {
     uint16_t fake_brightness_level : 4;
 
     // Encoder rotation rate multiplier for larger increments when rotated rapidly
-    uint16_t encoder_rate_multiplier : 8;
+    uint16_t encoder_rate_multiplier : 4;
+
+    uint16_t UNUSED : 4;
 
     // Headphone volume in centibels.
     int16_t headphone_volume_cb;
@@ -246,6 +250,11 @@ struct data_t {
     // Daylight savings time
     dst_config_t dst_config;
 
+    // Menu Color Scheme
+    Color menu_color;
+
+    uint16_t UNUSED_16;
+
     constexpr data_t()
         : structure_version(data_structure_version_enum::VERSION_CURRENT),
           target_frequency(target_frequency_reset_value),
@@ -296,11 +305,15 @@ struct data_t {
           encoder_dial_sensitivity(DIAL_SENSITIVITY_NORMAL),
           fake_brightness_level(BRIGHTNESS_50),
           encoder_rate_multiplier(1),
+          UNUSED(0),
+
           headphone_volume_cb(-600),
           misc_config(),
           ui_config2(),
           config_mode_storage(CONFIG_MODE_NORMAL_VALUE),
-          dst_config() {
+          dst_config(),
+          menu_color(Color::grey()),
+          UNUSED_16() {
     }
 };
 
@@ -408,6 +421,7 @@ void defaults() {
     set_config_disable_external_tcxo(false);
     set_encoder_dial_sensitivity(DIAL_SENSITIVITY_NORMAL);
     set_config_speaker_disable(true);  // Disable AK4951 speaker by default (in case of OpenSourceSDRLab H2)
+    set_menu_color(Color::grey());
 
     // Default values for recon app.
     set_recon_autosave_freqs(false);
@@ -457,7 +471,7 @@ void init() {
 
     // Firmware upgrade handling - adjust newly defined fields where 0 is an invalid default
     if (fake_brightness_level() == 0) set_fake_brightness_level(BRIGHTNESS_50);
-    if (encoder_rate_multiplier() == 0) set_encoder_rate_multiplier(1);
+    if (menu_color().v == 0) set_menu_color(Color::grey());
 }
 
 void persist() {
@@ -989,7 +1003,9 @@ void set_encoder_dial_sensitivity(uint8_t v) {
     data->encoder_dial_sensitivity = v;
 }
 uint8_t encoder_rate_multiplier() {
-    return data->encoder_rate_multiplier;
+    uint8_t v = data->encoder_rate_multiplier;
+    if (v == 0) v = 1;  // minimum value is 1; treat 0 the same as 1
+    return v;
 }
 void set_encoder_rate_multiplier(uint8_t v) {
     data->encoder_rate_multiplier = v;
@@ -1047,6 +1063,14 @@ void toggle_fake_brightness_level() {
     }
 }
 
+// Menu Color Scheme
+Color menu_color() {
+    return data->menu_color;
+}
+void set_menu_color(Color v) {
+    data->menu_color = v;
+}
+
 // PMem to sdcard settings
 
 bool should_use_sdcard_for_pmem() {
@@ -1153,6 +1177,7 @@ bool debug_dump() {
     pmem_dump_file.write_line("config_mode_storage: 0x" + to_string_hex(data->config_mode_storage, 8));
     pmem_dump_file.write_line("dst_config: 0x" + to_string_hex((uint32_t)data->dst_config.v, 8));
     pmem_dump_file.write_line("fake_brightness_level: " + to_string_dec_uint(data->fake_brightness_level));
+    pmem_dump_file.write_line("menu_color: 0x" + to_string_hex(data->menu_color.v, 4));
 
     // ui_config bits
     const auto backlight_timer = portapack::persistent_memory::config_backlight_timer();

firmware/common/portapack_persistent_memory.hpp

@@ -34,6 +34,7 @@
 #include "serializer.hpp"
 #include "volume.hpp"
 #include "config_mode.hpp"
+#include "ui.hpp"
 
 // persistent memory from/to sdcard flag file
 #define PMEM_FILEFLAG u"/SETTINGS/PMEM_FILEFLAG"
@@ -46,6 +47,7 @@
 
 using namespace modems;
 using namespace serializer;
+using namespace ui;
 
 namespace portapack {
 
@@ -282,6 +284,9 @@ uint8_t fake_brightness_level();
 void set_fake_brightness_level(uint8_t v);
 void toggle_fake_brightness_level();
 
+Color menu_color();
+void set_menu_color(Color v);
+
 /* Recon app */
 bool recon_autosave_freqs();
 bool recon_autostart_recon();

firmware/common/ui.hpp

@@ -78,6 +78,18 @@ struct Color {
                   ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3))} {
     }
 
+    uint8_t r() {
+        return (uint8_t)((v >> 8) & 0xf8);
+    }
+
+    uint8_t g() {
+        return (uint8_t)((v >> 3) & 0xfc);
+    }
+
+    uint8_t b() {
+        return (uint8_t)((v << 3) & 0xf8);
+    }
+
     uint8_t to_greyscale() {
         uint32_t r = (v >> 8) & 0xf8;
         uint32_t g = (v >> 3) & 0xfc;

firmware/common/ui_widget.cpp

@@ -1290,6 +1290,11 @@ void NewButton::set_color(Color color) {
     set_dirty();
 }
 
+void NewButton::set_bg_color(Color color) {
+    bg_color_ = color;
+    set_dirty();
+}
+
 void NewButton::set_vertical_center(bool value) {
     vertical_center_ = value;
     set_dirty();
@@ -1343,7 +1348,7 @@ Style NewButton::paint_style() {
         s.background = style().foreground;
         s.foreground = Color::black();
     } else {
-        s.background = Color::grey();
+        s.background = bg_color_;
         s.foreground = style().foreground;
     }
 

firmware/common/ui_widget.hpp

@@ -504,6 +504,7 @@ class NewButton : public Widget {
     void set_bitmap(const Bitmap* bitmap);
     void set_text(const std::string value);
     void set_color(Color value);
+    void set_bg_color(Color value);
     void set_vertical_center(bool value);
     std::string text() const;
     const Bitmap* bitmap();
@@ -522,6 +523,7 @@ class NewButton : public Widget {
    protected:
     virtual Style paint_style();
     Color color_;
+    Color bg_color_{Color::light_grey()};
 
    private:
     std::string text_;