From 0565f5f522cb55b813ff949b082a11b1f2bd35dd Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Mon, 4 Dec 2023 18:52:02 +0100 Subject: [PATCH] Redistribute tree --- .test/esphome_advanced.yaml | 8 +- ...esphome_advanced_climate_cool_esp_idf.yaml | 8 +- ...sphome_advanced_climate_cool_esp_idf5.yaml | 8 +- .test/esphome_advanced_climate_heat.yaml | 8 +- .test/esphome_climate_cool.yaml | 8 +- .test/esphome_climate_heat.yaml | 8 +- .test/esphome_core.yaml | 8 +- advanced/.gitignore | 15 + .../nspanel_esphome_addon_climate_base.yaml | 0 .../nspanel_esphome_addon_climate_cool.yaml | 0 .../nspanel_esphome_addon_climate_heat.yaml | 0 .../nspanel_esphome_addon_upload_tft.yaml | 0 .../esphome/nspanel_esphome_advanced.yaml | 0 .../esphome/nspanel_esphome_core.yaml | 0 .../hmi}/nspanel_blank.HMI | Bin .../hmi}/nspanel_blank_code/Program.s.txt | 0 .../hmi}/nspanel_blank_code/blank.txt | 0 .../hmi}/nspanel_blank_code/page0.txt | 0 .../hmi}/nspanel_blank_code/screensaver.txt | 0 nspanel_eu.HMI => advanced/hmi/nspanel_eu.HMI | Bin .../hmi/nspanel_eu_code}/Program.s.txt | 52 +- .../hmi/nspanel_eu_code}/alarm.txt | 0 .../hmi/nspanel_eu_code}/boot.txt | 546 +- .../hmi/nspanel_eu_code}/buttonpage01.txt | 0 .../hmi/nspanel_eu_code}/buttonpage02.txt | 0 .../hmi/nspanel_eu_code}/buttonpage03.txt | 0 .../hmi/nspanel_eu_code}/buttonpage04.txt | 0 .../hmi/nspanel_eu_code}/climate.txt | 0 .../hmi/nspanel_eu_code}/confirm.txt | 0 .../hmi/nspanel_eu_code}/cover.txt | 476 +- .../hmi/nspanel_eu_code}/entitypage01.txt | 0 .../hmi/nspanel_eu_code}/entitypage02.txt | 0 .../hmi/nspanel_eu_code}/entitypage03.txt | 0 .../hmi/nspanel_eu_code}/entitypage04.txt | 0 .../hmi/nspanel_eu_code}/fan.txt | 0 .../hmi/nspanel_eu_code}/home.txt | 0 .../hmi/nspanel_eu_code}/keyb_num.txt | 0 .../hmi/nspanel_eu_code}/light.txt | 1408 +- .../hmi/nspanel_eu_code}/media_player.txt | 0 .../hmi/nspanel_eu_code}/notification.txt | 394 +- .../hmi/nspanel_eu_code}/pics/SinglePixel.png | Bin .../hmi/nspanel_eu_code}/power.page | Bin .../hmi/nspanel_eu_code}/power.txt | 0 .../hmi/nspanel_eu_code}/qrcode.txt | 286 +- .../hmi/nspanel_eu_code}/screensaver.txt | 72 +- .../hmi/nspanel_eu_code}/settings.txt | 0 .../hmi/nspanel_eu_code}/weather01.txt | 0 .../hmi/nspanel_eu_code}/weather02.txt | 0 .../hmi/nspanel_eu_code}/weather03.txt | 0 .../hmi/nspanel_eu_code}/weather04.txt | 0 .../hmi/nspanel_eu_code}/weather05.txt | 0 nspanel_us.HMI => advanced/hmi/nspanel_us.HMI | Bin .../hmi/nspanel_us_code}/Program.s.txt | 52 +- .../hmi/nspanel_us_code}/alarm.txt | 0 .../hmi/nspanel_us_code}/boot.txt | 546 +- .../hmi/nspanel_us_code}/buttonpage01.txt | 1564 +- .../hmi/nspanel_us_code}/buttonpage02.txt | 1564 +- .../hmi/nspanel_us_code}/buttonpage03.txt | 1564 +- .../hmi/nspanel_us_code}/buttonpage04.txt | 1564 +- .../hmi/nspanel_us_code}/climate.txt | 0 .../hmi/nspanel_us_code}/confirm.txt | 0 .../hmi/nspanel_us_code}/cover.txt | 476 +- .../hmi/nspanel_us_code}/entitypage01.txt | 780 +- .../hmi/nspanel_us_code}/entitypage02.txt | 780 +- .../hmi/nspanel_us_code}/entitypage03.txt | 780 +- .../hmi/nspanel_us_code}/entitypage04.txt | 780 +- .../hmi/nspanel_us_code}/fan.txt | 0 .../hmi/nspanel_us_code}/home.txt | 1238 +- .../hmi/nspanel_us_code}/keyb_num.txt | 0 .../hmi/nspanel_us_code}/light.txt | 1408 +- .../hmi/nspanel_us_code}/media_player.txt | 0 .../hmi/nspanel_us_code}/notification.txt | 414 +- .../hmi/nspanel_us_code}/nspanel_us_Stats.txt | 0 .../hmi/nspanel_us_code}/qrcode.txt | 286 +- .../hmi/nspanel_us_code}/screensaver.txt | 72 +- .../hmi/nspanel_us_code}/settings.txt | 870 +- .../hmi/nspanel_us_code}/weather01.txt | 574 +- .../hmi/nspanel_us_code}/weather02.txt | 574 +- .../hmi/nspanel_us_code}/weather03.txt | 574 +- .../hmi/nspanel_us_code}/weather04.txt | 574 +- .../hmi/nspanel_us_code}/weather05.txt | 574 +- .../hmi/nspanel_us_land.HMI | Bin .../hmi/nspanel_us_land_code}/Program.s.txt | 52 +- .../hmi/nspanel_us_land_code}/alarm.txt | 0 .../hmi/nspanel_us_land_code}/boot.txt | 546 +- .../nspanel_us_land_code}/buttonpage01.txt | 1564 +- .../nspanel_us_land_code}/buttonpage02.txt | 1564 +- .../nspanel_us_land_code}/buttonpage03.txt | 1564 +- .../nspanel_us_land_code}/buttonpage04.txt | 1564 +- .../hmi/nspanel_us_land_code}/climate.txt | 0 .../hmi/nspanel_us_land_code}/confirm.txt | 0 .../hmi/nspanel_us_land_code}/cover.txt | 476 +- .../nspanel_us_land_code}/entitypage01.txt | 780 +- .../nspanel_us_land_code}/entitypage02.txt | 780 +- .../nspanel_us_land_code}/entitypage03.txt | 780 +- .../nspanel_us_land_code}/entitypage04.txt | 780 +- .../hmi/nspanel_us_land_code}/fan.txt | 0 .../hmi/nspanel_us_land_code}/home.txt | 1238 +- .../hmi/nspanel_us_land_code}/instructions.md | 0 .../hmi/nspanel_us_land_code}/keyb_num.txt | 0 .../hmi/nspanel_us_land_code}/light.txt | 1408 +- .../nspanel_us_land_code}/media_player.txt | 0 .../nspanel_us_land_code}/notification.txt | 394 +- .../pics/30_vertical.png | Bin .../pics/31_vertical.png | Bin .../hmi/nspanel_us_land_code}/qrcode.txt | 286 +- .../hmi/nspanel_us_land_code}/screensaver.txt | 72 +- .../hmi/nspanel_us_land_code}/settings.txt | 682 +- .../hmi/nspanel_us_land_code}/weather01.txt | 574 +- .../hmi/nspanel_us_land_code}/weather02.txt | 574 +- .../hmi/nspanel_us_land_code}/weather03.txt | 574 +- .../hmi/nspanel_us_land_code}/weather04.txt | 574 +- .../hmi/nspanel_us_land_code}/weather05.txt | 574 +- .../.vscode/settings.json | 5 - .../NSPanel_HA_Blueprint-beta/README.md | 159 - .../NSPanel_HA_Blueprint-beta/blueprint.yaml | 14851 ---------------- .../custom_configuration/climate.yaml | 18 - .../custom_configuration/folder_watcher.yaml | 7 - .../custom_configuration/sensor.yaml | 78 - .../NSPanel_HA_Blueprint-beta/esphome.yaml | 1198 -- .../nspanel_buero.tft | Bin 2688576 -> 0 bytes .../NSPanel_HA_Blueprint-main/README.md | 159 - .../NSPanel_HA_Blueprint-main/blueprint.yaml | 3341 ---- .../custom_configuration/climate.yaml | 18 - .../custom_configuration/folder_watcher.yaml | 7 - .../custom_configuration/sensor.yaml | 78 - .../NSPanel_HA_Blueprint-main/esphome.yaml | 1168 -- .../nspanel_buero.tft | Bin 2223144 -> 0 bytes .../OLD NSPanel version/OLD_nspanel_blank.tft | Bin 263492 -> 0 bytes .../OLD_nspanel_blank_9600.tft | Bin 263492 -> 0 bytes .../OLD NSPanel version/nspanel_old.HMI | Bin 17409963 -> 0 bytes .../OLD NSPanel version/nspanel_old.tft | Bin 8162516 -> 0 bytes custom_configuration/climate.yaml | 18 - custom_configuration/folder_watcher.yaml | 7 - custom_configuration/sensor.yaml | 78 - .../nspanel_blank.tft => nspanel_blank.tft | Bin nspanel_esphome.yaml | 4 +- 137 files changed, 19166 insertions(+), 40341 deletions(-) create mode 100644 advanced/.gitignore rename nspanel_esphome_addon_climate_base.yaml => advanced/esphome/nspanel_esphome_addon_climate_base.yaml (100%) rename nspanel_esphome_addon_climate_cool.yaml => advanced/esphome/nspanel_esphome_addon_climate_cool.yaml (100%) rename nspanel_esphome_addon_climate_heat.yaml => advanced/esphome/nspanel_esphome_addon_climate_heat.yaml (100%) rename nspanel_esphome_addon_upload_tft.yaml => advanced/esphome/nspanel_esphome_addon_upload_tft.yaml (100%) rename nspanel_esphome_advanced.yaml => advanced/esphome/nspanel_esphome_advanced.yaml (100%) rename nspanel_esphome_core.yaml => advanced/esphome/nspanel_esphome_core.yaml (100%) rename {custom_configuration => advanced/hmi}/nspanel_blank.HMI (100%) rename {custom_configuration => advanced/hmi}/nspanel_blank_code/Program.s.txt (100%) rename {custom_configuration => advanced/hmi}/nspanel_blank_code/blank.txt (100%) rename {custom_configuration => advanced/hmi}/nspanel_blank_code/page0.txt (100%) rename {custom_configuration => advanced/hmi}/nspanel_blank_code/screensaver.txt (100%) rename nspanel_eu.HMI => advanced/hmi/nspanel_eu.HMI (100%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/Program.s.txt (98%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/alarm.txt (100%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/boot.txt (96%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/buttonpage01.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/buttonpage02.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/buttonpage03.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/buttonpage04.txt (100%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/climate.txt (100%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/confirm.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/cover.txt (96%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/entitypage01.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/entitypage02.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/entitypage03.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/entitypage04.txt (100%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/fan.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/home.txt (100%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/keyb_num.txt (100%) rename {nspanel_us_code => advanced/hmi/nspanel_eu_code}/light.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/media_player.txt (100%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/notification.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/pics/SinglePixel.png (100%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/power.page (100%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/power.txt (100%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/qrcode.txt (95%) rename {nspanel_eu_code => advanced/hmi/nspanel_eu_code}/screensaver.txt (95%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/settings.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/weather01.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/weather02.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/weather03.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/weather04.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_eu_code}/weather05.txt (100%) rename nspanel_us.HMI => advanced/hmi/nspanel_us.HMI (100%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/Program.s.txt (98%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/alarm.txt (100%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/boot.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_code}/buttonpage01.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/buttonpage02.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_code}/buttonpage03.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/buttonpage04.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/climate.txt (100%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/confirm.txt (100%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/cover.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/entitypage01.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/entitypage02.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/entitypage03.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_code}/entitypage04.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/fan.txt (100%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/home.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/keyb_num.txt (100%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_code}/light.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/media_player.txt (100%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/notification.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/nspanel_us_Stats.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_code}/qrcode.txt (95%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/screensaver.txt (95%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/settings.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/weather01.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_code}/weather02.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/weather03.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/weather04.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_code}/weather05.txt (96%) rename nspanel_us_land.HMI => advanced/hmi/nspanel_us_land.HMI (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/Program.s.txt (98%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/alarm.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/boot.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_land_code}/buttonpage01.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_land_code}/buttonpage02.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_land_code}/buttonpage03.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_land_code}/buttonpage04.txt (96%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/climate.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/confirm.txt (100%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_land_code}/cover.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_land_code}/entitypage01.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_land_code}/entitypage02.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_land_code}/entitypage03.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_land_code}/entitypage04.txt (96%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/fan.txt (100%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_land_code}/home.txt (96%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/instructions.md (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/keyb_num.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/light.txt (96%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/media_player.txt (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/notification.txt (96%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/pics/30_vertical.png (100%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/pics/31_vertical.png (100%) rename {nspanel_us_code => advanced/hmi/nspanel_us_land_code}/qrcode.txt (95%) rename {nspanel_us_land_code => advanced/hmi/nspanel_us_land_code}/screensaver.txt (95%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_land_code}/settings.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_land_code}/weather01.txt (96%) rename {nspanel_us_code => advanced/hmi/nspanel_us_land_code}/weather02.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_land_code}/weather03.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_land_code}/weather04.txt (96%) rename {nspanel_eu_code => advanced/hmi/nspanel_us_land_code}/weather05.txt (96%) delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-beta/.vscode/settings.json delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-beta/README.md delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-beta/blueprint.yaml delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-beta/custom_configuration/climate.yaml delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-beta/custom_configuration/folder_watcher.yaml delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-beta/custom_configuration/sensor.yaml delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-beta/esphome.yaml delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-beta/nspanel_buero.tft delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-main/README.md delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-main/blueprint.yaml delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-main/custom_configuration/climate.yaml delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-main/custom_configuration/folder_watcher.yaml delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-main/custom_configuration/sensor.yaml delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-main/esphome.yaml delete mode 100644 custom_configuration/OLD NSPanel version/NSPanel_HA_Blueprint-main/nspanel_buero.tft delete mode 100644 custom_configuration/OLD NSPanel version/OLD_nspanel_blank.tft delete mode 100644 custom_configuration/OLD NSPanel version/OLD_nspanel_blank_9600.tft delete mode 100644 custom_configuration/OLD NSPanel version/nspanel_old.HMI delete mode 100644 custom_configuration/OLD NSPanel version/nspanel_old.tft delete mode 100644 custom_configuration/climate.yaml delete mode 100644 custom_configuration/folder_watcher.yaml delete mode 100644 custom_configuration/sensor.yaml rename custom_configuration/nspanel_blank.tft => nspanel_blank.tft (100%) diff --git a/.test/esphome_advanced.yaml b/.test/esphome_advanced.yaml index c908250..bafc3ff 100644 --- a/.test/esphome_advanced.yaml +++ b/.test/esphome_advanced.yaml @@ -5,7 +5,7 @@ substitutions: nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy" packages: - core_package: !include ../nspanel_esphome.yaml # Core package - advanced_package: !include ../nspanel_esphome_advanced.yaml - #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml - #addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml + core_package: !include ../advanced/esphome/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 diff --git a/.test/esphome_advanced_climate_cool_esp_idf.yaml b/.test/esphome_advanced_climate_cool_esp_idf.yaml index 23ab672..17923a8 100644 --- a/.test/esphome_advanced_climate_cool_esp_idf.yaml +++ b/.test/esphome_advanced_climate_cool_esp_idf.yaml @@ -5,10 +5,10 @@ substitutions: nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy" packages: - core_package: !include ../nspanel_esphome.yaml # Core package - advanced_package: !include ../nspanel_esphome_advanced.yaml - #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml - addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml + core_package: !include ../advanced/esphome/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 esp32: framework: diff --git a/.test/esphome_advanced_climate_cool_esp_idf5.yaml b/.test/esphome_advanced_climate_cool_esp_idf5.yaml index 1e99566..e7ac077 100644 --- a/.test/esphome_advanced_climate_cool_esp_idf5.yaml +++ b/.test/esphome_advanced_climate_cool_esp_idf5.yaml @@ -5,10 +5,10 @@ substitutions: nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy" packages: - core_package: !include ../nspanel_esphome.yaml # Core package - advanced_package: !include ../nspanel_esphome_advanced.yaml - #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml - addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml + core_package: !include ../advanced/esphome/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 esp32: framework: diff --git a/.test/esphome_advanced_climate_heat.yaml b/.test/esphome_advanced_climate_heat.yaml index 11d69e1..7299cd1 100644 --- a/.test/esphome_advanced_climate_heat.yaml +++ b/.test/esphome_advanced_climate_heat.yaml @@ -5,7 +5,7 @@ substitutions: nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy" packages: - core_package: !include ../nspanel_esphome.yaml # Core package - advanced_package: !include ../nspanel_esphome_advanced.yaml - addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml - #addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml + core_package: !include ../advanced/esphome/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 diff --git a/.test/esphome_climate_cool.yaml b/.test/esphome_climate_cool.yaml index 128abac..15104d4 100644 --- a/.test/esphome_climate_cool.yaml +++ b/.test/esphome_climate_cool.yaml @@ -5,7 +5,7 @@ substitutions: nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy" packages: - core_package: !include ../nspanel_esphome.yaml # Core package - #advanced_package: !include ../nspanel_esphome_advanced.yaml - #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml - addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml + core_package: !include ../advanced/esphome/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 diff --git a/.test/esphome_climate_heat.yaml b/.test/esphome_climate_heat.yaml index c839972..90071f3 100644 --- a/.test/esphome_climate_heat.yaml +++ b/.test/esphome_climate_heat.yaml @@ -5,7 +5,7 @@ substitutions: nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy" packages: - core_package: !include ../nspanel_esphome.yaml # Core package - #advanced_package: !include ../nspanel_esphome_advanced.yaml - addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml - #addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml + core_package: !include ../advanced/esphome/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 diff --git a/.test/esphome_core.yaml b/.test/esphome_core.yaml index 7eecc37..2feacfd 100644 --- a/.test/esphome_core.yaml +++ b/.test/esphome_core.yaml @@ -5,7 +5,7 @@ substitutions: nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy" packages: - core_package: !include ../nspanel_esphome.yaml # Core package - #advanced_package: !include ../nspanel_esphome_advanced.yaml - #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml - #addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml + core_package: !include ../advanced/esphome/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 diff --git a/advanced/.gitignore b/advanced/.gitignore new file mode 100644 index 0000000..db0c583 --- /dev/null +++ b/advanced/.gitignore @@ -0,0 +1,15 @@ +# Ignore Mac DS_Store files +.DS_Store +**/.DS_Store + +Nextion2Text.* +*.cmd +*.bat + +# Ignore IntelliJ IDEA project directory +.idea + +# Ignore dev folder +dev + +nspanel_esphome_prebuilt.yaml diff --git a/nspanel_esphome_addon_climate_base.yaml b/advanced/esphome/nspanel_esphome_addon_climate_base.yaml similarity index 100% rename from nspanel_esphome_addon_climate_base.yaml rename to advanced/esphome/nspanel_esphome_addon_climate_base.yaml diff --git a/nspanel_esphome_addon_climate_cool.yaml b/advanced/esphome/nspanel_esphome_addon_climate_cool.yaml similarity index 100% rename from nspanel_esphome_addon_climate_cool.yaml rename to advanced/esphome/nspanel_esphome_addon_climate_cool.yaml diff --git a/nspanel_esphome_addon_climate_heat.yaml b/advanced/esphome/nspanel_esphome_addon_climate_heat.yaml similarity index 100% rename from nspanel_esphome_addon_climate_heat.yaml rename to advanced/esphome/nspanel_esphome_addon_climate_heat.yaml diff --git a/nspanel_esphome_addon_upload_tft.yaml b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml similarity index 100% rename from nspanel_esphome_addon_upload_tft.yaml rename to advanced/esphome/nspanel_esphome_addon_upload_tft.yaml diff --git a/nspanel_esphome_advanced.yaml b/advanced/esphome/nspanel_esphome_advanced.yaml similarity index 100% rename from nspanel_esphome_advanced.yaml rename to advanced/esphome/nspanel_esphome_advanced.yaml diff --git a/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml similarity index 100% rename from nspanel_esphome_core.yaml rename to advanced/esphome/nspanel_esphome_core.yaml diff --git a/custom_configuration/nspanel_blank.HMI b/advanced/hmi/nspanel_blank.HMI similarity index 100% rename from custom_configuration/nspanel_blank.HMI rename to advanced/hmi/nspanel_blank.HMI diff --git a/custom_configuration/nspanel_blank_code/Program.s.txt b/advanced/hmi/nspanel_blank_code/Program.s.txt similarity index 100% rename from custom_configuration/nspanel_blank_code/Program.s.txt rename to advanced/hmi/nspanel_blank_code/Program.s.txt diff --git a/custom_configuration/nspanel_blank_code/blank.txt b/advanced/hmi/nspanel_blank_code/blank.txt similarity index 100% rename from custom_configuration/nspanel_blank_code/blank.txt rename to advanced/hmi/nspanel_blank_code/blank.txt diff --git a/custom_configuration/nspanel_blank_code/page0.txt b/advanced/hmi/nspanel_blank_code/page0.txt similarity index 100% rename from custom_configuration/nspanel_blank_code/page0.txt rename to advanced/hmi/nspanel_blank_code/page0.txt diff --git a/custom_configuration/nspanel_blank_code/screensaver.txt b/advanced/hmi/nspanel_blank_code/screensaver.txt similarity index 100% rename from custom_configuration/nspanel_blank_code/screensaver.txt rename to advanced/hmi/nspanel_blank_code/screensaver.txt diff --git a/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI similarity index 100% rename from nspanel_eu.HMI rename to advanced/hmi/nspanel_eu.HMI diff --git a/nspanel_eu_code/Program.s.txt b/advanced/hmi/nspanel_eu_code/Program.s.txt similarity index 98% rename from nspanel_eu_code/Program.s.txt rename to advanced/hmi/nspanel_eu_code/Program.s.txt index 81c87af..00cf31b 100644 --- a/nspanel_eu_code/Program.s.txt +++ b/advanced/hmi/nspanel_eu_code/Program.s.txt @@ -1,26 +1,26 @@ -Program.s - //The following code is only run once when power on, and is generally used for global variable definition and power on initialization data - int sys0=0,sys1=0,sys2=0,swipex=0,swipey=0,swipex2=0,swipey2=0,swipec=0,swipec2=0,swipedx=100,swipedy=100 //At present, the definition of global variable only supports 4-byte signed integer (int), and other types of global quantity declaration are not supported. If you want to use string type, you can use variable control in the page to implement - int r=0,g=0,b=0 - int h=0,s=0,v=0 - int p=0,q=0,t=0,f=0 - int dimdelta=0 - int api=0 // 0 = disconnected from HA, 1 = connected to HA - int is_alarm=0,is_entities=0,is_qrcode=0,is_notification=0 - int brightness=100,brightness_dim=40 - int display_mode=1 // 1 = EU, 2 = US, 3 = US landscape - //bauds=115200//Configure baudrate - recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode - randset 0,65535//used for touchevent sensor - printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port - if(display_mode==1) - { - lcd_dev fffb 0002 0000 0020// Fix touch offset for EU Version - } - printh 92 - prints "currentpage",0 - printh 00 - prints "",0 - printh 00 - printh FF FF FF - page 8//Power on start page boot +Program.s + //The following code is only run once when power on, and is generally used for global variable definition and power on initialization data + int sys0=0,sys1=0,sys2=0,swipex=0,swipey=0,swipex2=0,swipey2=0,swipec=0,swipec2=0,swipedx=100,swipedy=100 //At present, the definition of global variable only supports 4-byte signed integer (int), and other types of global quantity declaration are not supported. If you want to use string type, you can use variable control in the page to implement + int r=0,g=0,b=0 + int h=0,s=0,v=0 + int p=0,q=0,t=0,f=0 + int dimdelta=0 + int api=0 // 0 = disconnected from HA, 1 = connected to HA + int is_alarm=0,is_entities=0,is_qrcode=0,is_notification=0 + int brightness=100,brightness_dim=40 + int display_mode=1 // 1 = EU, 2 = US, 3 = US landscape + //bauds=115200//Configure baudrate + recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode + randset 0,65535//used for touchevent sensor + printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port + if(display_mode==1) + { + lcd_dev fffb 0002 0000 0020// Fix touch offset for EU Version + } + printh 92 + prints "currentpage",0 + printh 00 + prints "",0 + printh 00 + printh FF FF FF + page 8//Power on start page boot diff --git a/nspanel_eu_code/alarm.txt b/advanced/hmi/nspanel_eu_code/alarm.txt similarity index 100% rename from nspanel_eu_code/alarm.txt rename to advanced/hmi/nspanel_eu_code/alarm.txt diff --git a/nspanel_eu_code/boot.txt b/advanced/hmi/nspanel_eu_code/boot.txt similarity index 96% rename from nspanel_eu_code/boot.txt rename to advanced/hmi/nspanel_eu_code/boot.txt index 5213736..fa09988 100644 --- a/nspanel_eu_code/boot.txt +++ b/advanced/hmi/nspanel_eu_code/boot.txt @@ -1,273 +1,273 @@ -Page boot - Attributes - ID : 0 - Scope : local - Dragging : 0 - Send Component ID : disabled - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID: disabled - - Events - Preinitialize Event - sendme - dim=0 - vis bt_reboot,0 - covx baud,baud_rate.txt,0,0 - baud_rate.txt+=" bps" - covx display_mode,aux2.txt,0,0 - nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" - printh 92 - prints "localevent",0 - printh 00 - prints nspanelevent.txt,0 - printh 00 - printh FF FF FF - - Touch Press Event - printh 91 - prints "touchevent",0 - printh 00 - prints rand,0 - printh FF FF FF - - Touch Release Event - printh 91 - prints "touchevent",0 - printh 00 - prints rand,0 - printh FF FF FF - - Page Exit Event - dim=0 - -Variable (int32) counter - Attributes - ID : 12 - Scope: local - Value: 0 - -Variable (string) aux1 - Attributes - ID : 13 - Scope : local - Text : - Max. Text Size: 10 - -Variable (string) nspanelevent - Attributes - ID : 14 - Scope : local - Text : - Max. Text Size: 150 - -Variable (string) aux2 - Attributes - ID : 15 - Scope : local - Text : - Max. Text Size: 10 - -Text ip_addr - Attributes - ID : 1 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : Initializing... - Max. Text Size : 15 - -Text t0 - Attributes - ID : 2 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : Please wait... - Max. Text Size : 15 - -Text t1 - Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : The process can take several seconds! - Max. Text Size : 50 - -Text tft_label - Attributes - ID : 5 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : TFT: - Max. Text Size : 4 - -Text esph_label - Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : ESPHome: - Max. Text Size : 8 - -Text bluep_label - Attributes - ID : 7 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : Blueprint: - Max. Text Size : 10 - -Text tft_version - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : 4.2dev - Max. Text Size : 9 - -Text esph_version - Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 9 - -Text bluep_version - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 9 - -Text baud_rate - Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 10 - -Text framework - Attributes - ID : 20 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 10 - -Dual-state Button bt_reboot - Attributes - ID : 4 - Scope : local - Dragging : 0 - Send Component ID: on press and release - State : unpressed - Text : Reboot - Max. Text Size : 6 - -Timer timer - Attributes - ID : 11 - Scope : local - Period (ms): 65534 - Enabled : yes - - Events - Timer Event - counter.val++ - covx counter.val,aux1.txt,0,0 - covx display_mode,aux2.txt,0,0 - nspanelevent.txt="{\"page\": \"boot\", \"event\": \"timeout\", \"value\": "+aux1.txt+", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" - bluep_version.txt="Retry: "+aux1.txt - printh 92 - prints "nspanelevent",0 - printh 00 - prints nspanelevent.txt,0 - printh 00 - printh FF FF FF - -Timer wakeup_timer - Attributes - ID : 16 - Scope : local - Period (ms): 50 - Enabled : yes - - Events - Timer Event - if(dim<100) - { - dimdelta=100-dim - dimdelta/=25 - if(dimdelta<1) - { - dimdelta=1 - } - dim+=dimdelta - }else - { - wakeup_timer.en=0 - } - -Timer tm_esphome - Attributes - ID : 17 - Scope : local - Period (ms): 30000 - Enabled : yes - - Events - Timer Event - if(baud==115200) - { - bauds=921600 - }else - { - bauds=115200 - } - covx baud,baud_rate.txt,0,0 - baud_rate.txt+=" bps" - -Timer tm_pageid - Attributes - ID : 19 - Scope : local - Period (ms): 2500 - Enabled : yes - - Events - Timer Event - covx display_mode,aux2.txt,0,0 - nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" - printh 92 - prints "localevent",0 - printh 00 - prints nspanelevent.txt,0 - printh 00 - printh FF FF FF - +Page boot + Attributes + ID : 0 + Scope : local + Dragging : 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID: disabled + + Events + Preinitialize Event + sendme + dim=0 + vis bt_reboot,0 + covx baud,baud_rate.txt,0,0 + baud_rate.txt+=" bps" + covx display_mode,aux2.txt,0,0 + nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" + printh 92 + prints "localevent",0 + printh 00 + prints nspanelevent.txt,0 + printh 00 + printh FF FF FF + + Touch Press Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + + Touch Release Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + + Page Exit Event + dim=0 + +Variable (int32) counter + Attributes + ID : 12 + Scope: local + Value: 0 + +Variable (string) aux1 + Attributes + ID : 13 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) nspanelevent + Attributes + ID : 14 + Scope : local + Text : + Max. Text Size: 150 + +Variable (string) aux2 + Attributes + ID : 15 + Scope : local + Text : + Max. Text Size: 10 + +Text ip_addr + Attributes + ID : 1 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Initializing... + Max. Text Size : 15 + +Text t0 + Attributes + ID : 2 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Please wait... + Max. Text Size : 15 + +Text t1 + Attributes + ID : 3 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : The process can take several seconds! + Max. Text Size : 50 + +Text tft_label + Attributes + ID : 5 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : TFT: + Max. Text Size : 4 + +Text esph_label + Attributes + ID : 6 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : ESPHome: + Max. Text Size : 8 + +Text bluep_label + Attributes + ID : 7 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Blueprint: + Max. Text Size : 10 + +Text tft_version + Attributes + ID : 8 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 4.2dev + Max. Text Size : 9 + +Text esph_version + Attributes + ID : 9 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 9 + +Text bluep_version + Attributes + ID : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 9 + +Text baud_rate + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 10 + +Text framework + Attributes + ID : 20 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 10 + +Dual-state Button bt_reboot + Attributes + ID : 4 + Scope : local + Dragging : 0 + Send Component ID: on press and release + State : unpressed + Text : Reboot + Max. Text Size : 6 + +Timer timer + Attributes + ID : 11 + Scope : local + Period (ms): 65534 + Enabled : yes + + Events + Timer Event + counter.val++ + covx counter.val,aux1.txt,0,0 + covx display_mode,aux2.txt,0,0 + nspanelevent.txt="{\"page\": \"boot\", \"event\": \"timeout\", \"value\": "+aux1.txt+", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" + bluep_version.txt="Retry: "+aux1.txt + printh 92 + prints "nspanelevent",0 + printh 00 + prints nspanelevent.txt,0 + printh 00 + printh FF FF FF + +Timer wakeup_timer + Attributes + ID : 16 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + if(dim<100) + { + dimdelta=100-dim + dimdelta/=25 + if(dimdelta<1) + { + dimdelta=1 + } + dim+=dimdelta + }else + { + wakeup_timer.en=0 + } + +Timer tm_esphome + Attributes + ID : 17 + Scope : local + Period (ms): 30000 + Enabled : yes + + Events + Timer Event + if(baud==115200) + { + bauds=921600 + }else + { + bauds=115200 + } + covx baud,baud_rate.txt,0,0 + baud_rate.txt+=" bps" + +Timer tm_pageid + Attributes + ID : 19 + Scope : local + Period (ms): 2500 + Enabled : yes + + Events + Timer Event + covx display_mode,aux2.txt,0,0 + nspanelevent.txt="{\"page\": \"boot\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\", \"display_mode\": \""+aux2.txt+"\"}" + printh 92 + prints "localevent",0 + printh 00 + prints nspanelevent.txt,0 + printh 00 + printh FF FF FF + diff --git a/nspanel_us_land_code/buttonpage01.txt b/advanced/hmi/nspanel_eu_code/buttonpage01.txt similarity index 100% rename from nspanel_us_land_code/buttonpage01.txt rename to advanced/hmi/nspanel_eu_code/buttonpage01.txt diff --git a/nspanel_us_land_code/buttonpage02.txt b/advanced/hmi/nspanel_eu_code/buttonpage02.txt similarity index 100% rename from nspanel_us_land_code/buttonpage02.txt rename to advanced/hmi/nspanel_eu_code/buttonpage02.txt diff --git a/nspanel_us_land_code/buttonpage03.txt b/advanced/hmi/nspanel_eu_code/buttonpage03.txt similarity index 100% rename from nspanel_us_land_code/buttonpage03.txt rename to advanced/hmi/nspanel_eu_code/buttonpage03.txt diff --git a/nspanel_us_land_code/buttonpage04.txt b/advanced/hmi/nspanel_eu_code/buttonpage04.txt similarity index 100% rename from nspanel_us_land_code/buttonpage04.txt rename to advanced/hmi/nspanel_eu_code/buttonpage04.txt diff --git a/nspanel_eu_code/climate.txt b/advanced/hmi/nspanel_eu_code/climate.txt similarity index 100% rename from nspanel_eu_code/climate.txt rename to advanced/hmi/nspanel_eu_code/climate.txt diff --git a/nspanel_eu_code/confirm.txt b/advanced/hmi/nspanel_eu_code/confirm.txt similarity index 100% rename from nspanel_eu_code/confirm.txt rename to advanced/hmi/nspanel_eu_code/confirm.txt diff --git a/nspanel_us_land_code/cover.txt b/advanced/hmi/nspanel_eu_code/cover.txt similarity index 96% rename from nspanel_us_land_code/cover.txt rename to advanced/hmi/nspanel_eu_code/cover.txt index 461625b..93114ce 100644 --- a/nspanel_us_land_code/cover.txt +++ b/advanced/hmi/nspanel_eu_code/cover.txt @@ -1,238 +1,238 @@ -Page cover - Attributes - ID : 0 - Scope : local - Dragging : 0 - Send Component ID : disabled - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID: disabled - - Events - Preinitialize Event - if(api==0) - { - page home - }else - { - sendme - } - - Touch Press Event - printh 91 - prints "touchevent",0 - printh 00 - prints rand,0 - printh FF FF FF - - Touch Release Event - printh 91 - prints "touchevent",0 - printh 00 - prints rand,0 - printh FF FF FF - -Variable (string) va1 - Attributes - ID : 7 - Scope : local - Text : newtxt - Max. Text Size: 10 - -Variable (string) coversetting - Attributes - ID : 11 - Scope : local - Text : - Max. Text Size: 255 - -Variable (string) back_page - Attributes - ID : 12 - Scope : local - Text : home - Max. Text Size: 15 - -Text battery_value - Attributes - ID : 1 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 10 - -Text cover_value - Attributes - ID : 2 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 10 - -Text page_label - Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 25 - -Text icon_state - Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 10 - -Text battery_icon - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 10 - -Slider coverslider - Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled - Position : 0 - Upper range limit: 100 - Lower range limit: 0 - - Events - Touch Release Event - covx coverslider.val,va1.txt,0,0 - cover_value.txt=va1.txt+"%" - coversetting.txt="{\"page\": \"cover\", \"key\": \"position\", \"value\": "+va1.txt+"}" - printh 92 - prints "localevent",0 - printh 00 - prints coversetting.txt,0 - printh 00 - printh FF FF FF - -Button cover_open - Attributes - ID : 4 - Scope : local - Dragging : 0 - Send Component ID: disabled - State : unpressed - Text : - Max. Text Size : 3 - - Events - Touch Press Event - printh 92 - prints "localevent",0 - printh 00 - prints "{\"page\": \"cover\", \"key\": \"open_cover\", \"value\": \"press\"}",0 - printh 00 - printh FF FF FF - -Button cover_close - Attributes - ID : 5 - Scope : local - Dragging : 0 - Send Component ID: disabled - State : unpressed - Text : - Max. Text Size : 3 - - Events - Touch Press Event - printh 92 - prints "localevent",0 - printh 00 - prints "{\"page\": \"cover\", \"key\": \"close_cover\", \"value\": \"press\"}",0 - printh 00 - printh FF FF FF - -Button cover_stop - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID: disabled - State : unpressed - Text : - Max. Text Size : 3 - - Events - Touch Press Event - printh 92 - prints "localevent",0 - printh 00 - prints "{\"page\": \"cover\", \"key\": \"stop_cover\", \"value\": \"press\"}",0 - printh 00 - printh FF FF FF - -Button button_back - Attributes - ID : 13 - Scope : local - Dragging : 0 - Send Component ID: disabled - State : unpressed - Text :  - Max. Text Size : 3 - - Events - Touch Press Event - if(back_page.txt=="buttonpage01") - { - page buttonpage01 - }else if(back_page.txt=="buttonpage02") - { - page buttonpage02 - }else if(back_page.txt=="buttonpage03") - { - page buttonpage03 - }else if(back_page.txt=="buttonpage04") - { - page buttonpage04 - }else - { - page home - } - -Timer wakeup_timer - Attributes - ID : 14 - Scope : local - Period (ms): 100 - Enabled : yes - - Events - Timer Event - if(dim