Merge 42824e4aec into a3b71d0e3d

Note: If you are worried about grabify, one of our Mayhem maestros cooked up Grabify. Just using general stats to spruce up layout and discussions.

README.md

@@ -10,7 +10,7 @@ This is a fork of the [Havoc](https://github.com/furrtek/portapack-havoc/) firmw
 
 [<img src="https://raw.githubusercontent.com/wiki/portapack-mayhem/mayhem-firmware/img/hw_overview_h2_front.png" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview) [<img src="https://raw.githubusercontent.com/wiki/portapack-mayhem/mayhem-firmware/img/hw_overview_h2_inside.png" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview#portapack-internals)
 
-*[PortaPack H2+HackRF+battery](https://s.click.aliexpress.com/e/_DmU7GQX) (clone) with a custom [3d printed case](https://github.com/portapack-mayhem/mayhem-firmware/wiki/H2-Enclosure)*
+*[PortaPack H2+HackRF+battery](https://grabify.link/7T28JP) (clone) with a custom [3d printed case](https://github.com/portapack-mayhem/mayhem-firmware/wiki/H2-Enclosure)*
 
 # What is this?
 
@@ -26,9 +26,11 @@ This repository expands upon the previous work by many people and aims to consta
 
 ## What to buy?
 
-:heavy_check_mark: A recommended one is this [PortaPack H2](https://s.click.aliexpress.com/e/_DmU7GQX), that includes everything you need with the plastic case "inspired" on [this](https://github.com/portapack-mayhem/mayhem-firmware/wiki/H2-Enclosure).
+:heavy_check_mark: A recommended one is this [PortaPack H2](https://grabify.link/7T28JP), that includes everything you need with the plastic case "inspired" on [this](https://github.com/portapack-mayhem/mayhem-firmware/wiki/H2-Enclosure).
 
-:heavy_check_mark: Our friends at OpenSourceSDRLab give away five units every three months in our discord (check the badge on top) of their [PortaPack H2](https://www.aliexpress.com/item/4000247041639.html?gatewayAdapt=4itemAdapt), you can support them too by ordering.
+:heavy_check_mark: Some individuals lean towards the [H2 with a metal enclosure](https://grabify.link/HTDXG5), but its advantages remain debated. Share your insights on our [wiki](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview). 
+
+:heavy_check_mark: Our friends at OpenSourceSDRLab give away five units every three months in our discord (check the badge on top) of their [PortaPack H2](https://grabify.link/LG0OUY), you can support them too by ordering.
 
 :warning: Be cautious , *ask* the seller about compatibility with the latest releases. Look out for the description of the item, if they provide the firmware files for an older version or they have custom setup instructions, this means it might be **NOT compatible**, for example:
 

firmware/application/CMakeLists.txt

@@ -177,6 +177,7 @@ set(CPPSRC
 	${COMMON}/utility.cpp
 	${COMMON}/wm8731.cpp
 	${COMMON}/ads1110.cpp
+	${COMMON}/battery.cpp
 	${COMMON}/performance_counter.cpp
 	${COMMON}/bmpfile.cpp
 	app_settings.cpp
@@ -211,6 +212,7 @@ set(CPPSRC
 	usb_serial_thread.cpp
 	usb_serial.cpp
 	usb_serial_host_to_device.cpp
+	usb_serial_asyncmsg.cpp
 	qrcodegen.cpp
 	radio.cpp
 	receiver_model.cpp
@@ -227,7 +229,6 @@ set(CPPSRC
 	tone_key.cpp
 	transmitter_model.cpp
 	tuning.cpp
-	usb_serial_asyncmsg.hpp
 	hw/debounce.cpp
 	hw/encoder.cpp
 	hw/max2837.cpp
@@ -277,13 +278,13 @@ set(CPPSRC
 	apps/pocsag_app.cpp
 	# apps/replay_app.cpp
 	apps/soundboard_app.cpp
-	apps/tpms_app.cpp
-	apps/tpms_app.cpp
+	# apps/tpms_app.cpp
 	apps/ui_about_simple.cpp
 	apps/ui_adsb_rx.cpp
 	apps/ui_adsb_tx.cpp
 	apps/ui_aprs_rx.cpp
 	apps/ui_aprs_tx.cpp
+	apps/ui_battinfo.cpp
 	apps/ui_bht_tx.cpp
 	apps/ui_bmp_file_viewer.cpp
 	apps/ui_btle_rx.cpp

firmware/application/apps/ui_battinfo.cpp

@@ -0,0 +1,104 @@
+/*
+ * 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_battinfo.hpp"
+
+#include "event_m0.hpp"
+#include "portapack.hpp"
+
+#include <cstring>
+
+using namespace portapack;
+
+namespace ui {
+
+void BattinfoView::focus() {
+    button_exit.focus();
+}
+
+// called each 1/60th of second, so 6 = 100ms
+void BattinfoView::on_timer() {
+    if (++timer_counter == timer_period) {
+        timer_counter = 0;
+        update_result();
+    }
+}
+
+void BattinfoView::update_result() {
+    if (!battery::BatteryManagement::isDetected()) {
+        // todo show no batt management
+        text_percent.set("UNKNOWN");
+        text_voltage.set("UNKNOWN");
+        text_current.set("-");
+        text_charge.set("-");
+        return;
+    }
+    bool uichg = false;
+    battery::BatteryManagement::getBatteryInfo(percent, voltage, current, isCharging);
+    // update text fields
+    if (percent <= 100)
+        text_percent.set(to_string_dec_uint(percent) + " %");
+    else
+        text_percent.set("UNKNOWN");
+    if (voltage > 1) {
+        text_voltage.set(to_string_decimal(voltage / 1000.0, 3) + " V");
+    } else {
+        text_voltage.set("UNKNOWN");
+    }
+    if (current != 0) {
+        if (labels_opt.hidden()) uichg = true;
+        labels_opt.hidden(false);
+        text_current.hidden(false);
+        text_charge.hidden(false);
+        text_current.set(to_string_dec_int(current) + " mA");
+        text_charge.set(isCharging ? "charge" : "discharge");
+        labels_opt.hidden(false);
+    } else {
+        if (!labels_opt.hidden()) uichg = true;
+        labels_opt.hidden(true);
+        text_current.hidden(true);
+        text_charge.hidden(true);
+    }
+    if (uichg) set_dirty();
+    // to update status bar too, send message in behalf of batt manager
+    BatteryStateMessage msg{percent, isCharging, voltage};
+    EventDispatcher::send_message(msg);
+}
+
+BattinfoView::BattinfoView(NavigationView& nav)
+    : nav_{nav} {
+    add_children({&labels,
+                  &labels_opt,
+                  &text_percent,
+                  &text_voltage,
+                  &text_current,
+                  &text_charge,
+                  &button_exit});
+
+    button_exit.on_select = [this, &nav](Button&) {
+        nav.pop();
+    };
+
+    update_result();
+}
+
+}  // namespace ui

firmware/application/apps/ui_battinfo.hpp

@@ -0,0 +1,83 @@
+/*
+ * 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 __UI_BATTINFO_H__
+#define __UI_BATTINFO_H__
+
+#include "ui.hpp"
+#include "ui_widget.hpp"
+#include "ui_navigation.hpp"
+#include "string_format.hpp"
+
+namespace ui {
+class BattinfoView : public View {
+   public:
+    BattinfoView(NavigationView& nav);
+    void focus() override;
+    std::string title() const override { return "Battery"; };
+
+   private:
+    void update_result();
+    void on_timer();
+    NavigationView& nav_;
+    uint16_t timer_period = 60;
+    uint16_t timer_counter = 0;
+    uint8_t percent = 0;
+    uint16_t voltage = 0;
+    int32_t current = 0;
+    bool isCharging = false;
+
+    Labels labels{
+        {{2 * 8, 1 * 16}, "Percent:", Color::light_grey()},
+        {{2 * 8, 2 * 16}, "Voltage:", Color::light_grey()}};
+
+    Labels labels_opt{
+        {{2 * 8, 3 * 16}, "Current:", Color::light_grey()},
+        {{2 * 8, 4 * 16}, "Charge:", Color::light_grey()}};
+
+    Text text_percent{
+        {13 * 8, 1 * 16, 10 * 16, 16},
+        "-"};
+    Text text_voltage{
+        {13 * 8, 2 * 16, 10 * 16, 16},
+        "-"};
+    Text text_current{
+        {13 * 8, 3 * 16, 10 * 16, 16},
+        "-"};
+    Text text_charge{
+        {13 * 8, 4 * 16, 10 * 16, 16},
+        "-"};
+
+    Button button_exit{
+        {72, 17 * 16, 96, 32},
+        "Back"};
+
+    MessageHandlerRegistration message_handler_frame_sync{
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            this->on_timer();
+        }};
+};
+
+} /* namespace ui */
+
+#endif /*__UI_BATTINFO__*/

firmware/application/apps/ui_dfu_menu.cpp

@@ -42,7 +42,7 @@ DfuMenu::DfuMenu(NavigationView& nav)
                   &text_info_line_9,
                   &text_info_line_10});
 
-    if (portapack::battery_ads1110.isDetected()) {
+    if (battery::BatteryManagement::isDetected()) {
         add_child(&voltage_label);
         add_child(&text_info_line_11);
     }
@@ -53,7 +53,7 @@ void DfuMenu::paint(Painter& painter) {
     size_t m0_fragmented_free_space = 0;
     const auto m0_fragments = chHeapStatus(NULL, &m0_fragmented_free_space);
 
-    auto lines = (portapack::battery_ads1110.isDetected() ? 11 : 10) + 2;
+    auto lines = (battery::BatteryManagement::isDetected() ? 11 : 10) + 2;
 
     text_info_line_1.set(to_string_dec_uint(chCoreStatus(), 6));
     text_info_line_2.set(to_string_dec_uint(m0_fragmented_free_space, 6));
@@ -65,8 +65,8 @@ void DfuMenu::paint(Painter& painter) {
     text_info_line_8.set(to_string_dec_uint(shared_memory.m4_performance_counter, 6));
     text_info_line_9.set(to_string_dec_uint(shared_memory.m4_buffer_missed, 6));
     text_info_line_10.set(to_string_dec_uint(chTimeNow() / 1000, 6));
-    if (portapack::battery_ads1110.isDetected()) {
-        text_info_line_11.set(to_string_decimal_padding(portapack::battery_ads1110.readVoltage(), 3, 6));
+    if (battery::BatteryManagement::isDetected()) {
+        text_info_line_11.set(to_string_decimal_padding((float)battery::BatteryManagement::getVoltage() / 1000.0, 3, 6));
     }
 
     constexpr auto margin = 5;

firmware/application/apps/ui_flash_utility.cpp

@@ -163,8 +163,8 @@ bool FlashUtilityView::flash_firmware(std::filesystem::path::string_type path) {
         ui::Color::black());
 
     painter.draw_string({12, 24}, this->nav_.style(), "This will take 15 seconds.");
-    painter.draw_string({12, 64}, this->nav_.style(), "Please wait while LEDs RX");
-    painter.draw_string({12, 84}, this->nav_.style(), "and TX are flashing.");
+    painter.draw_string({12, 64}, this->nav_.style(), "Please wait while LED RX");
+    painter.draw_string({12, 84}, this->nav_.style(), "is on and TX is flashing.");
     painter.draw_string({12, 124}, this->nav_.style(), "Device will then restart.");
 
     std::memcpy(&shared_memory.bb_data.data[0], path.c_str(), (path.length() + 1) * 2);

firmware/application/apps/ui_settings.cpp

@@ -329,6 +329,10 @@ SetUIView::SetUIView(NavigationView& nav) {
     if (audio::speaker_disable_supported()) {
         add_child(&toggle_speaker);
     }
+    if (battery::BatteryManagement::isDetected()) {
+        add_child(&toggle_battery_icon);
+        add_child(&toggle_battery_text);
+    }
 
     checkbox_disable_touchscreen.set_value(pmem::disable_touchscreen());
     checkbox_showsplash.set_value(pmem::config_splash());
@@ -355,6 +359,8 @@ SetUIView::SetUIView(NavigationView& nav) {
     toggle_speaker.set_value(!pmem::ui_hide_speaker());
     toggle_mute.set_value(!pmem::ui_hide_mute());
     toggle_fake_brightness.set_value(!pmem::ui_hide_fake_brightness());
+    toggle_battery_icon.set_value(!pmem::ui_hide_battery_icon());
+    toggle_battery_text.set_value(!pmem::ui_hide_numeric_battery());
     toggle_sd_card.set_value(!pmem::ui_hide_sd_card());
 
     button_save.on_select = [&nav, this](Button&) {
@@ -382,6 +388,8 @@ SetUIView::SetUIView(NavigationView& nav) {
         pmem::set_ui_hide_speaker(!toggle_speaker.value());
         pmem::set_ui_hide_mute(!toggle_mute.value());
         pmem::set_ui_hide_fake_brightness(!toggle_fake_brightness.value());
+        pmem::set_ui_hide_battery_icon(!toggle_battery_icon.value());
+        pmem::set_ui_hide_numeric_battery(!toggle_battery_text.value());
         pmem::set_ui_hide_sd_card(!toggle_sd_card.value());
         send_system_refresh();
 
@@ -807,6 +815,7 @@ SetMenuColorView::SetMenuColorView(NavigationView& nav) {
                   &field_green_level,
                   &field_blue_level,
                   &button_save,
+                  &button_reset,
                   &button_cancel});
 
     button_sample.set_focusable(false);
@@ -824,6 +833,13 @@ SetMenuColorView::SetMenuColorView(NavigationView& nav) {
     field_green_level.on_change = color_changed_fn;
     field_blue_level.on_change = color_changed_fn;
 
+    button_reset.on_select = [&nav, this](Button&) {
+        field_red_level.set_value(127);
+        field_green_level.set_value(127);
+        field_blue_level.set_value(127);
+        set_dirty();
+    };
+
     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);

firmware/application/apps/ui_settings.hpp

@@ -323,37 +323,45 @@ class SetUIView : public View {
     };
 
     ImageToggle toggle_camera{
-        {6 * 8, 14 * 16 + 2, 16, 16},
+        {2 * 8, 14 * 16 + 2, 16, 16},
         &bitmap_icon_camera};
 
     ImageToggle toggle_sleep{
-        {8 * 8, 14 * 16 + 2, 16, 16},
+        {4 * 8, 14 * 16 + 2, 16, 16},
         &bitmap_icon_sleep};
 
     ImageToggle toggle_stealth{
-        {10 * 8, 14 * 16 + 2, 16, 16},
+        {6 * 8, 14 * 16 + 2, 16, 16},
         &bitmap_icon_stealth};
 
     ImageToggle toggle_converter{
-        {12 * 8, 14 * 16 + 2, 16, 16},
+        {8 * 8, 14 * 16 + 2, 16, 16},
         &bitmap_icon_upconvert};
 
     ImageToggle toggle_bias_tee{
-        {14 * 8, 14 * 16 + 2, 16, 16},
+        {10 * 8, 14 * 16 + 2, 16, 16},
         &bitmap_icon_biast_off};
 
     ImageToggle toggle_clock{
-        {16 * 8, 14 * 16 + 2, 8, 16},
+        {12 * 8, 14 * 16 + 2, 8, 16},
         &bitmap_icon_clk_ext};
 
     ImageToggle toggle_mute{
-        {17 * 8, 14 * 16 + 2, 16, 16},
+        {13 * 8, 14 * 16 + 2, 16, 16},
         &bitmap_icon_speaker_and_headphones_mute};
 
     ImageToggle toggle_speaker{
-        {19 * 8, 14 * 16 + 2, 16, 16},
+        {15 * 8, 14 * 16 + 2, 16, 16},
         &bitmap_icon_speaker_mute};
 
+    ImageToggle toggle_battery_icon{
+        {17 * 8, 14 * 16 + 2, 16, 16},
+        &bitmap_icon_batt_icon};
+
+    ImageToggle toggle_battery_text{
+        {19 * 8, 14 * 16 + 2, 16, 16},
+        &bitmap_icon_batt_text};
+
     ImageToggle toggle_fake_brightness{
         {21 * 8, 14 * 16 + 2, 16, 16},
         &bitmap_icon_brightness};
@@ -789,6 +797,11 @@ class SetMenuColorView : public View {
         ' ',
     };
 
+    Button button_reset{
+        {2 * 8, 13 * 16, 12 * 8, 32},
+        "Reset",
+    };
+
     Button button_save{
         {2 * 8, 16 * 16, 12 * 8, 32},
         "Save"};

firmware/application/bitmap.hpp

@@ -2447,6 +2447,82 @@ static constexpr Bitmap bitmap_icon_camera{
     {16, 16},
     bitmap_icon_camera_data};
 
+static constexpr uint8_t bitmap_icon_batt_icon_data[] = {
+    0xC0,
+    0x03,
+    0xC0,
+    0x03,
+    0xF0,
+    0x0F,
+    0x10,
+    0x08,
+    0x10,
+    0x08,
+    0x10,
+    0x08,
+    0x10,
+    0x08,
+    0x10,
+    0x08,
+    0xF0,
+    0x0F,
+    0xF0,
+    0x0F,
+    0xF0,
+    0x0F,
+    0xF0,
+    0x0F,
+    0xF0,
+    0x0F,
+    0xF0,
+    0x0F,
+    0xF0,
+    0x0F,
+    0x00,
+    0x00,
+};
+static constexpr Bitmap bitmap_icon_batt_icon{
+    {16, 16},
+    bitmap_icon_batt_icon_data};
+
+static constexpr uint8_t bitmap_icon_batt_text_data[] = {
+    0x00,
+    0x00,
+    0x30,
+    0x06,
+    0x48,
+    0x09,
+    0x48,
+    0x09,
+    0x70,
+    0x0E,
+    0x40,
+    0x08,
+    0x30,
+    0x06,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x48,
+    0x00,
+    0x20,
+    0x00,
+    0x10,
+    0x00,
+    0x48,
+    0x00,
+    0x00,
+    0x00,
+};
+static constexpr Bitmap bitmap_icon_batt_text{
+    {16, 16},
+    bitmap_icon_batt_text_data};
+
 static constexpr uint8_t bitmap_icon_tools_wipesd_data[] = {
     0xF0,
     0x3F,

firmware/application/event_m0.cpp

@@ -335,7 +335,8 @@ void EventDispatcher::handle_lcd_frame_sync() {
     static_cast<ui::SystemView*>(top_widget)->paint_overlay();
     painter.paint_widget_tree(top_widget);
 
-    portapack::backlight()->on();
+    // portapack::backlight()->on();
+    portapack::backlight()->set_level(28);
 
     if (waiting_for_frame)
         this->waiting_for_frame = false;

firmware/application/external/external.cmake

@@ -80,6 +80,10 @@ set(EXTCPPSRC
 	#wardrivemap
 	external/wardrivemap/main.cpp
 	external/wardrivemap/ui_wardrivemap.cpp
+
+	#tpmsrx
+	external/tpmsrx/main.cpp
+	external/tpmsrx/tpms_app.cpp
 )
 
 set(EXTAPPLIST
@@ -102,4 +106,5 @@ set(EXTAPPLIST
 	foxhunt_rx
 	audio_test
 	wardrivemap
+	tpmsrx
 )

firmware/application/external/external.ld

@@ -42,6 +42,7 @@ MEMORY
     ram_external_app_foxhunt_rx(rwx) : org = 0xADC00000, len = 32k
     ram_external_app_audio_test(rwx) : org = 0xADC10000, len = 32k
     ram_external_app_wardrivemap(rwx) : org = 0xADC20000, len = 32k
+    ram_external_app_tpmsrx(rwx) : org = 0xADC30000, len = 32k
 }
 
 SECTIONS
@@ -160,4 +161,10 @@ SECTIONS
         *(*ui*external_app*wardrivemap*);
     } > ram_external_app_wardrivemap
 
+   .external_app_tpmsrx : ALIGN(4) SUBALIGN(4)
+    {
+        KEEP(*(.external_app.app_tpmsrx.application_information));
+        *(*ui*external_app*tpmsrx*);
+    } > ram_external_app_tpmsrx
+
 }

firmware/application/external/tpmsrx/main.cpp

@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2024 Mark Thompson
+ *
+ * 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 "tpms_app.hpp"
+#include "ui_navigation.hpp"
+#include "external_app.hpp"
+
+namespace ui::external_app::tpmsrx {
+void initialize_app(ui::NavigationView& nav) {
+    nav.push<TPMSAppView>();
+}
+}  // namespace ui::external_app::tpmsrx
+
+extern "C" {
+
+__attribute__((section(".external_app.app_tpmsrx.application_information"), used)) application_information_t _application_information_tpmsrx = {
+    /*.memory_location = */ (uint8_t*)0x00000000,  // will be filled at compile time
+    /*.externalAppEntry = */ ui::external_app::tpmsrx::initialize_app,
+    /*.header_version = */ CURRENT_HEADER_VERSION,
+    /*.app_version = */ VERSION_MD5,
+
+    /*.app_name = */ "TPMS RX",
+    /*.bitmap_data = */ {
+        0xC0,
+        0x03,
+        0xF0,
+        0x0F,
+        0x18,
+        0x18,
+        0xEC,
+        0x37,
+        0x36,
+        0x6D,
+        0x3A,
+        0x59,
+        0x4B,
+        0xD5,
+        0x8B,
+        0xD3,
+        0xCB,
+        0xD1,
+        0xAB,
+        0xD2,
+        0x9A,
+        0x5C,
+        0xB6,
+        0x6C,
+        0xEC,
+        0x37,
+        0x18,
+        0x18,
+        0xF0,
+        0x0F,
+        0xC0,
+        0x03,
+    },
+    /*.icon_color = */ ui::Color::green().v,
+    /*.menu_location = */ app_location_t::RX,
+
+    /*.m4_app_tag = portapack::spi_flash::image_tag_tpms */ {'P', 'T', 'P', 'M'},
+    /*.m4_app_offset = */ 0x00000000,  // will be filled at compile time
+};
+}

firmware/application/external/tpmsrx/tpms_app.cpp

@@ -34,15 +34,15 @@ using namespace portapack;
 
 namespace pmem = portapack::persistent_memory;
 
-namespace tpms {
+namespace ui::external_app::tpmsrx {
 
 namespace format {
 
-std::string type(Reading::Type type) {
+std::string type(tpms::Reading::Type type) {
     return to_string_dec_uint(toUType(type), 2);
 }
 
-std::string id(TransponderID id) {
+std::string id(tpms::TransponderID id) {
     return to_string_hex(id.value(), 8);
 }
 
@@ -54,17 +54,17 @@ std::string temperature(Temperature temperature) {
     return to_string_dec_int(units_fahr ? temperature.fahrenheit() : temperature.celsius(), 3);
 }
 
-std::string flags(Flags flags) {
+std::string flags(tpms::Flags flags) {
     return to_string_hex(flags, 2);
 }
 
-static std::string signal_type(SignalType signal_type) {
+static std::string signal_type(tpms::SignalType signal_type) {
     switch (signal_type) {
-        case SignalType::FSK_19k2_Schrader:
+        case tpms::SignalType::FSK_19k2_Schrader:
             return "FSK 38400 19200 Schrader";
-        case SignalType::OOK_8k192_Schrader:
+        case tpms::SignalType::OOK_8k192_Schrader:
             return "OOK - 8192 Schrader";
-        case SignalType::OOK_8k4_Schrader:
+        case tpms::SignalType::OOK_8k4_Schrader:
             return "OOK - 8400 Schrader";
         default:
             return "- - - -";
@@ -73,15 +73,13 @@ static std::string signal_type(SignalType signal_type) {
 
 } /* namespace format */
 
-} /* namespace tpms */
-
 void TPMSLogger::on_packet(const tpms::Packet& packet, const uint32_t target_frequency) {
     const auto hex_formatted = packet.symbols_formatted();
 
     // TODO: function doesn't take uint64_t, so when >= 1<<32, weirdness will ensue!
     const auto target_frequency_str = to_string_dec_uint(target_frequency, 10);
 
-    std::string entry = target_frequency_str + " " + tpms::format::signal_type(packet.signal_type()) + " " + hex_formatted.data + "/" + hex_formatted.errors;
+    std::string entry = target_frequency_str + " " + ui::external_app::tpmsrx::format::signal_type(packet.signal_type()) + " " + hex_formatted.data + "/" + hex_formatted.errors;
     log_file.write_entry(packet.received_at(), entry);
 }
 
@@ -101,52 +99,9 @@ void TPMSRecentEntry::update(const tpms::Reading& reading) {
     }
 }
 
-namespace ui {
-
-template <>
-void RecentEntriesTable<TPMSRecentEntries>::draw(
-    const Entry& entry,
-    const Rect& target_rect,
-    Painter& painter,
-    const Style& style) {
-    std::string line = tpms::format::type(entry.type) + " " + tpms::format::id(entry.id);
-
-    if (entry.last_pressure.is_valid()) {
-        line += "  " + tpms::format::pressure(entry.last_pressure.value());
-    } else {
-        line +=
-            "  "
-            "   ";
-    }
-
-    if (entry.last_temperature.is_valid()) {
-        line += "  " + tpms::format::temperature(entry.last_temperature.value());
-    } else {
-        line +=
-            "  "
-            "   ";
-    }
-
-    if (entry.received_count > 999) {
-        line += " +++";
-    } else {
-        line += " " + to_string_dec_uint(entry.received_count, 3);
-    }
-
-    if (entry.last_flags.is_valid()) {
-        line += " " + tpms::format::flags(entry.last_flags.value());
-    } else {
-        line +=
-            " "
-            "  ";
-    }
-
-    line.resize(target_rect.width() / 8, ' ');
-    painter.draw_string(target_rect.location(), style, line);
-}
-
 TPMSAppView::TPMSAppView(NavigationView&) {
-    baseband::run_image(portapack::spi_flash::image_tag_tpms);
+    // baseband::run_image(portapack::spi_flash::image_tag_tpms);
+    baseband::run_prepared_image(portapack::memory::map::m4_code.base());
 
     add_children({&rssi,
                   &field_volume,
@@ -167,16 +122,16 @@ TPMSAppView::TPMSAppView(NavigationView&) {
     options_band.set_by_value(receiver_model.target_frequency());
 
     options_pressure.on_change = [this](size_t, int32_t i) {
-        tpms::format::units_psi = (bool)i;
+        format::units_psi = (bool)i;
         update_view();
     };
-    options_pressure.set_selected_index(tpms::format::units_psi, true);
+    options_pressure.set_selected_index(format::units_psi, true);
 
     options_temperature.on_change = [this](size_t, int32_t i) {
-        tpms::format::units_fahr = (bool)i;
+        format::units_fahr = (bool)i;
         update_view();
     };
-    options_temperature.set_selected_index(tpms::format::units_fahr, true);
+    options_temperature.set_selected_index(format::units_fahr, true);
 
     logger = std::make_unique<TPMSLogger>();
     if (logger) {
@@ -234,4 +189,50 @@ void TPMSAppView::on_show_list() {
     recent_entries_view.focus();
 }
 
-} /* namespace ui */
+}  // namespace ui::external_app::tpmsrx
+
+namespace ui {
+
+template <>
+void RecentEntriesTable<ui::external_app::tpmsrx::TPMSRecentEntries>::draw(
+    const Entry& entry,
+    const Rect& target_rect,
+    Painter& painter,
+    const Style& style) {
+    std::string line = ui::external_app::tpmsrx::format::type(entry.type) + " " + ui::external_app::tpmsrx::format::id(entry.id);
+
+    if (entry.last_pressure.is_valid()) {
+        line += "  " + ui::external_app::tpmsrx::format::pressure(entry.last_pressure.value());
+    } else {
+        line +=
+            "  "
+            "   ";
+    }
+
+    if (entry.last_temperature.is_valid()) {
+        line += "  " + ui::external_app::tpmsrx::format::temperature(entry.last_temperature.value());
+    } else {
+        line +=
+            "  "
+            "   ";
+    }
+
+    if (entry.received_count > 999) {
+        line += " +++";
+    } else {
+        line += " " + to_string_dec_uint(entry.received_count, 3);
+    }
+
+    if (entry.last_flags.is_valid()) {
+        line += " " + ui::external_app::tpmsrx::format::flags(entry.last_flags.value());
+    } else {
+        line +=
+            " "
+            "  ";
+    }
+
+    line.resize(target_rect.width() / 8, ' ');
+    painter.draw_string(target_rect.location(), style, line);
+}
+
+}  // namespace ui

firmware/application/external/tpmsrx/tpms_app.hpp

@@ -38,7 +38,7 @@
 
 #include "tpms_packet.hpp"
 
-namespace tpms {
+namespace ui::external_app::tpmsrx {
 
 namespace format {
 
@@ -47,12 +47,6 @@ static bool units_fahr{false};
 
 } /* namespace format */
 
-} /* namespace tpms */
-
-namespace std {
-
-} /* namespace std */
-
 struct TPMSRecentEntry {
     using Key = std::pair<tpms::Reading::Type, tpms::TransponderID>;
 
@@ -94,8 +88,6 @@ class TPMSLogger {
     LogFile log_file{};
 };
 
-namespace ui {
-
 using TPMSRecentEntriesView = RecentEntriesView<TPMSRecentEntries>;
 
 class TPMSAppView : public View {
@@ -115,16 +107,18 @@ class TPMSAppView : public View {
 
    private:
     RxRadioState radio_state_{
-        314950000 /* frequency*/,
+        314950000 /* frequency*/
+        ,
         1750000 /* bandwidth */,
-        2457600 /* sampling rate */};
+        2457600 /* sampling rate */
+    };
 
     app_settings::SettingsManager settings_{
         "rx_tpms",
         app_settings::Mode::RX,
         {
-            {"units_psi"sv, &tpms::format::units_psi},
-            {"units_fahr"sv, &tpms::format::units_fahr},
+            {"units_psi"sv, &format::units_psi},
+            {"units_fahr"sv, &format::units_fahr},
         }};
 
     MessageHandlerRegistration message_handler_packet{
@@ -198,6 +192,6 @@ class TPMSAppView : public View {
     void update_view();
 };
 
-} /* namespace ui */
+}  // namespace ui::external_app::tpmsrx
 
 #endif /*__TPMS_APP_H__*/

firmware/application/portapack.cpp

@@ -85,7 +85,6 @@ ClockManager clock_manager{
 
 WM8731 audio_codec_wm8731{i2c0, 0x1a};
 AK4951 audio_codec_ak4951{i2c0, 0x12};
-ads1110::ADS1110 battery_ads1110{i2c0, 0x48};
 
 ReceiverModel receiver_model;
 TransmitterModel transmitter_model;
@@ -267,10 +266,14 @@ static const portapack::cpld::Config& portapack_cpld_config() {
                : portapack::cpld::rev_20150901::config;
 }
 
+// Backlight* backlight() {
+//     return (portapack_model() == PortaPackModel::R2_20170522)
+//                ? static_cast<portapack::Backlight*>(&backlight_cat4004)  // R2_20170522
+//                : static_cast<portapack::Backlight*>(&backlight_on_off);  // R1_20150901
+// }
+
 Backlight* backlight() {
-    return (portapack_model() == PortaPackModel::R2_20170522)
-               ? static_cast<portapack::Backlight*>(&backlight_cat4004)  // R2_20170522
-               : static_cast<portapack::Backlight*>(&backlight_on_off);  // R1_20150901
+    return static_cast<portapack::Backlight*>(&backlight_cat4004);  // R1_20150901
 }
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
@@ -587,7 +590,7 @@ init_status_t init() {
     chThdSleepMilliseconds(10);
 
     audio::init(portapack_audio_codec());
-    battery_ads1110.init();
+    battery::BatteryManagement::init();
 
     if (lcd_fast_setup)
         draw_splash_screen_icon(4, ui::bitmap_icon_speaker);

firmware/application/portapack.hpp

@@ -38,6 +38,7 @@
 #include "radio.hpp"
 #include "clock_manager.hpp"
 #include "temperature_logger.hpp"
+#include "battery.hpp"
 
 /* TODO: This would be better as a class to add
  * guardrails on setting properties. */
@@ -63,7 +64,6 @@ extern portapack::USBSerial usb_serial;
 extern si5351::Si5351 clock_generator;
 extern ClockManager clock_manager;
 
-extern ads1110::ADS1110 battery_ads1110;
 extern ReceiverModel receiver_model;
 extern TransmitterModel transmitter_model;
 

firmware/application/ui/ui_bmpview.cpp

@@ -1,5 +1,4 @@
 #include "ui_bmpview.hpp"
-#include "usb_serial_asyncmsg.hpp"
 #include "portapack.hpp"
 
 bool BMPViewer::load_bmp(const std::filesystem::path& file) {

firmware/application/ui_navigation.cpp

@@ -84,6 +84,7 @@
 #include "ui_weatherstation.hpp"
 #include "ui_subghzd.hpp"
 #include "ui_whipcalc.hpp"
+#include "ui_battinfo.hpp"
 #include "ui_external_items_menu_loader.hpp"
 
 // #include "acars_app.hpp"
@@ -100,7 +101,7 @@
 #include "pocsag_app.hpp"
 #include "replay_app.hpp"
 #include "soundboard_app.hpp"
-#include "tpms_app.hpp"
+// #include "tpms_app.hpp" //moved to ext
 
 #include "core_control.hpp"
 #include "file.hpp"
@@ -171,9 +172,9 @@ const NavigationView::AppList NavigationView::appList = {
     {"radiosonde", "Radiosnde", RX, Color::green(), &bitmap_icon_sonde, new ViewFactory<SondeView>()},
     {"recon", "Recon", RX, Color::green(), &bitmap_icon_scanner, new ViewFactory<ReconView>()},
     {"search", "Search", RX, Color::yellow(), &bitmap_icon_search, new ViewFactory<SearchView>()},
-    {"tmps", "TPMS Cars", RX, Color::green(), &bitmap_icon_tpms, new ViewFactory<TPMSAppView>()},
-    {"weather", "Weather", RX, Color::green(), &bitmap_icon_thermometer, new ViewFactory<WeatherView>()},
+    //{"tmps", "TPMS Cars", RX, Color::green(), &bitmap_icon_tpms, new ViewFactory<TPMSAppView>()},
     {"subghzd", "SubGhzD", RX, Color::yellow(), &bitmap_icon_remote, new ViewFactory<SubGhzDView>()},
+    {"weather", "Weather", RX, Color::green(), &bitmap_icon_thermometer, new ViewFactory<WeatherView>()},
     //{"fskrx", "FSK RX", RX, Color::yellow(), &bitmap_icon_remote, new ViewFactory<FskxRxMainView>()},
     //{"dmr", "DMR", RX, Color::dark_grey(), &bitmap_icon_dmr, new ViewFactory<NotImplementedView>()},
     //{"sigfox", "SIGFOX", RX, Color::dark_grey(), &bitmap_icon_fox, new ViewFactory<NotImplementedView>()},
@@ -334,6 +335,9 @@ SystemStatusView::SystemStatusView(
         refresh();
     };
 
+    battery_icon.on_select = [this]() { on_battery_details(); };
+    battery_text.on_select = [this]() { on_battery_details(); };
+
     button_fake_brightness.on_select = [this](ImageButton&) {
         set_dirty();
         pmem::toggle_fake_brightness_level();
@@ -370,6 +374,26 @@ SystemStatusView::SystemStatusView(
     refresh();
 }
 
+// when battery icon / text is clicked
+void SystemStatusView::on_battery_details() {
+    if (!nav_.is_valid()) return;
+    if (batt_info_up) return;
+    batt_info_up = true;
+    nav_.push<BattinfoView>();
+    nav_.set_on_pop([this]() {
+        batt_info_up = false;
+    });
+}
+
+void SystemStatusView::on_battery_data(const BatteryStateMessage* msg) {
+    if (!pmem::ui_hide_numeric_battery()) {
+        battery_text.set_battery(msg->percent, msg->on_charger);
+    }
+    if (!pmem::ui_hide_battery_icon()) {
+        battery_icon.set_battery(msg->percent, msg->on_charger);
+    };
+}
+
 void SystemStatusView::refresh() {
     // NB: Order of insertion is the display order Left->Right.
     // TODO: Might be better to support hide and only add once.
@@ -386,8 +410,20 @@ void SystemStatusView::refresh() {
     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 (battery::BatteryManagement::isDetected()) {
+        uint8_t percent = battery::BatteryManagement::getPercent();
+        if (!pmem::ui_hide_battery_icon()) {
+            status_icons.add(&battery_icon);
+            battery_text.set_battery(percent, false);  // got an on select, that may pop up the details of the battery.
+        };
+        if (!pmem::ui_hide_numeric_battery()) {
+            status_icons.add(&battery_text);
+            battery_text.set_battery(percent, false);
+        }
+    }
 
     if (!pmem::ui_hide_sd_card()) status_icons.add(&sd_card_status_view);
+
     status_icons.update_layout();
 
     // Clock status
@@ -667,8 +703,9 @@ void NavigationView::display_modal(
     const std::string& title,
     const std::string& message,
     modal_t type,
-    std::function<void(bool)> on_choice) {
-    push<ModalMessageView>(title, message, type, on_choice);
+    std::function<void(bool)> on_choice,
+    bool compact) {
+    push<ModalMessageView>(title, message, type, on_choice, compact);
 }
 
 void NavigationView::free_view() {
@@ -997,11 +1034,13 @@ ModalMessageView::ModalMessageView(
     const std::string& title,
     const std::string& message,
     modal_t type,
-    std::function<void(bool)> on_choice)
+    std::function<void(bool)> on_choice,
+    bool compact)
     : title_{title},
       message_{message},
       type_{type},
-      on_choice_{on_choice} {
+      on_choice_{on_choice},
+      compact{compact} {
     if (type == INFO) {
         add_child(&button_ok);
         button_ok.on_select = [this, &nav](Button&) {
@@ -1034,13 +1073,13 @@ ModalMessageView::ModalMessageView(
 }
 
 void ModalMessageView::paint(Painter& painter) {
-    portapack::display.drawBMP({100, 48}, modal_warning_bmp, false);
+    if (!compact) portapack::display.drawBMP({100, 48}, modal_warning_bmp, false);
 
     // Break lines.
     auto lines = split_string(message_, '\n');
     for (size_t i = 0; i < lines.size(); ++i) {
         painter.draw_string(
-            {1 * 8, (Coord)(120 + (i * 16))},
+            {1 * 8, (Coord)(((compact) ? 8 * 3 : 120) + (i * 16))},
             style(),
             lines[i]);
     }

firmware/application/ui_navigation.hpp

@@ -120,7 +120,8 @@ class NavigationView : public View {
         const std::string& title,
         const std::string& message,
         modal_t type,
-        std::function<void(bool)> on_choice = nullptr);
+        std::function<void(bool)> on_choice = nullptr,
+        bool compact = false);
 
     void focus() override;
 
@@ -191,7 +192,7 @@ class SystemStatusView : public View {
 
    private:
     static constexpr auto default_title = "";
-
+    bool batt_info_up = false;  // to prevent show multiple batt info dialog
     NavigationView& nav_;
 
     Rectangle backdrop{
@@ -278,6 +279,9 @@ class SystemStatusView : public View {
     SDCardStatusView sd_card_status_view{
         {0, 0 * 16, 2 * 8, 1 * 16}};
 
+    BatteryTextField battery_text{{0, 0, 2 * 8, 1 * 16}, 102};
+    BatteryIcon battery_icon{{0, 0, 10, 1 * 16}, 102};
+
     void on_converter();
     void on_bias_tee();
     void on_camera();
@@ -285,6 +289,8 @@ class SystemStatusView : public View {
     void refresh();
     void on_clk();
     void rtc_battery_workaround();
+    void on_battery_data(const BatteryStateMessage* msg);
+    void on_battery_details();
 
     MessageHandlerRegistration message_handler_refresh{
         Message::ID::StatusRefresh,
@@ -292,6 +298,13 @@ class SystemStatusView : public View {
             (void)p;
             this->refresh();
         }};
+
+    MessageHandlerRegistration message_handler_battery{
+        Message::ID::BatteryStateData,
+        [this](const Message* const p) {
+            const auto message = static_cast<const BatteryStateMessage*>(p);
+            this->on_battery_data(message);
+        }};
 };
 
 class InformationView : public View {
@@ -418,7 +431,8 @@ class ModalMessageView : public View {
         const std::string& title,
         const std::string& message,
         modal_t type,
-        std::function<void(bool)> on_choice);
+        std::function<void(bool)> on_choice,
+        bool compact = false);
 
     void paint(Painter& painter) override;
     void focus() override;
@@ -430,6 +444,7 @@ class ModalMessageView : public View {
     const std::string message_;
     const modal_t type_;
     const std::function<void(bool)> on_choice_;
+    const bool compact;
 
     Button button_ok{
         {10 * 8, 14 * 16, 10 * 8, 48},

firmware/application/usb_serial_asyncmsg.cpp

@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2017 Furrtek
+ * Copyleft (ɔ) 2024 zxkmm with the GPL license
+ * 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 "usb_serial_asyncmsg.hpp"
+
+/// value
+// to_string_bin/ to_string_decimal/ to_string_hex/ to_string_hex_array/ to_string_dec_uint/ to_string_dec_int etc seems usellss so i didn't add them here
+// usage:     UsbSerialAsyncmsg::asyncmsg(num);
+
+template <>
+void UsbSerialAsyncmsg::asyncmsg<int64_t>(const int64_t& data) {
+    if (!portapack::async_tx_enabled) {
+        return;
+    }
+    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
+}
+
+template <>
+void UsbSerialAsyncmsg::asyncmsg<int32_t>(const int32_t& data) {
+    if (!portapack::async_tx_enabled) {
+        return;
+    }
+    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
+}
+
+template <>
+void UsbSerialAsyncmsg::asyncmsg<int16_t>(const int16_t& data) {
+    if (!portapack::async_tx_enabled) {
+        return;
+    }
+    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
+}
+
+template <>
+void UsbSerialAsyncmsg::asyncmsg<int8_t>(const int8_t& data) {
+    if (!portapack::async_tx_enabled) {
+        return;
+    }
+    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
+}
+
+template <>
+void UsbSerialAsyncmsg::asyncmsg<uint8_t>(const uint8_t& data) {
+    if (!portapack::async_tx_enabled) {
+        return;
+    }
+    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
+}
+
+template <>
+void UsbSerialAsyncmsg::asyncmsg<uint16_t>(const uint16_t& data) {
+    if (!portapack::async_tx_enabled) {
+        return;
+    }
+    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
+}
+
+template <>
+void UsbSerialAsyncmsg::asyncmsg<uint32_t>(const uint32_t& data) {
+    if (!portapack::async_tx_enabled) {
+        return;
+    }
+    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
+}
+
+template <>
+void UsbSerialAsyncmsg::asyncmsg<uint64_t>(const uint64_t& data) {
+    if (!portapack::async_tx_enabled) {
+        return;
+    }
+    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
+}
+
+template <>
+void UsbSerialAsyncmsg::asyncmsg<float>(const float& data) {
+    if (!portapack::async_tx_enabled) {
+        return;
+    }
+    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_decimal(data, 7).c_str());
+}
+
+/// fs things
+
+template <>
+// usage:     UsbSerialAsyncmsg::asyncmsg(path);
+void UsbSerialAsyncmsg::asyncmsg<std::filesystem::path>(const std::filesystem::path& data) {
+    if (!portapack::async_tx_enabled) {
+        return;
+    }
+    std::string path_str = data.string();
+    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", path_str.c_str());
+}
+
+/// string
+
+// string obj
+template <>
+// usage:     UsbSerialAsyncmsg::asyncmsg(str);
+void UsbSerialAsyncmsg::asyncmsg<std::string>(const std::string& data) {
+    if (!portapack::async_tx_enabled) {
+        return;
+    }
+    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", data.c_str());
+}
+
+// string literal AKA char[]
+// usage: UsbSerialAsyncmsg::asyncmsg("abc");
+void UsbSerialAsyncmsg::asyncmsg(const char* data) {
+    if (!portapack::async_tx_enabled) {
+        return;
+    }
+    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", data);
+}

firmware/application/usb_serial_asyncmsg.hpp

@@ -2,6 +2,7 @@
  * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
  * Copyright (C) 2017 Furrtek
  * Copyleft (ɔ) 2024 zxkmm with the GPL license
+ * Copyright (C) 2024 HTotoo
  *
  * This file is part of PortaPack.
  *
@@ -27,7 +28,11 @@
 #include <vector>
 #include <string>
 #include <sstream>
-#include <chprintf.h>
+
+#include "portapack.hpp"
+#include "ch.h"
+#include "chprintf.h"
+#include "hal.h"
 #include "usb_serial_device_to_host.h"
 
 class UsbSerialAsyncmsg {
@@ -48,119 +53,10 @@ class UsbSerialAsyncmsg {
  * - use this client to filter only PP devices: https://github.com/zxkmm/Pyserial-Demo-portapack
  * - usage:
  *        portapack::async_tx_enabled = true; // note that use this when debugging, unless the msg would be forbidden. but don't use this in production, since it's not real async and multiple serial transmittions will broken each other. if this class is used in other scene in the future, just use command to cover (protect your serial tramsnitton) in your extern thing: asyncmsg enable --- your cmd --- asyncmsg disable
- *        #include "usb_serial_asyncmsg.cpp"
+ *        #include "usb_serial_asyncmsg.hpp"
  *        UsbSerialAsyncmsg::asyncmsg("Hello PP");
  * */
 
-/// value
-// to_string_bin/ to_string_decimal/ to_string_hex/ to_string_hex_array/ to_string_dec_uint/ to_string_dec_int etc seems usellss so i didn't add them here
-// usage:     UsbSerialAsyncmsg::asyncmsg(num);
-
-template <>
-void UsbSerialAsyncmsg::asyncmsg<int64_t>(const int64_t& data) {
-    if (!portapack::async_tx_enabled) {
-        return;
-    }
-    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
-}
-
-template <>
-void UsbSerialAsyncmsg::asyncmsg<int32_t>(const int32_t& data) {
-    if (!portapack::async_tx_enabled) {
-        return;
-    }
-    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
-}
-
-template <>
-void UsbSerialAsyncmsg::asyncmsg<int16_t>(const int16_t& data) {
-    if (!portapack::async_tx_enabled) {
-        return;
-    }
-    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
-}
-
-template <>
-void UsbSerialAsyncmsg::asyncmsg<int8_t>(const int8_t& data) {
-    if (!portapack::async_tx_enabled) {
-        return;
-    }
-    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
-}
-
-template <>
-void UsbSerialAsyncmsg::asyncmsg<uint8_t>(const uint8_t& data) {
-    if (!portapack::async_tx_enabled) {
-        return;
-    }
-    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
-}
-
-template <>
-void UsbSerialAsyncmsg::asyncmsg<uint16_t>(const uint16_t& data) {
-    if (!portapack::async_tx_enabled) {
-        return;
-    }
-    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
-}
-
-template <>
-void UsbSerialAsyncmsg::asyncmsg<uint32_t>(const uint32_t& data) {
-    if (!portapack::async_tx_enabled) {
-        return;
-    }
-    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
-}
-
-template <>
-void UsbSerialAsyncmsg::asyncmsg<uint64_t>(const uint64_t& data) {
-    if (!portapack::async_tx_enabled) {
-        return;
-    }
-    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_dec_int(data).c_str());
-}
-
-template <>
-void UsbSerialAsyncmsg::asyncmsg<float>(const float& data) {
-    if (!portapack::async_tx_enabled) {
-        return;
-    }
-    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", to_string_decimal(data, 7).c_str());
-}
-
-/// fs things
-
-template <>
-// usage:     UsbSerialAsyncmsg::asyncmsg(path);
-void UsbSerialAsyncmsg::asyncmsg<std::filesystem::path>(const std::filesystem::path& data) {
-    if (!portapack::async_tx_enabled) {
-        return;
-    }
-    std::string path_str = data.string();
-    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", path_str.c_str());
-}
-
-/// string
-
-// string obj
-template <>
-// usage:     UsbSerialAsyncmsg::asyncmsg(str);
-void UsbSerialAsyncmsg::asyncmsg<std::string>(const std::string& data) {
-    if (!portapack::async_tx_enabled) {
-        return;
-    }
-    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", data.c_str());
-}
-
-// string literal AKA char[]
-// usage: UsbSerialAsyncmsg::asyncmsg("abc");
-void UsbSerialAsyncmsg::asyncmsg(const char* data) {
-    if (!portapack::async_tx_enabled) {
-        return;
-    }
-    chprintf((BaseSequentialStream*)&SUSBD1, "%s\r\n", data);
-}
-
 /// vec worker
 // ussgae:    UsbSerialAsyncmsg::asyncmsg(vec);
 template <typename VECTORCOVER>

firmware/baseband/CMakeLists.txt

@@ -498,12 +498,6 @@ set(MODE_CPPSRC
 )
 DeclareTargets(PTON tones)
 
-### TPMS
-
-set(MODE_CPPSRC
-	proc_tpms.cpp
-)
-DeclareTargets(PTPM tpms)
 
 ### Wideband Spectrum
 
@@ -651,6 +645,15 @@ set(MODE_CPPSRC
 )
 DeclareTargets(PABP audio_beep)
 
+
+### TPMS
+
+set(MODE_CPPSRC
+	proc_tpms.cpp
+)
+DeclareTargets(PTPM tpms)
+
+
 ### HackRF "factory" firmware
 
 add_custom_command(

firmware/common/ads1110.cpp

@@ -24,10 +24,11 @@
 #include <algorithm>
 #include <cstdint>
 
+namespace battery {
 namespace ads1110 {
 
-constexpr float BATTERY_MIN_VOLTAGE = 3.0;
-constexpr float BATTERY_MAX_VOLTAGE = 4.0;
+constexpr uint16_t BATTERY_MIN_VOLTAGE = 3000;
+constexpr uint16_t BATTERY_MAX_VOLTAGE = 4000;
 
 void ADS1110::init() {
     if (!detected_) {
@@ -50,6 +51,7 @@ bool ADS1110::detect() {
             return true;
         }
     }
+    detected_ = false;
     return false;
 }
 
@@ -57,7 +59,8 @@ bool ADS1110::write(const uint8_t value) {
     return bus.transmit(bus_address, &value, 1);
 }
 
-float ADS1110::readVoltage() {
+// returns the batt voltage in mV
+uint16_t ADS1110::readVoltage() {
     // Read the conversion result
     uint8_t data[3];
     if (!bus.receive(bus_address, data, 3)) {
@@ -67,7 +70,7 @@ float ADS1110::readVoltage() {
     uint16_t raw = (static_cast<uint16_t>(data[0]) << 8) | data[1];
 
     // Calculate the voltage based on the output code
-    float voltage = 0.0f;
+    int16_t voltage = 0;
     float minCode = 0;
     float pga = 0.0f;
 
@@ -110,21 +113,21 @@ float ADS1110::readVoltage() {
     }
 
     // 2.048 is the reference voltage & 2.0 is to make up for the voltage divider
-    voltage = raw / (-1.0 * minCode) * pga * 2.048 * 2.0;
-
-    return voltage;
+    voltage = (int16_t)(raw / (-1.0 * minCode) * pga * 2.048 * 2.0 * 1000.0);  // v to mV
+    if (voltage < 0) voltage *= -1;                                            // should not happen in this build, but prevent it
+    return (uint16_t)voltage;
 }
 
-void ADS1110::getBatteryInfo(float& batteryPercentage, float& voltage) {
+void ADS1110::getBatteryInfo(uint8_t& batteryPercentage, uint16_t& voltage) {
     voltage = readVoltage();
 
     // Calculate the remaining battery percentage
-    batteryPercentage = (voltage - BATTERY_MIN_VOLTAGE) /
-                        (BATTERY_MAX_VOLTAGE - BATTERY_MIN_VOLTAGE) * 100.0;
+    batteryPercentage = (float)(voltage - BATTERY_MIN_VOLTAGE) / (float)(BATTERY_MAX_VOLTAGE - BATTERY_MIN_VOLTAGE) * 100.0;
 
     // Limit the values to the valid range
-    batteryPercentage = std::clamp(batteryPercentage, 0.0f, 100.0f);
+    batteryPercentage = (batteryPercentage > 100) ? 100 : batteryPercentage;
     // ToDo: if its > 4, then 100%, if < 3 then 0%
 }
 
 } /* namespace ads1110 */
+}  // namespace battery

firmware/common/ads1110.hpp

@@ -27,11 +27,10 @@
 #include <string>
 
 #include "i2c_pp.hpp"
-
+namespace battery {
 namespace ads1110 {
 
 using address_t = uint8_t;
-using reg_t = uint16_t;
 
 class ADS1110 {
    public:
@@ -39,10 +38,11 @@ class ADS1110 {
         : bus(bus), bus_address(bus_address), detected_(false) {}
 
     void init();
+    bool detect();
     bool isDetected() const { return detected_; }
 
-    float readVoltage();
-    void getBatteryInfo(float& batteryPercentage, float& voltage);
+    uint16_t readVoltage();
+    void getBatteryInfo(uint8_t& batteryPercentage, uint16_t& voltage);
 
    private:
     I2C& bus;
@@ -50,9 +50,8 @@ class ADS1110 {
     bool detected_;
 
     bool write(const uint8_t value);
-    bool detect();
 };
 
 } /* namespace ads1110 */
-
+}  // namespace battery
 #endif /* __ADS1110_H__ */

firmware/common/backlight.cpp

@@ -29,6 +29,7 @@ void BacklightOnOff::on() {
     if (!is_on()) {
         io.lcd_backlight(true);
         on_ = true;
+        
     }
 }
 
@@ -40,6 +41,7 @@ void BacklightOnOff::off() {
 }
 
 void BacklightCAT4004::set_level(const value_t value) {
+    on_ = true;
     auto target = value;
 
     // Clip target value to valid range.

firmware/common/battery.cpp

@@ -0,0 +1,111 @@
+#include "battery.hpp"
+#include "event_m0.hpp"
+#include "portapack.hpp"
+#include "ads1110.hpp"
+
+// uncomment if you want to emulate batt management system
+// #define USE_BATT_EMULATOR
+
+extern I2C portapack::i2c0;
+
+namespace battery {
+
+constexpr uint32_t BATTERY_UPDATE_INTERVAL = 30000;
+BatteryManagement::BatteryModules BatteryManagement::detected_ = BatteryManagement::BATT_NONE;
+
+ads1110::ADS1110 battery_ads1110{portapack::i2c0, 0x48};
+
+Thread* BatteryManagement::thread = nullptr;
+
+void BatteryManagement::init() {
+    // try to detect supported modules
+    detected_ = BATT_NONE;
+    if (battery_ads1110.detect()) {
+        battery_ads1110.init();
+        detected_ = BATT_ADS1110;
+    }
+
+    // add new supported module detect + init here
+
+#ifdef USE_BATT_EMULATOR
+    if (detected_ == BATT_NONE) {
+        detected_ = BATT_EMULATOR;
+    }
+#endif
+
+    if (detected_ != BATT_NONE) {
+        // sets timer to query and broadcats this info
+        create_thread();
+    }
+}
+
+// sets the values, it the currend module supports it.
+bool BatteryManagement::getBatteryInfo(uint8_t& batteryPercentage, uint16_t& voltage, int32_t& current, bool& isCharging) {
+    if (detected_ == BATT_NONE) return false;
+    if (detected_ == BATT_ADS1110) {
+        battery_ads1110.getBatteryInfo(batteryPercentage, voltage);
+        return true;
+    }
+    // add new module query here
+
+#ifdef USE_BATT_EMULATOR
+    if (detected_ == BATT_EMULATOR) {
+        batteryPercentage += 5;  // %
+        if (batteryPercentage > 100) batteryPercentage = 0;
+        voltage = rand() % 1000 + 3000;  // mV
+        current = rand() % 150;          // mA
+        isCharging = rand() % 2;
+        return true;
+    }
+#endif
+
+    (void)isCharging;  // keep the compiler calm
+    (void)current;
+    return false;
+}
+
+uint8_t BatteryManagement::getPercent() {
+    if (detected_ == BATT_NONE) return 102;
+    uint8_t batteryPercentage = 0;
+    bool isCharging = false;
+    uint16_t voltage = 0;
+    int32_t current = 0;
+    getBatteryInfo(batteryPercentage, voltage, current, isCharging);
+    return batteryPercentage;
+}
+
+uint16_t BatteryManagement::getVoltage() {
+    if (detected_ == BATT_NONE) return 0;
+    if (detected_ == BATT_NONE) return 102;
+    uint8_t batteryPercentage = 0;
+    bool isCharging = false;
+    uint16_t voltage = 0;
+    int32_t current = 0;
+    getBatteryInfo(batteryPercentage, voltage, current, isCharging);
+    return voltage;
+}
+
+msg_t BatteryManagement::timer_fn(void* arg) {
+    (void)arg;
+    if (!detected_) return 0;
+    uint8_t batteryPercentage = 102;
+    bool isCharging = false;
+    uint16_t voltage = 0;
+    int32_t current = 0;
+    chThdSleepMilliseconds(1000);  // wait ui for fully load
+    while (1) {
+        if (BatteryManagement::getBatteryInfo(batteryPercentage, voltage, current, isCharging)) {
+            // send local message
+            BatteryStateMessage msg{batteryPercentage, isCharging, voltage};
+            EventDispatcher::send_message(msg);
+        }
+        chThdSleepMilliseconds(BATTERY_UPDATE_INTERVAL);
+    }
+    return 0;
+}
+
+void BatteryManagement::create_thread() {
+    thread = chThdCreateFromHeap(NULL, 512, NORMALPRIO, BatteryManagement::timer_fn, nullptr);
+}
+
+}  // namespace battery

firmware/common/battery.hpp

@@ -0,0 +1,50 @@
+/*
+ * 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 __BATTERY_H__
+#define __BATTERY_H__
+
+#include <cstdint>
+#include "ch.h"
+
+namespace battery {
+
+class BatteryManagement {
+   public:
+    enum BatteryModules {
+        BATT_NONE = 0,
+        BATT_ADS1110 = 1,
+        BATT_EMULATOR = 254
+    };
+    static void init();
+    static bool isDetected() { return detected_ != BATT_NONE; }
+    static bool getBatteryInfo(uint8_t& batteryPercentage, uint16_t& voltage, int32_t& current, bool& isCharging);
+    static uint16_t getVoltage();
+    static uint8_t getPercent();
+
+   private:
+    static void create_thread();
+    static msg_t timer_fn(void* arg);
+    static Thread* thread;
+    static BatteryModules detected_;  // if there is any batt management system
+};
+};  // namespace battery
+#endif

firmware/common/message.hpp

@@ -123,6 +123,7 @@ class Message {
         EnvironmentData = 65,
         AudioBeep = 66,
         PocsagTosend = 67,
+        BatteryStateData = 68,
         MAX
     };
 
@@ -1409,4 +1410,20 @@ class PocsagTosendMessage : public Message {
     uint64_t addr = 0;
 };
 
+class BatteryStateMessage : public Message {
+   public:
+    constexpr BatteryStateMessage(
+        uint8_t percent,
+        bool on_charger,
+        uint16_t voltage)
+        : Message{ID::BatteryStateData},
+          percent{percent},
+          on_charger{on_charger},
+          voltage{voltage} {
+    }
+    uint8_t percent = 0;
+    bool on_charger = false;
+    uint16_t voltage = 0;  // mV
+};
+
 #endif /*__MESSAGE_H__*/

firmware/common/portapack_persistent_memory.cpp

@@ -132,8 +132,8 @@ struct ui_config2_t {
 
     bool hide_mute : 1;
     bool hide_fake_brightness : 1;
-    bool UNUSED_1 : 1;
-    bool UNUSED_2 : 1;
+    bool hide_numeric_battery : 1;
+    bool hide_battery_icon : 1;
     bool UNUSED_3 : 1;
     bool UNUSED_4 : 1;
     bool UNUSED_5 : 1;
@@ -423,6 +423,7 @@ void defaults() {
     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());
+    set_ui_hide_numeric_battery(true);  // hide the numeric battery by default - no space to display it
 
     // Default values for recon app.
     set_recon_autosave_freqs(false);
@@ -954,6 +955,13 @@ bool ui_hide_fake_brightness() {
     return data->ui_config2.hide_fake_brightness;
 }
 
+bool ui_hide_numeric_battery() {
+    return data->ui_config2.hide_numeric_battery;
+}
+bool ui_hide_battery_icon() {
+    return data->ui_config2.hide_battery_icon;
+}
+
 void set_ui_hide_speaker(bool v) {
     data->ui_config2.hide_speaker = v;
 }
@@ -986,6 +994,12 @@ void set_ui_hide_sd_card(bool v) {
 void set_ui_hide_fake_brightness(bool v) {
     data->ui_config2.hide_fake_brightness = v;
 }
+void set_ui_hide_numeric_battery(bool v) {
+    data->ui_config2.hide_numeric_battery = v;
+}
+void set_ui_hide_battery_icon(bool v) {
+    data->ui_config2.hide_battery_icon = v;
+}
 
 /* Converter */
 bool config_converter() {
@@ -1248,6 +1262,8 @@ bool debug_dump() {
     pmem_dump_file.write_line("ui_config2 hide_sd_card: " + to_string_dec_uint(data->ui_config2.hide_sd_card));
     pmem_dump_file.write_line("ui_config2 hide_mute: " + to_string_dec_uint(data->ui_config2.hide_mute));
     pmem_dump_file.write_line("ui_config2 hide_fake_brightness: " + to_string_dec_uint(data->ui_config2.hide_fake_brightness));
+    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));
 
     // 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

@@ -335,6 +335,8 @@ bool ui_hide_sleep();
 bool ui_hide_bias_tee();
 bool ui_hide_clock();
 bool ui_hide_fake_brightness();
+bool ui_hide_numeric_battery();
+bool ui_hide_battery_icon();
 bool ui_hide_sd_card();
 void set_ui_hide_speaker(bool v);
 void set_ui_hide_mute(bool v);
@@ -345,6 +347,8 @@ void set_ui_hide_sleep(bool v);
 void set_ui_hide_bias_tee(bool v);
 void set_ui_hide_clock(bool v);
 void set_ui_hide_fake_brightness(bool v);
+void set_ui_hide_numeric_battery(bool v);
+void set_ui_hide_battery_icon(bool v);
 void set_ui_hide_sd_card(bool v);
 
 // sd persisting settings

firmware/common/ui_widget.cpp

@@ -2044,6 +2044,135 @@ bool TextField::on_touch(TouchEvent event) {
     return false;
 }
 
+/* BatteryIcon *************************************************************/
+
+BatteryIcon::BatteryIcon(Rect parent_rect, uint8_t percent)
+    : Widget(parent_rect) {
+    this->set_battery(percent, false);
+    set_focusable(true);
+}
+
+void BatteryIcon::getAccessibilityText(std::string& result) {
+    result = to_string_dec_uint(percent_) + "%";
+}
+void BatteryIcon::getWidgetName(std::string& result) {
+    result = "Battery percent";
+}
+
+void BatteryIcon::set_battery(uint8_t percentage, bool charge) {
+    if (charge == charge_ && percent_ == percentage) return;
+    percent_ = percentage;
+    charge_ = charge;
+    set_dirty();
+}
+
+bool BatteryIcon::on_key(KeyEvent key) {
+    if (key == KeyEvent::Select && on_select) {
+        on_select();
+        return true;
+    }
+    return false;
+}
+
+bool BatteryIcon::on_touch(TouchEvent event) {
+    if (event.type == TouchEvent::Type::Start) {
+        focus();
+        return true;
+    }
+    if (event.type == TouchEvent::Type::End && on_select) {
+        on_select();
+        return true;
+    }
+    return false;
+}
+void BatteryIcon::paint(Painter& painter) {
+    ui::Rect rect = screen_rect();                                                                          // 10, 1 * 16
+    painter.fill_rectangle(rect, has_focus() || highlighted() ? Color::light_grey() : Color::dark_grey());  // clear
+    ui::Color battColor = (charge_) ? Color::cyan() : Color::green();
+    // batt body:
+    painter.draw_vline({rect.left() + 1, rect.top() + 2}, rect.height() - 4, battColor);
+    painter.draw_vline({rect.right() - 2, rect.top() + 2}, rect.height() - 4, battColor);
+    painter.draw_hline({rect.left() + 1, rect.top() + 2}, rect.width() - 2, battColor);
+    painter.draw_hline({rect.left() + 1, rect.bottom() - 2}, rect.width() - 2, battColor);
+    // batt cap:
+    painter.draw_hline({rect.left() + 3, rect.top() + 1}, rect.width() - 6, battColor);
+    painter.draw_hline({rect.left() + 3, 0}, rect.width() - 6, battColor);
+    if (percent_ > 100) {  // error / unk
+        painter.draw_string({rect.left() + 2, rect.top() + 3}, font::fixed_5x8, Color::white(), Color::dark_grey(), "?");
+        return;
+    }
+    int8_t ppx = (rect.bottom() - 3) - (rect.top() + 2);                                // 11px max height to draw bars
+    int8_t ptd = (int8_t)((static_cast<float>(percent_) / 100.0f) * (float)ppx + 0.5);  // pixels to draw
+    int8_t pp = ppx - ptd;                                                              // pixels to start from
+
+    if (percent_ >= 70)
+        battColor = Color::green();
+    else if (percent_ >= 40)
+        battColor = Color::orange();
+    else
+        battColor = Color::red();
+    // fill the bars
+    for (int y = pp; y < ppx; y++) {
+        painter.draw_hline({rect.left() + 2, rect.top() + 3 + y}, rect.width() - 4, battColor);
+    }
+}
+
+/* BatteryTextField *************************************************************/
+
+BatteryTextField::BatteryTextField(Rect parent_rect, uint8_t percent)
+    : Widget(parent_rect) {
+    this->set_battery(percent, false);
+    set_focusable(true);
+}
+
+void BatteryTextField::paint(Painter& painter) {
+    Color bg = has_focus() || highlighted() ? Color::light_grey() : Color::dark_grey();
+    ui::Rect rect = screen_rect();     // 2 * 8, 1 * 16
+    painter.fill_rectangle(rect, bg);  // clear
+    std::string txt_batt = percent_ <= 100 ? to_string_dec_uint(percent_) : "UNK";
+    int xdelta = 0;
+    if (txt_batt.length() == 1)
+        xdelta = 5;
+    else if (txt_batt.length() == 2)
+        xdelta = 2;
+    painter.draw_string({rect.left() + xdelta, rect.top()}, font::fixed_5x8, Color::white(), bg, txt_batt);
+    painter.draw_string({rect.left(), rect.top() + 8}, font::fixed_5x8, Color::white(), bg, (charge_) ? "+%" : " %");
+}
+
+void BatteryTextField::getAccessibilityText(std::string& result) {
+    result = to_string_dec_uint(percent_) + "%";
+}
+void BatteryTextField::getWidgetName(std::string& result) {
+    result = "Battery percent";
+}
+
+void BatteryTextField::set_battery(uint8_t percentage, bool charge) {
+    if (charge == charge_ && percent_ == percentage) return;
+    charge_ = charge;
+    percent_ = percentage;
+    set_dirty();
+}
+
+bool BatteryTextField::on_key(KeyEvent key) {
+    if (key == KeyEvent::Select && on_select) {
+        on_select();
+        return true;
+    }
+    return false;
+}
+
+bool BatteryTextField::on_touch(TouchEvent event) {
+    if (event.type == TouchEvent::Type::Start) {
+        focus();
+        return true;
+    }
+    if (event.type == TouchEvent::Type::End && on_select) {
+        on_select();
+        return true;
+    }
+    return false;
+}
+
 /* NumberField ***********************************************************/
 
 NumberField::NumberField(

firmware/common/ui_widget.hpp

@@ -33,6 +33,8 @@
 #include "portapack.hpp"
 #include "utility.hpp"
 
+#include "ui/ui_font_fixed_5x8.hpp"
+
 #include <functional>
 #include <memory>
 #include <string>
@@ -781,6 +783,52 @@ class TextField : public Text {
     using Text::set;
 };
 
+class BatteryTextField : public Widget {
+   public:
+    std::function<void()> on_select{};
+
+    BatteryTextField(Rect parent_rect, uint8_t percent);
+    void paint(Painter& painter) override;
+
+    void set_battery(uint8_t percentage, bool charge);
+    void set_text(std::string_view value);
+
+    bool on_key(KeyEvent key) override;
+    bool on_touch(TouchEvent event) override;
+
+    void getAccessibilityText(std::string& result) override;
+    void getWidgetName(std::string& result) override;
+
+   private:
+    uint8_t percent_{102};
+    bool charge_{false};
+
+    static constexpr Style style{
+        .font = font::fixed_5x8,
+        .background = Color::dark_grey(),
+        .foreground = Color::white(),
+    };
+};
+
+class BatteryIcon : public Widget {
+   public:
+    std::function<void()> on_select{};
+
+    BatteryIcon(Rect parent_rect, uint8_t percent);
+    void paint(Painter& painter) override;
+    void set_battery(uint8_t percentage, bool charge);
+
+    bool on_key(KeyEvent key) override;
+    bool on_touch(TouchEvent event) override;
+
+    void getAccessibilityText(std::string& result) override;
+    void getWidgetName(std::string& result) override;
+
+   private:
+    uint8_t percent_{102};
+    bool charge_{false};
+};
+
 class NumberField : public Widget {
    public:
     std::function<void(NumberField&)> on_select{};

firmware/tools/bitmap_arr_reverse_decode.py

@@ -1,3 +1,27 @@
+#!/usr/bin/env python3
+
+#
+# Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+# Copyleft (ɔ) 2024 zxkmm with the GPL license
+#
+# 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.
+#
+
 from PIL import Image
 import numpy as np
 

firmware/tools/check_gcc_version_from_elf.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+
+#
+# Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+# Copyleft (ɔ) 2024 zxkmm with the GPL license
+#
+# 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.
+#
+
+import subprocess
+import sys
+
+if_succeed = False
+
+
+def get_gcc_version(elf_file):
+    global if_succeed
+
+    output = subprocess.check_output(['readelf', '-p', '.comment', elf_file])
+    output = output.decode('utf-8')
+    lines = output.split('\n')
+
+    for line in lines:
+        if 'GCC:' in line:
+            version_info = line.split('GCC:')[1].strip()
+            if_succeed = True
+            return version_info
+
+    if not if_succeed:  # didn't use try except here cuz don't need to break compile if this is bad result anyway
+        return None
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        current_dir = subprocess.check_output(['pwd'])
+        print(f"current dir: {current_dir}")
+        print("usage python check_gcc_version_from_elf.py xxx.elf")
+        sys.exit(1)
+
+    elf_file = sys.argv[1]
+    version_info = get_gcc_version(elf_file)
+
+if version_info is not None:
+    print(f"real gcc version readed from elf: {version_info}")
+else:
+    print("something went wrong when checking gcc version don't worry tho, it's not deadly issue. skip.")

firmware/tools/make_spi_image.py

@@ -3,6 +3,7 @@
 #
 # Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 # Copyright (C) 2024 Mark Thompson
+# Copyleft (ɔ) 2024 zxkmm with the GPL license
 #
 # This file is part of PortaPack.
 #
@@ -23,9 +24,11 @@
 #
 
 import sys
+import os
 from external_app_info import maximum_application_size
 from external_app_info import external_apps_address_start
 from external_app_info import external_apps_address_end
+import subprocess
 
 usage_message = """
 PortaPack SPI flash image generator
@@ -34,65 +37,120 @@ Usage: <command> <application_path> <baseband_path> <output_path>
        Where paths refer to the .bin files for each component project.
 """
 
+
 def read_image(path):
-	f = open(path, 'rb')
-	data = f.read()
-	f.close()
-	return data
+    f = open(path, 'rb')
+    data = f.read()
+    f.close()
+    return data
+
 
 def write_image(data, path):
-	f = open(path, 'wb')
-	f.write(data)
-	f.close()
+    f = open(path, 'wb')
+    f.write(data)
+    f.close()
+
+
+def get_gcc_version_from_elf(elf_file):
+    succeed = False
+
+    output = subprocess.check_output(['readelf', '-p', '.comment', elf_file])
+    output = output.decode('utf-8')
+    lines = output.split('\n')
+
+    for line in lines:
+        if 'GCC:' in line:
+            version_info = line.split('GCC:')[1].strip()
+            succeed = True
+            return version_info
+
+    if not succeed:  # didn't use try except here cuz don't need to break compile if this is bad result anyway
+        return None
+
+
+def get_gcc_version_from_elf_files_in_giving_path_or_filename_s_path(path):
+    elf_files = []
+    if os.path.isdir(path):
+        elf_files = [os.path.join(path, f) for f in os.listdir(path) if f.endswith(".elf")]
+    elif os.path.isfile(path):
+        elf_files = [os.path.join(os.path.dirname(path), f) for f in os.listdir(os.path.dirname(path)) if
+                     f.endswith(".elf")]
+    else:
+        print(
+            "gave path or filename is not valid")  # didn't use except nor exit here cuz don't need to break compile if this is bad result anyway
+
+    gcc_versions = []
+    for elf_file in elf_files:
+        version_info = get_gcc_version_from_elf(elf_file)
+        if version_info is not None:
+            extract_elf_file_name = os.path.basename(elf_file)
+            gcc_versions.append("gcc version of " + extract_elf_file_name + " is " + version_info)
+    return gcc_versions
+
 
 if len(sys.argv) != 4:
-	print(usage_message)
-	sys.exit(-1)
+    print(usage_message)
+    sys.exit(-1)
 
 application_image = read_image(sys.argv[1])
 baseband_image = read_image(sys.argv[2])
 output_path = sys.argv[3]
 
+print("\ncheck gcc versions from all elf target\n")
+application_gcc_versions = get_gcc_version_from_elf_files_in_giving_path_or_filename_s_path(sys.argv[1])
+baseband_gcc_versions = get_gcc_version_from_elf_files_in_giving_path_or_filename_s_path(sys.argv[2])
+
+for itap in application_gcc_versions:
+    print(itap)
+
+for itbb in baseband_gcc_versions:
+    print(itbb)
+
+print("\n")
 spi_size = 1048576
 
 images = (
-	{
-		'name': 'application',
-		'data': application_image,
-		'size': len(application_image),
-	},
-	{
-		'name': 'baseband',
-		'data': baseband_image,
-		'size': len(baseband_image),
-	},
+    {
+        'name': 'application',
+        'data': application_image,
+        'size': len(application_image),
+    },
+    {
+        'name': 'baseband',
+        'data': baseband_image,
+        'size': len(baseband_image),
+    },
 )
 
 spi_image = bytearray()
 spi_image_default_byte = bytearray((255,))
 
 for image in images:
-	if len(image['data']) > image['size']:
-		raise RuntimeError('data for image "%(name)s" is longer than 0x%(size)x bytes 0x%(sz)x' % {'name':image['name'], 'size':image['size'], 'sz':len(image['data'])})
-	pad_size = image['size'] - len(image['data'])
-	padded_data = image['data'] + (spi_image_default_byte * pad_size)
-	spi_image += padded_data
+    if len(image['data']) > image['size']:
+        raise RuntimeError(
+            'data for image "%(name)s" is longer than 0x%(size)x bytes 0x%(sz)x' % {'name': image['name'],
+                                                                                    'size': image['size'],
+                                                                                    'sz': len(image['data'])})
+    pad_size = image['size'] - len(image['data'])
+    padded_data = image['data'] + (spi_image_default_byte * pad_size)
+    spi_image += padded_data
 
 if len(spi_image) > spi_size - 4:
-	raise RuntimeError('SPI flash image size of %d exceeds device size of %d bytes' % (len(spi_image) + 4, spi_size))
+    raise RuntimeError('SPI flash image size of %d exceeds device size of %d bytes' % (len(spi_image) + 4, spi_size))
 
 pad_size = spi_size - 4 - len(spi_image)
 for i in range(pad_size):
-	spi_image += spi_image_default_byte
+    spi_image += spi_image_default_byte
 
 # quick "add up the words" checksum, and check for possible references to code in external apps
 checksum = 0
 for i in range(0, len(spi_image), 4):
-	snippet = spi_image[i:i+4]
-	val = int.from_bytes(snippet, byteorder='little')
-	checksum += val
-	if (val >= external_apps_address_start) and (val < external_apps_address_end) and ((val & 0xFFFF) < maximum_application_size):
-		print ("WARNING: Possible external code address", hex(val), "at offset", hex(i), "in", sys.argv[3])
+    snippet = spi_image[i:i + 4]
+    val = int.from_bytes(snippet, byteorder='little')
+    checksum += val
+    if (val >= external_apps_address_start) and (val < external_apps_address_end) and (
+            (val & 0xFFFF) < maximum_application_size):
+        print("WARNING: Possible external code address", hex(val), "at offset", hex(i), "in", sys.argv[3])
 
 final_checksum = 0
 checksum = (final_checksum - checksum) & 0xFFFFFFFF
@@ -102,4 +160,4 @@ spi_image += checksum.to_bytes(4, 'little')
 write_image(spi_image, output_path)
 
 percent_remaining = round(1000 * pad_size / spi_size) / 10;
-print ("Space remaining in flash ROM:", pad_size, "bytes (", percent_remaining, "%)")
+print("Space remaining in flash ROM:", pad_size, "bytes (", percent_remaining, "%)")

sdcard/FREQMAN/JAMMER_GSM_GPS.TXT

@@ -12,3 +12,4 @@ a=433050000,b=434790000,d=ISM 433
 a=868000000,b=868200000,d=ISM 868
 a=1574920000,b=1575920000,d=GPS L1
 a=1226600000,b=1228600000,d=GPS L2
+a=1175450000,b=1177450000,d=GPS L5