From 6c7c99b1be9a684e3a6ccc533f46979b39f7a529 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 18 Jul 2023 14:44:40 -0600
Subject: converted Emisar D4 and BLF Q8 to multi-channel, and enabled
 previously-removed tactical mode on the Q8 since there seems to be enough
 space now (also lowercased their hwdef files)

---
 spaghetti-monster/fsm-main.c | 88 +++++++++++++++++++++++---------------------
 1 file changed, 46 insertions(+), 42 deletions(-)

(limited to 'spaghetti-monster/fsm-main.c')

diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
index 4116d3f..066188c 100644
--- a/spaghetti-monster/fsm-main.c
+++ b/spaghetti-monster/fsm-main.c
@@ -26,48 +26,52 @@ ISR(TIMER1_COMPA_vect) {
 // FIXME: hw_setup() shouldn't be here ... move it entirely to hwdef files
 #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
 static inline void hw_setup() {
-    // configure PWM channels
-    #if PWM_CHANNELS >= 1
-    DDRB |= (1 << PWM1_PIN);
-    TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
-    TCCR0A = PHASE;
-    #if (PWM1_PIN == PB4) // Second PWM counter is ... weird
-    TCCR1 = _BV (CS10);
-    GTCCR = _BV (COM1B1) | _BV (PWM1B);
-    OCR1C = 255;  // Set ceiling value to maximum
-    #endif
-    #endif
-    // 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);
-    GTCCR = _BV (COM1B1) | _BV (PWM1B);
-    OCR1C = 255;  // Set ceiling value to maximum
-    #endif
-    #endif
-    #if PWM_CHANNELS >= 3
-    DDRB |= (1 << PWM3_PIN);
-    #if (PWM3_PIN == PB4) // Second PWM counter is ... weird
-    TCCR1 = _BV (CS10);
-    GTCCR = _BV (COM1B1) | _BV (PWM1B);
-    OCR1C = 255;  // Set ceiling value to maximum
-    #endif
-    #endif
-    #if PWM_CHANNELS >= 4
-    // 4th PWM channel is ... not actually supported in hardware  :(
-    DDRB |= (1 << PWM4_PIN);
-    //OCR1C = 255;  // Set ceiling value to maximum
-    TCCR1 = 1<<CTC1 | 1<<PWM1A | 3<<COM1A0 | 2<<CS10;
-    GTCCR = (2<<COM1B0) | (1<<PWM1B);
-    // set up an interrupt to control PWM4 pin
-    TIMSK |= (1<<OCIE1A) | (1<<TOIE1);
-    #endif
-
-    // configure e-switch
-    PORTB = (1 << SWITCH_PIN);  // e-switch is the only input
-    PCMSK = (1 << SWITCH_PIN);  // pin change interrupt uses this pin
+    #if !defined(USE_GENERIC_HWDEF_SETUP)
+        hwdef_setup();
+    #else
+        // configure PWM channels
+        #if PWM_CHANNELS >= 1
+            DDRB |= (1 << PWM1_PIN);
+            TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)
+            TCCR0A = PHASE;
+            #if (PWM1_PIN == PB4) // Second PWM counter is ... weird
+                TCCR1 = _BV (CS10);
+                GTCCR = _BV (COM1B1) | _BV (PWM1B);
+                OCR1C = 255;  // Set ceiling value to maximum
+            #endif
+        #endif
+        // 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);
+                GTCCR = _BV (COM1B1) | _BV (PWM1B);
+                OCR1C = 255;  // Set ceiling value to maximum
+            #endif
+        #endif
+        #if PWM_CHANNELS >= 3
+            DDRB |= (1 << PWM3_PIN);
+            #if (PWM3_PIN == PB4) // Second PWM counter is ... weird
+                TCCR1 = _BV (CS10);
+                GTCCR = _BV (COM1B1) | _BV (PWM1B);
+                OCR1C = 255;  // Set ceiling value to maximum
+            #endif
+        #endif
+        #if PWM_CHANNELS >= 4
+            // 4th PWM channel is ... not actually supported in hardware  :(
+            DDRB |= (1 << PWM4_PIN);
+            //OCR1C = 255;  // Set ceiling value to maximum
+            TCCR1 = 1<<CTC1 | 1<<PWM1A | 3<<COM1A0 | 2<<CS10;
+            GTCCR = (2<<COM1B0) | (1<<PWM1B);
+            // set up an interrupt to control PWM4 pin
+            TIMSK |= (1<<OCIE1A) | (1<<TOIE1);
+        #endif
+
+        // configure e-switch
+        PORTB = (1 << SWITCH_PIN);  // e-switch is the only input
+        PCMSK = (1 << SWITCH_PIN);  // pin change interrupt uses this pin
+    #endif  // ifdef USE_GENERIC_HWDEF_SETUP
 }
 #elif (ATTINY == 1634) || defined(AVRXMEGA3)  // ATTINY816, 817, etc
 static inline void hw_setup() {
-- 
cgit v1.2.3