6 Commits

Author SHA1 Message Date
Edward Firmo
cd34f1885c Remove trailing spaces 2023-12-07 08:49:12 +01:00
Edward Firmo
61d061d69e Fix file reference on validation 2023-12-07 08:47:07 +01:00
Edward Firmo
07304a2dcc Don't use not released features 2023-12-07 08:15:12 +01:00
Edward Firmo
ae6ad884f7 Repo reorg 2023-12-07 08:12:38 +01:00
Edward Firmo
65408e3a44 Repo reorg 2023-12-07 07:42:01 +01:00
Edward Firmo
5780b7208a Remove reference to DEV component 2023-12-07 07:26:17 +01:00
33 changed files with 55 additions and 193 deletions

View File

@@ -3,11 +3,11 @@ name: Validate ESPHome
on:
push:
paths:
- "nspanel_esphome.yaml"
- "nspanel_esphome*.yaml"
- "advanced/esphome/nspanel_esphome*.yaml"
pull_request:
paths:
- "nspanel_esphome.yaml"
- "nspanel_esphome*.yaml"
- "advanced/esphome/nspanel_esphome*.yaml"
#schedule:
# - cron: "0 0 * * *"
@@ -26,12 +26,18 @@ jobs:
- uses: actions/checkout@v4.1.0
- name: Validate nspanel_esphome.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome.yaml
- name: Validate nspanel_esphome_core.yaml
run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_core.yaml
- name: Validate nspanel_esphome_addon_upload_tft.yaml
run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
- name: Validate nspanel_esphome_advanced.yaml
run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_advanced.yaml
- name: Validate nspanel_esphome_addon_climate_base.yaml
run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_base.yaml
- name: Validate nspanel_esphome_addon_climate_cool.yaml
run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_cool.yaml
- name: Validate nspanel_esphome_addon_climate_heat.yaml
run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_heat.yaml
build_core:
name: Core

View File

@@ -4,7 +4,7 @@ on:
workflow_dispatch:
pull_request:
paths:
- "nspanel_esphome.yaml"
- "nspanel_esphome*.yaml"
- "advanced/esphome/nspanel_esphome*.yaml"
#schedule:
#- cron: "0 0 * * *"
@@ -22,12 +22,18 @@ jobs:
- uses: actions/checkout@v4.1.0
- name: Validate nspanel_esphome.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome.yaml
- name: Validate nspanel_esphome_core.yaml
run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_core.yaml
- name: Validate nspanel_esphome_addon_upload_tft.yaml
run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
- name: Validate nspanel_esphome_advanced.yaml
run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_advanced.yaml
- name: Validate nspanel_esphome_addon_climate_base.yaml
run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_base.yaml
- name: Validate nspanel_esphome_addon_climate_cool.yaml
run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_cool.yaml
- name: Validate nspanel_esphome_addon_climate_heat.yaml
run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_heat.yaml
build_core:
name: Core

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -10,11 +10,11 @@ substitutions:
version: "4.2dev"
#############################
external_components:
- source: github://pr#5825 #5683 # Remove this when that pr is merged and released
components:
- nextion
refresh: 1s
#external_components:
# - source: github://pr#5825 #5683 # Remove this when that pr is merged and released
# components:
# - nextion
# refresh: 1s
##### ESPHOME CONFIGURATION #####
esphome:
@@ -33,7 +33,7 @@ esphome:
timeout: 60s
- wait_until:
condition:
- lambda: !lambda return disp1->is_detected();
- lambda: !lambda return disp1->is_setup(); //is_detected();
timeout: 45s
- script.execute: exit_reparse
- wait_until:
@@ -2185,7 +2185,7 @@ script:
if (not compareVersions("${version}", id(version_tft).c_str())) ESP_LOGE(TAG, "TFT version mismatch!");
ESP_LOGD(TAG, "Blueprint version: %s", id(version_blueprint).c_str());
if (not compareVersions("${version}", id(version_blueprint).c_str())) ESP_LOGE(TAG, "Blueprint version mismatch!");
std::string framework = "unknown";
#ifdef ARDUINO
framework = "arduino";

View File

@@ -80,15 +80,6 @@ Text baud_rate
Touch Release Event
dim=100
tm0.en=1
if(baud==115200)
{
bauds=921600
}else
{
bauds=115200
}
covx baud,baud_rate.txt,0,0
baud_rate.txt+=" bps"
Text tft_version
Attributes
@@ -97,7 +88,7 @@ Text tft_version
Dragging : 0
Send Component ID : on press and release
Associated Keyboard: none
Text : TFT: v2023.11.2
Text : TFT: v2023.11.0
Max. Text Size : 20
Events
@@ -198,21 +189,15 @@ Timer tm_esphome
Events
Timer Event
if(framework.txt=="")
if(baud==115200)
{
if(baud==115200)
{
bauds=921600
}else
{
bauds=115200
}
covx baud,baud_rate.txt,0,0
baud_rate.txt+=" bps"
bauds=921600
}else
{
tm_esphome.en=0
bauds=115200
}
covx baud,baud_rate.txt,0,0
baud_rate.txt+=" bps"
Timer tm_pageid
Attributes

View File

