Compare commits
2 Commits
8692b71fd8
...
9827a8f6be
Author | SHA1 | Date | |
---|---|---|---|
|
9827a8f6be | ||
|
57f7b1b48d |
Binary file not shown.
@ -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
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
<Name>HSC_Wand</Name>
|
<Name>HSC_Wand</Name>
|
||||||
<RootNamespace>HackSpaceCon_AS7</RootNamespace>
|
<RootNamespace>HackSpaceCon_AS7</RootNamespace>
|
||||||
<ToolchainFlavour>Native</ToolchainFlavour>
|
<ToolchainFlavour>Native</ToolchainFlavour>
|
||||||
<KeepTimersRunning>true</KeepTimersRunning>
|
<KeepTimersRunning>false</KeepTimersRunning>
|
||||||
<OverrideVtor>false</OverrideVtor>
|
<OverrideVtor>false</OverrideVtor>
|
||||||
<CacheFlash>true</CacheFlash>
|
<CacheFlash>true</CacheFlash>
|
||||||
<ProgFlashFromRam>true</ProgFlashFromRam>
|
<ProgFlashFromRam>true</ProgFlashFromRam>
|
||||||
@ -43,7 +43,8 @@
|
|||||||
<avrtool>com.atmel.avrdbg.tool.snap</avrtool>
|
<avrtool>com.atmel.avrdbg.tool.snap</avrtool>
|
||||||
<avrtoolserialnumber>021038102RYN</avrtoolserialnumber>
|
<avrtoolserialnumber>021038102RYN</avrtoolserialnumber>
|
||||||
<avrdeviceexpectedsignature>0x1E9227</avrdeviceexpectedsignature>
|
<avrdeviceexpectedsignature>0x1E9227</avrdeviceexpectedsignature>
|
||||||
<avrtoolinterface>UPDI</avrtoolinterface>
|
<avrtoolinterface>
|
||||||
|
</avrtoolinterface>
|
||||||
<com_atmel_avrdbg_tool_snap>
|
<com_atmel_avrdbg_tool_snap>
|
||||||
<ToolOptions>
|
<ToolOptions>
|
||||||
<InterfaceProperties>
|
<InterfaceProperties>
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user