Update the ams and slot calculation for rotary encoder

Author: EmberLightVFX

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

@@ -51,33 +51,54 @@ sensor:
     on_clockwise:
       then:
         - lambda: |-
-            if(id(ams_number).state == 0) {
-              id(ams_number).publish_state(1);
-            } else if (id(slot_number).state == 4) {
-              if (id(ams_number).state == id(ams_units).state) {
+            // Calculate total slots (AMS 0 + all AMS units with 4 slots each)
+            int total_slots = 1 + id(ams_units).state * 4;
+            int current_slot;
+
+            // Get current absolute slot position
+            if (id(ams_number).state == 0) {
+                current_slot = 0;
+            } else {
+                current_slot = (id(ams_number).state - 1) * 4 + id(slot_number).state;
+            }
+
+            // Move to next slot
+            current_slot = (current_slot + 1) % total_slots;
+
+            // Convert back to AMS and slot
+            if (current_slot == 0) {
                 id(ams_number).publish_state(0);
-              } else {
-                id(ams_number).publish_state(id(ams_number).state + 1);
-              }
-              id(slot_number).publish_state(1);
+                id(slot_number).publish_state(1);
             } else {
-              id(slot_number).publish_state(id(slot_number).state + 1);
+                id(ams_number).publish_state((current_slot - 1) / 4 + 1);
+                id(slot_number).publish_state((current_slot - 1) % 4 + 1);
             }
         - script.execute: update_selected_slot
     on_anticlockwise:
       then:
         - lambda: |-
-            if(id(ams_number).state == 0) {
-              id(ams_number).publish_state(id(ams_units).state);
-              id(slot_number).publish_state(4);
-            } else if (id(slot_number).state == 1) {
-              id(ams_number).publish_state(id(ams_number).state - 1);
-              id(slot_number).publish_state(4);
+            // Calculate total slots (AMS 0 + all AMS units with 4 slots each)
+            int total_slots = 1 + id(ams_units).state * 4;
+            int current_slot;
+
+            // Get current absolute slot position
+            if (id(ams_number).state == 0) {
+                current_slot = 0;
             } else {
-              id(slot_number).publish_state(id(slot_number).state - 1);
+                current_slot = (id(ams_number).state - 1) * 4 + id(slot_number).state;
             }
 
-        - script.execute: update_leds
+            // Move to previous slot
+            current_slot = (current_slot + total_slots - 1) % total_slots;
+
+            // Convert back to AMS and slot
+            if (current_slot == 0) {
+                id(ams_number).publish_state(0);
+                id(slot_number).publish_state(1);
+            } else {
+                id(ams_number).publish_state((current_slot - 1) / 4 + 1);
+                id(slot_number).publish_state((current_slot - 1) % 4 + 1);
+            }
         - script.execute: update_selected_slot
 
 binary_sensor: