feat: update

Author: Lzw655

ports/esp32/main_esp32s3_box3/esp-box-3/CMakeLists.txt

@@ -9,6 +9,5 @@ idf_component_register(
     SRCS "esp-box-3.c" ${SRC_VER}
     INCLUDE_DIRS "include"
     PRIV_INCLUDE_DIRS "priv_include"
-    REQUIRES driver spiffs
-    PRIV_REQUIRES fatfs esp_lcd
+    REQUIRES driver spiffs  esp_lcd
 )

ports/esp32/main_esp32s3_box3/esp-box-3/esp-box-3.c

@@ -14,9 +14,8 @@
 #include "esp_lcd_panel_io.h"
 #include "esp_lcd_panel_vendor.h"
 #include "esp_lcd_panel_ops.h"
-#include "esp_vfs_fat.h"
 
-#include "iot_button.h"
+// #include "iot_button.h"
 #include "bsp/esp-box-3.h"
 #include "bsp/display.h"
 #include "bsp/touch.h"
@@ -29,7 +28,7 @@
 static const char *TAG = "ESP-BOX-3";
 
 /** @cond */
-_Static_assert(CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS > 0, "Touch buttons must be supported for this BSP");
+// _Static_assert(CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS > 0, "Touch buttons must be supported for this BSP");
 /** @endcond */
 
 static const ili9341_lcd_init_cmd_t vendor_specific_init[] = {
@@ -55,33 +54,32 @@ static const ili9341_lcd_init_cmd_t vendor_specific_init[] = {
 static esp_lcd_touch_handle_t tp;   // LCD touch handle
 static esp_lcd_panel_handle_t panel_handle = NULL;
 
-sdmmc_card_t *bsp_sdcard = NULL;    // Global SD card handler
 static bool i2c_initialized = false;
 
-// This is just a wrapper to get function signature for espressif/button API callback
-static uint8_t bsp_get_main_button(void *param);
-static esp_err_t bsp_init_main_button(void *param);
-
-static const button_config_t bsp_button_config[BSP_BUTTON_NUM] = {
-    {
-        .type = BUTTON_TYPE_GPIO,
-        .gpio_button_config.gpio_num = BSP_BUTTON_CONFIG_IO,
-        .gpio_button_config.active_level = 0,
-    },
-    {
-        .type = BUTTON_TYPE_GPIO,
-        .gpio_button_config.gpio_num = BSP_BUTTON_MUTE_IO,
-        .gpio_button_config.active_level = 0,
-    },
-    {
-        .type = BUTTON_TYPE_CUSTOM,
-        .custom_button_config.button_custom_init = bsp_init_main_button,
-        .custom_button_config.button_custom_get_key_value = bsp_get_main_button,
-        .custom_button_config.button_custom_deinit = NULL,
-        .custom_button_config.active_level = 1,
-        .custom_button_config.priv = (void *) BSP_BUTTON_MAIN,
-    }
-};
+// // This is just a wrapper to get function signature for espressif/button API callback
+// static uint8_t bsp_get_main_button(void *param);
+// static esp_err_t bsp_init_main_button(void *param);
+
+// static const button_config_t bsp_button_config[BSP_BUTTON_NUM] = {
+//     {
+//         .type = BUTTON_TYPE_GPIO,
+//         .gpio_button_config.gpio_num = BSP_BUTTON_CONFIG_IO,
+//         .gpio_button_config.active_level = 0,
+//     },
+//     {
+//         .type = BUTTON_TYPE_GPIO,
+//         .gpio_button_config.gpio_num = BSP_BUTTON_MUTE_IO,
+//         .gpio_button_config.active_level = 0,
+//     },
+//     {
+//         .type = BUTTON_TYPE_CUSTOM,
+//         .custom_button_config.button_custom_init = bsp_init_main_button,
+//         .custom_button_config.button_custom_get_key_value = bsp_get_main_button,
+//         .custom_button_config.button_custom_deinit = NULL,
+//         .custom_button_config.active_level = 1,
+//         .custom_button_config.priv = (void *) BSP_BUTTON_MAIN,
+//     }
+// };
 
 esp_err_t bsp_i2c_init(void)
 {
@@ -160,45 +158,6 @@ esp_err_t bsp_spiffs_unmount(void)
     return esp_vfs_spiffs_unregister(CONFIG_BSP_SPIFFS_PARTITION_LABEL);
 }
 
-esp_err_t bsp_sdcard_mount(void)
-{
-    gpio_config_t power_gpio_config = {
-        .mode = GPIO_MODE_OUTPUT,
-        .pin_bit_mask = 1ULL << BSP_SD_POWER
-    };
-    ESP_ERROR_CHECK(gpio_config(&power_gpio_config));
-
-    /* SD card power on first */
-    ESP_ERROR_CHECK(gpio_set_level(BSP_SD_POWER, 0));
-
-    const esp_vfs_fat_sdmmc_mount_config_t mount_config = {
-#ifdef CONFIG_BSP_SD_FORMAT_ON_MOUNT_FAIL
-        .format_if_mount_failed = true,
-#else
-        .format_if_mount_failed = false,
-#endif
-        .max_files = 5,
-        .allocation_unit_size = 16 * 1024
-    };
-
-    sdmmc_host_t host = SDMMC_HOST_DEFAULT();
-    sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();
-    slot_config.width = 4;
-    slot_config.cmd = BSP_SD_CMD;
-    slot_config.clk = BSP_SD_CLK;
-    slot_config.d0 = BSP_SD_D0;
-    slot_config.d1 = BSP_SD_D1;
-    slot_config.d2 = BSP_SD_D2;
-    slot_config.d3 = BSP_SD_D3;
-
-    return esp_vfs_fat_sdmmc_mount(BSP_SD_MOUNT_POINT, &host, &slot_config, &mount_config, &bsp_sdcard);
-}
-
-esp_err_t bsp_sdcard_unmount(void)
-{
-    return esp_vfs_fat_sdcard_unmount(BSP_SD_MOUNT_POINT, bsp_sdcard);
-}
-
 esp_codec_dev_handle_t bsp_audio_codec_speaker_init(void)
 {
     const audio_codec_data_if_t *i2s_data_if = bsp_audio_get_codec_itf();
@@ -495,47 +454,47 @@ esp_err_t bsp_touch_new(const bsp_touch_config_t *config, esp_lcd_touch_handle_t
     return ESP_OK;
 }
 
-static uint8_t bsp_get_main_button(void *param)
-{
-    assert(tp);
-#if (CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS > 0)
-    uint8_t home_btn_val = 0x00;
-    esp_lcd_touch_get_button_state(tp, 0, &home_btn_val);
-    return home_btn_val ? true : false;
-#else
-    ESP_LOGE(TAG, "Button main is inaccessible");
-    return false;
-#endif
-}
-
-static esp_err_t bsp_init_main_button(void *param)
-{
-    if (tp == NULL) {
-        BSP_ERROR_CHECK_RETURN_ERR(bsp_touch_new(NULL, &tp));
-    }
-    return ESP_OK;
-}
-
-esp_err_t bsp_iot_button_create(button_handle_t btn_array[], int *btn_cnt, int btn_array_size)
-{
-    esp_err_t ret = ESP_OK;
-    if ((btn_array_size < BSP_BUTTON_NUM) ||
-            (btn_array == NULL)) {
-        return ESP_ERR_INVALID_ARG;
-    }
-
-    if (btn_cnt) {
-        *btn_cnt = 0;
-    }
-    for (int i = 0; i < BSP_BUTTON_NUM; i++) {
-        btn_array[i] = iot_button_create(&bsp_button_config[i]);
-        if (btn_array[i] == NULL) {
-            ret = ESP_FAIL;
-            break;
-        }
-        if (btn_cnt) {
-            (*btn_cnt)++;
-        }
-    }
-    return ret;
-}
+// static uint8_t bsp_get_main_button(void *param)
+// {
+//     assert(tp);
+// #if (CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS > 0)
+//     uint8_t home_btn_val = 0x00;
+//     esp_lcd_touch_get_button_state(tp, 0, &home_btn_val);
+//     return home_btn_val ? true : false;
+// #else
+//     ESP_LOGE(TAG, "Button main is inaccessible");
+//     return false;
+// #endif
+// }
+
+// static esp_err_t bsp_init_main_button(void *param)
+// {
+//     if (tp == NULL) {
+//         BSP_ERROR_CHECK_RETURN_ERR(bsp_touch_new(NULL, &tp));
+//     }
+//     return ESP_OK;
+// }
+
+// esp_err_t bsp_iot_button_create(button_handle_t btn_array[], int *btn_cnt, int btn_array_size)
+// {
+//     esp_err_t ret = ESP_OK;
+//     if ((btn_array_size < BSP_BUTTON_NUM) ||
+//             (btn_array == NULL)) {
+//         return ESP_ERR_INVALID_ARG;
+//     }
+
+//     if (btn_cnt) {
+//         *btn_cnt = 0;
+//     }
+//     for (int i = 0; i < BSP_BUTTON_NUM; i++) {
+//         btn_array[i] = iot_button_create(&bsp_button_config[i]);
+//         if (btn_array[i] == NULL) {
+//             ret = ESP_FAIL;
+//             break;
+//         }
+//         if (btn_cnt) {
+//             (*btn_cnt)++;
+//         }
+//     }
+//     return ret;
+// }

ports/esp32/main_esp32s3_box3/esp-box-3/idf_component.yml

@@ -1,13 +1,17 @@
 dependencies:
-  button:
-    public: true
-    version: '>=2.5'
+  # button:
+  #   public: true
+  #   version: '>=2.5'
   esp_codec_dev:
     public: true
     version: ^1,<1.2
   esp_lcd_ili9341: ^1
-  esp_lcd_touch_gt911: ^1
-  esp_lcd_touch_tt21100: ^1
+  esp_lcd_touch_gt911:
+    version: ^1
+    public: true
+  esp_lcd_touch_tt21100:
+    version: ^1
+    public: true
   icm42670:
     public: true
     version: ^1

ports/esp32/main_esp32s3_box3/esp-box-3/include/bsp/esp-box-3.h

@@ -14,10 +14,9 @@
 #include "sdkconfig.h"
 #include "driver/gpio.h"
 #include "driver/i2c.h"
-#include "driver/sdmmc_host.h"
 #include "soc/usb_pins.h"
 #include "esp_codec_dev.h"
-#include "iot_button.h"
+// #include "iot_button.h"
 #include "bsp/display.h"
 
 #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
@@ -31,11 +30,11 @@
 
 #define BSP_CAPS_DISPLAY        1
 #define BSP_CAPS_TOUCH          1
-#define BSP_CAPS_BUTTONS        1
+#define BSP_CAPS_BUTTONS        0
 #define BSP_CAPS_AUDIO          1
 #define BSP_CAPS_AUDIO_SPEAKER  1
 #define BSP_CAPS_AUDIO_MIC      1
-#define BSP_CAPS_SDCARD         1
+#define BSP_CAPS_SDCARD         0
 #define BSP_CAPS_IMU            1
 
 /**************************************************************************************************
@@ -68,19 +67,9 @@
 #define BSP_USB_POS           USBPHY_DP_NUM
 #define BSP_USB_NEG           USBPHY_DM_NUM
 
-/* Buttons */
-#define BSP_BUTTON_CONFIG_IO  (GPIO_NUM_0)
-#define BSP_BUTTON_MUTE_IO    (GPIO_NUM_1)
-
-/* SD card */
-#define BSP_SD_D0             (GPIO_NUM_9)
-#define BSP_SD_D1             (GPIO_NUM_13)
-#define BSP_SD_D2             (GPIO_NUM_42)
-#define BSP_SD_D3             (GPIO_NUM_12)
-#define BSP_SD_CMD            (GPIO_NUM_14)
-#define BSP_SD_CLK            (GPIO_NUM_11)
-#define BSP_SD_DET            (GPIO_NUM_NC)
-#define BSP_SD_POWER          (GPIO_NUM_43)
+// /* Buttons */
+// #define BSP_BUTTON_CONFIG_IO  (GPIO_NUM_0)
+// #define BSP_BUTTON_MUTE_IO    (GPIO_NUM_1)
 
 /* PMOD */
 /*
@@ -119,13 +108,13 @@
 #define BSP_PMOD2_IO7        GPIO_NUM_11 // Intended for SPI2 D (MOSI)
 #define BSP_PMOD2_IO8        GPIO_NUM_43 // UART0 TX by defaultf
 
-/* Buttons */
-typedef enum {
-    BSP_BUTTON_CONFIG = 0,
-    BSP_BUTTON_MUTE,
-    BSP_BUTTON_MAIN,
-    BSP_BUTTON_NUM
-} bsp_button_t;
+// /* Buttons */
+// typedef enum {
+//     BSP_BUTTON_CONFIG = 0,
+//     BSP_BUTTON_MUTE,
+//     BSP_BUTTON_MAIN,
+//     BSP_BUTTON_NUM
+// } bsp_button_t;
 
 #ifdef __cplusplus
 extern "C" {
@@ -270,47 +259,6 @@ esp_err_t bsp_spiffs_mount(void);
  */
 esp_err_t bsp_spiffs_unmount(void);
 
-/**************************************************************************************************
- *
- * SD card
- *
- * After mounting the SD card, it can be accessed with stdio functions ie.:
- * \code{.c}
- * FILE* f = fopen(BSP_SD_MOUNT_POINT"/hello.txt", "w");
- * fprintf(f, "Hello %s!\n", bsp_sdcard->cid.name);
- * fclose(f);
- * \endcode
- *
- * @attention IO2 is also routed to RGB LED and push button
- **************************************************************************************************/
-#define BSP_SD_MOUNT_POINT      CONFIG_BSP_SD_MOUNT_POINT
-extern sdmmc_card_t *bsp_sdcard;
-
-/**
- * @brief Mount microSD card to virtual file system
- *
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_sdmmc_mount was already called
- *      - ESP_ERR_NO_MEM if memory can not be allocated
- *      - ESP_FAIL if partition can not be mounted
- *      - other error codes from SDMMC or SPI drivers, SDMMC protocol, or FATFS drivers
- */
-esp_err_t bsp_sdcard_mount(void);
-
-/**
- * @brief Unmount micorSD card from virtual file system
- *
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_NOT_FOUND if the partition table does not contain FATFS partition with given label
- *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_spiflash_mount was already called
- *      - ESP_ERR_NO_MEM if memory can not be allocated
- *      - ESP_FAIL if partition can not be mounted
- *      - other error codes from wear levelling library, SPI flash driver, or FATFS drivers
- */
-esp_err_t bsp_sdcard_unmount(void);
-
 /**************************************************************************************************
  *
  * LCD interface
@@ -353,7 +301,7 @@ esp_err_t bsp_sdcard_unmount(void);
  *     - ESP_ERR_INVALID_ARG  btn_array is too small or NULL
  *     - ESP_FAIL             Underlaying iot_button_create failed
  */
-esp_err_t bsp_iot_button_create(button_handle_t btn_array[], int *btn_cnt, int btn_array_size);
+// esp_err_t bsp_iot_button_create(button_handle_t btn_array[], int *btn_cnt, int btn_array_size);
 
 #ifdef __cplusplus
 }