Use the new status LED helper methods as they're much nicer

Author: ben-xo

buttons.cpp

@@ -3,6 +3,7 @@
  */
 
 #include "buttons.h"
+#include "ledpwm.h"
 
 uint8_t was_button_pressed() {
 
@@ -56,7 +57,7 @@ uint8_t was_button_pressed() {
   if(F.is_down && !pins) {
     // released
     if(F.clicks && now - F.last_push > BUTTON_LONG_PUSH_SPEED) {
-      portb_val = 0;
+      clear_status_leds();
     }
     F.is_down = false;
   }
@@ -66,10 +67,10 @@ uint8_t was_button_pressed() {
     if(F.clicks) {
       if(now - F.last_push > BUTTON_REALLY_LONG_PUSH_SPEED) {
         // full bright as really long press (usually reset)
-        portb_val = seven_seg(12);
+        set_status_leds(seven_seg(12));
       } else if(now - F.last_push > BUTTON_LONG_PUSH_SPEED) {
         // half bright at long press
-        portb_val = (F.frame_counter & 1) ? 0 : seven_seg(12);
+        set_status_leds((F.frame_counter & 1) ? 0 : seven_seg(12));
       }
     }
   }

demo.cpp

@@ -106,8 +106,7 @@ static void _demo_loop(const uint8_t start_sober)
   uint8_t sober_mode_divider = FPS; // once per second
   uint8_t sober_mode_counter = sober_mode_divider;
 
-  portb_val = 0;
-  portb_mask = 0;
+  clear_status_leds();
 
   uint8_t portb_mask_in = 0;
   uint8_t portb_val_in = 0;
@@ -253,9 +252,7 @@ static void _demo_loop(const uint8_t start_sober)
           break;
       }
     }
-    portb_mask = portb_mask_in;
-    portb_val = portb_val_in;
-
+    set_status_leds_and_mask(portb_val_in, portb_mask_in);
     frame_epilogue();
   }
 }

gpio0.h

@@ -5,11 +5,13 @@
 #ifndef _GPIO0_H
 #define _GPIO0_H
 
+// - bit 1 is used as an overflow flag for the fps_count() to tick the FPS (see fps.h, fps_count.h)
+// - bit 0 is used to trigger the sampler at half the PWM rate (e.g. 5kHz sampler for 10kHz PWM) (see ledpwm.h, sampler.h)
+
 #define LEDPWM_ROTATE_BACK_BUFFER_FLAG_BIT (2)
 #define END_OF_FRAME_FLAG_BIT              (1)
 #define EVERY_OTHER_FRAME_FLAG_BIT         (0)
 
-
 #define LEDPWM_ROTATE_BACK_BUFFER_FLAG (1<<LEDPWM_ROTATE_BACK_BUFFER_FLAG_BIT)
 #define END_OF_FRAME_FLAG              (1<<END_OF_FRAME_FLAG_BIT)
 #define EVERY_OTHER_FRAME_FLAG         (1<<EVERY_OTHER_FRAME_FLAG_BIT)

ledpwm.cpp

