diff options
| author | Selene ToyKeeper | 2019-11-14 01:52:50 -0700 |
|---|---|---|
| committer | Selene ToyKeeper | 2019-11-14 01:52:50 -0700 |
| commit | 8b59e880614455bd7bc7d8595de847dd6fe9b5b2 (patch) | |
| tree | a7426296b9fa1471ba2841eba0415bbfaed3e5c7 /spaghetti-monster/fsm-pcint.c | |
| parent | fixed some compile issues related to delay_4ms() (diff) | |
| download | anduril-8b59e880614455bd7bc7d8595de847dd6fe9b5b2.tar.gz anduril-8b59e880614455bd7bc7d8595de847dd6fe9b5b2.tar.bz2 anduril-8b59e880614455bd7bc7d8595de847dd6fe9b5b2.zip | |
refactored how interrupts work...
set a flag and return immediately,
then handle the actual logic later during a less-critical code path
Enables smarter responses to standby wakeups.
Seems to fix missed button presses during standby,
and most of the too-fast sleep ticks.
Also eliminated waits from button state measurement, so it can happen easier during standby.
(also eliminates the chance of an infinite loop on extra-noisy hardware)
Also might improve timing-sensitive interrupts like attiny85 PWM channel 4,
or a PWM-DSM hybrid technique I'd like to try.
BUT this change also appears to break the thermal sensor, so that needs to be fixed.
Diffstat (limited to 'spaghetti-monster/fsm-pcint.c')
| -rw-r--r-- | spaghetti-monster/fsm-pcint.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/spaghetti-monster/fsm-pcint.c b/spaghetti-monster/fsm-pcint.c index 4928980..a4a496a 100644 --- a/spaghetti-monster/fsm-pcint.c +++ b/spaghetti-monster/fsm-pcint.c @@ -24,19 +24,9 @@ #include <util/delay_basic.h> uint8_t button_is_pressed() { - // remember the past 32 measurements - static uint32_t readings = 0; - // take at least one new measurement, - // and wait for measurements to settle to all zeroes or all ones - do { - // shift past readings and add current value - readings = (readings << 1) | ((SWITCH_PORT & (1<<SWITCH_PIN)) == 0); - // wait a moment - _delay_loop_2(BOGOMIPS/16); // up to 2ms to stabilize - } - while ((readings != 0) && (readings != 0xFFFFFFFF)); - button_last_state = readings; - return readings; + uint8_t value = ((SWITCH_PORT & (1<<SWITCH_PIN)) == 0); + button_last_state = value; + return value; } inline void PCINT_on() { @@ -75,7 +65,10 @@ inline void PCINT_off() { //void button_change_interrupt() { #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85) || (ATTINY == 1634) -EMPTY_INTERRUPT(PCINT0_vect); +//EMPTY_INTERRUPT(PCINT0_vect); +ISR(PCINT0_vect) { + irq_pcint = 1; +} #else #error Unrecognized MCU type #endif |
