Changes to add-on component, S31 fixes

Author: renzenicolai

main/idf_component.yml

@@ -1,7 +1,7 @@
 dependencies:
   idf: ">=6.0.2"
   espressif/cjson: "^1.7.19"
-  badgeteam/badge-bsp: "=1.2.0"
+  badgeteam/badge-bsp: "=1.4.0"
   robotman2412/pax-gfx: "=2.2.2"
   robotman2412/pax-codecs: "=1.0.1"
   badgeteam/appfs: "=2.1.0"
@@ -10,7 +10,7 @@ dependencies:
   nicolaielectronics/tanmatsu-wifi: "=1.3.1"
   badgeteam/badgelink: "=0.2.0"
   nicolaielectronics/tanmatsu-lora: "=0.6.0"
-  nicolaielectronics/tanmatsu-addon: "=0.0.1"
+  nicolaielectronics/tanmatsu-addon: "=0.1.0"
   nicolaielectronics/tanmatsu-settings: "=1.2.0"
   nicolaielectronics/scd4x: "=0.0.1"
   nicolaielectronics/rvswd:

main/main.c

@@ -81,8 +81,8 @@
 #include "esp_hosted.h"
 #endif
 
-
-#if defined(CONFIG_BSP_TARGET_TANMATSU) || defined(CONFIG_BSP_TARGET_ESP32_P4_FUNCTION_EV_BOARD) || defined(CONFIG_BSP_TARGET_ESP32_S31_KORVO_1)
+#if defined(CONFIG_BSP_TARGET_TANMATSU) || defined(CONFIG_BSP_TARGET_ESP32_P4_FUNCTION_EV_BOARD) || \
+    defined(CONFIG_BSP_TARGET_ESP32_S31_KORVO_1)
 #include "hid_keyboard.h"
 #endif
 
@@ -664,7 +664,8 @@ void app_main(void) {
     usb_debug_listener_initialize();
 
     startup_dialog("Detecting Add-On boards...");
-    addon_initialize();
+    addon_read_descriptor(ADDON_LOCATION_INTERNAL);
+    addon_read_descriptor(ADDON_LOCATION_CATT);
 
     if (!display_available) {
         ESP_LOGE(TAG, "Started without display");
@@ -698,7 +699,8 @@ void app_main(void) {
 
     bsp_power_set_usb_host_boost_enabled(true);
 
-#if defined(CONFIG_BSP_TARGET_TANMATSU) || defined(CONFIG_BSP_TARGET_ESP32_P4_FUNCTION_EV_BOARD) || defined(CONFIG_BSP_TARGET_ESP32_S31_KORVO_1)
+#if defined(CONFIG_BSP_TARGET_TANMATSU) || defined(CONFIG_BSP_TARGET_ESP32_P4_FUNCTION_EV_BOARD) || \
+    defined(CONFIG_BSP_TARGET_ESP32_S31_KORVO_1)
     res = hid_kbd_init();
     if (res != ESP_OK) {
         ESP_LOGE(TAG, "Failed to initialize USB HID keyboard support");

main/menu/home.c

@@ -122,9 +122,8 @@ static void execute_action(menu_home_action_t action) {
 }
 
 static void describe_addon(addon_location_t location, char* description, size_t description_size) {
-    addon_descriptor_t* descriptor = NULL;
-    esp_err_t           res        = addon_get_descriptor(location, &descriptor);
-    if (res == ESP_OK && descriptor) {
+    addon_descriptor_t* descriptor = addon_get_descriptor(location);
+    if (descriptor) {
         const char* location_str = location == ADDON_LOCATION_INTERNAL ? "Internal" : "CATT";
         switch (descriptor->descriptor_type) {
             case ADDON_TYPE_UNINITIALIZED:
@@ -155,7 +154,7 @@ static void describe_addon(addon_location_t location, char* description, size_t
 
 static void describe_addons(char* description, size_t description_size) {
     describe_addon(ADDON_LOCATION_INTERNAL, description, description_size);
-    describe_addon(ADDON_LOCATION_EXTERNAL, &description[strlen(description)], description_size - strlen(description));
+    describe_addon(ADDON_LOCATION_CATT, &description[strlen(description)], description_size - strlen(description));
 }
 
 static void render(pax_buf_t* buffer, gui_theme_t* theme, menu_t* menu, pax_vec2_t position, bool partial, bool icons,