diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml index cabce76..8cfd1b4 100644 --- a/.github/workflows/validate_esphome.yml +++ b/.github/workflows/validate_esphome.yml @@ -105,6 +105,18 @@ jobs: with: 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: name: Customizations runs-on: "ubuntu-latest" diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml index aaa4ea3..81e7f91 100644 --- a/.github/workflows/validate_esphome_beta.yml +++ b/.github/workflows/validate_esphome_beta.yml @@ -108,6 +108,19 @@ jobs: yaml_file: "./.test/esphome_advanced_climate_cool_esp_idf.yaml" 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: name: Customizations runs-on: "ubuntu-latest" diff --git a/nspanel_esphome_core.yaml b/nspanel_esphome_core.yaml index b76fab8..08fcbac 100644 --- a/nspanel_esphome_core.yaml +++ b/nspanel_esphome_core.yaml @@ -557,9 +557,9 @@ api: // Chips icon size ESP_LOGV(TAG, "Chips size"); 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; // Notification button @@ -725,10 +725,11 @@ display: platform: nextion uart_id: tf_uart 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: |- - ESP_LOGW("display.disp1.on_page", "NEXTION PAGE CHANGED"); - ESP_LOGW("display.disp1.on_page", "New page: %i", int(x)); + static const char *const TAG = "display.disp1.on_page"; + ESP_LOGD(TAG, "Nextion page changed"); + ESP_LOGD(TAG, "New page: %i", int(x)); on_setup: - script.execute: boot_sequence @@ -841,7 +842,7 @@ globals: restore_value: false initial_value: '' - id: home_relay1_icon_color - type: uint + type: uint16_t restore_value: true initial_value: '65535' @@ -850,15 +851,15 @@ globals: restore_value: false initial_value: '' - id: home_relay2_icon_color - type: uint + type: uint16_t restore_value: true initial_value: '65535' - id: home_notify_icon_color_normal - type: std::vector + type: std::vector restore_value: false - id: home_notify_icon_color_unread - type: std::vector + type: std::vector restore_value: false ##### Versions ##### @@ -1988,8 +1989,8 @@ script: mode: queued parameters: component: string - foreground: int[] - background: int[] + foreground: int32_t[] + background: int32_t[] then: - lambda: |- int fg565 = -1;