get rid of led stubs + make bootloader always show blue leds

Author: AmyJeanes

Keypad.Firmware/Keypad.Firmware.ino

@@ -40,19 +40,16 @@ void setup()
   if (configuration_bootloader_requested())
   {
 #if NEO_COUNT > 0
-    const uint8_t boot_hues[3] = {NEO_CYAN, NEO_BLUE, NEO_MAG};
-    for (uint8_t i = 0; i < NEO_COUNT; ++i)
-    {
-      NEO_writeHue(i, boot_hues[i % 3], NEO_BRIGHT_KEYS);
-    }
-    NEO_update(); // update pixels
+    led_show_bootloader_indicator();
 #endif
     BOOT_now();     // jump to bootloader
   }
 
   buttons_setup();
   encoder_setup();
+#if NEO_COUNT > 0
   led_set_mode(LED_LOOP);
+#endif
   USBInit();
 #endif
 }
@@ -68,7 +65,9 @@ void loop()
   buttons_update();
   encoder_update();
   hid_service();
+#if NEO_COUNT > 0
   led_update();
+#endif
 
   // light idle to avoid saturating USB
   delay(1);

Keypad.Firmware/configuration.h

@@ -10,5 +10,5 @@
 #define CONFIGURATION_DEBUG_MODE 0
 
 #define PIN_NEO P34
-#define NEO_COUNT 3
+#define NEO_COUNT 2
 #define NEO_GRB

Keypad.Firmware/src/buttons.c

@@ -3,6 +3,7 @@
 #include "util.h"
 #include "buttons.h"
 #include "configuration_data.h"
+#include "led.h"
 #include "../configuration.h"
 
 #if !CONFIGURATION_DEBUG_MODE
@@ -81,6 +82,9 @@ void buttons_update(void)
 
     if (has_bootloader_chord && bootloader_chord_candidate)
     {
+#if NEO_COUNT > 0
+        led_show_bootloader_indicator();
+#endif
         BOOT_now();
     }
 }

Keypad.Firmware/src/hid.c

@@ -129,6 +129,7 @@ void hid_handle_button(size_t button_index, hid_trigger_mode_t mode)
 
   const button_binding_t *binding = &button_bindings[button_index];
 
+#if NEO_COUNT > 0
   if (binding->led_index >= 0)
   {
     if (mode == HID_TRIGGER_PRESS)
@@ -140,6 +141,7 @@ void hid_handle_button(size_t button_index, hid_trigger_mode_t mode)
       led_presskey(-1);
     }
   }
+#endif
 
   hid_run_binding(&binding->function, mode);
 }

Keypad.Firmware/src/led.c

@@ -2,9 +2,7 @@
 #include "../configuration.h"
 #include "led.h"
 
-#if !CONFIGURATION_DEBUG_MODE
-
-#if NEO_COUNT > 0
+#if !CONFIGURATION_DEBUG_MODE && NEO_COUNT > 0
 #include "neo/neo.h"
 
 static enum led_keyboard_mode_t led_mode_s = LED_LOOP;
@@ -22,6 +20,16 @@ void led_set_color_hue(uint8_t led0, uint8_t led1, uint8_t led2)
   }
 }
 
+void led_show_bootloader_indicator(void)
+{
+  for (uint8_t i = 0; i < NEO_COUNT; ++i)
+  {
+    NEO_writeHue(i, NEO_BLUE, NEO_BRIGHT_KEYS);
+  }
+  current_led_s = -1;
+  NEO_update();
+}
+
 void led_set_mode(enum led_keyboard_mode_t mode)
 {
   led_mode_s = mode;
@@ -83,30 +91,4 @@ void led_update()
 
   NEO_update();
 }
-
-#else
-
-void led_set_color_hue(uint8_t led0, uint8_t led1, uint8_t led2)
-{
-  (void)led0;
-  (void)led1;
-  (void)led2;
-}
-
-void led_set_mode(enum led_keyboard_mode_t mode)
-{
-  (void)mode;
-}
-
-void led_presskey(int key)
-{
-  (void)key;
-}
-
-void led_update()
-{
-}
-
-#endif
-
 #endif

Keypad.Firmware/src/led.h

@@ -22,6 +22,9 @@ void led_set_mode(enum led_keyboard_mode_t mode);
 // set led color in FIX mode
 void led_set_color_hue(uint8_t led0, uint8_t led1, uint8_t led2);
 
+// show bootloader entry feedback
+void led_show_bootloader_indicator(void);
+
 // update led task
 void led_update();