true
/
000000widow-hackspacecon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
true 2025-04-27 21:36:50 -07:00
parent 8692b71fd8
commit 57f7b1b48d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
fw/HackSpaceCon_AS7/.vs/HackSpaceCon_AS7/v14/.atsuo
View File

Binary file not shown.

3
fw/HackSpaceCon_AS7/Arduino/arduino_libraries/tinyNeoPixel_static/tinyNeoPixel_Static.cpp
View File

@ -1073,6 +1073,8 @@ void tinyNeoPixel::show(uint16_t leds) {
interrupts(); interrupts();
/*
#if (!defined(MILLIS_USE_TIMERNONE) && !defined(MILLIS_USE_TIMERRTC) && !defined(MILLIS_USE_TIMERRTC_XTAL) && !defined(MILLIS_USE_TIMERRTC_XOSC)) #if (!defined(MILLIS_USE_TIMERNONE) && !defined(MILLIS_USE_TIMERRTC) && !defined(MILLIS_USE_TIMERRTC_XTAL) && !defined(MILLIS_USE_TIMERRTC_XOSC))
endTime = micros(); endTime = micros();
// Save EOD time for latch on next call // Save EOD time for latch on next call
@ -1080,6 +1082,7 @@ void tinyNeoPixel::show(uint16_t leds) {
#else #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.") #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 #endif
*/
} }
// Set the output pin number // Set the output pin number

8
fw/HackSpaceCon_AS7/HSC_Wand/rgbled.cpp
View File

@ -34,15 +34,13 @@ uint8_t rgbled[3 * RGB_COUNT];
void conf_rgb_timer() void conf_rgb_timer()
{ {
// this timer will run at half speed. // this timer will run at half speed.
// so 8MHz / 2 (prescale) / 1 (CLK_PER) = 4MHz // so 8MHz / 2 (timer prescale) / 2 (CLK_PER) = 2MHz
// this will allow a full cycle time of ~61Hz. // this will allow a cycle time with 33333 counts to be 60Hz.
_PROTECTED_WRITE(CLKCTRL_MCLKCTRLB, 0); // disable CLK_PER divider
disable_rgb_timer(); disable_rgb_timer();
TCB0.CTRLA = TCB_CLKSEL_CLKDIV2_gc; // prescale timer to run at half speed TCB0.CTRLA = TCB_CLKSEL_CLKDIV2_gc; // prescale timer to run at half speed
TCB0.CCMP = 0xffff; // count to full TCB0.CCMP = 33333 - 1; // count to full
TCB0.CNT = 0; TCB0.CNT = 0;
} }