Merge lp:~sammyshp/flashlight-firmware/aux-blink-fix into lp:~toykeeper/flashlight-firmware/anduril2

[Sven Greiner]

Previously the aux LED might have flashed at high intensity until the next loop was started, starting the pattern. I've changed the order in the switch statement so that they are off by default.

There might be a better way of fixing this which avoids the short darkness that might be visible now.

Unmerged revisions

619. By Sven Greiner on 2021-08-30

Fix initial AUX level for blinking mode

=== modified file 'ToyKeeper/spaghetti-monster/fsm-misc.c'
--- ToyKeeper/spaghetti-monster/fsm-misc.c	2021-04-02 00:29:17 +0000
+++ ToyKeeper/spaghetti-monster/fsm-misc.c	2021-08-30 08:49:32 +0000
@@ -112,14 +112,6 @@
     switch (lvl) {
         #ifdef AVRXMEGA3  // ATTINY816, 817, etc
 
-        case 0:  // indicator off
-            AUXLED_PORT.DIRSET = (1 << AUXLED_PIN); // set as output
-            AUXLED_PORT.OUTCLR = (1 << AUXLED_PIN); // set output low
-            #ifdef AUXLED2_PIN  // second LED mirrors the first
-            AUXLED2_PORT.DIRSET = (1 << AUXLED2_PIN); // set as output
-            AUXLED2_PORT.OUTCLR = (1 << AUXLED2_PIN); // set output low
-            #endif
-            break;
         case 1:  // indicator low
             AUXLED_PORT.DIRCLR = (1 << AUXLED_PIN); // set as input
             // this resolves to PORTx.PINxCTRL = PORT_PULLUPEN_bm;
@@ -130,7 +122,7 @@
             *((uint8_t *)&AUXLED2_PORT + 0x10 + AUXLED2_PIN) = PORT_PULLUPEN_bm; // enable internal pull-up
             #endif
             break;
-        default:  // indicator high
+        case 2:  // indicator high
             AUXLED_PORT.DIRSET = (1 << AUXLED_PIN); // set as output
             AUXLED_PORT.OUTSET = (1 << AUXLED_PIN); // set as high
             #ifdef AUXLED2_PIN  // second LED mirrors the first
@@ -138,10 +130,34 @@
             AUXLED2_PORT.OUTSET = (1 << AUXLED2_PIN); // set as high
             #endif
             break;
+        default:  // indicator off
+            AUXLED_PORT.DIRSET = (1 << AUXLED_PIN); // set as output
+            AUXLED_PORT.OUTCLR = (1 << AUXLED_PIN); // set output low
+            #ifdef AUXLED2_PIN  // second LED mirrors the first
+            AUXLED2_PORT.DIRSET = (1 << AUXLED2_PIN); // set as output
+            AUXLED2_PORT.OUTCLR = (1 << AUXLED2_PIN); // set output low
+            #endif
+            break;
       
         #else
 
-        case 0:  // indicator off
+        case 1:  // indicator low
+            DDRB &= 0xff ^ (1 << AUXLED_PIN);
+            PORTB |= (1 << AUXLED_PIN);
+            #ifdef AUXLED2_PIN  // second LED mirrors the first
+            DDRB &= 0xff ^ (1 << AUXLED2_PIN);
+            PORTB |= (1 << AUXLED2_PIN);
+            #endif
+            break;
+        case 2:  // indicator high
+            DDRB |= (1 << AUXLED_PIN);
+            PORTB |= (1 << AUXLED_PIN);
+            #ifdef AUXLED2_PIN  // second LED mirrors the first
+            DDRB |= (1 << AUXLED2_PIN);
+            PORTB |= (1 << AUXLED2_PIN);
+            #endif
+            break;
+        default:  // indicator off
             DDRB &= 0xff ^ (1 << AUXLED_PIN);
             PORTB &= 0xff ^ (1 << AUXLED_PIN);
             #ifdef AUXLED2_PIN  // second LED mirrors the first
@@ -149,22 +165,6 @@
             PORTB &= 0xff ^ (1 << AUXLED2_PIN);
             #endif
             break;
-        case 1:  // indicator low
-            DDRB &= 0xff ^ (1 << AUXLED_PIN);
-            PORTB |= (1 << AUXLED_PIN);
-            #ifdef AUXLED2_PIN  // second LED mirrors the first
-            DDRB &= 0xff ^ (1 << AUXLED2_PIN);
-            PORTB |= (1 << AUXLED2_PIN);
-            #endif
-            break;
-        default:  // indicator high
-            DDRB |= (1 << AUXLED_PIN);
-            PORTB |= (1 << AUXLED_PIN);
-            #ifdef AUXLED2_PIN  // second LED mirrors the first
-            DDRB |= (1 << AUXLED2_PIN);
-            PORTB |= (1 << AUXLED2_PIN);
-            #endif
-            break;
 
         #endif  // MCU type
     }