config: generalize CONFIG_HAS_BATTERY meaning in Kconfig

Hide more menu items that require camera/battery if not present.

Author: Daniel Newton

main/Kconfig.projbuild

@@ -33,32 +33,41 @@ menu "Blockstream Jade"
             bool "Blockstream Jade v1 (wheel)"
             select HAS_AXP
             select HAS_CAMERA
+            select HAS_BATTERY
         config BOARD_TYPE_JADE_V1_1
             bool "Blockstream Jade v1.1 (rocker)"
             select HAS_AXP
             select HAS_CAMERA
+            select HAS_BATTERY
         config BOARD_TYPE_JADE_V2
             bool "Blockstream Jade v2 (esp32s3)"
             select HAS_AXP
             select HAS_CAMERA
+            select HAS_BATTERY
         config BOARD_TYPE_M5_FIRE
             bool "M5Stack Fire"
             select HAS_IP5306
+            select HAS_BATTERY
         config BOARD_TYPE_M5_BLACK_GRAY
             bool "M5Stack Black/Gray"
             select HAS_IP5306
+            select HAS_BATTERY
         config BOARD_TYPE_M5_CORE2
             bool "M5Stack Core 2"
             select HAS_AXP
+            select HAS_BATTERY
         config BOARD_TYPE_M5_CORES3
             bool "M5Stack Core S3"
             select HAS_AXP
             select HAS_CAMERA
+            select HAS_BATTERY
         config BOARD_TYPE_M5_STICKC_PLUS
             bool "M5StickC Plus"
             select HAS_AXP
+            select HAS_BATTERY
         config BOARD_TYPE_M5_STICKC_PLUS_2
             bool "M5StickC Plus 2"
+            select HAS_BATTERY
         config BOARD_TYPE_TTGO_TDISPLAY
             bool "TTGO T-DISPLAY"
         config BOARD_TYPE_TTGO_TDISPLAYS3
@@ -154,13 +163,6 @@ menu "Blockstream Jade"
         help
             Jade v1 (and some other devices) come with the AXP192 to manage power to ESP, display, camera
 
-    config HAS_BATTERY
-        bool "Use analog input as battery level indicator and USB connection"
-        depends on BOARD_TYPE_TTGO_TDISPLAYS3
-        default n
-        help
-            Some devices can measure voltage and detect charging status through an analog input.
-
     menu "SDA/SCL Pin Mapping"
         visible if BOARD_TYPE_CUSTOM
 
@@ -279,6 +281,12 @@ menu "Blockstream Jade"
             Enables USB JTAG serial rather than CDC tinyusb, implies no tinyusb/host storage/etc
             default n
 
+    config HAS_BATTERY
+        bool "Enable Battery Functions"
+        help
+            Enables battery functionality
+            default y if BOARD_TYPE_JADE_V2 || BOARD_TYPE_JADE_V1_1 || BOARD_TYPE_JADE || BOARD_TYPE_M5_FIRE || BOARD_TYPE_M5_BLACK_GRAY || BOARD_TYPE_M5_CORE2 || BOARD_TYPE_M5_CORES3 || BOARD_TYPE_M5_STICKC_PLUS || BOARD_TYPE_M5_STICKC_PLUS_2
+
     config HAS_CAMERA
         bool "Enable Camera Functions"
         help

main/amalgamated.c

@@ -164,10 +164,10 @@ void __wrap_abort(void);
 #include "./ui/sign_tx.c"
 #include "./ui/signer.c"
 #include "./ui/update_pinserver.c"
-#ifdef CONFIG_IDF_TARGET_ESP32S3
+#if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(CONFIG_HAS_BATTERY)
 #include "./usbhmsc/usbhmsc.c"
 #include "./usbhmsc/usbmode.c"
-#endif // CONFIG_IDF_TARGET_ESP32S3
+#endif // CONFIG_IDF_TARGET_ESP32S3 && CONFIG_HAS_BATTERY
 #include "./utils/address.c"
 #include "./utils/cbor_rpc.c"
 #ifndef CONFIG_LIBJADE_NO_GUI

main/button_events.h

