Wardrive map improv (#2251)

Added paginator.
Added Flipper SUB file support.

firmware/application/CMakeLists.txt

@@ -206,6 +206,7 @@ set(CPPSRC
 	irq_rtc.cpp
 	log_file.cpp
 	metadata_file.cpp
+	flipper_subfile.cpp
 	portapack.cpp
 	usb_serial_shell.cpp
 	usb_serial_shell_filesystem.cpp

firmware/application/apps/ui_looking_glass_app.cpp

@@ -561,6 +561,17 @@ GlassView::GlassView(
     update_display_beep();
 }
 
+void GlassView::on_freqchg(int64_t freq) {
+    int64_t half_range = abs(field_frequency_max.value() - field_frequency_max.value()) / 2;
+    if (half_range < 1) {
+        half_range = 1;
+    }
+    range_presets.set_selected_index(0);  // Manual
+    update_min(freq - half_range);
+    update_max(freq + half_range);
+    on_range_changed();
+}
+
 uint8_t GlassView::get_spec_iq_phase_calibration_value() {  // define accessor functions inside AnalogAudioView to read & write real iq_phase_calibration_value
     return iq_phase_calibration_value;
 }

firmware/application/apps/ui_looking_glass_app.hpp

@@ -109,6 +109,7 @@ class GlassView : public View {
         std::string label{};
     };
 
+    void on_freqchg(int64_t freq);
     int32_t map(int32_t value, int32_t fromLow, int32_t fromHigh, int32_t toLow, int32_t toHigh);
     std::vector<preset_entry> presets_db{};
     void manage_beep_audio();
@@ -307,6 +308,7 @@ class GlassView : public View {
             const auto message = *reinterpret_cast<const ChannelSpectrumConfigMessage*>(p);
             this->fifo = message.fifo;
         }};
+
     MessageHandlerRegistration message_handler_frame_sync{
         Message::ID::DisplayFrameSync,
         [this](const Message* const) {
@@ -317,6 +319,13 @@ class GlassView : public View {
                 }
             }
         }};
+
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->on_freqchg(message->freq);
+        }};
 };
 }  // namespace ui
 #endif

firmware/application/apps/ui_settings.cpp

@@ -774,31 +774,44 @@ void SetConfigModeView::focus() {
     button_save.focus();
 }
 
-/* SetFakeBrightnessView ************************************/
+/* SetDisplayView ************************************/
 
-SetFakeBrightnessView::SetFakeBrightnessView(NavigationView& nav) {
+SetDisplayView::SetDisplayView(NavigationView& nav) {
     add_children({&labels,
                   &field_fake_brightness,
                   &button_save,
                   &button_cancel,
+                  &checkbox_invert_switch,
                   &checkbox_brightness_switch});
 
     field_fake_brightness.set_by_value(pmem::fake_brightness_level());
     checkbox_brightness_switch.set_value(pmem::apply_fake_brightness());
+    checkbox_invert_switch.set_value(pmem::config_lcd_inverted_mode());
 
     button_save.on_select = [&nav, this](Button&) {
         pmem::set_apply_fake_brightness(checkbox_brightness_switch.value());
         pmem::set_fake_brightness_level(field_fake_brightness.selected_index_value());
+        if (checkbox_invert_switch.value() != pmem::config_lcd_inverted_mode()) {
+            display.set_inverted(checkbox_invert_switch.value());
+            pmem::set_lcd_inverted_mode(checkbox_invert_switch.value());
+        }
         send_system_refresh();
         nav.pop();
     };
+    // only enable invert OR fake brightness
+    checkbox_invert_switch.on_select = [this](Checkbox&, bool v) {
+        if (v) checkbox_brightness_switch.set_value(false);
+    };
+    checkbox_brightness_switch.on_select = [this](Checkbox&, bool v) {
+        if (v) checkbox_invert_switch.set_value(false);
+    };
 
     button_cancel.on_select = [&nav, this](Button&) {
         nav.pop();
     };
 }
 
-void SetFakeBrightnessView::focus() {
+void SetDisplayView::focus() {
     button_save.focus();
 }
 
@@ -999,7 +1012,7 @@ void SettingsMenuView::on_populate() {
         {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [this]() { nav_.push<SetSDCardView>(); }},
         {"User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui, [this]() { nav_.push<SetUIView>(); }},
         //{"QR Code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [this]() { nav_.push<SetQRCodeView>(); }},
-        {"Brightness", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetFakeBrightnessView>(); }},
+        {"Display", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetDisplayView>(); }},
         {"Menu Color", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetMenuColorView>(); }},
         {"Theme", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetThemeView>(); }},
         {"Autostart", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetAutostartView>(); }},

