Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bsp: Update BSPs for using button v4 #500

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bsp: Update BSPs for using button v4 #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions bsp/esp-box-3/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ ESP32-S3-BOX-3 also uses a Type-C USB connector that provides 5 V of power input

<!-- Autogenerated start: Dependencies -->
### Capabilities and dependencies
| Capability | Available | Component | Version |
|-------------|------------------|----------------------------------------------------------------------------------------------------------|----------|
| DISPLAY |:heavy_check_mark:| [espressif/esp_lcd_ili9341](https://components.espressif.com/components/espressif/esp_lcd_ili9341) | ^1 |
| LVGL_PORT |:heavy_check_mark:| [espressif/esp_lvgl_port](https://components.espressif.com/components/espressif/esp_lvgl_port) | ^2 |
| TOUCH |:heavy_check_mark:|[espressif/esp_lcd_touch_gt911](https://components.espressif.com/components/espressif/esp_lcd_touch_gt911)| ^1 |
| BUTTONS |:heavy_check_mark:| [espressif/button](https://components.espressif.com/components/espressif/button) |>=2.5,<4.0|
| AUDIO |:heavy_check_mark:| [espressif/esp_codec_dev](https://components.espressif.com/components/espressif/esp_codec_dev) | ~1.3.1 |
|AUDIO_SPEAKER|:heavy_check_mark:| | |
| AUDIO_MIC |:heavy_check_mark:| | |
| SDCARD |:heavy_check_mark:| idf | >=5.3 |
| IMU |:heavy_check_mark:| [espressif/icm42670](https://components.espressif.com/components/espressif/icm42670) | ^2.0.1 |
| Capability | Available | Component |Version|
|-------------|------------------|----------------------------------------------------------------------------------------------------------|-------|
| DISPLAY |:heavy_check_mark:| [espressif/esp_lcd_ili9341](https://components.espressif.com/components/espressif/esp_lcd_ili9341) | ^1 |
| LVGL_PORT |:heavy_check_mark:| [espressif/esp_lvgl_port](https://components.espressif.com/components/espressif/esp_lvgl_port) | ^2 |
| TOUCH |:heavy_check_mark:|[espressif/esp_lcd_touch_gt911](https://components.espressif.com/components/espressif/esp_lcd_touch_gt911)| ^1 |
| BUTTONS |:heavy_check_mark:| [espressif/button](https://components.espressif.com/components/espressif/button) | ^4 |
| AUDIO |:heavy_check_mark:| [espressif/esp_codec_dev](https://components.espressif.com/components/espressif/esp_codec_dev) | ~1.3.1|
|AUDIO_SPEAKER|:heavy_check_mark:| | |
| AUDIO_MIC |:heavy_check_mark:| | |
| SDCARD |:heavy_check_mark:| idf | >=5.3 |
| IMU |:heavy_check_mark:| [espressif/icm42670](https://components.espressif.com/components/espressif/icm42670) | ^2.0.1|
<!-- Autogenerated end: Dependencies -->
76 changes: 46 additions & 30 deletions bsp/esp-box-3/esp-box-3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand All @@ -17,6 +17,7 @@
#include "esp_vfs_fat.h"

#include "iot_button.h"
#include "button_gpio.h"
#include "bsp/esp-box-3.h"
#include "bsp/display.h"
#include "bsp/touch.h"
Expand Down Expand Up @@ -71,27 +72,44 @@ static i2c_master_bus_handle_t i2c_handle = NULL;
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] = {
static uint8_t bsp_get_main_button(button_driver_t *button_driver);

typedef enum {
BSP_BUTTON_TYPE_GPIO,
BSP_BUTTON_TYPE_CUSTOM
} bsp_button_type_t;

typedef struct {
bsp_button_type_t type;
union {
button_gpio_config_t gpio;
button_driver_t custom;
} cfg;
} bsp_button_config_t;

static const bsp_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 = BSP_BUTTON_TYPE_GPIO,
.cfg.gpio = {
.gpio_num = BSP_BUTTON_CONFIG_IO,
.active_level = 0,
}
},
{
.type = BUTTON_TYPE_GPIO,
.gpio_button_config.gpio_num = BSP_BUTTON_MUTE_IO,
.gpio_button_config.active_level = 0,
.type = BSP_BUTTON_TYPE_GPIO,
.cfg.gpio = {
.gpio_num = BSP_BUTTON_MUTE_IO,
.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,
.type = BSP_BUTTON_TYPE_CUSTOM,
.cfg.custom = {
.enable_power_save = false,
.get_key_level = bsp_get_main_button,
.enter_power_save = NULL,
.del = NULL
}
}
};

Expand Down Expand Up @@ -624,7 +642,7 @@ esp_err_t bsp_display_exit_sleep(void)
return ESP_OK;
}

static uint8_t bsp_get_main_button(void *param)
static uint8_t bsp_get_main_button(button_driver_t *button_driver)
{
assert(tp);
#if (CONFIG_ESP_LCD_TOUCH_MAX_BUTTONS > 0)
Expand All @@ -637,17 +655,10 @@ static uint8_t bsp_get_main_button(void *param)
#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;
const button_config_t btn_config = {0};
if ((btn_array_size < BSP_BUTTON_NUM) ||
(btn_array == NULL)) {
return ESP_ERR_INVALID_ARG;
Expand All @@ -657,10 +668,15 @@ esp_err_t bsp_iot_button_create(button_handle_t btn_array[], int *btn_cnt, int b
*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 (bsp_button_config[i].type == BSP_BUTTON_TYPE_CUSTOM) {
if (tp == NULL) {
BSP_ERROR_CHECK_RETURN_ERR(bsp_touch_new(NULL, &tp));
}
ret |= iot_button_create(&btn_config, &bsp_button_config[i].cfg.custom, &btn_array[i]);
} else if (bsp_button_config[i].type == BSP_BUTTON_TYPE_GPIO) {
ret |= iot_button_new_gpio_device(&btn_config, &bsp_button_config[i].cfg.gpio, &btn_array[i]);
} else {
ESP_LOGW(TAG, "Unsupported button type!");
}
if (btn_cnt) {
(*btn_cnt)++;
Expand Down
2 changes: 1 addition & 1 deletion bsp/esp-box-3/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
public: true

button:
version: ">=2.5,<4.0"
version: "^4"
public: true

icm42670:
Expand Down
34 changes: 17 additions & 17 deletions bsp/esp32_azure_iot_kit/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ ESP32-Azure IoT Kit has integrated an ESP32-WROVER-B module, serial port-to-USB

<!-- Autogenerated start: Dependencies -->
### Capabilities and dependencies
| Capability | Available | Component | Version |
|------------------|------------------|----------------------------------------------------------------------------------------------|----------|
| DISPLAY |:heavy_check_mark:| idf | >=4.4.5 |
| LVGL_PORT |:heavy_check_mark:|[espressif/esp_lvgl_port](https://components.espressif.com/components/espressif/esp_lvgl_port)| ^2 |
| TOUCH | :x: | | |
| BUTTONS |:heavy_check_mark:| [espressif/button](https://components.espressif.com/components/espressif/button) |>=2.5,<4.0|
| AUDIO | :x: | | |
| AUDIO_SPEAKER | :x: | | |
| AUDIO_MIC | :x: | | |
| LED |:heavy_check_mark:| idf | >=4.4.5 |
| SDCARD |:heavy_check_mark:| idf | >=4.4.5 |
| IMU |:heavy_check_mark:| [espressif/mpu6050](https://components.espressif.com/components/espressif/mpu6050) | ^1.0.0 |
|SENSOR_TEMPERATURE|:heavy_check_mark:| [espressif/hts221](https://components.espressif.com/components/espressif/hts221) | ^1.1.1 |
| SENSOR_HUMIDITY |:heavy_check_mark:| [espressif/hts221](https://components.espressif.com/components/espressif/hts221) | ^1.1.1 |
| SENSOR_PRESSURE |:heavy_check_mark:| [espressif/fbm320](https://components.espressif.com/components/espressif/fbm320) | ^1.0.0 |
| SENSOR_LIGHT |:heavy_check_mark:| [espressif/bh1750](https://components.espressif.com/components/espressif/bh1750) | ^1.0.0 |
| SENSOR_MAG |:heavy_check_mark:| [espressif/mag3110](https://components.espressif.com/components/espressif/mag3110) | ^1.0.0 |
| Capability | Available | Component |Version|
|------------------|------------------|----------------------------------------------------------------------------------------------|-------|
| DISPLAY |:heavy_check_mark:| idf |>=4.4.5|
| LVGL_PORT |:heavy_check_mark:|[espressif/esp_lvgl_port](https://components.espressif.com/components/espressif/esp_lvgl_port)| ^2 |
| TOUCH | :x: | | |
| BUTTONS |:heavy_check_mark:| [espressif/button](https://components.espressif.com/components/espressif/button) | ^4 |
| AUDIO | :x: | | |
| AUDIO_SPEAKER | :x: | | |
| AUDIO_MIC | :x: | | |
| LED |:heavy_check_mark:| idf |>=4.4.5|
| SDCARD |:heavy_check_mark:| idf |>=4.4.5|
| IMU |:heavy_check_mark:| [espressif/mpu6050](https://components.espressif.com/components/espressif/mpu6050) | ^1.0.0|
|SENSOR_TEMPERATURE|:heavy_check_mark:| [espressif/hts221](https://components.espressif.com/components/espressif/hts221) | ^1.1.1|
| SENSOR_HUMIDITY |:heavy_check_mark:| [espressif/hts221](https://components.espressif.com/components/espressif/hts221) | ^1.1.1|
| SENSOR_PRESSURE |:heavy_check_mark:| [espressif/fbm320](https://components.espressif.com/components/espressif/fbm320) | ^1.0.0|
| SENSOR_LIGHT |:heavy_check_mark:| [espressif/bh1750](https://components.espressif.com/components/espressif/bh1750) | ^1.0.0|
| SENSOR_MAG |:heavy_check_mark:| [espressif/mag3110](https://components.espressif.com/components/espressif/mag3110) | ^1.0.0|
<!-- Autogenerated end: Dependencies -->
<!-- Autogenerated start: Dependencies -->
### Capabilities and dependencies
Expand Down
17 changes: 7 additions & 10 deletions bsp/esp32_azure_iot_kit/esp32_azure_iot_kit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand All @@ -16,18 +16,18 @@
#include "bsp/display.h"
#include "esp_lvgl_port.h"
#include "bsp_err_check.h"
#include "button_gpio.h"

static const char *TAG = "Azure-IoT";

static lv_display_t *disp;
sdmmc_card_t *bsp_sdcard = NULL; // Global uSD card handler
static bool i2c_initialized = false;

static const button_config_t bsp_button_config[BSP_BUTTON_NUM] = {
static const button_gpio_config_t bsp_button_config[BSP_BUTTON_NUM] = {
{
.type = BUTTON_TYPE_GPIO,
.gpio_button_config.gpio_num = BSP_BUTTON_MAIN_IO,
.gpio_button_config.active_level = 0,
.gpio_num = BSP_BUTTON_MAIN_IO,
.active_level = 0,
}
};

Expand Down Expand Up @@ -382,6 +382,7 @@ bool bsp_button_get(void)
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;
const button_config_t btn_config = {0};
if ((btn_array_size < BSP_BUTTON_NUM) ||
(btn_array == NULL)) {
return ESP_ERR_INVALID_ARG;
Expand All @@ -391,11 +392,7 @@ esp_err_t bsp_iot_button_create(button_handle_t btn_array[], int *btn_cnt, int b
*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;
}
ret |= iot_button_new_gpio_device(&btn_config, &bsp_button_config[i], &btn_array[i]);
if (btn_cnt) {
(*btn_cnt)++;
}
Expand Down
2 changes: 1 addition & 1 deletion bsp/esp32_azure_iot_kit/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
override_path: "../../components/esp_lvgl_port"

button:
version: ">=2.5,<4.0"
version: "^4"
public: true

hts221:
Expand Down
17 changes: 11 additions & 6 deletions bsp/esp32_c3_lcdkit/esp32_c3_lcdkit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand All @@ -23,6 +23,7 @@
#include "bsp_err_check.h"
#include "esp_lcd_gc9a01.h"
#include "iot_knob.h"
#include "button_gpio.h"
#include "esp_lvgl_port.h"
#include "esp_codec_dev_defaults.h"

Expand Down Expand Up @@ -78,10 +79,9 @@ static const led_strip_rmt_config_t bsp_rmt_config = {
.flags.with_dma = false,
};

static const button_config_t bsp_encoder_btn_config = {
.type = BUTTON_TYPE_GPIO,
.gpio_button_config.active_level = false,
.gpio_button_config.gpio_num = BSP_BTN_PRESS,
static const button_gpio_config_t bsp_encoder_btn_config = {
.gpio_num = BSP_BTN_PRESS,
.active_level = 0,
};

static const knob_config_t bsp_encoder_a_b_config = {
Expand Down Expand Up @@ -241,10 +241,15 @@ static lv_display_t *bsp_display_lcd_init(const bsp_display_cfg_t *cfg)

static lv_indev_t *bsp_display_indev_init(lv_display_t *disp)
{

const button_config_t btn_cfg = {0};
button_handle_t encoder_btn = NULL;
BSP_ERROR_CHECK_RETURN_NULL(iot_button_new_gpio_device(&btn_cfg, &bsp_encoder_btn_config, &encoder_btn));

const lvgl_port_encoder_cfg_t encoder = {
.disp = disp,
.encoder_a_b = &bsp_encoder_a_b_config,
.encoder_enter = &bsp_encoder_btn_config
.encoder_enter = encoder_btn
};

return lvgl_port_add_encoder(&encoder);
Expand Down
4 changes: 2 additions & 2 deletions bsp/esp32_c3_lcdkit/idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "1.1.0~1"
version: "2.0.0"
description: Board Support Package (BSP) for esp32_c3_lcdkit
url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_c3_lcdkit

Expand Down Expand Up @@ -26,7 +26,7 @@ dependencies:

button:
public: true
version: ">=2,<4.0"
version: "^4"

knob:
version: "^0.1.3"
Expand Down
2 changes: 1 addition & 1 deletion bsp/esp32_lyrat/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The ESP32-LyraT is a stereo audio board. If you are looking for a mono audio boa
|-------------|------------------|----------------------------------------------------------------------------------------------|-----------|
| DISPLAY | :x: | | |
| TOUCH | :x: | | |
| BUTTONS |:heavy_check_mark:| [espressif/button](https://components.espressif.com/components/espressif/button) | >=2.5,<4.0|
| BUTTONS |:heavy_check_mark:| [espressif/button](https://components.espressif.com/components/espressif/button) | ^4 |
| AUDIO |:heavy_check_mark:|[espressif/esp_codec_dev](https://components.espressif.com/components/espressif/esp_codec_dev)|^1.0.3,<1.2|
|AUDIO_SPEAKER|:heavy_check_mark:| | |
| AUDIO_MIC |:heavy_check_mark:| | |
Expand Down
Loading