From 57f7b1b48d9a2088b30f121d1a0f3ebcd0b10866 Mon Sep 17 00:00:00 2001
From: true <true_git@truecontrol.org>
Date: Sun, 27 Apr 2025 21:36:50 -0700
Subject: [PATCH] fix setting clock divider to /1 when it should be /2

misinterpreted docs. too much ARM in my life.
the system sets up the clock divider with /2 and expects it to stay there.
was setting the divider to /1 thinking it only affected peripherals.
adjusted timings to compensate for the new divider.
---
 .../.vs/HackSpaceCon_AS7/v14/.atsuo           | Bin 74752 -> 74752 bytes
 .../tinyNeoPixel_Static.cpp                   |   3 +++
 fw/HackSpaceCon_AS7/HSC_Wand/rgbled.cpp       |  10 ++++------
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/fw/HackSpaceCon_AS7/.vs/HackSpaceCon_AS7/v14/.atsuo b/fw/HackSpaceCon_AS7/.vs/HackSpaceCon_AS7/v14/.atsuo
index 30334cc11619ae9bcdb7b63fe55070b5554ea181..77eee68d74442bdcf6fa16b7ed6c90ab11377202 100644
GIT binary patch
delta 548
zcmZoT!P0PoWr6`C(?mmQR%QkU2EmPi(rkPOJOjhNZokc_3KU_moLt3L#rSyhS0--8
zNgN`Pia@ddQ1A~(^8@*kK&%86=YZ1OKpG_f7l@^RY!)CE0Agt%25A?9(!4-g6o|Vf
z1`6|X0U4Y?tN_ISH}|p>Gj8ImVC20I<URo6hd}&j@<*=fMFLEl_?%fLJ9{*6GHL@w
zL9Un_V68Fvi;zDjBglMxs0iyWAmhs9pMsi<W|I|}WG6canXughifJ)!{v~^ok&{6W
z$Pt68o@B$q$gugRC_B?8DQCvXhnWl~mq_<)l44?-%;a#4MHi}U@)wcwoD5n(o(@!m
zbq<hmYx7T8b{2U@h9ZU(hEj%1hCGIRh8TuK6n^~Vjq0LFC1BY~20w;Wpqc<6uL8)*
zVTflaW+(yb0Ldo<_2O0+jHFJFA%o%axyhH*+WDUK@o3FR7wf(;*}+<Ca)Y%A&`X<t
zC~+|If<grZT7WM7Kb@C@QJqx;#N2Ml!FZf;ks8b7iCvQ0CFK~?8JSv`CL89|Ez<b`
E09;I?%>V!Z

delta 571
zcmYk2yGtB#5XX1cpL=_{YkZuqGm5DAI^**+ng@hKL^O&^nxHneRwCML;T;HRb$9*)
zD?uAwJ0A#}!XibAbg9y&zJp7OT)v~f!hsJn^PTz4&Q9S$6&}>_IPZALV6Lf}48u6Q
z@H(uz?^pSi%+*gChH^i~zU9*$m(0Ai4I!0azv{ruRrB9OdaDmgMcY4kTjwp>w>_)Z
zBCZE%ttH_*KngU11|XxF;R`_KDJIn#>?m>ruhq>!9RaVvWZ*TmPa&8F@@xkFHJAmT
z`PX2Eo%e0rH#FNUgVuG|2K*-Y5_m^p&8a#=%;z=Pc4-o>A>4pl@TgsEB`9>}ZPY5=
z5P9wGptXYFjm5s>(?>2jd0OUu_mgsUotC1KyQ(<0CU~!L&6cG{buB6`IuyQ)lZG5e
zen}=q#Sadhw3uP;tNj9+9P&xeIdqveO*T`zG{^g?)g;L(N;ib>6qmcc**(bR>hcI0
z8PT84gbEj8j?D=OQMt#)pqM0g<nHnbv6FrkX0c8$;sGENxS0K+Or6voAovYnQ6)p=
E|L0<|5C8xG

diff --git a/fw/HackSpaceCon_AS7/Arduino/arduino_libraries/tinyNeoPixel_static/tinyNeoPixel_Static.cpp b/fw/HackSpaceCon_AS7/Arduino/arduino_libraries/tinyNeoPixel_static/tinyNeoPixel_Static.cpp
index 2cf1aa6..0ea58c7 100644
--- a/fw/HackSpaceCon_AS7/Arduino/arduino_libraries/tinyNeoPixel_static/tinyNeoPixel_Static.cpp
+++ b/fw/HackSpaceCon_AS7/Arduino/arduino_libraries/tinyNeoPixel_static/tinyNeoPixel_Static.cpp
@@ -1073,6 +1073,8 @@ void tinyNeoPixel::show(uint16_t leds) {
 
 
   interrupts();
+  
+  /*
   #if (!defined(MILLIS_USE_TIMERNONE) && !defined(MILLIS_USE_TIMERRTC) && !defined(MILLIS_USE_TIMERRTC_XTAL) && !defined(MILLIS_USE_TIMERRTC_XOSC))
     endTime = micros();
     // Save EOD time for latch on next call
@@ -1080,6 +1082,7 @@ void tinyNeoPixel::show(uint16_t leds) {
   #else
     #pragma message("micros() is not available because millis is disabled from the tools subemnu. It is your responsibility to ensure a sufficient time has passed between calls to show(). See documentation.")
   #endif
+  */
 }
 
 // Set the output pin number
diff --git a/fw/HackSpaceCon_AS7/HSC_Wand/rgbled.cpp b/fw/HackSpaceCon_AS7/HSC_Wand/rgbled.cpp
index 8db8673..dacbbaa 100644
--- a/fw/HackSpaceCon_AS7/HSC_Wand/rgbled.cpp
+++ b/fw/HackSpaceCon_AS7/HSC_Wand/rgbled.cpp
@@ -34,15 +34,13 @@ uint8_t rgbled[3 * RGB_COUNT];
 void conf_rgb_timer()
 {
     // this timer will run at half speed.
-    // so 8MHz / 2 (prescale) / 1 (CLK_PER) = 4MHz
-    // this will allow a full cycle time of ~61Hz. 
-    
-    _PROTECTED_WRITE(CLKCTRL_MCLKCTRLB, 0); // disable CLK_PER divider
+    // so 8MHz / 2 (timer prescale) / 2 (CLK_PER) = 2MHz
+    // this will allow a cycle time with 33333 counts to be 60Hz.
 
     disable_rgb_timer();
     
-    TCB0.CTRLA = TCB_CLKSEL_CLKDIV2_gc;     // prescale timer to run at half speed
-    TCB0.CCMP = 0xffff;                     // count to full
+    TCB0.CTRLA = TCB_CLKSEL_CLKDIV2_gc;    // prescale timer to run at half speed
+    TCB0.CCMP = 33333 - 1;                 // count to full
     TCB0.CNT = 0;
 }