Fix selected_slot and led selection

Author: EmberLightVFX

firmware/common-manual-ams.yaml

@@ -65,7 +65,8 @@ esphome:
         #     id(my_ota).set_auth_password("New password");
   on_shutdown:
     then:
-      - script.execute: set_leds_off
+      - light.turn_off:
+          id: neopixel_light
 esp32:
   framework:
     type: esp-idf

firmware/conf.d/bambu_ams.yaml

@@ -1,3 +1,20 @@
+globals:
+  - id: selected_slot
+    type: int
+    restore_value: yes
+    initial_value: "0"
+
+script:
+  - id: update_selected_slot
+    then:
+      - lambda: |-
+          if (id(ams_number).state == 0) {
+            id(selected_slot) = 0;
+          } else {
+            id(selected_slot) = (id(ams_number).state - 1) * 4 + id(slot_number).state;
+          }
+      - script.execute: update_leds
+
 number:
   - platform: template
     name: "Number of AMS units"
@@ -9,7 +26,6 @@ number:
     max_value: 4
     step: 1
     initial_value: 1
-    mode: box
     set_action:
       then:
         - lambda: |-
@@ -36,7 +52,6 @@ number:
     max_value: 4
     step: 1
     initial_value: 1
-    mode: box
     set_action:
       then:
         - lambda: |-
@@ -49,10 +64,15 @@ number:
                 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);
+            }
     web_server:
       sorting_group_id: sorting_group_ams
 
@@ -75,9 +95,14 @@ number:
             } 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);
+            }
     web_server:
       sorting_group_id: sorting_group_ams

firmware/conf.d/led-external.yaml

@@ -52,13 +52,22 @@ light:
           #         - state: FALSE
           #           duration: 50ms
 script:
+  - id: update_leds
+    then:
+      - lambda: |-
+          // Clear all LEDs first
+          for (int i = 0; i < 17; i++) {
+            id(set_led_off).execute(i);
+          }
+          ESP_LOGD("LED", "LED index: %d", (int)id(selected_slot));
+          //id(set_leds_off).execute();
+          id(set_led_blue).execute(id(selected_slot));
   - id: set_led_red
     parameters:
       led_number: int8_t
     then:
       - light.addressable_set:
           id: neopixel_light
-          color_brightness: 50%
           range_from: !lambda "return led_number < 0 ? 0 : led_number;"
           range_to: !lambda "return led_number < 0 ? ${led_count} : led_number;"
           red: 100%
@@ -70,7 +79,6 @@ script:
     then:
       - light.addressable_set:
           id: neopixel_light
-          color_brightness: 50%
           range_from: !lambda "return led_number < 0 ? 0 : led_number;"
           range_to: !lambda "return led_number < 0 ? ${led_count} : led_number;"
           red: 0%
@@ -82,7 +90,6 @@ script:
     then:
       - light.addressable_set:
           id: neopixel_light
-          color_brightness: 50%
           range_from: !lambda "return led_number < 0 ? 0 : led_number;"
           range_to: !lambda "return led_number < 0 ? ${led_count} : led_number;"
           red: 0%
@@ -94,7 +101,6 @@ script:
     then:
       - light.addressable_set:
           id: neopixel_light
-          color_brightness: 50%
           range_from: !lambda "return led_number < 0 ? 0 : led_number;"
           range_to: !lambda "return led_number < 0 ? ${led_count} : led_number;"
           red: 0%
@@ -106,7 +112,6 @@ script:
     then:
       - light.addressable_set:
           id: neopixel_light
-          color_brightness: 50%
           range_from: !lambda "return led_number < 0 ? 0 : led_number;"
           range_to: !lambda "return led_number < 0 ? ${led_count} : led_number;"
           red: 100%
@@ -118,7 +123,6 @@ script:
     then:
       - light.addressable_set:
           id: neopixel_light
-          color_brightness: 50%
           range_from: !lambda "return led_number < 0 ? 0 : led_number;"
           range_to: !lambda "return led_number < 0 ? ${led_count} : led_number;"
           red: 100%
@@ -130,7 +134,6 @@ script:
     then:
       - light.addressable_set:
           id: neopixel_light
-          color_brightness: 50%
           range_from: !lambda "return led_number < 0 ? 0 : led_number;"
           range_to: !lambda "return led_number < 0 ? ${led_count} : led_number;"
           red: 100%
@@ -152,7 +155,6 @@ script:
       - light.turn_on:
           id: neopixel_light
           effect: none
-          brightness: 50%
           red: 100%
           green: 100%
           blue: 100%
@@ -174,16 +176,13 @@ script:
       - light.turn_on:
           id: neopixel_light
           effect: Breathing Blue
-          brightness: 100%
   - id: set_led_breathing_green
     then:
       - light.turn_on:
           id: neopixel_light
           effect: Breathing Green
-          brightness: 100%
   - id: set_led_apple_breathing
     then:
       - light.turn_on:
           id: neopixel_light
           effect: Apple Breathing
-          brightness: 100%

firmware/conf.d/pn532_rfid-manual-ams.yaml

@@ -3,23 +3,7 @@ substitutions:
   spi_data_rate: 200kHz
   update_interval: "750ms"
 
-globals:
-  - id: selected_slot
-    type: int
-    restore_value: yes
-    initial_value: "0"
-
 script:
-  - id: update_leds
-    then:
-      - lambda: |-
-          for (int i = 0; i < id(ams_units).state * 4; i++) {
-            if (i == id(selected_slot)) {
-              id(set_led_blue).execute(i);
-            } else {
-              id(set_led_off).execute(i);
-            }
-          }
   - id: publish_filament_data_to_mqtt
     parameters:
       payload_data: string
@@ -79,7 +63,7 @@ sensor:
             } else {
               id(slot_number).publish_state(id(slot_number).state + 1);
             }
-        - script.execute: update_leds
+        - script.execute: update_selected_slot
     on_anticlockwise:
       then:
         - lambda: |-
@@ -94,6 +78,7 @@ sensor:
             }
 
         - script.execute: update_leds
+        - script.execute: update_selected_slot
 
 binary_sensor:
   - platform: template