Add compatibility to IDF v5

This commit is contained in:
Edward Firmo
2023-11-25 17:30:10 +01:00
parent 8f3fc8c081
commit 48c5453f0a
3 changed files with 37 additions and 11 deletions

View File

@@ -105,6 +105,18 @@ jobs:
with: with:
yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf.yaml" yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf.yaml"
build_climate_cool_advanced_esp_idf5:
name: esp-idf v5 & Bluetooth proxy
runs-on: "ubuntu-latest"
needs:
- build_climate_cool_advanced_esp_idf
steps:
- uses: actions/checkout@v4.1.0
- name: Build core+advanced+climate_cool+esp_idf5
uses: esphome/build-action@v1.8.0
with:
yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf5.yaml"
build_climate_heat_advanced_customization: build_climate_heat_advanced_customization:
name: Customizations name: Customizations
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"

View File

@@ -108,6 +108,19 @@ jobs:
yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf.yaml" yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf.yaml"
version: beta version: beta
build_climate_cool_advanced_esp_idf5:
name: esp-idf v5 & Bluetooth proxy
runs-on: "ubuntu-latest"
needs:
- build_climate_cool_advanced_esp_idf
steps:
- uses: actions/checkout@v4.1.0
- name: Build core+advanced+climate_cool+esp_idf5
uses: esphome/build-action@v1.8.0
with:
yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf5.yaml"
version: beta
build_climate_heat_advanced_customization: build_climate_heat_advanced_customization:
name: Customizations name: Customizations
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"

View File

@@ -557,9 +557,9 @@ api:
// Chips icon size // Chips icon size
ESP_LOGV(TAG, "Chips size"); ESP_LOGV(TAG, "Chips size");
for (int i = 1; i <= 10; ++i) { for (int i = 1; i <= 10; ++i) {
disp1->send_command_printf("home.icon_top_%02d.font=%i", i, chip_font_size); disp1->send_command_printf("home.icon_top_%02d.font=%" PRIu32, i, chip_font_size);
} }
disp1->send_command_printf("home.wifi_icon.font=%i", chip_font_size); disp1->send_command_printf("home.wifi_icon.font=%" PRIu32, chip_font_size);
id(home_chip_font_size) = chip_font_size; id(home_chip_font_size) = chip_font_size;
// Notification button // Notification button
@@ -725,10 +725,11 @@ display:
platform: nextion platform: nextion
uart_id: tf_uart uart_id: tf_uart
start_up_page: 8 start_up_page: 8
on_page: # I couldn't make this trigger to work, so used text_sensor nspanelevent and localevent instead on_page: # This requires `sendme` to be executed on Nextion side
lambda: |- lambda: |-
ESP_LOGW("display.disp1.on_page", "NEXTION PAGE CHANGED"); static const char *const TAG = "display.disp1.on_page";
ESP_LOGW("display.disp1.on_page", "New page: %i", int(x)); ESP_LOGD(TAG, "Nextion page changed");
ESP_LOGD(TAG, "New page: %i", int(x));
on_setup: on_setup:
- script.execute: boot_sequence - script.execute: boot_sequence
@@ -841,7 +842,7 @@ globals:
restore_value: false restore_value: false
initial_value: '' initial_value: ''
- id: home_relay1_icon_color - id: home_relay1_icon_color
type: uint type: uint16_t
restore_value: true restore_value: true
initial_value: '65535' initial_value: '65535'
@@ -850,15 +851,15 @@ globals:
restore_value: false restore_value: false
initial_value: '' initial_value: ''
- id: home_relay2_icon_color - id: home_relay2_icon_color
type: uint type: uint16_t
restore_value: true restore_value: true
initial_value: '65535' initial_value: '65535'
- id: home_notify_icon_color_normal - id: home_notify_icon_color_normal
type: std::vector<int> type: std::vector<int32_t>
restore_value: false restore_value: false
- id: home_notify_icon_color_unread - id: home_notify_icon_color_unread
type: std::vector<int> type: std::vector<int32_t>
restore_value: false restore_value: false
##### Versions ##### ##### Versions #####
@@ -1988,8 +1989,8 @@ script:
mode: queued mode: queued
parameters: parameters:
component: string component: string
foreground: int[] foreground: int32_t[]
background: int[] background: int32_t[]
then: then:
- lambda: |- - lambda: |-
int fg565 = -1; int fg565 = -1;