From 4d58a3df74c7c25fdcb1a4fb722caca0874c4d64 Mon Sep 17 00:00:00 2001
From: Brooke <brookep447@gmail.com>
Date: Mon, 28 Apr 2025 21:07:46 -0400
Subject: [PATCH] LEDs now operating on button push

Fixed several bugs:
- TCB wasn't running. The datasheet steps were not complete.
- TCA was waking the MCU and causing the main program to run. Added checks
  to ensure program only runs on button or TCB wakeup.
- Fixed some peculiarities with specific RGBLED programs
---
 .../.vs/HackSpaceCon_AS7/v14/.atsuo           | Bin 74752 -> 74752 bytes
 fw/HackSpaceCon_AS7/HSC_Wand/isr.cpp          |   8 ++++--
 fw/HackSpaceCon_AS7/HSC_Wand/rgbled.cpp       |  27 +++++++++++-------
 fw/HackSpaceCon_AS7/HSC_Wand/rgbled.h         |   9 ++++--
 fw/HackSpaceCon_AS7/HSC_Wand/wand_program.cpp |   6 ++++
 5 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/fw/HackSpaceCon_AS7/.vs/HackSpaceCon_AS7/v14/.atsuo b/fw/HackSpaceCon_AS7/.vs/HackSpaceCon_AS7/v14/.atsuo
