support for battery if any + TPMS app to ext (#2129)

* batt initial
* batt widgets
* settings modify
* batt info screen
* ability to hide icon
* battView
* redo tmps
* hide curr + charge if no data
* fix flashing

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
@@ -283,6 +284,7 @@ set(CPPSRC
 	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_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/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;
@@ -587,7 +586,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"
@@ -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},