8 Commits

Author SHA1 Message Date
Edward Firmo
5cb2a193c6 Fix file path 2023-12-04 23:15:11 +01:00
Edward Firmo
cf4d0f9393 Try update at 921600bps first 2023-12-04 22:49:44 +01:00
Edward Firmo
a0a17bcfa1 Shortening boot sequence a bit
As baud rate wouldn't change anymore
2023-12-04 22:45:42 +01:00
Edward Firmo
ae40f651be Set advanced baud rate to 115200
Users reported issues on #1358
2023-12-04 22:38:25 +01:00
Edward Firmo
3df926cfc1 Fix path 2023-12-04 22:35:39 +01:00
Edward Firmo
304233218a Fix relative path on workflows 2023-12-04 22:33:21 +01:00
Edward Firmo
642c680cae Fix test relative folders 2023-12-04 22:24:01 +01:00
Edward Firmo
da4b64ed95 Reorg files
To make it easier for users
2023-12-04 22:19:03 +01:00
139 changed files with 19401 additions and 40592 deletions

View File

@@ -3,10 +3,12 @@ name: Validate ESPHome
on: on:
push: push:
paths: paths:
- "nspanel_esphome*.yaml" - "nspanel_esphome.yaml"
- "advanced/esphome/nspanel_esphome*.yaml"
pull_request: pull_request:
paths: paths:
- "nspanel_esphome*.yaml" - "nspanel_esphome.yaml"
- "advanced/esphome/nspanel_esphome*.yaml"
#schedule: #schedule:
# - cron: "0 0 * * *" # - cron: "0 0 * * *"
workflow_dispatch: workflow_dispatch:
@@ -25,11 +27,11 @@ jobs:
- name: Validate nspanel_esphome.yaml - name: Validate nspanel_esphome.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome.yaml run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome.yaml
- name: Validate nspanel_esphome_advanced.yaml - name: Validate nspanel_esphome_advanced.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_advanced.yaml run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_advanced.yaml
- name: Validate nspanel_esphome_addon_climate_cool.yaml - name: Validate nspanel_esphome_addon_climate_cool.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_cool.yaml run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
- name: Validate nspanel_esphome_addon_climate_heat.yaml - name: Validate nspanel_esphome_addon_climate_heat.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_heat.yaml run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
build_core: build_core:
name: Core name: Core

View File

@@ -4,7 +4,8 @@ on:
workflow_dispatch: workflow_dispatch:
pull_request: pull_request:
paths: paths:
- "nspanel_esphome*.yaml" - "nspanel_esphome.yaml"
- "advanced/esphome/nspanel_esphome*.yaml"
#schedule: #schedule:
#- cron: "0 0 * * *" #- cron: "0 0 * * *"
@@ -22,11 +23,11 @@ jobs:
- name: Validate nspanel_esphome.yaml - name: Validate nspanel_esphome.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome.yaml run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome.yaml
- name: Validate nspanel_esphome_advanced.yaml - name: Validate nspanel_esphome_advanced.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_advanced.yaml run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_advanced.yaml
- name: Validate nspanel_esphome_addon_climate_cool.yaml - name: Validate nspanel_esphome_addon_climate_cool.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_cool.yaml run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
- name: Validate nspanel_esphome_addon_climate_heat.yaml - name: Validate nspanel_esphome_addon_climate_heat.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_heat.yaml run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
build_core: build_core:
name: Core name: Core

View File

@@ -6,6 +6,6 @@ substitutions:
packages: packages:
core_package: !include ../nspanel_esphome.yaml # Core package core_package: !include ../nspanel_esphome.yaml # Core package
advanced_package: !include ../nspanel_esphome_advanced.yaml advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
#addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml #addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
#addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml #addon_climate_cool: !include ../advanced/esphome/nspanel_esphome_addon_climate_cool.yaml

View File

@@ -6,9 +6,9 @@ substitutions:
packages: packages:
core_package: !include ../nspanel_esphome.yaml # Core package core_package: !include ../nspanel_esphome.yaml # Core package
advanced_package: !include ../nspanel_esphome_advanced.yaml advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
#addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml #addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml addon_climate_cool: !include ../advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
esp32: esp32:
framework: framework:

