Merge branch 'main' of https://github.com/TheRealFalseReality/aquapi

TheRealFalseReality · Nov 28, 2024 · b500ae2 · b500ae2
2 parents 6a56045 + 13141fb
commit b500ae2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/publish-firmware.yml b/.github/workflows/publish-firmware.yml
@@ -16,7 +16,7 @@ jobs:
       #### Modify below here to match your project ####
       files: |
         aquapi_config.yaml
-      esphome-version: 2024.11.1
+      esphome-version: latest
       # combined-name: AquaPi
 
       release-summary: ${{ github.event.release.body }}

diff --git a/aquapi_config.factory.yaml b/aquapi_config.factory.yaml
@@ -7,4 +7,4 @@ esphome:
   # configuration and updates.
   project:
     name: esphome.aquapi
-    version: dev # This will be replaced by the github workflows with the `release` version
+    version: dev # This will be replaced by the github workflows with the `release` version
diff --git a/common/device_base.yaml b/common/device_base.yaml
@@ -1,6 +1,4 @@
 substitutions:
-  # Import Config
-  import_config: "false"
   # Logger Level - Can use VERBOSE for more information in Logs
   logger: "DEBUG"
 
@@ -30,7 +28,7 @@ esp32:
 
 dashboard_import:
   package_import_url: github://TheRealFalseReality/aquapi/aquapi_config.yaml@main
-  import_full_config: ${import_config}
+  import_full_config: false
 
 # Enable logging
 logger:
@@ -220,4 +218,4 @@ button:
     disabled_by_default: true
     id: shutdown_button
     web_server:
-      sorting_group_id: sorting_group_config
+      sorting_group_id: sorting_group_config
diff --git a/common/dht.yaml b/common/dht.yaml
@@ -11,12 +11,14 @@ sensor:
     temperature:
       name: "Air Temperature"
       id: air_temperature
+      web_server:
+        sorting_group_id: sorting_group_misc
     humidity:
       name: "Humidity"
       id: relative_humidity
+      web_server:
+        sorting_group_id: sorting_group_misc
     update_interval: "${update_dht}"
-    web_server:
-      sorting_group_id: sorting_group_misc
   - platform: absolute_humidity
     name: Absolute Humidity
     temperature: air_temperature
@@ -33,4 +35,4 @@ sensor:
     lambda: |- 
       return ( id(air_temperature).state - (( 100 - id(relative_humidity).state ) / 5 ) );
     web_server:
-      sorting_group_id: sorting_group_misc
+      sorting_group_id: sorting_group_misc