release 2024.12.0

dentra · Dec 6, 2024 · 5d1c5b4 · 5d1c5b4
1 parent 1fd5b5d
commit 5d1c5b4
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
-[version-shield]: https://img.shields.io/static/v1?label=Версия&message=2024.8.0&color=green
+[version-shield]: https://img.shields.io/static/v1?label=Версия&message=2024.12.0&color=green
 [version]: https://github.com/dentra/esphome-tion/releases/
 
 [license-shield]: https://img.shields.io/static/v1?label=Лицензия&message=MIT&color=orange&logo=license
 [license]: https://opensource.org/licenses/MIT
 
-[esphome-release-shield]: https://img.shields.io/static/v1?label=ESPHome&message=2024.8.3&color=green&logo=esphome
+[esphome-release-shield]: https://img.shields.io/static/v1?label=ESPHome&message=2024.10.3&color=green&logo=esphome
 [esphome-release]: https://github.com/esphome/esphome/releases/
 
 [open-in-vscode-shield]: https://img.shields.io/static/v1?label=+&message=Открыть+в+VSCode&color=blue&logo=visualstudiocode

diff --git a/configs/tion-3s-ble.yaml b/configs/tion-3s-ble.yaml
@@ -13,13 +13,10 @@ substitutions:
   ## WiFi Access Point password.
   wifi_ap_password: tion-0123-3s
 
-  project_source_refresh: 0s
-
 packages:
   tion:
-    refresh: 0s
     url: https://github.com/dentra/esphome-tion
-    ref: 2024.8.0 # cant use substitutions here
+    ref: 2024.12.0 # cant use substitutions here
     files:
       ## You can enable or disable some of the features listed below.
       ## The disabled feature starts with # symbol.
@@ -33,12 +30,20 @@ packages:
       - packages/uptime.yaml
       ## Additional Restart button.
       - packages/restart.yaml
-      ## Unlock Tion 30°C heating.
-      #- packages/tion_temperature30c.yaml
+      ## Additional virtual energy sensor.
+      ## !!! Be sure to uncomment mqtt.yaml if you use it with MQTT.
+      #- packages/tion_energy.yaml
+
       ## Antifreeze protection. Automatically turns on the heater at a temperature of 0°C and below.
       - packages/tion_enable_antifreeze.yaml
       ## Common configuration settings. Do not comment or move or remove!
       - packages/base.yaml
+      ## Base platform support package:
+      ## esp32_s3_ble.yaml - ESP32-S3
+      ## esp32_c3_ble.yaml - ESP32-C3
+      ## esp32_c6_ble.yaml - ESP32-C6
+      ## esp32_ble.yaml - ESP32
+      - packages/esp32_ble.yaml
       ## Change to esp32_s3_ble.yaml/esp32_c3_ble.yaml to use with ESP32-S3/ESP32-C3 chip.
       - packages/esp32_ble.yaml
       ## Persistent connection runtime control switch.

diff --git a/configs/tion-3s-uart.yaml b/configs/tion-3s-uart.yaml
@@ -20,13 +20,10 @@ substitutions:
   ## WiFi Access Point password.
   wifi_ap_password: tion-0123-3s
 
-  project_source_refresh: 0s
-
 packages:
   tion:
-    refresh: 0s
     url: https://github.com/dentra/esphome-tion
-    ref: 2024.8.0 # cant use substitutions here
+    ref: 2024.12.0 # cant use substitutions here
     files:
       ## You can enable or disable some of the features listed below.
       ## The disabled feature starts with # symbol.

diff --git a/configs/tion-4s-ble.yaml b/configs/tion-4s-ble.yaml
@@ -13,13 +13,10 @@ substitutions:
   ## WiFi Access Point password.
   wifi_ap_password: tion-0123-4s
 
-  project_source_refresh: 0s
-
 packages:
   tion:
-    refresh: 0s
     url: https://github.com/dentra/esphome-tion
-    ref: 2024.8.0 # cant use substitutions here
+    ref: 2024.12.0 # cant use substitutions here
     files:
       ## You can enable or disable some of the features listed below.
       ## The disabled feature starts with # symbol.
@@ -45,6 +42,8 @@ packages:
       ## esp32_c6_ble.yaml - ESP32-C6
       ## esp32_ble.yaml - ESP32
       - packages/esp32_ble.yaml