View File

@@ -6,9 +6,9 @@ substitutions:
packages: packages:
core_package: !include ../nspanel_esphome.yaml # Core package core_package: !include ../nspanel_esphome.yaml # Core package
advanced_package: !include ../nspanel_esphome_advanced.yaml advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
#addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml #addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml addon_climate_cool: !include ../advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
esp32: esp32:
framework: framework:

View File

@@ -6,6 +6,6 @@ substitutions:
packages: packages:
core_package: !include ../nspanel_esphome.yaml # Core package core_package: !include ../nspanel_esphome.yaml # Core package
advanced_package: !include ../nspanel_esphome_advanced.yaml advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
#addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml #addon_climate_cold: !include ../advanced/esphome/nspanel_esphome_addon_climate_cold.yaml

View File

@@ -7,9 +7,9 @@ substitutions:
packages: packages:
core_package: !include ../nspanel_esphome.yaml # Core package core_package: !include ../nspanel_esphome.yaml # Core package
advanced_package: !include ../nspanel_esphome_advanced.yaml advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
#addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml #addon_climate_cold: !include ../advanced/esphome/nspanel_esphome_addon_climate_cold.yaml
##### Customizations from Wiki ##### ##### Customizations from Wiki #####
api: api:

View File

@@ -6,6 +6,6 @@ substitutions:
packages: packages:
core_package: !include ../nspanel_esphome.yaml # Core package core_package: !include ../nspanel_esphome.yaml # Core package
#advanced_package: !include ../nspanel_esphome_advanced.yaml #advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
#addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml #addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml addon_climate_cool: !include ../advanced/esphome/nspanel_esphome_addon_climate_cool.yaml

View File

@@ -6,6 +6,6 @@ substitutions:
packages: packages:
core_package: !include ../nspanel_esphome.yaml # Core package core_package: !include ../nspanel_esphome.yaml # Core package
#advanced_package: !include ../nspanel_esphome_advanced.yaml #advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
#addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml #addon_climate_cool: !include ../advanced/esphome/nspanel_esphome_addon_climate_cool.yaml

View File

@@ -6,6 +6,6 @@ substitutions:
packages: packages:
core_package: !include ../nspanel_esphome.yaml # Core package core_package: !include ../nspanel_esphome.yaml # Core package
#advanced_package: !include ../nspanel_esphome_advanced.yaml #advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
#addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml #addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
#addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml #addon_climate_cool: !include ../advanced/esphome/nspanel_esphome_addon_climate_cool.yaml

View File

@@ -765,7 +765,7 @@ script:
while (upload_tries < 5) { while (upload_tries < 5) {
upload_tries++; upload_tries++;
ESP_LOGD(TAG, "Try #%i", upload_tries); ESP_LOGD(TAG, "Try #%i", upload_tries);
if (upload_tft_(url, id(tf_uart).get_baud_rate())) id(restart_nspanel).press(); if (upload_tft_(url, 921600)) id(restart_nspanel).press();
ESP_LOGD(TAG, "Turn off Nextion"); ESP_LOGD(TAG, "Turn off Nextion");
id(screen_power).turn_off(); id(screen_power).turn_off();
delay_seconds_(2); delay_seconds_(2);

View File

@@ -84,10 +84,6 @@ time:
- component.update: api_timestamp - component.update: api_timestamp
- component.update: device_timestamp - component.update: device_timestamp
uart:
- id: !extend tf_uart
baud_rate: 921600
web_server: web_server:
id: web_server_std id: web_server_std
port: 80 port: 80

View File

@@ -68,7 +68,7 @@ esphome:
- wait_until: - wait_until:
condition: condition:
- lambda: !lambda return disp1->is_setup(); - lambda: !lambda return disp1->is_setup();
timeout: 45s timeout: 20s
- lambda: |- - lambda: |-
static const char *const TAG = "on_boot"; static const char *const TAG = "on_boot";
nextion_status->execute(); nextion_status->execute();

View File

Before

Width:  |  Height:  |  Size: 120 B

After

Width:  |  Height:  |  Size: 120 B

Some files were not shown because too many files have changed in this diff Show More