Yeah well, ugh.

Author: ben-xo

ledpwm.cpp

@@ -115,23 +115,23 @@ ISR(TIMER2_COMPA_vect, ISR_NAKED) {
   temp_r24 = (temp_r24 >> 1) | (temp_r24 << 7); // basically, ror -    // 3 cy
   portb_mask = temp_r24; // 1 cy
 
-  if(GPIOR0 & (LEDPWM_ROTATE_BACK_BUFFER_FLAG)) {
-    asm volatile(
-      "push r25 \n\t"
-      "in   r24, %[portb_val_io_reg] \n\t"
-      "andi r24, 15  \n\t" // temp_r24 &= 0x0F
-      "in   r25, %[portb_val_io_reg] \n\t"
-      "andi r25, 240 \n\t" // temp_r25 &= 0xF0
-      "add  r25, r25  \n\t" // temp_r25 *= 2
-      "brcc .+2       \n\t" // skip if there was no carry
-      "sbr  r25, 4    \n\t" // set bit 4 if bit 7 was set
-      "or   r25, r24  \n\t" // temp_r24 |= temp_r25
-      "out  %[portb_val_io_reg], r25 \n\t"
-      "pop  r25 \n\t"
-      ::
-      [portb_val_io_reg] "I" (_SFR_IO_ADDR(portb_val))
-    );
-  } // 2cy or 14 cy
+  // // if(GPIOR0 & (LEDPWM_ROTATE_BACK_BUFFER_FLAG)) {
+  //   asm volatile(
+  //     "push r25 \n\t"
+  //     "in   r24, %[portb_val_io_reg] \n\t"
+  //     "andi r24, 15   \n\t"
+  //     "in   r25, %[portb_val_io_reg] \n\t"
+  //     "andi r25, 240  \n\t"
+  //     "bst  r25, 7    \n\t"
+  //     "add  r25, r25  \n\t"
+  //     "bld  r25, 4    \n\t" // bit 7 moved to bit 4
+  //     "or   r25, r24  \n\t" // temp_r24 |= temp_r25
+  //     "out  %[portb_val_io_reg], r25 \n\t"
+  //     "pop  r25 \n\t"
+  //     ::
+  //     [portb_val_io_reg] "I" (_SFR_IO_ADDR(portb_val))
+  //   );
+  // // } // 2cy or 14 cy
 
   asm volatile( "out     __SREG__, r25                   \n\t"); // 1cy
   asm volatile( "pop     r25                             \n\t"); // 2cy

ledpwm.h

@@ -36,7 +36,6 @@ extern DigitalPin<BEAT_PIN_2> tempo_pin;
 
 #define disable_backbuffer_rotation() (GPIOR0 &= ~(LEDPWM_ROTATE_BACK_BUFFER_FLAG))
 #define enable_backbuffer_rotation() (GPIOR0 |= (LEDPWM_ROTATE_BACK_BUFFER_FLAG))
-// #define enable_backbuffer_rotation() 
 
 static void inline __attribute__((always_inline)) set_status_leds_and_mask_within_interrupt(uint8_t new_portb_val, uint8_t new_portb_mask)
 {
@@ -88,8 +87,8 @@ static void inline __attribute__((always_inline)) set_status_leds_and_mask_rotat
     // } else {
     //    enable_backbuffer_rotation();
     // }
+    // enable_backbuffer_rotation();
     set_status_leds_and_mask_within_interrupt(new_portb_val, new_portb_mask);
-    enable_backbuffer_rotation();
     sei();
 }
 

loop.h

@@ -25,7 +25,7 @@
 extern bool filter_beat;
 extern uint8_t my_current_sample;
 extern uint16_t my_sample_sum;
-extern struct Framestate F;
+extern Framestate F;
 
 __attribute__((always_inline)) static void inline one_frame_sample_handler() {
 

pwm_constants.h

@@ -10,7 +10,7 @@
 
 // 0b11111111 is "invisible" and 0b00000000 is "super bright" not that the human eye can tell
 #ifndef MASK_RESET_VAL
-#  define MASK_RESET_VAL 0b00000000
+#  define MASK_RESET_VAL 0b01111111
 #endif
 
 // These values are specific to the LEDs you choose. 

vu3.ino

@@ -109,34 +109,36 @@ static bool auto_mode_change(bool is_beat) {
   return false;
 }
 
+static const uint8_t masks[16] = { 
+  0b11111110, 0b11111110, 0b11111110, 0b11111110,
+  0b11111110, 0b11111110, 0b11111110, 0b11101110,
+  0b10101010, 0b10101010, 0b10001000, 0b10001000,
+  0b10000000, 0b10000000, 0b10001000, 0b10101010
+};
+
+// there are only 4 lights, so 5 brightness levels
+static const uint8_t vals[16] = { 
+  0b00000000, 0b00000000, 0b00000000, 0b00000000,
+  0b00000000, 0b00000000, 0b00000000, 0b00000000,
+  0b00000000, 0b00000000, 0b00000000, 0b00000000,
+  0b00000000, 0b11110000, 0b11110000, 0b11110000
+};
 
 /*
  * Mess with the brightness of the status LEDs (by adjusting the mask and double-buffer content) 
  * so that it's VU reactive. Kinda ugly but also kinda cool at the same time.
  */
 static void ledpwm_vu_1() {
 
-    static const PROGMEM uint8_t masks[16] = { 
-      0b11111110, 0b11111110, 0b11111110, 0b11111110,
-      0b11101110, 0b11101110, 0b11101010, 0b11101010,
-      0b10101010, 0b10101010, 0b10101010, 0b10101010,
-      0b10101010, 0b10101010, 0b10101010, 0b10101010
-    };
-
-    // there are only 4 lights, so 5 brightness levels
-    static const PROGMEM uint8_t vals[8] = { 
-      0b00000000, 0b00010000, 0b01000000, 0b10100000,
-      0b01010000, 0b11100000, 0b01110000, 0b11110000
-    };
-
     // uint8_t volatile old_portb_val = portb_val;
 
-    uint8_t four_bit_level = (F.vu_width >> 4) & 0b00001111;
+    uint8_t four_bit_level = F.vu_width / 4;
+    if(four_bit_level > 15) four_bit_level = 15;
     uint8_t new_portb_mask = masks[four_bit_level];
 
-    uint8_t three_bit_level = (four_bit_level >> 1) & 0b00000111;
+    // uint8_t three_bit_level = (four_bit_level >> 1) & 0b00000111;
     // uint8_t new_portb_val = (old_portb_val & 0x0F) | vals[three_bit_level];
-    uint8_t new_portb_val = vals[three_bit_level] | seven_seg(F.mode);
+    uint8_t new_portb_val = vals[four_bit_level] | seven_seg(F.mode);
 
     set_status_leds_and_mask_rotate(new_portb_val, new_portb_mask);
 }