+      ## Change to esp32_ble.yaml/esp32_c3_ble.yaml to use with ESP32/ESP32-C3 chip.
+      - packages/esp32_ble_s3.yaml
       ## Persistent connection runtime control switch.
       # - packages/persistent.yaml
       ## Additional connect switch useful for debugging.

diff --git a/configs/tion-4s-uart.yaml b/configs/tion-4s-uart.yaml
@@ -11,13 +11,10 @@ substitutions:
   ## WiFi Access Point password.
   wifi_ap_password: tion-0123-4s
 
-  project_source_refresh: 0s
-
 packages:
   tion:
-    refresh: 0s
     url: https://github.com/dentra/esphome-tion
-    ref: 2024.8.0 # cant use substitutions here
+    ref: 2024.12.0 # cant use substitutions here
     files:
       ## You can enable or disable some of the features listed below.
       ## The disabled feature starts with # symbol.

diff --git a/configs/tion-lt-ble.yaml b/configs/tion-lt-ble.yaml
@@ -13,13 +13,10 @@ substitutions:
   ## WiFi Access Point password.
   wifi_ap_password: tion-0123-lt
 
-  project_source_refresh: 0s
-
 packages:
   tion:
-    refresh: 0s
     url: https://github.com/dentra/esphome-tion
-    ref: 2024.8.0 # cant use substitutions here
+    ref: 2024.12.0 # cant use substitutions here
     files:
       ## You can enable or disable some of the features listed below.
       ## The disabled feature starts with # symbol.
@@ -38,9 +35,15 @@ packages:
       ## Additional  energy sensor.
       ## !!! Be sure to uncomment mqtt.yaml if you use it with MQTT.
       #- packages/tion_energy.yaml
-
+      
       ## Common configuration settings. Do not comment or move or remove!
       - packages/base.yaml
+      ## Base platform support package:
+      ## esp32_s3_ble.yaml - ESP32-S3
+      ## esp32_c3_ble.yaml - ESP32-C3
+      ## esp32_c6_ble.yaml - ESP32-C6
+      ## esp32_ble.yaml - ESP32
+      - packages/esp32_ble.yaml
       ## Change to esp32_s3_ble.yaml/esp32_c3_ble.yaml to use with ESP32-S3/ESP32-C3 chip.
       - packages/esp32_ble.yaml
       ## Persistent connection runtime control switch.

diff --git a/configs/tion-o2-uart.yaml b/configs/tion-o2-uart.yaml
@@ -16,13 +16,10 @@ substitutions:
   ## WiFi Access Point password.
   wifi_ap_password: tion-0123-o2
 
-  project_source_refresh: 0s
-
 packages:
   tion:
-    refresh: 0s
     url: https://github.com/dentra/esphome-tion
-    ref: 2024.8.0 # cant use substitutions here
+    ref: 2024.12.0 # cant use substitutions here
     files:
       ## You can enable or disable some of the features listed below.
       ## The disabled feature starts with # symbol.

diff --git a/packages/base.yaml b/packages/base.yaml
@@ -1,6 +1,6 @@
 substitutions:
   # project version
-  project_version: "2024.8.0"
+  project_version: "2024.12.0"
   # project branch
   project_branch: $project_version
   # project git source
@@ -14,7 +14,7 @@ substitutions:
   # name for main entity and prefix for all others.
   friendly_name: $node_name
   # vport and additional components configuration parameters
-  vport_version: "2024.8.0"
+  vport_version: "2024.12.0"
   vport_source: github://dentra/esphome-components@$vport_version
   vport_source_refresh: 1d
 
@@ -25,7 +25,7 @@ esphome:
   project:
     name: "dentra.$project_id-${tion_type}-${tion_conn}-${board_code}"
     version: "$project_version"
-  min_version: "2024.8.3"
+  min_version: "2024.10.3"
   platformio_options:
     build_flags:
       - -std=gnu++17

diff --git a/scripts/j2_vars b/scripts/j2_vars
@@ -5,7 +5,7 @@ if [ "$1" != "" ]; then
   version_tion=$1
 fi
 
-version_vport=2024.8.0
+version_vport=2024.12.0
 if [ "$version_tion" == "next" ]; then
   version_vport="master"
 fi