firmware/application/apps/ui_settings.hpp

@@ -711,13 +711,13 @@ class SetConfigModeView : public View {
 
 using portapack::persistent_memory::fake_brightness_level_options;
 
-class SetFakeBrightnessView : public View {
+class SetDisplayView : public View {
    public:
-    SetFakeBrightnessView(NavigationView& nav);
+    SetDisplayView(NavigationView& nav);
 
     void focus() override;
 
-    std::string title() const override { return "Brightness"; };
+    std::string title() const override { return "Display"; };
 
    private:
     Labels labels{
@@ -739,6 +739,11 @@ class SetFakeBrightnessView : public View {
         16,
         "Enable brightness adjust"};
 
+    Checkbox checkbox_invert_switch{
+        {1 * 8, 10 * 16},
+        23,
+        "Invert colors (For IPS)"};
+
     Button button_save{
         {2 * 8, 16 * 16, 12 * 8, 32},
         "Save"};

firmware/application/external/tpmsrx/tpms_app.hpp

@@ -107,7 +107,7 @@ class TPMSAppView : public View {
 
    private:
     RxRadioState radio_state_{
-        314950000 /* frequency*/
+        314900000 /* frequency*/
         ,
         1750000 /* bandwidth */,
         2457600 /* sampling rate */
@@ -147,20 +147,21 @@ class TPMSAppView : public View {
     // "315 MHz" TPMS sensors transmit at either 314.9 or 315 MHz but we should pick up either
     OptionsField options_band{
         {0 * 8, 0 * 16},
-        3,
+        5,
         {
-            {"315", 314950000},
-            {"434", 433920000},
+            {"314.9", 314900000},
+            {"315.0", 315000000},
+            {"433.9", 433920000},
         }};
 
     OptionsField options_pressure{
-        {5 * 8, 0 * 16},
+        {6 * 8, 0 * 16},
         3,
         {{"kPa", 0},
          {"PSI", 1}}};
 
     OptionsField options_temperature{
-        {9 * 8, 0 * 16},
+        {10 * 8, 0 * 16},
         2,
         {{STR_DEGREES_C, 0},
          {STR_DEGREES_F, 1}}};

firmware/application/external/wardrivemap/ui_wardrivemap.cpp

@@ -23,6 +23,7 @@
 #include "string_format.hpp"
 #include "file_path.hpp"
 #include "metadata_file.hpp"
+#include "flipper_subfile.hpp"
 #include "portapack_persistent_memory.hpp"
 
 using namespace portapack;
@@ -36,14 +37,14 @@ void WardriveMapView::focus() {
 
 // needs to load on every map change, because won't store or draw all while marker is not in the current view.
 // todo optimize this somehow
-bool WardriveMapView::load_markers() {
-    uint16_t cnt = 0;
+void WardriveMapView::load_markers() {
     uint16_t displayed_cnt = 0;
+    uint16_t cnt = 0;
     geomap.clear_markers();
     // serach for files with geotag, and add it to geomap as marker with tag. limit to N bc of mem limit.
     for (const auto& entry : std::filesystem::directory_iterator(captures_dir, u"*.txt")) {
         if (std::filesystem::is_regular_file(entry.status())) {
-            if (displayed_cnt > 30) break;
+            if (markers_counted && displayed_cnt > ui::GeoMap::NumMarkerListElements) return;  // only if not fist iteration, since then not counted all elements
             std::filesystem::path pth = captures_dir;
             pth += u"/" + entry.path();
             auto metadata_path = get_metadata_path(pth);
@@ -51,23 +52,65 @@ bool WardriveMapView::load_markers() {
 
             if (metadata) {
                 if (metadata.value().latitude != 0 && metadata.value().longitude != 0 && metadata.value().latitude < 400 && metadata.value().longitude < 400) {
-                    if (first_init == false) {
-                        // move map there before add, so will display this.
-                        geopos.set_report_change(false);
-                        geopos.set_lat(metadata.value().latitude);
-                        geopos.set_lon(metadata.value().longitude);
-                        geopos.set_report_change(true);
-                        geomap.move(metadata.value().longitude, metadata.value().latitude);
-                        first_init = true;
+                    // skip nth
+                    if (marker_start <= cnt) {
+                        if (first_init == false) {
+                            // move map there before add, so will display this.
+                            geopos.set_report_change(false);
+                            geopos.set_lat(metadata.value().latitude);
+                            geopos.set_lon(metadata.value().longitude);
+                            geopos.set_report_change(true);
+                            geomap.move(metadata.value().longitude, metadata.value().latitude);
+                            first_init = true;
+                        }
+                        GeoMarker tmp{metadata.value().latitude, metadata.value().longitude, 400, entry.path().filename().string()};
+                        if (geomap.store_marker(tmp) == MapMarkerStored::MARKER_STORED) displayed_cnt++;
+                        if (!markers_counted) marker_cntall++;
                     }
-                    GeoMarker tmp{metadata.value().latitude, metadata.value().longitude, 400, entry.path().filename().string()};
-                    if (geomap.store_marker(tmp) == MapMarkerStored::MARKER_STORED) displayed_cnt++;
                     cnt++;
                 }
             }
         }
     }
-    return (cnt > 0);
+    // load flipper files too
+    for (const auto& entry : std::filesystem::directory_iterator(flippersub_dir, u"*.sub")) {
+        if (std::filesystem::is_regular_file(entry.status())) {
+            if (markers_counted && displayed_cnt > ui::GeoMap::NumMarkerListElements) return;  // only if not fist iteration, since then not counted all elements
+            std::filesystem::path pth = flippersub_dir;
+            pth += u"/" + entry.path();
+            auto metadata = read_flippersub_file(pth);
+
+            if (metadata) {
+                if (metadata.value().latitude != 0 && metadata.value().longitude != 0 && metadata.value().latitude < 400 && metadata.value().longitude < 400) {
+                    // skip nth
+                    if (marker_start <= cnt) {
+                        if (first_init == false) {
+                            // move map there before add, so will display this.
+                            geopos.set_report_change(false);
+                            geopos.set_lat(metadata.value().latitude);
+                            geopos.set_lon(metadata.value().longitude);
+                            geopos.set_report_change(true);
+                            geomap.move(metadata.value().longitude, metadata.value().latitude);
+                            first_init = true;
+                        }
+                        GeoMarker tmp{metadata.value().latitude, metadata.value().longitude, 400, entry.path().filename().string()};
+                        if (geomap.store_marker(tmp) == MapMarkerStored::MARKER_STORED) displayed_cnt++;
+                        if (!markers_counted) marker_cntall++;
+                    }
+                    cnt++;
+                }
+            }
+        }
+    }
+
+    markers_counted = true;
+    // show / hide paginator buttons
+    btn_back.hidden((marker_start == 0) || (marker_cntall == 0));
+    btn_next.hidden(((marker_start + ui::GeoMap::NumMarkerListElements) >= marker_cntall) || (marker_cntall == 0));
+    // update text
+    text_info.set(to_string_dec_uint(marker_start + 1) + " - " + to_string_dec_uint(displayed_cnt + marker_start) + " / " + to_string_dec_uint(marker_cntall));
+    set_dirty();
+    return;
 }
 
 WardriveMapView::WardriveMapView(NavigationView& nav)
@@ -75,7 +118,9 @@ WardriveMapView::WardriveMapView(NavigationView& nav)
     add_children({&text_info,
                   &geomap,
                   &geopos,
-                  &text_notfound});
+                  &text_notfound,
+                  &btn_back,
+                  &btn_next});
 
     geomap.set_mode(DISPLAY);
     geomap.set_manual_panning(false);
@@ -100,21 +145,38 @@ WardriveMapView::WardriveMapView(NavigationView& nav)
         load_markers();
         geomap.set_dirty();
     };
-    text_notfound.hidden(true);
     geomap.init();
-    // load markers
-    if (load_markers()) {
+    load_markers();
+    if (marker_cntall > 0) {
         text_notfound.hidden(true);
         geomap.set_dirty();
     } else {
         geomap.hidden(true);
         geopos.hidden(true);
+        text_notfound.hidden(false);
+        text_info.hidden(true);
     }
+
+    // never move this before the first load() bc that will mess load up
     geomap.on_move = [this](float lon, float lat) {
         (void)lon;
         (void)lat;
         load_markers();
     };
+    btn_back.on_select = [this, &nav](Button&) {
+        if (marker_start - ui::GeoMap::NumMarkerListElements >= 0)
+            marker_start = marker_start - ui::GeoMap::NumMarkerListElements;
+        else
+            marker_start = 0;
+        load_markers();
+    };
+    btn_next.on_select = [this, &nav](Button&) {
+        if (marker_start + ui::GeoMap::NumMarkerListElements <= marker_cntall)
+            marker_start = marker_start + ui::GeoMap::NumMarkerListElements;
+        else
+            marker_start = marker_cntall - ui::GeoMap::NumMarkerListElements;
+        load_markers();
+    };
 }
 
 WardriveMapView::~WardriveMapView() {

firmware/application/external/wardrivemap/ui_wardrivemap.hpp

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2017 Furrtek
+ * Copyright (C) 2024 HTotoo
  *
  * This file is part of PortaPack.
  *
@@ -20,10 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-// Code from https://github.com/Flipper-XFW/Xtreme-Apps/tree/04c3a60093e2c2378e79498b4505aa8072980a42/ble_spam/protocols
-// Thanks for the work of the original creators!
-// Saying thanks in the main view!
-
 #ifndef __UI_WARDRIVEMAP_H__
 #define __UI_WARDRIVEMAP_H__
 
@@ -50,22 +45,29 @@ class WardriveMapView : public View {
     };
 
    private:
+    const std::filesystem::path flippersub_dir = u"subghz";
     NavigationView& nav_;
 
-    Text text_info{{0 * 8, 0 * 8, 30 * 8, 16 * 1}, "All GEOTAG from CAPTURES"};
-    Text text_notfound{{0 * 8, 3 * 8, 30 * 8, 16 * 1}, "No GeoTagged captures found"};
+    Text text_info{{0 * 8, 0 * 8, 20 * 8, 16 * 1}, "0 / 30"};
+    Text text_notfound{{0 * 8, 0 * 8, 30 * 8, 16 * 1}, "No GeoTagged captures found"};
     GeoPos geopos{
         {0, 20},
         GeoPos::alt_unit::METERS,
         GeoPos::spd_unit::HIDDEN};
     GeoMap geomap{{0, 75, 240, 320 - 75}};
 
+    Button btn_back{{22 * 8, 0 * 8, 3 * 8, 16}, "<-"};
+    Button btn_next{{26 * 8, 0 * 8, 3 * 8, 16}, "->"};
+
     void on_gps(const GPSPosDataMessage* msg);
     void on_orientation(const OrientationDataMessage* msg);
 
-    bool load_markers();  // returns true if any exists, false if none.
+    void load_markers();  // returns true if any exists, false if none.
 
-    bool first_init = false;
+    bool first_init = false;       // to center map to first marker, before callback is set
+    bool markers_counted = false;  // to iterate all files on first, but only on first.
+    uint16_t marker_start = 0;     // for paginator, this will be the first displayed
+    uint16_t marker_cntall = 0;    // all geotagged marker count
 
     MessageHandlerRegistration message_handler_gps{
         Message::ID::GPSPosData,

firmware/application/flipper_subfile.cpp

@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2024 HTotoo
+ *
+ * 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 "flipper_subfile.hpp"
+
+#include "convert.hpp"
+#include "file_reader.hpp"
+#include "string_format.hpp"
+#include <string_view>
+
+namespace fs = std::filesystem;
+using namespace std::literals;
+
+const std::string_view filetype_name = "Filetype"sv;
+const std::string_view frequency_name = "Frequency"sv;
+const std::string_view latitude_name = "Latitute"sv;
+const std::string_view longitude_name = "Longitude"sv;
+const std::string_view protocol_name = "Protocol"sv;
+const std::string_view preset_name = "Preset"sv;
+const std::string_view te_name = "TE"sv;  // only in BinRAW
+
+/*
+Filetype: Flipper SubGhz Key File
+Version: 1
+Frequency: 433920000
+Preset: FuriHalSubGhzPresetOok650Async
+Latitute: nan
+Longitude: nan
+Protocol: BinRAW
+Bit: 1730
+TE: 495
+Bit_RAW: 1730
+Data_RAW: 02 10 84
+
+te: is the quantization interval, in us.
+bit: all bit counts in file.
+bit_raw: the bits stored in the next data_raw. this 2 can repeat
+data_raw: is an encoded sequence of durations, where each bit in the sequence encodes one TE interval: 1 - high level (there is a carrier), 0 - low (no carrier). For example, TE=100, Bit_RAW=8, Data_RAW=0x37 => 0b00110111, that is, -200 200 -100 300 will be transmitted
+
+
+
+Filetype: Flipper SubGhz RAW File
+Version: 1
+Frequency: 433920000
+Preset: FuriHalSubGhzPresetOok650Async
+Protocol: RAW
+RAW_Data: 5832 -12188 130 -162
+
+raw_data- positive: carrier for n time, negative: no carrier for n time. (us)
+*/
+
+Optional<flippersub_metadata> read_flippersub_file(const fs::path& path) {
+    File f;
+    auto error = f.open(path);
+
+    if (error)
+        return {};
+
+    flippersub_metadata metadata{};
+
+    auto reader = FileLineReader(f);
+    for (const auto& line : reader) {
+        auto cols = split_string(line, ':');
+
+        if (cols.size() != 2)
+            continue;  // Bad line.
+        if (cols[1].length() <= 1) continue;
+        std::string fixed = cols[1].data() + 1;
+        fixed = trim(fixed);
+        if (cols[0] == filetype_name) {
+            if (fixed != "Flipper SubGhz Key File" && fixed != "Flipper SubGhz RAW File") return {};  // not supported
+        } else if (cols[0] == frequency_name)
+            parse_int(fixed, metadata.center_frequency);
+        else if (cols[0] == latitude_name)
+            parse_float_meta(fixed, metadata.latitude);
+        else if (cols[0] == longitude_name)
+            parse_float_meta(fixed, metadata.longitude);
+        else if (cols[0] == protocol_name) {
+            if (fixed == "RAW") metadata.protocol = FLIPPER_PROTO_RAW;
+            if (fixed == "BinRAW") metadata.protocol = FLIPPER_PROTO_BINRAW;
+        } else if (cols[0] == te_name) {
+            metadata.te = atoi(fixed.c_str());
+        } else if (cols[0] == preset_name) {
+            if (fixed.find("FSK") != std::string::npos) {
+                metadata.preset = FLIPPER_PRESET_2FSK;
+            } else if (fixed.find("Ook") != std::string::npos) {
+                metadata.preset = FLIPPER_PRESET_OOK;
+            } else if (fixed.find("Custom") != std::string::npos) {
+                metadata.preset = FLIPPER_PRESET_CUSTOM;
+            }
+
+        } else
+            continue;
+    }
+
+    if (metadata.center_frequency == 0) return {};  // Parse failed.
+
+    return metadata;
+}

firmware/application/flipper_subfile.hpp

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2024 HTotoo
+ *
+ * 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 __FLIPPER_SUBFILE_HPP__
+#define __FLIPPER_SUBFILE_HPP__
+
+#include "metadata_file.hpp"
+
+typedef enum : uint8_t {
+    FLIPPER_PROTO_UNSUPPORTED = 0,
+    FLIPPER_PROTO_RAW = 1,
+    FLIPPER_PROTO_BINRAW = 2
+} FlipperProto;
+
+typedef enum : uint8_t {
+    FLIPPER_PRESET_UNK = 0,
+    FLIPPER_PRESET_CUSTOM = 1,
+    FLIPPER_PRESET_OOK = 2,
+    FLIPPER_PRESET_2FSK = 3,
+} FlipperPreset;
+
+struct flippersub_metadata {
+    rf::Frequency center_frequency;
+    float latitude = 0;
+    float longitude = 0;
+    FlipperProto protocol = FLIPPER_PROTO_UNSUPPORTED;
+    FlipperPreset preset = FLIPPER_PRESET_UNK;
+    uint16_t te = 0;
+};
+
+Optional<flippersub_metadata> read_flippersub_file(const std::filesystem::path& path);
+
+// Maybe sometime there will be a data part reader / converter
+
+#endif  // __FLIPPER_SUBFILE_HPP__

firmware/application/portapack.cpp

@@ -535,6 +535,8 @@ init_status_t init() {
 
     set_cpu_clock_speed();
 
+    if (persistent_memory::config_lcd_inverted_mode()) display.set_inverted(true);
+
     if (lcd_fast_setup)
         draw_splash_screen_icon(0, ui::bitmap_icon_memory);
 

firmware/application/ui_navigation.cpp

@@ -413,7 +413,7 @@ void SystemStatusView::refresh() {
     // Display "Disable speaker" icon only if AK4951 Codec which has separate speaker/headphone control
     if (audio::speaker_disable_supported() && !pmem::ui_hide_speaker()) status_icons.add(&toggle_speaker);
 
-    if (!pmem::ui_hide_fake_brightness()) status_icons.add(&button_fake_brightness);
+    if (!pmem::ui_hide_fake_brightness() && !pmem::config_lcd_inverted_mode()) status_icons.add(&button_fake_brightness);
     if (battery::BatteryManagement::isDetected()) {
         batt_was_inited = true;
         uint8_t percent = battery::BatteryManagement::getPercent();
@@ -450,7 +450,7 @@ void SystemStatusView::refresh() {
     button_converter.set_foreground(pmem::config_converter() ? Theme::getInstance()->fg_red->foreground : Theme::getInstance()->fg_light->foreground);
 
     // Fake Brightness
-    button_fake_brightness.set_foreground(pmem::apply_fake_brightness() ? *Theme::getInstance()->status_active : Theme::getInstance()->fg_light->foreground);
+    button_fake_brightness.set_foreground((pmem::apply_fake_brightness() & (!pmem::config_lcd_inverted_mode())) ? *Theme::getInstance()->status_active : Theme::getInstance()->fg_light->foreground);
 
     set_dirty();
 }
@@ -1072,7 +1072,7 @@ ModalMessageView::ModalMessageView(
 }
 
 void ModalMessageView::paint(Painter& painter) {
-    if (!compact) portapack::display.drawBMP({100, 48}, modal_warning_bmp, false);
+    if (!compact) portapack::display.drawBMP({100, 48}, modal_warning_bmp, true);
 
     // Break lines.
     auto lines = split_string(message_, '\n');

firmware/common/lcd_ili9341.cpp

@@ -307,6 +307,14 @@ void ILI9341::wake() {
     lcd_wake();
 }
 
+void ILI9341::set_inverted(bool invert) {
+    if (invert) {
+        io.lcd_data_write_command_and_data(0x21, {});
+    } else {
+        io.lcd_data_write_command_and_data(0x20, {});
+    }
+}
+
 void ILI9341::fill_rectangle(ui::Rect r, const ui::Color c) {
     const auto r_clipped = r.intersect(screen_rect());
     if (!r_clipped.is_empty()) {

firmware/common/lcd_ili9341.hpp

@@ -50,6 +50,8 @@ class ILI9341 {
     void sleep();
     void wake();
 
+    void set_inverted(bool invert);
+
     void fill_rectangle(ui::Rect r, const ui::Color c);
     void fill_rectangle_unrolled8(ui::Rect r, const ui::Color c);
     void draw_line(const ui::Point start, const ui::Point end, const ui::Color color);

firmware/common/portapack_io.cpp

@@ -78,7 +78,11 @@ void IO::reference_oscillator(const bool enable) {
 }
 
 bool IO::get_dark_cover() {
-    return portapack::persistent_memory::apply_fake_brightness();
+    return portapack::persistent_memory::apply_fake_brightness() & (!portapack::persistent_memory::config_lcd_inverted_mode());
+}
+
+bool IO::get_is_inverted() {
+    return portapack::persistent_memory::config_lcd_inverted_mode();
 }
 
 uint8_t IO::get_brightness() {

firmware/common/portapack_io.hpp

@@ -231,7 +231,7 @@ class IO {
 
         return switches_raw;
     }
-
+    bool get_is_inverted();
     bool get_dark_cover();
     uint8_t get_brightness();
     // TODO: cache the value ^^ & ^ to increaase performance, need a trigger cuz init doesn't work. And since the constructor is constexpr, we can't use with in class var to cache it. maybe cache from outside somewhere and pass it here as argument.
@@ -417,7 +417,7 @@ class IO {
         uint32_t original_value = (value_high << 8) | value_low;
 
         if (get_dark_cover()) {
-            original_value = UNDARKENED_PIXEL(original_value, get_brightness());
+            original_value = DARKENED_PIXEL(original_value, get_brightness());
         }
         return original_value;
     }

firmware/common/portapack_persistent_memory.cpp

@@ -212,7 +212,7 @@ struct data_t {
     bool updown_converter;
     bool updown_frequency_rx_correction;
     bool updown_frequency_tx_correction;
-    bool UNUSED_4 : 1;
+    bool lcd_inverted_mode : 1;
     bool UNUSED_5 : 1;
     bool UNUSED_6 : 1;
     bool UNUSED_7 : 1;
@@ -292,7 +292,7 @@ struct data_t {
           updown_converter(false),
           updown_frequency_rx_correction(false),
           updown_frequency_tx_correction(false),
-          UNUSED_4(false),
+          lcd_inverted_mode(false),
           UNUSED_5(false),
           UNUSED_6(false),
           UNUSED_7(false),
@@ -1062,6 +1062,14 @@ void set_config_freq_rx_correction(uint32_t v) {
     data->frequency_rx_correction = v;
 }
 
+// LCD invert
+bool config_lcd_inverted_mode() {
+    return data->lcd_inverted_mode;
+}
+void set_lcd_inverted_mode(bool v) {
+    data->lcd_inverted_mode = v;
+}
+
 // Rotary encoder dial settings
 uint8_t encoder_dial_sensitivity() {
     return data->encoder_dial_sensitivity;
@@ -1121,7 +1129,7 @@ void set_fake_brightness_level(uint8_t v) {
 // Cycle through 4 brightness options: disabled -> enabled/50% -> enabled/25% -> enabled/12.5% -> disabled
 void toggle_fake_brightness_level() {
     bool fbe = apply_fake_brightness();
-
+    if (config_lcd_inverted_mode()) return;  // for now only inverted mode OR fake brightness
     if ((!fbe) || (data->fake_brightness_level >= BRIGHTNESS_12p5)) {
         set_apply_fake_brightness(!fbe);
         data->fake_brightness_level = BRIGHTNESS_50;
@@ -1231,7 +1239,7 @@ bool debug_dump() {
     pmem_dump_file.write_line("updown_converter: " + to_string_dec_int(data->updown_converter));
     pmem_dump_file.write_line("updown_frequency_rx_correction: " + to_string_dec_int(data->updown_frequency_rx_correction));
     pmem_dump_file.write_line("updown_frequency_tx_correction: " + to_string_dec_int(data->updown_frequency_tx_correction));
-    // pmem_dump_file.write_line("UNUSED_4: " + to_string_dec_int(data->UNUSED_4));
+    pmem_dump_file.write_line("lcd_inverted_mode: " + to_string_dec_uint(data->lcd_inverted_mode));
     // pmem_dump_file.write_line("UNUSED_5: " + to_string_dec_int(data->UNUSED_5));
     // pmem_dump_file.write_line("UNUSED_6: " + to_string_dec_int(data->UNUSED_6));
     // pmem_dump_file.write_line("UNUSED_7: " + to_string_dec_int(data->UNUSED_7));
@@ -1278,6 +1286,7 @@ bool debug_dump() {
     pmem_dump_file.write_line("ui_config2 hide_battery_icon: " + to_string_dec_uint(data->ui_config2.hide_battery_icon));
     pmem_dump_file.write_line("ui_config2 hide_numeric_battery: " + to_string_dec_uint(data->ui_config2.hide_numeric_battery));
     pmem_dump_file.write_line("ui_config2 theme_id: " + to_string_dec_uint(data->ui_config2.theme_id));
+    pmem_dump_file.write_line("ui_config2 override_batt_calc: " + to_string_dec_uint(data->ui_config2.override_batt_calc));
 
     // misc_config bits
     pmem_dump_file.write_line("misc_config config_audio_mute: " + to_string_dec_int(config_audio_mute()));

firmware/common/portapack_persistent_memory.hpp

@@ -251,6 +251,8 @@ void set_config_audio_mute(bool v);
 void set_config_speaker_disable(bool v);
 void set_config_backlight_timer(const backlight_config_t& new_value);
 void set_disable_touchscreen(bool v);
+bool config_lcd_inverted_mode();
+void set_lcd_inverted_mode(bool v);
 
 uint8_t encoder_dial_sensitivity();
 void set_encoder_dial_sensitivity(uint8_t v);

firmware/common/ui_widget.cpp

@@ -971,7 +971,7 @@ void Button::paint(Painter& painter) {
 
     const Style paint_style = {style().font, bg, fg};
 
-    painter.draw_rectangle({r.location(), {r.size().width(), 1}}, Theme::getInstance()->fg_light->foreground);
+    painter.draw_rectangle({r.location(), {r.size().width(), 1}}, Theme::getInstance()->bg_light->background);
     painter.draw_rectangle({r.location().x(), r.location().y() + r.size().height() - 1, r.size().width(), 1}, Theme::getInstance()->bg_dark->background);
     painter.draw_rectangle({r.location().x() + r.size().width() - 1, r.location().y(), 1, r.size().height()}, Theme::getInstance()->bg_dark->background);
 
@@ -1311,7 +1311,7 @@ void NewButton::paint(Painter& painter) {
     const auto r = screen_rect();
     const Style style = paint_style();
 
-    painter.draw_rectangle({r.location(), {r.width(), 1}}, Theme::getInstance()->fg_light->foreground);
+    painter.draw_rectangle({r.location(), {r.width(), 1}}, Theme::getInstance()->bg_light->background);
     painter.draw_rectangle({r.left(), r.top() + r.height() - 1, r.width(), 1}, Theme::getInstance()->bg_dark->background);
     painter.draw_rectangle({r.left() + r.width() - 1, r.top(), 1, r.height()}, Theme::getInstance()->bg_dark->background);