@@ -17,16 +17,7 @@ Page buttonpage01
page home
}else
{
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/buttonpage01.txt
printh 92
prints "currentpage",0
printh 00
prints "buttonpage01",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/buttonpage01.txt
vis 255,0
vis button_back,1
vis page_index,1

View File

@@ -17,16 +17,7 @@ Page buttonpage02
page home
}else
{
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/buttonpage02.txt
printh 92
prints "currentpage",0
printh 00
prints "buttonpage02",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/buttonpage02.txt
vis 255,0
vis button_back,1
vis page_index,1

View File

@@ -17,16 +17,7 @@ Page buttonpage03
page home
}else
{
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/buttonpage03.txt
printh 92
prints "currentpage",0
printh 00
prints "buttonpage03",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/buttonpage03.txt
vis 255,0
vis button_back,1
vis page_index,1

View File

@@ -17,16 +17,7 @@ Page buttonpage04
page home
}else
{
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/buttonpage04.txt
printh 92
prints "currentpage",0
printh 00
prints "buttonpage04",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/buttonpage04.txt
vis 255,0
vis button_back,1
vis page_index,1

View File

@@ -104,7 +104,7 @@ Text body
Send Component ID : disabled
Associated Keyboard: none
Text : Please confirm
Max. Text Size : 254
Max. Text Size : 22
Events
Touch Press Event

View File

@@ -17,16 +17,7 @@ Page entitypage01
page home
}else
{
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/entitypage01.txt
printh 92
prints "currentpage",0
printh 00
prints "entitypage01",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/entitypage01.txt
}
Touch Press Event

View File

@@ -17,16 +17,7 @@ Page entitypage02
page home
}else
{
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/entitypage02.txt
printh 92
prints "currentpage",0
printh 00
prints "entitypage02",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/entitypage02.txt
}
Touch Press Event

View File

@@ -17,16 +17,7 @@ Page entitypage03
page home
}else
{
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/entitypage03.txt
printh 92
prints "currentpage",0
printh 00
prints "entitypage03",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/entitypage03.txt
}
Touch Press Event

View File

@@ -17,16 +17,7 @@ Page entitypage04
page home
}else
{
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/entitypage04.txt
printh 92
prints "currentpage",0
printh 00
prints "entitypage04",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/entitypage04.txt
}
Touch Press Event

View File

@@ -12,16 +12,7 @@ Page home
Events
Preinitialize Event
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/home.txt
printh 92
prints "currentpage",0
printh 00
prints "home",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/home.txt
vis bt_notific,is_notification
vis bt_qrcode,is_qrcode
vis bt_entities,is_entities

View File

@@ -12,16 +12,7 @@ Page settings
Events
Preinitialize Event
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/settings.txt
printh 92
prints "currentpage",0
printh 00
prints "settings",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/settings.txt
covx brightslider.val,bright_text.txt,0,0
bright_text.txt+="%"
covx dimslider.val,dim_text.txt,0,0

View File

@@ -17,16 +17,7 @@ Page weather01
page home
}else
{
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather01.txt
printh 92
prints "currentpage",0
printh 00
prints "weather01",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather01.txt
}
Touch Press Event

View File

@@ -17,16 +17,7 @@ Page weather02
page home
}else
{
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather02.txt
printh 92
prints "currentpage",0
printh 00
prints "weather02",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather02.txt
}
Touch Press Event

View File

@@ -17,16 +17,7 @@ Page weather03
page home
}else
{
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather03.txt
printh 92
prints "currentpage",0
printh 00
prints "weather03",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather03.txt
}
Touch Press Event

View File

@@ -17,16 +17,7 @@ Page weather04
page home
}else
{
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather04.txt
printh 92
prints "currentpage",0
printh 00
prints "weather04",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather04.txt
}
Touch Press Event

View File

@@ -17,16 +17,7 @@ Page weather05
page home
}else
{
<<<<<<<< HEAD:advanced/hmi/nspanel_us_land_code/weather05.txt
printh 92
prints "currentpage",0
printh 00
prints "weather05",0
printh 00
printh FF FF FF
========
sendme
>>>>>>>> 0565f5f522cb55b813ff949b082a11b1f2bd35dd:advanced/hmi/nspanel_eu_code/weather05.txt
}
Touch Press Event

View File

@@ -104,7 +104,7 @@ Text body
Send Component ID : disabled
Associated Keyboard: none
Text : Please confirm
Max. Text Size : 254
Max. Text Size : 22
Events
Touch Press Event

View File

@@ -104,7 +104,7 @@ Text body
Send Component ID : disabled
Associated Keyboard: none
Text : Please confirm
Max. Text Size : 254
Max. Text Size : 22
Events
Touch Press Event

View File

@@ -1,3 +1,3 @@
packages:
core_package: !include ./advanced/esphome/nspanel_esphome_core.yaml
upload_tft_package: !include ./advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
core_package: !include advanced/esphome/nspanel_esphome_core.yaml
upload_tft_package: !include advanced/esphome/nspanel_esphome_addon_upload_tft.yaml

View File

@@ -34,4 +34,4 @@ climate:
default_target_temperature_high: 21 ${temp_units}
packages:
core_package: !include nspanel_esphome_addon_climate_base.yaml
climate_base_package: !include advanced/esphome/nspanel_esphome_addon_climate_base.yaml

View File

@@ -34,4 +34,4 @@ climate:
default_target_temperature_low: 21 ${temp_units}
packages:
core_package: !include nspanel_esphome_addon_climate_base.yaml
climate_base_package: !include advanced/esphome/nspanel_esphome_addon_climate_base.yaml