index 77eee68d74442bdcf6fa16b7ed6c90ab11377202..9059c35aa354aa2d52512e949d89949079163eb7 100644
GIT binary patch
delta 2820
zcmeH|ZA_b06vyv*`m{WqfGu4KjMuiTLJO>52_r5O7!V+A(gkB;h_vg>Bu;2xgSeQi
z3mTK@2iv<yV*J4RZOIay&xgHevSuL}VT*4cU33K8=F4QSPRgYCzXh}qw}jb`KJD+h
z_nv#7bI(2J-gAQ!a&SWaz{LX|eU5>#bjFwl#1|JAQ7{6IQ=U92(^Y$M&+#)?Xfq`B
zjr@@Akff0MK$1w(>G{0IzFB<pG<tJ^6_|hmGQd;72;#h1E^5m}%?yr$0)UBG5wL*`
zKo5$63*-Ykcm|Y$Lf`}on5`t_F{x4cBxO!r+2sA(x`u>xa*}mv_E5KSIN7iqs8}%!
zni9_@$YdZIc__tVvVd6FT9YdwPc}Il?PBm4lXI7B#-PM(cnQVg!5ZqxNN~0UG(hyk
zRm=9P6bcw3>5^q_rxt^BAT4R|LsIh%vP9L~(q@ylU?TqI>2mE1DziLhF5?lCMNh)Q
zXGLG<bEVoFs7&*iv5acDMJnJ?lUp|pnU46px%3~QR>nM2YOLTADOKnf%M}X3+hldl
ztjOWg3HevZ)XSxA3b&3cB1FP}Vi3RI`aTbucIZiXt$JCi{Q(uI%$p=VIZ!WO>G&9x
z@6=dPnq+ptp-aDE*30&?em2Z1_>sXKJZN`R3E2SXWBXVSdV5j!vIES=_OnXnXZ5j9
zuD*Ldwna04%-3;k>;)F`><rsCHtfMy{rJ7kUS-{^2{k`E$lgG!4_^;L_8Q)Plq<7~
za<v7`e6Gj9BU`tJ0y*ZOZ>W0G{odF>&B&dYb$IB%n`v09GUU4*u}hzAc$*H3%^^<a
zkMPqqa2*KQPbhx|zbv<JqWlfaf?MD=xC8Ejd*D9!9XtSkfH@EY^WY))6D)u@5ZOS?
zQN=3TSrxodiB05YTj3+&e?L5a5D^gm^syoMSIGO}%|48BA?TIx=}7a9k*bByS?jm$
zZ#l<qMiCDa_gaf-ij&<`v7WF@h%ZtZ$l7A#jK0p+a(=kz`$o$*@!f6Lg?T0s%GJ*o
zVru6)j8zw%8cCH3FOVV*U((r0Th`2v586fp*;JyoxXw{H+sdsbt0GRYIBbcNntY0P
zKjz$yhKi{DLxmK6xy>DM>qbKv<W%!t*+m(1*faPi7*Co1#8EV4G$7=Au?56t=;u>j
zGmY^h&eTLGF#|VP4`}@?zyf@m_a%O@tS;OYO+Tw!x?8X;ncwQN^4YHHEFH^SWe%H6
z?P6g{3EfS(&JK#ERHuW^2z_<y*r`eR4%sf!s8iPDTm#?LlSLPV-shiK?~+b6>aC|o
zCip~p9c@adjmDXm2h0_Y6Q6!`?BqNA-t;MPEXjrIs*qN$0%2A@x4!sQq(kAMqq%CX
zV;@Q9h=1+rtms5W@*~%ayzWCr5_x_<>J6+5EwN$W#O=|<T39FR=8Lu(DpPApF40cp
fy8lz1-BiAwK&Qa_<q7XUa%VjG)&H+|s(1V^&^*7&

delta 1042
zcmaizT}V@57{|}^dR%99oaS`4kKA$7xu)6FnJKwuPD}bwu|}765q2Rl&>*~s34&lF
z+8$^UUBtR5!VB98qHY@4g`z}g7f~QmAVE+NGis3QdG`T!)dN4?=XuWmJ?H;^oY0aO
zS`zQLYnYIaGC|N&%Ilp>Cd0c$#Qvv4W~K{%?Hy@&_7Uo+lWfOH){i~LX0{=yKN$nI
zR)pyyM;%SehLKb}vE|278s&VR!CukYZKbM`m@Ra36Ek+I_YyinA-EGB4$A8ZCvk{q
ziVW$cBb2xaH7U-6F4;d6*nXa~D0Gm;N%nb{y*-X|{AJt<w^y(xQO-ZGk4FCd4`HHQ
zBxpwjGr^yi=f@Hnv&P9l9e1iF6oQL*{LiTm63%JRexfP-dpnWK<8hfKoHqa{pGlM{
z3>C{mEi{mVyNwOn!HFr$fEM`s`J!{JiGu^U$eJ}9)Nz5D)-QurXrjVUkf^CjSxg-0
z0j|RdV>nU0NE#PCZ!Bnv?^E_c{jFaC>7U7%s%TUdWfO4uga^%CgXLF+^*6ZYn9*(B
zmR)nBhFkArK0CN#AuD*)RG$pdfCnnnw!jL+9V}{E68Q?%Rg(uWGHX<g7e;|iGi)Ba
znP_ATnc)Y#z-_~@$agotsH!l=$8E8o0czDg_e)49J)q6rJAUqYQB64R(de!;4O2_d
z9KUvbY|M*Otu5%g=zA2h0dP+ta-g)5z(ceVM~Qag7?It3a))0`wN5`ZdWk;b6mgp9
zCkmp%h#qq=yC!^WzEnI#3JYC>;u%V+)b7A5hy-h+vIQ;G^CCaK{Lxjv6Au?EIlJ9d
z@ra+)L@lo+eipk=Ivks`g8!}r60Wv-qW+YogA`j`nD(dTPD(fVk4X_fD@DCY`3e2A
z{Qd%6Tm0^|;Wuv!2<SfZ78gcKNfdif0v5HQ^E{NS=X6{vEFjcR;XQkqDvkVF{0nUY
BL`DDr

diff --git a/fw/HackSpaceCon_AS7/HSC_Wand/isr.cpp b/fw/HackSpaceCon_AS7/HSC_Wand/isr.cpp
index 7c0fd8b..013450d 100644
--- a/fw/HackSpaceCon_AS7/HSC_Wand/isr.cpp
+++ b/fw/HackSpaceCon_AS7/HSC_Wand/isr.cpp
@@ -19,6 +19,7 @@ ISR(TCB0_INT_vect)
 
     // in this program, this interrupt is only used for timing.
     // we'll now return to executing loop()
+	rgb_run_next = 1;
 
     // reset the INTFLAGS - necessary on this series
     TCB0.INTFLAGS = intflags;
@@ -30,12 +31,15 @@ ISR(PORTA_PORT_vect)
     uint8_t intflags = PORTA.INTFLAGS;
 
     // shitty debounce; this is bad practice
-    delay(5);
+    delay(8);
 
 	// was our pin changed?
     if (intflags & PIN2_bm) {
         // start or re-start running a program
-        run_rgbprog = 1;        // run a new program
+		if (!digitalRead(PIN_PA2)) {
+			run_rgbprog = 1;        // run a new program
+			rgb_run_next = 1;
+		}
     }
 
     // reset the INTFLAGS - necessary on this series
diff --git a/fw/HackSpaceCon_AS7/HSC_Wand/rgbled.cpp b/fw/HackSpaceCon_AS7/HSC_Wand/rgbled.cpp
index dacbbaa..cb5a8be 100644
--- a/fw/HackSpaceCon_AS7/HSC_Wand/rgbled.cpp
+++ b/fw/HackSpaceCon_AS7/HSC_Wand/rgbled.cpp
@@ -30,17 +30,20 @@ uint8_t (*rgb_program[PROG_COUNT])(uint8_t) = {
 uint8_t rgbled[3 * RGB_COUNT];
 
 
+volatile uint8_t rgb_run_next = 0;		// set to 1 to run next frame
+
+
 // configures and enables the 50Hz timer interrupt that is used for RGB program updates
 void conf_rgb_timer()
 {
     // this timer will run at half speed.
-    // so 8MHz / 2 (timer prescale) / 2 (CLK_PER) = 2MHz
-    // this will allow a cycle time with 33333 counts to be 60Hz.
+    // so 16MHz / 2 (timer prescale) / 2 (CLK_PER) = 4MHz
+    // this will allow a cycle time with full counts to be ~61Hz.
 
     disable_rgb_timer();
     
-    TCB0.CTRLA = TCB_CLKSEL_CLKDIV2_gc;    // prescale timer to run at half speed
-    TCB0.CCMP = 33333 - 1;                 // count to full
+    TCB0.CTRLA = TCB_CLKSEL_CLKDIV2_gc;		// prescale timer to run at half speed
+    TCB0.CCMP = 0xffff;						// count to full
     TCB0.CNT = 0;
 }
 
@@ -56,7 +59,7 @@ uint8_t  r, g, b;
 #define RAINBOW_OFFSET      (1536/5)            // offset between each LED
 #define RAINBOW_TIMEOUT     240                 // how long to show this program
 #define RAINBOW_SAT         0xff                // saturation
-#define RAINBOW_VAL         0x40                // value (brightness); keep low enough to keep average current down
+#define RAINBOW_VAL         0x20                // value (brightness); keep low enough to keep average current down
 
 uint16_t rainbow_hue = 0;
 
@@ -101,23 +104,25 @@ uint8_t rgbp_rainbow(uint8_t init)
 
 // rgb program 2: circle loops with fading
 #define CF_TIMEOUT      90              // how long to show this program (max 255, ideally (20*loopcount)+10)
-#define CF_BRIGHTNESS   64              // how bright to make the LED. don't make too bright or badge will brown out
-#define CF_FADERATE     12              // how much to fade all LEDs each frame
+#define CF_BRIGHTNESS   48              // how bright to make the LED. don't make too bright or badge will brown out
+#define CF_FADERATE     6				// how much to fade all LEDs each frame
 
 uint8_t circlefade_idx = 0;
+uint8_t circlefade_delay = 0;
 
 uint8_t rgbp_circlefade(uint8_t init)
 {
     uint8_t i;
     uint8_t t;
-
+	
+	
     // set our timer when initializing. otherwise every call is identical
     if (init) {
         prog_timeout = CF_TIMEOUT;
         circlefade_idx = 4;         // top LED
     }
 
-    if (--prog_timeout) {
+    if (prog_timeout) {
         t = (uint8_t)(CF_TIMEOUT - prog_timeout);   // get time elapsed
         t &= 0x3;                                   // light a new LED every 4th loop
 
@@ -133,7 +138,7 @@ uint8_t rgbp_circlefade(uint8_t init)
         // set the next LED in sequence on to full brightness every 4 cycles
         if (prog_timeout >= 10) {                   // as long as >10 loops remain,
             if (!t) {                               // then on a loop boundary, light the next LED
-                rgb.setPixelColor(circlefade_idx, CF_BRIGHTNESS, CF_BRIGHTNESS, CF_BRIGHTNESS);
+                rgb.setPixelColor(circlefade_idx, 56, 16, 44);
 
                 if (++circlefade_idx >= RGB_COUNT) { // then work on the next LED in sequence
                     circlefade_idx = 0;
@@ -141,6 +146,8 @@ uint8_t rgbp_circlefade(uint8_t init)
             }
         }
 		
+		prog_timeout--;
+		
 		return 1;
     }
 	
diff --git a/fw/HackSpaceCon_AS7/HSC_Wand/rgbled.h b/fw/HackSpaceCon_AS7/HSC_Wand/rgbled.h
index 40cd6ab..e480c78 100644
--- a/fw/HackSpaceCon_AS7/HSC_Wand/rgbled.h
+++ b/fw/HackSpaceCon_AS7/HSC_Wand/rgbled.h
@@ -19,8 +19,9 @@
 
 
 
-#define enable_rgb_timer()      {TCB0.CNT = 0; TCB0.CTRLA |=  1;};
-#define disable_rgb_timer()     {TCB0.CTRLA &= ~1;};
+#define enable_rgb_timer()      {TCB0.CNT = 0; TCB0.INTFLAGS = 0xff; \
+								 TCB0.INTCTRL = TCB_CAPT_bm; TCB0.CTRLA |=  TCB_ENABLE_bm;};
+#define disable_rgb_timer()     {TCB0.INTCTRL = 0;           TCB0.CTRLA &= ~TCB_ENABLE_bm;};
 
 
 
@@ -31,6 +32,10 @@ extern uint8_t (*rgb_program[PROG_COUNT])(uint8_t);
 
 
 
+extern volatile uint8_t rgb_run_next;
+
+
+
 void conf_rgb_timer();
 
 
diff --git a/fw/HackSpaceCon_AS7/HSC_Wand/wand_program.cpp b/fw/HackSpaceCon_AS7/HSC_Wand/wand_program.cpp
index 6d7c1d0..3cffe0a 100644
--- a/fw/HackSpaceCon_AS7/HSC_Wand/wand_program.cpp
+++ b/fw/HackSpaceCon_AS7/HSC_Wand/wand_program.cpp
@@ -120,6 +120,12 @@ void setup() {
 
 // mcu program loop
 void loop() {
+	while (!rgb_run_next) {
+		// __asm("sleep");
+	}
+	
+	rgb_run_next = 0;
+		
 	switch (run_rgbprog) {
 		case RGB_INIT: {						// just started running a program
 			digitalWrite(PIN_LED_PWRENA, HIGH);	// enable LED power supply,