@@ -39,7 +39,7 @@ void setup_ledpwm() {
   // TIMER2_COMPA_vect clears the LEDs, TIMER2_COMPB_vect lights them.
   TIMSK2 |= (1 << OCIE2A) | (1 << OCIE2B);
 
-  portb_mask = MASK_RESET_VAL;
+  clear_status_leds_within_interrupt();
 
   // this clears the timer and sets the right pre-scaler, starting the timer.
   enable_ledpwm();
@@ -55,7 +55,7 @@ void setup_ledpwm() {
 void disable_ledpwm() {
   cli();
   TCCR2B = 0;
-  PORTB = 0;
+  clear_status_leds_within_interrupt();
   sei();
 }
 

ledpwm.h

@@ -3,17 +3,19 @@
  */
 
 // LED PWM using interrupts.
+
 // Makes a huge assumption that you're using the entirety of PORTB for LEDs.
+
 // Uses all three GPIOR registers for speed.
-// GPIOR0 is used as a flags register 
-// - bit 0 is used to trigger the sampler at half the PWM rate (e.g. 5kHz sampler for 10kHz PWM)
-// - but 1 is used as an overflow flag for the fps_count() to tick the FPS
+
+// GPIOR0 is used as a flags register. See gpio0.h for bit meanings
 // GPIOR1 contains the PORTB value to write
 // GPIOR2 contains the a rotating mask used to swap nibbles of GPIOR1 before writing
 
 #ifndef _LEDPWM_H
 #define _LEDPWM_H
 
+#include <Arduino.h>
 #include <DigitalIO.h>
 
 #include "render.h"
@@ -33,4 +35,42 @@ extern DigitalPin<BEAT_PIN_1> beat_pin;
 extern DigitalPin<BEAT_PIN_2> tempo_pin;
 
 
+static void inline __attribute__((always_inline)) set_status_leds_and_mask_within_interrupt(uint8_t new_portb_val, uint8_t new_portb_mask)
+{
+    portb_mask = new_portb_mask;
+    portb_val = new_portb_val;
+}
+
+static void inline __attribute__((always_inline)) set_status_leds_within_interrupt(uint8_t new_portb_val)
+{
+    set_status_leds_and_mask_within_interrupt(new_portb_val, MASK_RESET_VAL);
+}
+
+static void inline __attribute__((always_inline)) clear_status_leds_within_interrupt()
+{
+    set_status_leds_and_mask_within_interrupt(0, MASK_RESET_VAL);
+}
+
+static void inline __attribute__((always_inline)) set_status_leds_and_mask(uint8_t new_portb_val, uint8_t new_portb_mask)
+{
+    cli();
+    set_status_leds_and_mask_within_interrupt(new_portb_val, new_portb_mask);
+    sei();
+}
+
+static void inline __attribute__((always_inline)) set_status_leds(uint8_t new_portb_val)
+{
+    cli();
+    set_status_leds_within_interrupt(new_portb_val);
+    sei();
+}
+
+static void inline __attribute__((always_inline)) clear_status_leds()
+{
+    cli();
+    clear_status_leds_within_interrupt();
+    sei();
+}
+
+
 #endif /* _LEDPWM_H */

vu3.ino

@@ -108,11 +108,9 @@ static bool auto_mode_change(bool is_beat) {
   return false;
 }
 
-static void ledpwm_reset() {
-    cli();
-    portb_mask = MASK_RESET_VAL; // min brightness mask
-    portb_val = seven_seg(F.mode);
-    sei();
+static void ledpwm_reset()
+{
+    set_status_leds(seven_seg(F.mode));
 }
 
 /*
@@ -121,10 +119,10 @@ static void ledpwm_reset() {
  */
 static void ledpwm_vu_1() {
 
-    static const PROGMEM uint8_t masks[16] = { 0b11111110, 0b11101110, 0b11101010, 0b10101010,
-                                               0b10101000, 0b10001000, 0b10000000, 0b00000000,
-                                               0b10101010, 0b10101010, 0b10101010, 0b10101010,
-                                               0b10101010, 0b10101010, 0b10101010, 0b10101010 };
+    static const PROGMEM uint8_t masks[16] = { 0b01111111, 0b01110111, 0b01110101, 0b01010101,
+                                               0b01010100, 0b01000100, 0b01000000, 0b00000000,
+                                               0b01010101, 0b01010101, 0b01010101, 0b01010101,
+                                               0b01010101, 0b01010101, 0b01010101, 0b01010101 };
 
     uint8_t four_bit_level = (F.vu_width & 0xF0) >> 4;
     uint8_t new_portb_mask = masks[four_bit_level];
@@ -140,10 +138,7 @@ static void ledpwm_vu_1() {
     }
     new_portb_val |= seven_seg(F.mode);
 
-    cli();
-    portb_mask = new_portb_mask;
-    portb_val = new_portb_val;
-    sei();
+    set_status_leds_and_mask(new_portb_val, new_portb_mask);
 }
 
 void loop() {