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/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"};