Merge pull request #22 from raihei/main

Added sorting_weight to filament settings for web server.
spuder · Jan 12, 2025 · 476c0cd · 476c0cd
2 parents dde7304 + 76b4547
commit 476c0cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/firmware/conf.d/filament.yaml b/firmware/conf.d/filament.yaml
@@ -11,6 +11,7 @@ select:
   icon: mdi:movie-roll
   web_server:
     sorting_group_id: sorting_group_filament_settings
+    sorting_weight: 30
   options:
   - ABS
   - ASA
@@ -49,6 +50,7 @@ select:
   icon: mdi:label
   web_server:
     sorting_group_id: sorting_group_filament_settings
+    sorting_weight: 40
   options:
   - Basic
   - Matte
@@ -70,6 +72,7 @@ select:
   icon: mdi:alpha-f-circle
   web_server:
     sorting_group_id: sorting_group_filament_settings
+    sorting_weight: 10
   options:
   - Generic
   - Bambu # Adding bambu even though you should never add a openspool tag to a bambu spool or you might get conflicts on RFID
@@ -88,6 +91,7 @@ select:
   icon: mdi:palette-outline
   web_server:
     sorting_group_id: sorting_group_filament_settings
+    sorting_weight: 20
   optimistic: true
   options:
   - "beige"
@@ -190,6 +194,7 @@ number:
   optimistic: true
   web_server:
     sorting_group_id: sorting_group_filament_settings
+    sorting_weight: 50
   set_action:
     then:
     - lambda: |-
@@ -213,6 +218,7 @@ number:
   optimistic: true
   web_server:
     sorting_group_id: sorting_group_filament_settings
+    sorting_weight: 60
   set_action:
     then:
     - lambda: |-
@@ -231,6 +237,7 @@ text_sensor:
   icon: mdi:code-brackets
   web_server:
     sorting_group_id: sorting_group_filament_settings
+    sorting_weight: 110
   on_value:
     then:
     - script.execute: preview_rfid_data
@@ -241,6 +248,7 @@ text_sensor:
   icon: mdi:hexagon-outline
   web_server:
     sorting_group_id: sorting_group_filament_settings
+    sorting_weight: 100
   on_value:
     then:
     - script.execute: preview_rfid_data
@@ -251,6 +259,7 @@ text_sensor:
   icon: mdi:label
   web_server:
     sorting_group_id: sorting_group_filament_settings
+    sorting_weight: 120
   on_value:
     then:
     - script.execute: preview_rfid_data
@@ -262,6 +271,7 @@ button:
   icon: mdi:upload
   web_server:
     sorting_group_id: sorting_group_filament_settings
+    sorting_weight: 200
   on_press:
     then:
     - script.execute: publish_filament_setting
diff --git a/firmware/conf.d/pn532_rfid-solo.yaml b/firmware/conf.d/pn532_rfid-solo.yaml
@@ -178,6 +178,7 @@ button:
   icon: mdi:nfc-tap
   web_server:
     sorting_group_id: sorting_group_filament_settings
+    sorting_weight: 210
   on_press:
     then:
     - if: