diff options
| author | Gabriel Hart | 2021-09-19 10:15:57 -0500 |
|---|---|---|
| committer | Gabriel Hart | 2021-09-19 10:15:57 -0500 |
| commit | b1ceb8cc59a075cf9ce69ef4eb1239747be0d4a2 (patch) | |
| tree | d36c0cc56b7452a84f1f7d2bab0125cd3c94ca99 /spaghetti-monster/fsm-main.c | |
| parent | Merge TK's changes thru her rev 618 including autolock in Simple UI and jump ... (diff) | |
| parent | clarified where brightness level comes from in beacon/sos/momentary modes (diff) | |
| download | anduril-b1ceb8cc59a075cf9ce69ef4eb1239747be0d4a2.tar.gz anduril-b1ceb8cc59a075cf9ce69ef4eb1239747be0d4a2.tar.bz2 anduril-b1ceb8cc59a075cf9ce69ef4eb1239747be0d4a2.zip | |
Merge TK changes thru rev 623 (2021-09-17)
Diffstat (limited to 'spaghetti-monster/fsm-main.c')
| -rw-r--r-- | spaghetti-monster/fsm-main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c index 2015563..30b8a67 100644 --- a/spaghetti-monster/fsm-main.c +++ b/spaghetti-monster/fsm-main.c @@ -52,7 +52,9 @@ static inline void hw_setup() { OCR1C = 255; // Set ceiling value to maximum #endif #endif - #if PWM_CHANNELS >= 2 + // tint ramping needs second channel enabled, + // despite PWM_CHANNELS being only 1 + #if (PWM_CHANNELS >= 2) || defined(USE_TINT_RAMPING) DDRB |= (1 << PWM2_PIN); #if (PWM2_PIN == PB4) // Second PWM counter is ... weird TCCR1 = _BV (CS10); |