diff options
| author | Selene ToyKeeper | 2019-11-14 18:28:52 -0700 |
|---|---|---|
| committer | Selene ToyKeeper | 2019-11-14 18:28:52 -0700 |
| commit | 81ed77d88c999f9c2368718047d0969fef44e534 (patch) | |
| tree | 9b1bc0b4e27241c61b6052c187e1e347d9ded2ed /spaghetti-monster/fsm-events.c | |
| parent | fixed ADC code; measures and behaves correctly now, and is easier to read... (diff) | |
| download | anduril-81ed77d88c999f9c2368718047d0969fef44e534.tar.gz anduril-81ed77d88c999f9c2368718047d0969fef44e534.tar.bz2 anduril-81ed77d88c999f9c2368718047d0969fef44e534.zip | |
fixed factory reset (wasn't running interrupt logic since it's deferred now)
(also fixed issue where nice_delay_ms() was aborted during setup())
(and adjusted the timing to make factory reset similar to the speed it was before this change)
Diffstat (limited to 'spaghetti-monster/fsm-events.c')
| -rw-r--r-- | spaghetti-monster/fsm-events.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spaghetti-monster/fsm-events.c b/spaghetti-monster/fsm-events.c index e125e84..a1b013a 100644 --- a/spaghetti-monster/fsm-events.c +++ b/spaghetti-monster/fsm-events.c @@ -110,7 +110,7 @@ uint8_t nice_delay_ms(uint16_t ms) { /* // delay_zero() implementation if (ms == 0) { CLKPR = 1<<CLKPCE; CLKPR = 0; // full speed - _delay_loop_2(BOGOMIPS*98/100/3); + _delay_loop_2(BOGOMIPS*95/100/3); return 1; } */ @@ -120,15 +120,15 @@ uint8_t nice_delay_ms(uint16_t ms) { uint8_t level = actual_level; // volatile, avoid repeat access if (level < QUARTERSPEED_LEVEL) { clock_prescale_set(clock_div_4); - _delay_loop_2(BOGOMIPS*98/100/4); + _delay_loop_2(BOGOMIPS*95/100/4); } //else if (level < HALFSPEED_LEVEL) { // clock_prescale_set(clock_div_2); - // _delay_loop_2(BOGOMIPS*98/100/2); + // _delay_loop_2(BOGOMIPS*95/100/2); //} else { clock_prescale_set(clock_div_1); - _delay_loop_2(BOGOMIPS*98/100); + _delay_loop_2(BOGOMIPS*95/100); } // restore regular clock speed clock_prescale_set(clock_div_1); @@ -136,13 +136,13 @@ uint8_t nice_delay_ms(uint16_t ms) { // underclock MCU to save power clock_prescale_set(clock_div_4); // wait - _delay_loop_2(BOGOMIPS*98/100/4); + _delay_loop_2(BOGOMIPS*95/100/4); // restore regular clock speed clock_prescale_set(clock_div_1); #endif // ifdef USE_RAMPING #else // wait - _delay_loop_2(BOGOMIPS*98/100); + _delay_loop_2(BOGOMIPS*95/100); #endif // ifdef USE_DYNAMIC_UNDERCLOCKING // run pending system processes while we wait |