Redistribute tree

2023-12-04 18:52:02 +01:00
parent 978df5ad75
commit 0565f5f522
137 changed files with 19166 additions and 40341 deletions
--- 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
+  core_package: !include ../advanced/esphome/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
--- 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
+  core_package: !include ../advanced/esphome/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:
  framework:
--- 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
+  core_package: !include ../advanced/esphome/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:
  framework:
--- 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
+  core_package: !include ../advanced/esphome/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
--- 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
+  core_package: !include ../advanced/esphome/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
--- 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
+  core_package: !include ../advanced/esphome/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
--- 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
+  core_package: !include ../advanced/esphome/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
--- a/advanced/.gitignore
+++ 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
--- a/advanced/esphome/nspanel_esphome_addon_climate_base.yaml
+++ b/advanced/esphome/nspanel_esphome_addon_climate_base.yaml
--- a/advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
+++ b/advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
--- a/advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
+++ b/advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
--- a/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
+++ b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
--- a/advanced/esphome/nspanel_esphome_advanced.yaml
+++ b/advanced/esphome/nspanel_esphome_advanced.yaml
--- a/advanced/esphome/nspanel_esphome_core.yaml
+++ b/advanced/esphome/nspanel_esphome_core.yaml
--- a/custom_configuration/nspanel_blank.HMI
+++ b/custom_configuration/nspanel_blank.HMI
--- a/custom_configuration/nspanel_blank_code/Program.s.txt
+++ b/custom_configuration/nspanel_blank_code/Program.s.txt
--- a/custom_configuration/nspanel_blank_code/blank.txt
+++ b/custom_configuration/nspanel_blank_code/blank.txt
--- a/custom_configuration/nspanel_blank_code/page0.txt
+++ b/custom_configuration/nspanel_blank_code/page0.txt
--- a/custom_configuration/nspanel_blank_code/screensaver.txt
+++ b/custom_configuration/nspanel_blank_code/screensaver.txt
--- a/advanced/hmi/nspanel_eu.HMI
+++ b/advanced/hmi/nspanel_eu.HMI
--- a/advanced/hmi/nspanel_eu_code/Program.s.txt
+++ b/advanced/hmi/nspanel_eu_code/Program.s.txt
--- a/advanced/hmi/nspanel_eu_code/alarm.txt
+++ b/advanced/hmi/nspanel_eu_code/alarm.txt
--- a/advanced/hmi/nspanel_eu_code/boot.txt
+++ b/advanced/hmi/nspanel_eu_code/boot.txt
--- a/advanced/hmi/nspanel_eu_code/buttonpage01.txt
+++ b/advanced/hmi/nspanel_eu_code/buttonpage01.txt
--- a/advanced/hmi/nspanel_eu_code/buttonpage02.txt
+++ b/advanced/hmi/nspanel_eu_code/buttonpage02.txt
--- a/advanced/hmi/nspanel_eu_code/buttonpage03.txt
+++ b/advanced/hmi/nspanel_eu_code/buttonpage03.txt
--- a/advanced/hmi/nspanel_eu_code/buttonpage04.txt
+++ b/advanced/hmi/nspanel_eu_code/buttonpage04.txt
--- a/advanced/hmi/nspanel_eu_code/climate.txt
+++ b/advanced/hmi/nspanel_eu_code/climate.txt
--- a/advanced/hmi/nspanel_eu_code/confirm.txt
+++ b/advanced/hmi/nspanel_eu_code/confirm.txt
--- a/advanced/hmi/nspanel_eu_code/cover.txt
+++ b/advanced/hmi/nspanel_eu_code/cover.txt
--- a/advanced/hmi/nspanel_eu_code/entitypage01.txt
+++ b/advanced/hmi/nspanel_eu_code/entitypage01.txt
--- a/advanced/hmi/nspanel_eu_code/entitypage02.txt
+++ b/advanced/hmi/nspanel_eu_code/entitypage02.txt
--- a/advanced/hmi/nspanel_eu_code/entitypage03.txt
+++ b/advanced/hmi/nspanel_eu_code/entitypage03.txt
--- a/advanced/hmi/nspanel_eu_code/entitypage04.txt
+++ b/advanced/hmi/nspanel_eu_code/entitypage04.txt
--- a/advanced/hmi/nspanel_eu_code/fan.txt
+++ b/advanced/hmi/nspanel_eu_code/fan.txt
--- a/advanced/hmi/nspanel_eu_code/home.txt
+++ b/advanced/hmi/nspanel_eu_code/home.txt
--- a/advanced/hmi/nspanel_eu_code/keyb_num.txt
+++ b/advanced/hmi/nspanel_eu_code/keyb_num.txt
--- a/advanced/hmi/nspanel_eu_code/light.txt
+++ b/advanced/hmi/nspanel_eu_code/light.txt
--- a/advanced/hmi/nspanel_eu_code/media_player.txt
+++ b/advanced/hmi/nspanel_eu_code/media_player.txt
--- a/advanced/hmi/nspanel_eu_code/notification.txt
+++ b/advanced/hmi/nspanel_eu_code/notification.txt
--- a/advanced/hmi/nspanel_eu_code/pics/SinglePixel.png
+++ b/advanced/hmi/nspanel_eu_code/pics/SinglePixel.png
--- a/advanced/hmi/nspanel_eu_code/power.page
+++ b/advanced/hmi/nspanel_eu_code/power.page
--- a/advanced/hmi/nspanel_eu_code/power.txt
+++ b/advanced/hmi/nspanel_eu_code/power.txt
--- a/advanced/hmi/nspanel_eu_code/qrcode.txt
+++ b/advanced/hmi/nspanel_eu_code/qrcode.txt
--- a/advanced/hmi/nspanel_eu_code/screensaver.txt
+++ b/advanced/hmi/nspanel_eu_code/screensaver.txt
--- a/advanced/hmi/nspanel_eu_code/settings.txt
+++ b/advanced/hmi/nspanel_eu_code/settings.txt
--- a/advanced/hmi/nspanel_eu_code/weather01.txt
+++ b/advanced/hmi/nspanel_eu_code/weather01.txt
--- a/advanced/hmi/nspanel_eu_code/weather02.txt
+++ b/advanced/hmi/nspanel_eu_code/weather02.txt
--- a/advanced/hmi/nspanel_eu_code/weather03.txt
+++ b/advanced/hmi/nspanel_eu_code/weather03.txt
--- a/advanced/hmi/nspanel_eu_code/weather04.txt
+++ b/advanced/hmi/nspanel_eu_code/weather04.txt
--- a/advanced/hmi/nspanel_eu_code/weather05.txt
+++ b/advanced/hmi/nspanel_eu_code/weather05.txt
--- a/advanced/hmi/nspanel_us.HMI
+++ b/advanced/hmi/nspanel_us.HMI
--- a/advanced/hmi/nspanel_us_code/Program.s.txt
+++ b/advanced/hmi/nspanel_us_code/Program.s.txt
--- a/advanced/hmi/nspanel_us_code/alarm.txt
+++ b/advanced/hmi/nspanel_us_code/alarm.txt
--- a/advanced/hmi/nspanel_us_code/boot.txt
+++ b/advanced/hmi/nspanel_us_code/boot.txt
--- a/advanced/hmi/nspanel_us_code/buttonpage01.txt
+++ b/advanced/hmi/nspanel_us_code/buttonpage01.txt
--- a/advanced/hmi/nspanel_us_code/buttonpage02.txt
+++ b/advanced/hmi/nspanel_us_code/buttonpage02.txt
--- a/advanced/hmi/nspanel_us_code/buttonpage03.txt
+++ b/advanced/hmi/nspanel_us_code/buttonpage03.txt
--- a/advanced/hmi/nspanel_us_code/buttonpage04.txt
+++ b/advanced/hmi/nspanel_us_code/buttonpage04.txt
--- a/advanced/hmi/nspanel_us_code/climate.txt
+++ b/advanced/hmi/nspanel_us_code/climate.txt
--- a/advanced/hmi/nspanel_us_code/confirm.txt
+++ b/advanced/hmi/nspanel_us_code/confirm.txt
--- a/advanced/hmi/nspanel_us_code/cover.txt
+++ b/advanced/hmi/nspanel_us_code/cover.txt
--- a/advanced/hmi/nspanel_us_code/entitypage01.txt
+++ b/advanced/hmi/nspanel_us_code/entitypage01.txt
--- a/advanced/hmi/nspanel_us_code/entitypage02.txt
+++ b/advanced/hmi/nspanel_us_code/entitypage02.txt
--- a/advanced/hmi/nspanel_us_code/entitypage03.txt
+++ b/advanced/hmi/nspanel_us_code/entitypage03.txt
--- a/advanced/hmi/nspanel_us_code/entitypage04.txt
+++ b/advanced/hmi/nspanel_us_code/entitypage04.txt
--- a/advanced/hmi/nspanel_us_code/fan.txt
+++ b/advanced/hmi/nspanel_us_code/fan.txt
--- a/advanced/hmi/nspanel_us_code/home.txt
+++ b/advanced/hmi/nspanel_us_code/home.txt
--- a/advanced/hmi/nspanel_us_code/keyb_num.txt
+++ b/advanced/hmi/nspanel_us_code/keyb_num.txt
--- a/advanced/hmi/nspanel_us_code/light.txt
+++ b/advanced/hmi/nspanel_us_code/light.txt
--- a/advanced/hmi/nspanel_us_code/media_player.txt
+++ b/advanced/hmi/nspanel_us_code/media_player.txt
--- a/advanced/hmi/nspanel_us_code/notification.txt
+++ b/advanced/hmi/nspanel_us_code/notification.txt
--- a/advanced/hmi/nspanel_us_code/nspanel_us_Stats.txt
+++ b/advanced/hmi/nspanel_us_code/nspanel_us_Stats.txt
--- a/advanced/hmi/nspanel_us_code/qrcode.txt
+++ b/advanced/hmi/nspanel_us_code/qrcode.txt
--- a/advanced/hmi/nspanel_us_code/screensaver.txt
+++ b/advanced/hmi/nspanel_us_code/screensaver.txt
--- a/advanced/hmi/nspanel_us_code/settings.txt
+++ b/advanced/hmi/nspanel_us_code/settings.txt
--- a/advanced/hmi/nspanel_us_code/weather01.txt
+++ b/advanced/hmi/nspanel_us_code/weather01.txt
--- a/advanced/hmi/nspanel_us_code/weather02.txt
+++ b/advanced/hmi/nspanel_us_code/weather02.txt
--- a/advanced/hmi/nspanel_us_code/weather03.txt
+++ b/advanced/hmi/nspanel_us_code/weather03.txt
--- a/advanced/hmi/nspanel_us_code/weather04.txt
+++ b/advanced/hmi/nspanel_us_code/weather04.txt
--- a/advanced/hmi/nspanel_us_code/weather05.txt
+++ b/advanced/hmi/nspanel_us_code/weather05.txt
--- a/advanced/hmi/nspanel_us_land.HMI
+++ b/advanced/hmi/nspanel_us_land.HMI
--- a/advanced/hmi/nspanel_us_land_code/Program.s.txt
+++ b/advanced/hmi/nspanel_us_land_code/Program.s.txt
--- a/advanced/hmi/nspanel_us_land_code/alarm.txt
+++ b/advanced/hmi/nspanel_us_land_code/alarm.txt
--- a/advanced/hmi/nspanel_us_land_code/boot.txt
+++ b/advanced/hmi/nspanel_us_land_code/boot.txt
--- a/advanced/hmi/nspanel_us_land_code/buttonpage01.txt
+++ b/advanced/hmi/nspanel_us_land_code/buttonpage01.txt
--- a/advanced/hmi/nspanel_us_land_code/buttonpage02.txt
+++ b/advanced/hmi/nspanel_us_land_code/buttonpage02.txt
--- a/advanced/hmi/nspanel_us_land_code/buttonpage03.txt
+++ b/advanced/hmi/nspanel_us_land_code/buttonpage03.txt
--- a/advanced/hmi/nspanel_us_land_code/buttonpage04.txt
+++ b/advanced/hmi/nspanel_us_land_code/buttonpage04.txt
--- a/advanced/hmi/nspanel_us_land_code/climate.txt
+++ b/advanced/hmi/nspanel_us_land_code/climate.txt
--- a/advanced/hmi/nspanel_us_land_code/confirm.txt
+++ b/advanced/hmi/nspanel_us_land_code/confirm.txt
--- a/advanced/hmi/nspanel_us_land_code/cover.txt
+++ b/advanced/hmi/nspanel_us_land_code/cover.txt
--- a/advanced/hmi/nspanel_us_land_code/entitypage01.txt
+++ b/advanced/hmi/nspanel_us_land_code/entitypage01.txt
--- a/advanced/hmi/nspanel_us_land_code/entitypage02.txt
+++ b/advanced/hmi/nspanel_us_land_code/entitypage02.txt
--- a/advanced/hmi/nspanel_us_land_code/entitypage03.txt
+++ b/advanced/hmi/nspanel_us_land_code/entitypage03.txt
--- a/advanced/hmi/nspanel_us_land_code/entitypage04.txt
+++ b/advanced/hmi/nspanel_us_land_code/entitypage04.txt
--- a/advanced/hmi/nspanel_us_land_code/fan.txt
+++ b/advanced/hmi/nspanel_us_land_code/fan.txt
--- a/advanced/hmi/nspanel_us_land_code/home.txt
+++ b/advanced/hmi/nspanel_us_land_code/home.txt
--- a/advanced/hmi/nspanel_us_land_code/instructions.md
+++ b/advanced/hmi/nspanel_us_land_code/instructions.md
--- a/advanced/hmi/nspanel_us_land_code/keyb_num.txt
+++ b/advanced/hmi/nspanel_us_land_code/keyb_num.txt
--- a/Show More
+++ b/Show More