@@ -139,7 +139,9 @@ typedef enum {
     BTN_SETTINGS_TEMPORARY_WALLET_LOGIN,
     BTN_SETTINGS_PINSERVER,
     BTN_SETTINGS_PINSERVER_SHOW,
+#ifdef CONFIG_HAS_CAMERA
     BTN_SETTINGS_PINSERVER_SCAN_QR,
+#endif
     BTN_SETTINGS_PINSERVER_RESET,
     BTN_SETTINGS_PINSERVER_HELP,
     BTN_SETTINGS_PINSERVER_EXIT,
@@ -149,7 +151,9 @@ typedef enum {
     BTN_SETTINGS_INFO_FWVERSION_EXIT,
     BTN_SETTINGS_DEVICE_INFO,
     BTN_SETTINGS_DEVICE_INFO_MAC,
+#ifdef CONFIG_HAS_BATTERY
     BTN_SETTINGS_DEVICE_INFO_BATTERY,
+#endif
     BTN_SETTINGS_DEVICE_INFO_STORAGE,
     BTN_SETTINGS_DEVICE_INFO_STORAGE_EXIT,
     BTN_SETTINGS_DEVICE_INFO_DETAIL_EXIT,
@@ -163,12 +167,14 @@ typedef enum {
     BTN_SETTINGS_OTP,
     BTN_SETTINGS_OTP_VIEW,
     BTN_SETTINGS_OTP_NEW,
+#ifdef CONFIG_HAS_CAMERA
     BTN_SETTINGS_OTP_NEW_QR,
+#endif
     BTN_SETTINGS_OTP_NEW_KB,
     BTN_SETTINGS_OTP_NEW_EXIT,
     BTN_SETTINGS_OTP_HELP,
     BTN_SETTINGS_OTP_EXIT,
-#ifdef CONFIG_IDF_TARGET_ESP32S3
+#if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(CONFIG_HAS_BATTERY)
     BTN_SETTINGS_USBSTORAGE,
     BTN_SETTINGS_USBSTORAGE_FW,
     BTN_SETTINGS_USBSTORAGE_BACK,
@@ -180,7 +186,9 @@ typedef enum {
     BTN_SETTINGS_BLE,
     BTN_SETTINGS_NETWORK_TYPE,
     BTN_SETTINGS_CHANGE_PIN,
+#ifdef CONFIG_HAS_CAMERA
     BTN_SETTINGS_CHANGE_PIN_QR,
+#endif
     BTN_SETTINGS_RESET,
     BTN_SETTINGS_EXIT,
 

main/gui.c

@@ -2291,7 +2291,12 @@ static bool update_status_bar(const bool force_redraw)
 
     if (status_bar.battery_update_counter == 0) {
         uint8_t new_bat = power_get_battery_status();
+#ifdef CONFIG_HAS_BATTERY
         color_t color = new_bat == 0 ? TFT_RED : new_bat == 1 ? TFT_ORANGE : TFT_WHITE;
+#else
+        // If no battery on the device then hide the battery icon with background color
+        color_t color = status_bar.root->fill->color;
+#endif
         if (power_get_battery_charging()) {
             new_bat = new_bat + 12;
         }

main/main.c

@@ -198,7 +198,7 @@ static void boot_process(void)
     JADE_ASSERT(event_data);
     gui_activity_register_event(splash, GUI_EVENT, GUI_FRONT_CLICK_EVENT, sync_wait_event_handler, event_data);
 
-#ifdef CONFIG_IDF_TARGET_ESP32S3
+#if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(CONFIG_HAS_BATTERY)
     usbstorage_init();
 #endif
 

main/power/jadev20.inc

@@ -205,25 +205,32 @@ esp_err_t power_camera_on(void) { return ESP_OK; }
 
 esp_err_t power_camera_off(void)
 {
+#ifdef CONFIG_HAS_CAMERA
     esp_rom_gpio_pad_select_gpio(CONFIG_CAMERA_PWDN);
     gpio_set_direction(CONFIG_CAMERA_PWDN, GPIO_MODE_OUTPUT);
     gpio_set_level(CONFIG_CAMERA_PWDN, 1);
+#endif
     return ESP_OK;
 }
 
 uint16_t power_get_vbat(void)
 {
+#ifdef CONFIG_HAS_BATTERY
     uint8_t msb, lsb;
     JADE_SEMAPHORE_TAKE(i2c_mutex);
     I2C_LOG_ANY_ERROR(_power_master_read_slave(stm32, STM32_REG_BAT_VOLTS_0, &lsb, 1));
     I2C_LOG_ANY_ERROR(_power_master_read_slave(stm32, STM32_REG_BAT_VOLTS_1, &msb, 1));
     JADE_SEMAPHORE_GIVE(i2c_mutex);
 
     return (msb << 8) + lsb;
+#else
+    return 0;
+#endif
 }
 
 uint8_t power_get_battery_status(void)
 {
+#ifdef CONFIG_HAS_BATTERY
     const uint16_t vbat = power_get_vbat();
     if (vbat > 4000) {
         return 5;
@@ -236,18 +243,23 @@ uint8_t power_get_battery_status(void)
     } else if (vbat > 3400) {
         return 1;
     }
+#endif
     return 0;
 }
 
 bool power_get_battery_charging(void)
 {
+#ifdef CONFIG_HAS_BATTERY
     JADE_SEMAPHORE_TAKE(i2c_mutex);
     uint8_t charging_status;
     // Bit5-Bit4: 0b00 Ready 0b01 Charging 0b10 Charge done 0b11 Fault
     I2C_LOG_ANY_ERROR(_power_master_read_slave(stm32, STM32_REG_BAT_STATUS, &charging_status, 1));
     JADE_SEMAPHORE_GIVE(i2c_mutex);
 
     return (charging_status & STM32_REG_BAT_CHARGING_MASK) == STM32_REG_BAT_CHARGING;
+#else
+    return false;
+#endif
 }
 
 uint16_t power_get_ibat_charge(void) { return 0; }

main/process/dashboard.c

@@ -2154,7 +2154,7 @@ static void handle_settings(const bool startup_menu)
         case BTN_SETTINGS_WALLET_EXIT:
         case BTN_SETTINGS_AUTHENTICATION_EXIT:
         case BTN_SETTINGS_PINSERVER_EXIT:
-#ifdef CONFIG_IDF_TARGET_ESP32S3
+#if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(CONFIG_HAS_BATTERY)
         case BTN_SETTINGS_USBSTORAGE_EXIT:
 #endif
             // Change to base 'Settings' menu
@@ -2233,9 +2233,11 @@ static void handle_settings(const bool startup_menu)
             handle_display_mac_address();
             break;
 
+#ifdef CONFIG_HAS_BATTERY
         case BTN_SETTINGS_DEVICE_INFO_BATTERY:
             handle_display_battery_volts();
             break;
+#endif
 
         case BTN_SETTINGS_DEVICE_INFO_STORAGE:
             handle_storage();
@@ -2257,9 +2259,11 @@ static void handle_settings(const bool startup_menu)
             handle_change_pin();
             break;
 
+#ifdef CONFIG_HAS_CAMERA
         case BTN_SETTINGS_CHANGE_PIN_QR:
             done = handle_change_pin_qr();
             break;
+#endif
 
 // NOTE: Only Jade v1.1's and v2's have brightness controls
 #if defined(CONFIG_BOARD_TYPE_JADE_V1_1) || defined(CONFIG_BOARD_TYPE_JADE_V2)                                         \
@@ -2322,7 +2326,7 @@ static void handle_settings(const bool startup_menu)
             done = offer_temporary_wallet_login();
             break;
 
-#ifdef CONFIG_IDF_TARGET_ESP32S3
+#if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(CONFIG_HAS_BATTERY)
         case BTN_SETTINGS_USBSTORAGE:
             // when entering manually (rather than detecting hot plug)
             // we have to first manually disable the usb serial, no op if already off
@@ -2364,9 +2368,11 @@ static void handle_settings(const bool startup_menu)
             handle_view_otps();
             break;
 
+#ifdef CONFIG_HAS_CAMERA
         case BTN_SETTINGS_OTP_NEW_QR:
             register_otp_qr();
             break;
+#endif
 
         case BTN_SETTINGS_OTP_NEW_KB:
             register_otp_kb_entry();
@@ -2376,9 +2382,11 @@ static void handle_settings(const bool startup_menu)
             show_pinserver_details();
             break;
 
+#ifdef CONFIG_HAS_CAMERA
         case BTN_SETTINGS_PINSERVER_SCAN_QR:
             handle_pinserver_scan();
             break;
+#endif
 
         case BTN_SETTINGS_PINSERVER_RESET:
             handle_pinserver_reset();