Fix conditions when manually selecting units, ams and slots in web UI

Author: EmberLightVFX

firmware/conf.d/bambu_ams.yaml

@@ -1,7 +1,7 @@
 globals:
   - id: selected_slot
     type: int
-    restore_value: yes
+    restore_value: true
     initial_value: "0"
 
 script:
@@ -22,22 +22,31 @@ number:
     optimistic: false
     restore_value: true
     icon: mdi:printer-3d-nozzle
-    min_value: 1
+    min_value: 0
     max_value: 4
     step: 1
     initial_value: 1
     set_action:
       then:
         - lambda: |-
             if (id(bambu_model).state == "A1Mini" || id(bambu_model).state == "A1") {
+              ESP_LOGD("AMS Units", "A1Mini or A1 detected, setting AMS to 1");
               id(ams_units).publish_state(1);
             } else {
+              ESP_LOGD("AMS Units", "AMS units: %d", (int)id(ams_units).state);
               id(ams_units).publish_state(x);
             }
-    on_value:
-      then:
-        - lambda: |-
             ESP_LOGD("AMS", "Number of AMS units set: %d", (int)x);
+
+            if (x < id(ams_number).state) {
+              ESP_LOGD("AMS Units", "AMS is higher than current units size, forcing AMS to %d", (int)x);
+              id(ams_number).publish_state(x);
+            }
+            if (x == 0) {
+              ESP_LOGD("AMS Units", "AMS units is 0, forcing slot to 1");
+              id(slot_number).publish_state(1);
+            }
+        - script.execute: update_selected_slot
     web_server:
       sorting_group_id: sorting_group_printer_settings
       sorting_weight: 100
@@ -55,24 +64,19 @@ number:
     set_action:
       then:
         - lambda: |-
-            if (id(bambu_model).state == "A1Mini" || id(bambu_model).state == "A1") {
-              id(ams_number).publish_state(1);
+            if (x > id(ams_units).state) {
+              ESP_LOGD("ams_number", "AMS number too high, setting to %d", (int)id(ams_units).state);
+              id(ams_number).publish_state(id(ams_units).state);
             } else {
-              if (x > id(ams_units).state) {
-                id(ams_number).publish_state(id(ams_units).state);
-              } else {
-                id(ams_number).publish_state(x);
-              }
+              id(ams_number).publish_state(x);
             }
-        - script.execute: update_selected_slot
-    on_value:
-      then:
-        - lambda: |-
             ESP_LOGD("AMS", "AMS selected: %d", (int)x);
-            // If AMS is 0, ensure slot is forced to 1
+
             if (x == 0 && id(slot_number).state != 1) {
-                id(slot_number).publish_state(1);
+              ESP_LOGD("AMS", "AMS is 0, forcing slot to 1");
+              id(slot_number).publish_state(1);
             }
+        - script.execute: update_selected_slot
     web_server:
       sorting_group_id: sorting_group_ams
 
@@ -86,23 +90,16 @@ number:
     max_value: 4
     step: 1
     initial_value: 1
-    mode: box
     set_action:
       then:
         - lambda: |-
             if (id(ams_number).state == 0) {
+              ESP_LOGD("slot_number", "AMS is 0, forcing slot to 1");
               id(slot_number).publish_state(1);
             } else {
               id(slot_number).publish_state(x);
             }
-        - script.execute: update_selected_slot
-    on_value:
-      then:
-        - lambda: |-
             ESP_LOGD("AMS", "Slot selected: %d", (int)x);
-            // If AMS is 0, ensure slot is forced to 1
-            if (id(ams_number).state == 0 && x != 1) {
-                id(slot_number).publish_state(1);
-            }
+        - script.execute: update_selected_slot
     web_server:
       sorting_group_id: sorting_group_ams