From 3d12b7066d27b591e0283e20ed066bc66e29fbe4 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 10 Nov 2023 21:34:40 -0700
Subject: refactor checkpoint: splitting MCU-specific code into arch/$MCU.[ch]

Phew, that's a lot of changes!  And there's still a lot more to do...
---
 arch/attiny1616.c                                  | 147 ++++++++++++++++++
 arch/attiny1616.h                                  |  96 ++++++++++++
 arch/attiny1634.c                                  | 125 +++++++++++++++
 arch/attiny1634.h                                  |  98 ++++++++++++
 arch/attiny85.c                                    | 167 +++++++++++++++++++++
 arch/attiny85.h                                    |  91 +++++++++++
 arch/mcu.c                                         |  10 ++
 arch/mcu.h                                         | 147 ++----------------
 bin/detect-mcu.sh                                  |   4 +-
 fsm/adc.c                                          | 159 +++-----------------
 fsm/adc.h                                          |  12 +-
 fsm/main.c                                         |  62 +-------
 fsm/misc.c                                         |  22 ---
 fsm/misc.h                                         |   4 -
 fsm/pcint.c                                        |  54 +------
 fsm/pcint.h                                        |   6 +-
 fsm/spaghetti-monster.h                            |   9 +-
 fsm/wdt.c                                          |  78 +---------
 fsm/wdt.h                                          |   7 +-
 hw/gchart/fet1-t1616/hwdef.h                       |   4 +-
 hw/hank/emisar-2ch/fet/hwdef.h                     |   6 +-
 hw/hank/emisar-2ch/hwdef.h                         |   6 +-
 hw/hank/emisar-d18/hwdef.h                         |   4 +-
 hw/hank/emisar-d4/hwdef.h                          |   4 +-
 hw/hank/emisar-d4k-3ch/hwdef.h                     |   6 +-
 hw/hank/emisar-d4sv2/hwdef.h                       |   6 +-
 hw/hank/emisar-d4v2/hwdef.h                        |   8 +-
 hw/hank/emisar-d4v2/nofet/anduril.h                |   2 +-
 hw/hank/noctigon-dm11/boost/hwdef.h                |   6 +-
 hw/hank/noctigon-dm11/hwdef.h                      |   8 +-
 hw/hank/noctigon-dm11/nofet/anduril.h              |   2 +-
 hw/hank/noctigon-k1/boost/hwdef.h                  |   6 +-
 hw/hank/noctigon-k1/hwdef.h                        |   8 +-
 hw/hank/noctigon-k1/sbt90/hwdef.h                  |   6 +-
 hw/hank/noctigon-kr4/2ch/hwdef.h                   |   4 +-
 hw/hank/noctigon-kr4/boost/hwdef.h                 |   4 +-
 hw/hank/noctigon-kr4/hwdef.h                       |   8 +-
 hw/hank/noctigon-kr4/nofet/anduril.h               |   2 +-
 hw/hank/noctigon-m44/hwdef.h                       |   6 +-
 hw/lumintop/blf-gt/hwdef.h                         |   4 +-
 hw/lumintop/fw3a/hwdef.h                           |   4 +-
 hw/lumintop/fw3x-lume1/hwdef.h                     |   6 +-
 hw/mateminco/mf01-mini/hwdef.h                     |   4 +-
 hw/mateminco/mf01s/hwdef.h                         |   4 +-
 hw/mateminco/mt35-mini/hwdef.h                     |   4 +-
 hw/sofirn/blf-lt1-t1616/hwdef.h                    |   4 +-
 hw/sofirn/blf-lt1/hwdef.h                          |   4 +-
 hw/sofirn/blf-q8-t1616/hwdef.h                     |   4 +-
 hw/sofirn/lt1s-pro/hwdef.h                         |   4 +-
 hw/sofirn/sp10-pro/hwdef.h                         |   6 +-
 .../boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h          |   6 +-
 hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h  |   6 +-
 hw/thefreeman/lin16dac/hwdef.h                     |   4 +-
 hw/wurkkos/ts10/hwdef.h                            |   6 +-
 hw/wurkkos/ts25/hwdef.h                            |   6 +-
 ui/anduril/anduril.c                               |  18 ++-
 ui/anduril/config-default.h                        |   6 +-
 57 files changed, 862 insertions(+), 642 deletions(-)
 create mode 100644 arch/attiny1616.c
 create mode 100644 arch/attiny1616.h
 create mode 100644 arch/attiny1634.c
 create mode 100644 arch/attiny1634.h
 create mode 100644 arch/attiny85.c
 create mode 100644 arch/attiny85.h
 create mode 100644 arch/mcu.c

diff --git a/arch/attiny1616.c b/arch/attiny1616.c
new file mode 100644
index 0000000..3b170bb
--- /dev/null
+++ b/arch/attiny1616.c
@@ -0,0 +1,147 @@
+// arch/attiny1616.c: attiny1616 support functions
+// Copyright (C) 2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#include "arch/attiny1616.h"
+
+////////// clock speed / delay stuff //////////
+
+///// clock dividers
+// this should work, but needs further validation
+inline void clock_prescale_set(uint8_t n) {
+    cli();
+    CCP = CCP_IOREG_gc; // temporarily disable clock change protection
+    CLKCTRL.MCLKCTRLB = n; // Set the prescaler
+    while (CLKCTRL.MCLKSTATUS & CLKCTRL_SOSC_bm) {} // wait for clock change to finish
+    sei();
+}
+
+////////// ADC voltage / temperature //////////
+
+inline void mcu_set_admux_therm() {
+    ADC0.MUXPOS = ADC_MUXPOS_TEMPSENSE_gc;  // read temperature
+    ADC0.CTRLC = ADC_SAMPCAP_bm
+               | ADC_PRESC_DIV64_gc
+               | ADC_REFSEL_INTREF_gc; // Internal ADC reference
+}
+
+inline void mcu_set_admux_voltage() {
+    #ifdef USE_VOLTAGE_DIVIDER  // 1.1V / ADC input pin
+        // verify that this is correct!!!  untested
+        ADC0.MUXPOS = ADMUX_VOLTAGE_DIVIDER;  // read the requested ADC pin
+        ADC0.CTRLC = ADC_SAMPCAP_bm
+                   | ADC_PRESC_DIV64_gc
+                   | ADC_REFSEL_INTREF_gc; // Use internal ADC reference
+    #else  // VCC / 1.1V reference
+        ADC0.MUXPOS = ADC_MUXPOS_INTREF_gc;  // read internal reference
+        ADC0.CTRLC = ADC_SAMPCAP_bm
+                   | ADC_PRESC_DIV64_gc
+                   | ADC_REFSEL_VDDREF_gc; // Vdd (Vcc) be ADC reference
+    #endif
+}
+
+inline void mcu_adc_sleep_mode() {
+    set_sleep_mode(SLEEP_MODE_STANDBY);
+}
+
+inline void mcu_adc_start_measurement() {
+    ADC0.INTCTRL |= ADC_RESRDY_bm; // enable interrupt
+    ADC0.COMMAND |= ADC_STCONV_bm; // Start the ADC conversions
+}
+
+inline void mcu_adc_on() {
+    VREF.CTRLA |= VREF_ADC0REFSEL_1V1_gc; // Set Vbg ref to 1.1V
+    // Enabled, free-running (aka, auto-retrigger), run in standby
+    ADC0.CTRLA = ADC_ENABLE_bm | ADC_FREERUN_bm | ADC_RUNSTBY_bm;
+    // set a INITDLY value because the AVR manual says so (section 30.3.5)
+    // (delay 1st reading until Vref is stable)
+    ADC0.CTRLD |= ADC_INITDLY_DLY16_gc;
+    hwdef_set_admux_voltage();
+}
+
+inline void mcu_adc_off() {
+    ADC0.CTRLA &= ~(ADC_ENABLE_bm);  // disable the ADC
+}
+
+inline void mcu_adc_vect_clear() {
+    ADC0.INTFLAGS = ADC_RESRDY_bm; // clear the interrupt
+}
+
+inline uint16_t mcu_adc_result_temp() {
+    // Use the factory calibrated values in SIGROW.TEMPSENSE0 and
+    // SIGROW.TEMPSENSE1 to calculate a temperature reading in Kelvin, then
+    // left-align it.
+    int8_t sigrow_offset = SIGROW.TEMPSENSE1;  // Read signed value from signature row
+    uint8_t sigrow_gain = SIGROW.TEMPSENSE0;  // Read unsigned value from signature row
+    uint32_t temp = ADC0.RES - sigrow_offset;
+    temp *= sigrow_gain;  // Result might overflow 16 bit variable (10bit+8bit)
+    temp += 0x80;  // Add 1/2 to get correct rounding on division below
+    //temp >>= 8;  // Divide result to get Kelvin
+    //return temp << 6;  // left align it
+    return temp >> 2;  // left-aligned uint16_t
+}
+
+inline uint16_t mcu_adc_result_volts() {
+    // FIXME: set up ADC to use left-aligned values natively
+    return ADC0.RES << 6;  // voltage, force left-alignment
+}
+
+inline uint8_t mcu_adc_lsb() {
+    //return (ADCL >> 6) + (ADCH << 2);
+    return ADC0.RESL; // right aligned, not left... so should be equivalent?
+}
+
+
+////////// WDT //////////
+
+inline void mcu_wdt_active() {
+    RTC.PITINTCTRL = RTC_PI_bm;   // enable the Periodic Interrupt
+    while (RTC.PITSTATUS > 0) {}  // make sure the register is ready to be updated
+    RTC.PITCTRLA = RTC_PERIOD_CYC512_gc | RTC_PITEN_bm; // Period = 16ms, enable the PI Timer
+}
+
+inline void mcu_wdt_standby() {
+    RTC.PITINTCTRL = RTC_PI_bm;   // enable the Periodic Interrupt
+    while (RTC.PITSTATUS > 0) {}  // make sure the register is ready to be updated
+    RTC.PITCTRLA = (1<<6) | (STANDBY_TICK_SPEED<<3) | RTC_PITEN_bm; // Set period, enable the PI Timer
+}
+
+inline void mcu_wdt_stop() {
+    while (RTC.PITSTATUS > 0) {}  // make sure the register is ready to be updated
+    RTC.PITCTRLA = 0; // Disable the PI Timer
+}
+
+inline void mcu_wdt_vect_clear() {
+    RTC.PITINTFLAGS = RTC_PI_bm; // clear the PIT interrupt flag
+}
+
+
+////////// PCINT - pin change interrupt (e-switch) //////////
+
+inline void mcu_switch_vect_clear() {
+    // Write a '1' to clear the interrupt flag
+    SWITCH_INTFLG |= (1 << SWITCH_PIN);
+}
+
+inline void mcu_pcint_on() {
+    SWITCH_ISC_REG |= PORT_ISC_BOTHEDGES_gc;
+}
+
+inline void mcu_pcint_off() {
+    SWITCH_ISC_REG &= ~(PORT_ISC_gm);
+}
+
+
+////////// misc //////////
+
+void reboot() {
+    // put the WDT in hard reset mode, then trigger it
+    cli();
+    CCP = CCP_IOREG_gc;  // temporarily disable change protection
+    WDT.CTRLA = WDT_PERIOD_8CLK_gc;  // Enable, timeout 8ms
+    sei();
+    wdt_reset();
+    while (1) {}
+}
+
diff --git a/arch/attiny1616.h b/arch/attiny1616.h
new file mode 100644
index 0000000..5989785
--- /dev/null
+++ b/arch/attiny1616.h
@@ -0,0 +1,96 @@
+// arch/attiny1616.h: attiny1616 support header
+// Copyright (C) 2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+// FIXME: remove this
+#define AVRXMEGA3
+
+////////// clock speed / delay stuff //////////
+
+#define F_CPU  10000000UL
+#define BOGOMIPS  (F_CPU/4700)
+#define DELAY_ZERO_TIME  1020
+
+///// clock dividers
+// this should work, but needs further validation
+inline void clock_prescale_set(uint8_t n);
+
+typedef enum
+{
+    // Actual clock is 20 MHz, but assume that 10 MHz is the top speed and work from there
+    // TODO: measure PWM speed and power use at 1.25/2.5/5/10 MHz, to determine which speeds are optimal
+    clock_div_1 =   (CLKCTRL_PDIV_2X_gc  | CLKCTRL_PEN_bm), // 10 MHz
+    clock_div_2 =   (CLKCTRL_PDIV_4X_gc  | CLKCTRL_PEN_bm), // 5 MHz
+    clock_div_4 =   (CLKCTRL_PDIV_8X_gc  | CLKCTRL_PEN_bm), // 2.5 MHz
+    clock_div_8 =   (CLKCTRL_PDIV_16X_gc | CLKCTRL_PEN_bm), // 1.25 MHz
+    clock_div_16 =  (CLKCTRL_PDIV_32X_gc | CLKCTRL_PEN_bm), // 625 kHz
+    clock_div_32 =  (CLKCTRL_PDIV_64X_gc | CLKCTRL_PEN_bm), // 312 kHz, max without changing to the 32 kHz ULP
+    clock_div_64 =  (CLKCTRL_PDIV_64X_gc | CLKCTRL_PEN_bm), // 312 kHz
+    clock_div_128 = (CLKCTRL_PDIV_64X_gc | CLKCTRL_PEN_bm), // 312 kHz
+    clock_div_256 = (CLKCTRL_PDIV_64X_gc | CLKCTRL_PEN_bm)  // 312 kHz
+} clock_div_t;
+
+
+////////// ADC voltage / temperature //////////
+
+#define hwdef_set_admux_therm  mcu_set_admux_therm
+inline void mcu_set_admux_therm();
+
+#define hwdef_set_admux_voltage mcu_set_admux_voltage
+inline void mcu_set_admux_voltage();
+
+inline void mcu_adc_sleep_mode();
+
+inline void mcu_adc_start_measurement();
+
+inline void mcu_adc_on();
+
+inline void mcu_adc_off();
+
+#define ADC_vect  ADC0_RESRDY_vect
+inline void mcu_adc_vect_clear();
+
+// read ADC differently for temperature and voltage
+#define MCU_ADC_RESULT_PER_TYPE
+
+inline uint16_t mcu_adc_result_temp();
+
+inline uint16_t mcu_adc_result_volts();
+
+inline uint8_t mcu_adc_lsb();
+
+
+////////// WDT //////////
+
+inline void mcu_wdt_active();
+
+inline void mcu_wdt_standby();
+
+inline void mcu_wdt_stop();
+
+// *** Note for the AVRXMEGA3 (1-Series, eg 816 and 817), the WDT 
+// is not used for time-based interrupts.  A new peripheral, the 
+// Periodic Interrupt Timer ("PIT") is used for this purpose.
+
+#define WDT_vect  RTC_PIT_vect
+inline void mcu_wdt_vect_clear();
+
+
+////////// PCINT - pin change interrupt (e-switch) //////////
+
+// set these in hwdef
+//#define SWITCH_PORT  PINA
+//#define SWITCH_VECT  PCINT0_vect
+
+inline void mcu_switch_vect_clear();
+
+inline void mcu_pcint_on();
+
+inline void mcu_pcint_off();
+
+
+////////// misc //////////
+
+void reboot();
+
diff --git a/arch/attiny1634.c b/arch/attiny1634.c
new file mode 100644
index 0000000..d4b3767
--- /dev/null
+++ b/arch/attiny1634.c
@@ -0,0 +1,125 @@
+// arch/attiny1634.c: attiny85 support functions
+// Copyright (C) 2014-2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#include "arch/attiny1634.h"
+
+////////// clock speed / delay stuff //////////
+
+///// clock dividers
+// make it a NOP for now
+// FIXME
+//#define clock_prescale_set(x) ((void)0)
+//#define clock_prescale_set(n) {cli(); CCP = 0xD8; CLKPR = n; sei();}
+//#define clock_prescale_set(n) {cli(); CCP = 0xD8; CLKPR = n; sei();}
+inline void clock_prescale_set(uint8_t n) {
+    cli();
+    CCP = 0xD8;
+    CLKPR = n;
+    sei();
+}
+
+////////// default hw_setup() //////////
+
+
+////////// ADC voltage / temperature //////////
+
+inline void mcu_set_admux_therm() {
+    ADMUX = ADMUX_THERM;
+}
+
+inline void mcu_set_admux_voltage() {
+    #ifdef USE_VOLTAGE_DIVIDER  // 1.1V / pin7
+        ADMUX = ADMUX_VOLTAGE_DIVIDER;
+    #else  // VCC / 1.1V reference
+        ADMUX = ADMUX_VCC;
+    #endif
+}
+
+inline void mcu_adc_sleep_mode() {
+    set_sleep_mode(SLEEP_MODE_ADC);
+}
+
+inline void mcu_adc_start_measurement() {
+    ADCSRA |= (1 << ADSC) | (1 << ADIE);
+}
+
+inline void mcu_adc_on() {
+    hwdef_set_admux_voltage();
+    #ifdef USE_VOLTAGE_DIVIDER
+        // disable digital input on divider pin to reduce power consumption
+        VOLTAGE_ADC_DIDR |= (1 << VOLTAGE_ADC);
+    #else
+        // disable digital input on VCC pin to reduce power consumption
+        //VOLTAGE_ADC_DIDR |= (1 << VOLTAGE_ADC);  // FIXME: unsure how to handle for VCC pin
+    #endif
+    //ACSRA |= (1 << ACD);  // turn off analog comparator to save power
+    ADCSRB |= (1 << ADLAR);  // left-adjust flag is here instead of ADMUX
+    // enable, start, auto-retrigger, prescale
+    ADCSRA = (1 << ADEN) | (1 << ADSC) | (1 << ADATE) | ADC_PRSCL;
+}
+
+inline void mcu_adc_off() {
+    ADCSRA &= ~(1<<ADEN); //ADC off
+}
+
+inline uint16_t mcu_adc_result() { return ADC; }
+
+inline uint8_t mcu_adc_lsb() { return (ADCL >> 6) + (ADCH << 2); }
+
+
+////////// WDT //////////
+
+inline void mcu_wdt_active() {
+    wdt_reset();                    // Reset the WDT
+    WDTCSR = (1<<WDIE);             // Enable interrupt every 16ms
+}
+
+inline void mcu_wdt_standby() {
+    wdt_reset();                    // Reset the WDT
+    WDTCSR = (1<<WDIE) | STANDBY_TICK_SPEED;
+}
+
+inline void mcu_wdt_stop() {
+    cli();                // needed because CCP, below
+    wdt_reset();          // Reset the WDT
+    MCUSR &= ~(1<<WDRF);  // clear watchdog reset flag
+    CCP = 0xD8;           // enable config changes
+    WDTCSR = 0;           // disable and clear all WDT settings
+    sei();
+}
+
+
+////////// PCINT - pin change interrupt (e-switch) //////////
+
+inline void mcu_pcint_on() {
+    // enable pin change interrupt
+    #ifdef SWITCH2_PCIE
+    GIMSK |= ((1 << SWITCH_PCIE) | (1 << SWITCH2_PCIE));
+    #else
+    GIMSK |= (1 << SWITCH_PCIE);
+    #endif
+}
+
+inline void mcu_pcint_off() {
+    // disable all pin-change interrupts
+    GIMSK &= ~(1 << SWITCH_PCIE);
+}
+
+
+////////// misc //////////
+
+void reboot() {
+    // put the WDT in hard reset mode, then trigger it
+    cli();
+    // allow protected configuration changes for next 4 clock cycles
+    CCP = 0xD8;  // magic number
+    // reset (WDIF + WDE), no WDIE, fastest (16ms) timing (0000)
+    // (DS section 8.5.2 and table 8-4)
+    WDTCSR = 0b10001000;
+    sei();
+    wdt_reset();
+    while (1) {}
+}
+
diff --git a/arch/attiny1634.h b/arch/attiny1634.h
new file mode 100644
index 0000000..e01abad
--- /dev/null
+++ b/arch/attiny1634.h
@@ -0,0 +1,98 @@
+// arch/attiny1634.h: attiny1634 support header
+// Copyright (C) 2014-2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+// fill in missing values from Atmel's headers
+#define PROGMEM_SIZE  16384
+#define EEPROM_SIZE   256
+
+////////// clock speed / delay stuff //////////
+
+#define F_CPU  8000000UL
+#define BOGOMIPS  (F_CPU/4000)
+#define DELAY_ZERO_TIME  1020
+
+///// clock dividers
+inline void clock_prescale_set(uint8_t n);
+
+typedef enum
+{
+    clock_div_1 = 0,
+    clock_div_2 = 1,
+    clock_div_4 = 2,
+    clock_div_8 = 3,
+    clock_div_16 = 4,
+    clock_div_32 = 5,
+    clock_div_64 = 6,
+    clock_div_128 = 7,
+    clock_div_256 = 8
+} clock_div_t;
+
+
+////////// ADC voltage / temperature //////////
+
+#define V_REF REFS1
+//#define VOLTAGE_ADC_DIDR DIDR0  // set this in hwdef
+
+// DS table 19-3, 19-4, 1.1V ref / VCC
+#define ADMUX_VCC 0b00001101
+// (1 << V_REF) | (THERM_CHANNEL)
+// DS table 19-3, 19-4, internal sensor / 1.1V ref
+#define ADMUX_THERM 0b10001110
+
+
+
+
+#define hwdef_set_admux_therm  mcu_set_admux_therm
+inline void mcu_set_admux_therm();
+
+#define hwdef_set_admux_voltage mcu_set_admux_voltage
+inline void mcu_set_admux_voltage();
+
+inline void mcu_adc_sleep_mode();
+
+inline void mcu_adc_start_measurement();
+
+inline void mcu_adc_on();
+
+inline void mcu_adc_off();
+
+// NOP because interrupt flag clears itself
+#define mcu_adc_vect_clear()
+
+inline uint16_t mcu_adc_result();
+
+inline uint8_t mcu_adc_lsb();
+
+
+////////// WDT //////////
+
+inline void mcu_wdt_active();
+
+inline void mcu_wdt_standby();
+
+inline void mcu_wdt_stop();
+
+// NOP because interrupt flag clears itself
+#define mcu_wdt_vect_clear()
+
+
+////////// PCINT - pin change interrupt (e-switch) //////////
+
+// set these in hwdef
+//#define SWITCH_PORT  PINA
+//#define SWITCH_VECT  PCINT0_vect
+
+// NOP because interrupt flag clears itself
+#define mcu_switch_vect_clear()
+
+inline void mcu_pcint_on();
+
+inline void mcu_pcint_off();
+
+
+////////// misc //////////
+
+void reboot();
+
diff --git a/arch/attiny85.c b/arch/attiny85.c
new file mode 100644
index 0000000..40cbcfe
--- /dev/null
+++ b/arch/attiny85.c
@@ -0,0 +1,167 @@
+// arch/attiny85.c: attiny85 support functions
+// Copyright (C) 2014-2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#include "arch/attiny85.h"
+
+////////// clock speed / delay stuff //////////
+
+///// clock dividers
+
+////////// default hw_setup() //////////
+
+// FIXME: fsm/main should call hwdef_setup(), not hw_setup,
+//        and this function should be hwdef_setup
+#ifdef USE_GENERIC_HWDEF_SETUP
+static inline void hwdef_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
+}
+#endif  // #ifdef USE_GENERIC_HWDEF_SETUP
+
+
+////////// ADC voltage / temperature //////////
+
+inline void mcu_set_admux_therm() {
+    ADMUX = ADMUX_THERM | (1 << ADLAR);
+}
+
+inline void mcu_set_admux_voltage() {
+    #ifdef USE_VOLTAGE_DIVIDER  // 1.1V / pin7
+        ADMUX = ADMUX_VOLTAGE_DIVIDER | (1 << ADLAR);
+    #else  // VCC / 1.1V reference
+        ADMUX = ADMUX_VCC | (1 << ADLAR);
+    #endif
+}
+
+inline void mcu_adc_sleep_mode() {
+    set_sleep_mode(SLEEP_MODE_ADC);
+}
+
+inline void mcu_adc_start_measurement() {
+    ADCSRA |= (1 << ADSC) | (1 << ADIE);
+}
+
+inline void mcu_adc_on() {
+    hwdef_set_admux_voltage();
+    #ifdef USE_VOLTAGE_DIVIDER
+        // disable digital input on divider pin to reduce power consumption
+        VOLTAGE_ADC_DIDR |= (1 << VOLTAGE_ADC);
+    #else
+        // disable digital input on VCC pin to reduce power consumption
+        //VOLTAGE_ADC_DIDR |= (1 << VOLTAGE_ADC);  // FIXME: unsure how to handle for VCC pin
+    #endif
+    // enable, start, auto-retrigger, prescale
+    ADCSRA = (1 << ADEN) | (1 << ADSC) | (1 << ADATE) | ADC_PRSCL;
+}
+
+inline void mcu_adc_off() {
+    ADCSRA &= ~(1<<ADEN); //ADC off
+}
+
+inline uint16_t mcu_adc_result() { return ADC; }
+
+inline uint8_t mcu_adc_lsb() { return (ADCL >> 6) + (ADCH << 2); }
+
+
+////////// WDT //////////
+
+inline void mcu_wdt_active() {
+    // interrupt every 16ms
+    //cli();                          // Disable interrupts
+    wdt_reset();                    // Reset the WDT
+    WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
+    WDTCR = (1<<WDIE);              // Enable interrupt every 16ms
+    //sei();                          // Enable interrupts
+}
+
+inline void mcu_wdt_standby() {
+    // interrupt slower
+    //cli();                          // Disable interrupts
+    wdt_reset();                    // Reset the WDT
+    WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
+    WDTCR = (1<<WDIE) | STANDBY_TICK_SPEED; // Enable interrupt every so often
+    //sei();                          // Enable interrupts
+}
+
+inline void mcu_wdt_stop() {
+    //cli();                          // Disable interrupts
+    wdt_reset();                    // Reset the WDT
+    MCUSR &= ~(1<<WDRF);            // Clear Watchdog reset flag
+    WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
+    WDTCR = 0x00;                   // Disable WDT
+    //sei();                          // Enable interrupts
+}
+
+
+////////// PCINT - pin change interrupt (e-switch) //////////
+
+inline void mcu_pcint_on() {
+    // enable pin change interrupt
+    GIMSK |= (1 << PCIE);
+    // only pay attention to the e-switch pin
+    #if 0  // this is redundant; was already done in main()
+    PCMSK = (1 << SWITCH_PCINT);
+    #endif
+    // set bits 1:0 to 0b01 (interrupt on rising *and* falling edge) (default)
+    // MCUCR &= 0b11111101;  MCUCR |= 0b00000001;
+}
+
+inline void mcu_pcint_off() {
+    // disable all pin-change interrupts
+    GIMSK &= ~(1 << PCIE);
+}
+
+
+////////// misc //////////
+
+void reboot() {
+    // put the WDT in hard reset mode, then trigger it
+    cli();
+    WDTCR = 0xD8 | WDTO_15MS;
+    sei();
+    wdt_reset();
+    while (1) {}
+}
+
diff --git a/arch/attiny85.h b/arch/attiny85.h
new file mode 100644
index 0000000..840079c
--- /dev/null
+++ b/arch/attiny85.h
@@ -0,0 +1,91 @@
+// arch/attiny85.h: attiny85 support header
+// Copyright (C) 2014-2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+// fill in missing values from Atmel's headers
+#define PROGMEM_SIZE  8192
+#define EEPROM_SIZE   512
+
+////////// clock speed / delay stuff //////////
+
+// TODO: Use 6.4 MHz instead of 8 MHz?
+#define F_CPU  8000000UL
+#define BOGOMIPS  (F_CPU/4000)
+#define DELAY_ZERO_TIME  1020
+
+///// clock dividers
+// use clock_prescale_set(n) instead; it's safer
+//#define CLOCK_DIVIDER_SET(n) {CLKPR = 1<<CLKPCE; CLKPR = n;}
+
+
+////////// default hw_setup() //////////
+
+// FIXME: fsm/main should call hwdef_setup(), not hw_setup,
+//        and this function should be hwdef_setup
+#ifdef USE_GENERIC_HWDEF_SETUP
+static inline void hwdef_setup();
+#endif
+
+
+////////// ADC voltage / temperature //////////
+
+#define V_REF REFS1
+#define VOLTAGE_ADC_DIDR DIDR0  // this MCU only has one DIDR
+
+// (1 << V_REF) | (0 << ADLAR) | (VCC_CHANNEL)
+#define ADMUX_VCC 0b00001100
+// (1 << V_REF) | (0 << ADLAR) | (THERM_CHANNEL)
+#define ADMUX_THERM 0b10001111
+
+#define hwdef_set_admux_therm  mcu_set_admux_therm
+inline void mcu_set_admux_therm();
+
+#define hwdef_set_admux_voltage mcu_set_admux_voltage
+inline void mcu_set_admux_voltage();
+
+inline void mcu_adc_sleep_mode();
+
+inline void mcu_adc_start_measurement();
+
+inline void mcu_adc_on();
+
+inline void mcu_adc_off();
+
+// NOP because interrupt flag clears itself
+#define mcu_adc_vect_clear()
+
+inline uint16_t mcu_adc_result();
+
+inline uint8_t mcu_adc_lsb();
+
+
+////////// WDT //////////
+
+inline void mcu_wdt_active();
+
+inline void mcu_wdt_standby();
+
+inline void mcu_wdt_stop();
+
+// NOP because interrupt flag clears itself
+#define mcu_wdt_vect_clear()
+
+
+////////// PCINT - pin change interrupt (e-switch) //////////
+
+#define SWITCH_PORT  PINB  // PINA or PINB or PINC
+#define SWITCH_VECT  PCINT0_vect
+
+// NOP because interrupt flag clears itself
+#define mcu_switch_vect_clear()
+
+inline void mcu_pcint_on();
+
+inline void mcu_pcint_off();
+
+
+////////// misc //////////
+
+void reboot();
+
diff --git a/arch/mcu.c b/arch/mcu.c
new file mode 100644
index 0000000..8881c16
--- /dev/null
+++ b/arch/mcu.c
@@ -0,0 +1,10 @@
+// arch/mcu.c: Attiny portability header.
+// Copyright (C) 2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#include "arch/mcu.h"
+
+#define MCU_C arch/MCUNAME.c
+#include incfile(MCU_C)
+
diff --git a/arch/mcu.h b/arch/mcu.h
index 3b2b974..2080ea9 100644
--- a/arch/mcu.h
+++ b/arch/mcu.h
@@ -5,145 +5,20 @@
 
 // This helps abstract away the differences between various attiny MCUs.
 
-// auto-detect eeprom size from avr-libc headers
-#ifndef EEPROM_SIZE
-    #ifdef E2SIZE
-        #define EEPROM_SIZE E2SIZE
-    #elif defined(E2END)
-        #define EEPROM_SIZE (E2END+1)
-    #endif
-#endif
-
-/******************** hardware-specific values **************************/
-#if (ATTINY == 13)
-    #define F_CPU 4800000UL
-    #define V_REF REFS0
-    #define BOGOMIPS 950
-    #define ADMUX_VCC 0b00001100
-    #define DELAY_ZERO_TIME 252
-    #define SWITCH_PORT  PINB  // PINA or PINB or PINC
-    #define VOLTAGE_ADC_DIDR DIDR0  // this MCU only has one DIDR
-#elif (ATTINY == 25)
-    // TODO: Use 6.4 MHz instead of 8 MHz?
-    #define F_CPU 8000000UL
-    #define V_REF REFS1
-    #define BOGOMIPS (F_CPU/4000)
-    #define ADMUX_VCC 0b00001100
-    #define ADMUX_THERM 0b10001111
-    #define DELAY_ZERO_TIME 1020
-    #define SWITCH_PORT  PINB  // PINA or PINB or PINC
-    #define VOLTAGE_ADC_DIDR DIDR0  // this MCU only has one DIDR
-#elif (ATTINY == 85)
-    // TODO: Use 6.4 MHz instead of 8 MHz?
-    #define F_CPU 8000000UL
-    #define V_REF REFS1
-    #define BOGOMIPS (F_CPU/4000)
-    // (1 << V_REF) | (0 << ADLAR) | (VCC_CHANNEL)
-    #define ADMUX_VCC 0b00001100
-    // (1 << V_REF) | (0 << ADLAR) | (THERM_CHANNEL)
-    #define ADMUX_THERM 0b10001111
-    #define DELAY_ZERO_TIME 1020
-    #define SWITCH_PORT  PINB  // PINA or PINB or PINC
-    #define VOLTAGE_ADC_DIDR DIDR0  // this MCU only has one DIDR
-#elif (ATTINY == 1634)
-    #define F_CPU 8000000UL
-    #define V_REF REFS1
-    #define BOGOMIPS (F_CPU/4000)
-    // DS table 19-3, 19-4, 1.1V ref / VCC
-    #define ADMUX_VCC 0b00001101
-    // (1 << V_REF) | (THERM_CHANNEL)
-    // DS table 19-3, 19-4, internal sensor / 1.1V ref
-    #define ADMUX_THERM 0b10001110
-    #define DELAY_ZERO_TIME 1020
-    //#define SWITCH_PORT  PINA  // set this in hwdef
-    //#define VOLTAGE_ADC_DIDR DIDR0  // set this in hwdef
-#elif (ATTINY == 412) || (ATTINY == 416) || (ATTINY == 417) || (ATTINY == 816) || (ATTINY == 817) || (ATTINY == 1616) || (ATTINY == 1617) || (ATTINY == 3216) || (ATTINY == 3217)
-    #define AVRXMEGA3
-    #define F_CPU 10000000UL
-    #define BOGOMIPS (F_CPU/4700)
-    #define DELAY_ZERO_TIME 1020
-#else
-    #error Hey, you need to define ATTINY.
-#endif
-
-
+#include <avr/eeprom.h>
 #include <avr/interrupt.h>
+#include <avr/io.h>
+#include <avr/power.h>
+#include <avr/sleep.h>
+#include <avr/wdt.h>
 
-/******************** I/O pin and register layout ************************/
-#ifdef HWDEFFILE
-#include "fsm/tk.h"
-#include incfile(HWDEFFILE)
-#endif
-
-#if 0  // placeholder
-
-#elif defined(NANJG_LAYOUT)
-#include "hwdef-nanjg.h"
 
-#elif defined(FET_7135_LAYOUT)
-#include "hwdef-FET_7135.h"
+// for consistency, ROM_SIZE + EEPROM_SIZE
+#define ROM_SIZE  PROGMEM_SIZE
 
-#elif defined(TRIPLEDOWN_LAYOUT)
-#include "hwdef-Tripledown.h"
-
-#elif defined(FERRERO_ROCHER_LAYOUT)
-#include "hwdef-Ferrero_Rocher.h"
-
-#endif  // no more recognized driver types
-
-#ifndef LAYOUT_DEFINED
-#error Hey, you need to define an I/O pin layout.
-#endif
-
-#if (ATTINY==13)
-  // no changes needed
-#elif (ATTINY==25) || (ATTINY==45) || (ATTINY==85)
-  // use clock_prescale_set(n) instead; it's safer
-  //#define CLOCK_DIVIDER_SET(n) {CLKPR = 1<<CLKPCE; CLKPR = n;}
-#elif (ATTINY==1634)
-  // make it a NOP for now
-  // FIXME
-  //#define clock_prescale_set(x) ((void)0)
-  //#define clock_prescale_set(n) {cli(); CCP = 0xD8; CLKPR = n; sei();}
-  //#define clock_prescale_set(n) {cli(); CCP = 0xD8; CLKPR = n; sei();}
-  inline void clock_prescale_set(uint8_t n) {cli(); CCP = 0xD8; CLKPR = n; sei();}
-  typedef enum
-  {
-      clock_div_1 = 0,
-      clock_div_2 = 1,
-      clock_div_4 = 2,
-      clock_div_8 = 3,
-      clock_div_16 = 4,
-      clock_div_32 = 5,
-      clock_div_64 = 6,
-      clock_div_128 = 7,
-      clock_div_256 = 8
-  } clock_div_t;
+#include "fsm/tk.h"
 
-#elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-    // this should work, but needs further validation
-    inline void clock_prescale_set(uint8_t n) {
-        cli();         
-        CCP = CCP_IOREG_gc; // temporarily disable clock change protection
-        CLKCTRL.MCLKCTRLB = n; // Set the prescaler
-        while (CLKCTRL.MCLKSTATUS & CLKCTRL_SOSC_bm) {} // wait for clock change to finish
-        sei();
-    }
-    typedef enum
-    {
-      // Actual clock is 20 MHz, but assume that 10 MHz is the top speed and work from there
-      // TODO: measure PWM speed and power use at 1.25/2.5/5/10 MHz, to determine which speeds are optimal 
-      clock_div_1 =   (CLKCTRL_PDIV_2X_gc  | CLKCTRL_PEN_bm), // 10 MHz
-      clock_div_2 =   (CLKCTRL_PDIV_4X_gc  | CLKCTRL_PEN_bm), // 5 MHz
-      clock_div_4 =   (CLKCTRL_PDIV_8X_gc  | CLKCTRL_PEN_bm), // 2.5 MHz
-      clock_div_8 =   (CLKCTRL_PDIV_16X_gc | CLKCTRL_PEN_bm), // 1.25 MHz
-      clock_div_16 =  (CLKCTRL_PDIV_32X_gc | CLKCTRL_PEN_bm), // 625 kHz
-      clock_div_32 =  (CLKCTRL_PDIV_64X_gc | CLKCTRL_PEN_bm), // 312 kHz, max without changing to the 32 kHz ULP
-      clock_div_64 =  (CLKCTRL_PDIV_64X_gc | CLKCTRL_PEN_bm), // 312 kHz 
-      clock_div_128 = (CLKCTRL_PDIV_64X_gc | CLKCTRL_PEN_bm), // 312 kHz 
-      clock_div_256 = (CLKCTRL_PDIV_64X_gc | CLKCTRL_PEN_bm)  // 312 kHz 
-    } clock_div_t;
-#else
-#error Unable to define MCU macros.
-#endif
+#define MCU_H arch/MCUNAME.h
+#define MCU_C arch/MCUNAME.c
+#include incfile(MCU_H)
 
diff --git a/bin/detect-mcu.sh b/bin/detect-mcu.sh
index 57670e2..93b624b 100755
--- a/bin/detect-mcu.sh
+++ b/bin/detect-mcu.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 # Anduril / FSM MCU type detection script
 # Copyright (C) 2014-2023 Selene ToyKeeper
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -30,7 +30,7 @@ while [ -n "$TARGET" ]; do
         NUM=$( echo "$MCU" | sed 's/^avr//; s/^attiny//;' )
         echo "export MCUNAME=${MCU}"
         echo "export MCU=0x${NUM}"
-        echo "export ATTINY=${NUM}"
+        [[ "$MCU" =~ "attiny" ]] && echo "export ATTINY=${NUM}"
         echo "export MCUFLAGS=\"-DMCUNAME=${MCU} -DMCU=0x${NUM} -DATTINY=${NUM}\""
         exit
       fi
diff --git a/fsm/adc.c b/fsm/adc.c
index 31b250f..6d4eeb1 100644
--- a/fsm/adc.c
+++ b/fsm/adc.c
@@ -16,57 +16,14 @@
 
 
 static inline void set_admux_therm() {
-    #if (ATTINY == 1634)
-        ADMUX = ADMUX_THERM;
-    #elif (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
-        ADMUX = ADMUX_THERM | (1 << ADLAR);
-    #elif (ATTINY == 841)  // FIXME: not tested
-        ADMUXA = ADMUXA_THERM;
-        ADMUXB = ADMUXB_THERM;
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-        ADC0.MUXPOS = ADC_MUXPOS_TEMPSENSE_gc;  // read temperature
-        ADC0.CTRLC = ADC_SAMPCAP_bm | ADC_PRESC_DIV64_gc | ADC_REFSEL_INTREF_gc; // Internal ADC reference
-    #else
-        #error Unrecognized MCU type
-    #endif
+    hwdef_set_admux_therm();
     adc_channel = 1;
     adc_sample_count = 0;  // first result is unstable
     ADC_start_measurement();
 }
 
 inline void set_admux_voltage() {
-    #if (ATTINY == 1634)
-        #ifdef USE_VOLTAGE_DIVIDER // 1.1V / pin7
-            ADMUX = ADMUX_VOLTAGE_DIVIDER;
-        #else  // VCC / 1.1V reference
-            ADMUX = ADMUX_VCC;
-        #endif
-    #elif (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
-        #ifdef USE_VOLTAGE_DIVIDER  // 1.1V / pin7
-            ADMUX = ADMUX_VOLTAGE_DIVIDER | (1 << ADLAR);
-        #else  // VCC / 1.1V reference
-            ADMUX = ADMUX_VCC | (1 << ADLAR);
-        #endif
-    #elif (ATTINY == 841)  // FIXME: not tested
-        #ifdef USE_VOLTAGE_DIVIDER  // 1.1V / pin7
-            ADMUXA = ADMUXA_VOLTAGE_DIVIDER;
-            ADMUXB = ADMUXB_VOLTAGE_DIVIDER;
-        #else  // VCC / 1.1V reference
-            ADMUXA = ADMUXA_VCC;
-            ADMUXB = ADMUXB_VCC;
-        #endif
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-        #ifdef USE_VOLTAGE_DIVIDER  // 1.1V / ADC input pin
-            // verify that this is correct!!!  untested
-            ADC0.MUXPOS = ADMUX_VOLTAGE_DIVIDER;  // read the requested ADC pin
-            ADC0.CTRLC = ADC_SAMPCAP_bm | ADC_PRESC_DIV64_gc | ADC_REFSEL_INTREF_gc; // Use internal ADC reference
-        #else  // VCC / 1.1V reference
-            ADC0.MUXPOS = ADC_MUXPOS_INTREF_gc;  // read internal reference
-            ADC0.CTRLC = ADC_SAMPCAP_bm | ADC_PRESC_DIV64_gc | ADC_REFSEL_VDDREF_gc; // Vdd (Vcc) be ADC reference
-        #endif
-    #else
-        #error Unrecognized MCU type
-    #endif
+    hwdef_set_admux_voltage();
     adc_channel = 0;
     adc_sample_count = 0;  // first result is unstable
     ADC_start_measurement();
@@ -74,79 +31,19 @@ inline void set_admux_voltage() {
 
 
 #ifdef TICK_DURING_STANDBY
-inline void adc_sleep_mode() {
     // needs a special sleep mode to get accurate measurements quickly 
     // ... full power-down ends up using more power overall, and causes 
     // some weird issues when the MCU doesn't stay awake enough cycles 
     // to complete a reading
-    #ifdef SLEEP_MODE_ADC
-        // attiny1634
-        set_sleep_mode(SLEEP_MODE_ADC);
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-        set_sleep_mode(SLEEP_MODE_STANDBY);
-    #else
-        #error No ADC sleep mode defined for this hardware.
-    #endif
-}
+    #define adc_sleep_mode  mcu_adc_sleep_mode
 #endif
 
-inline void ADC_start_measurement() {
-    #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85) || (ATTINY == 841) || (ATTINY == 1634)
-        ADCSRA |= (1 << ADSC) | (1 << ADIE);
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-        ADC0.INTCTRL |= ADC_RESRDY_bm; // enable interrupt
-        ADC0.COMMAND |= ADC_STCONV_bm; // Start the ADC conversions
-    #else
-        #error unrecognized MCU type
-    #endif
-}
+#define ADC_start_measurement  mcu_adc_start_measurement
 
 // set up ADC for reading battery voltage
-inline void ADC_on()
-{
-    #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85) || (ATTINY == 1634)
-        set_admux_voltage();
-        #ifdef USE_VOLTAGE_DIVIDER
-            // disable digital input on divider pin to reduce power consumption
-            VOLTAGE_ADC_DIDR |= (1 << VOLTAGE_ADC);
-        #else
-            // disable digital input on VCC pin to reduce power consumption
-            //VOLTAGE_ADC_DIDR |= (1 << VOLTAGE_ADC);  // FIXME: unsure how to handle for VCC pin
-        #endif
-        #if (ATTINY == 1634)
-            //ACSRA |= (1 << ACD);  // turn off analog comparator to save power
-            ADCSRB |= (1 << ADLAR);  // left-adjust flag is here instead of ADMUX
-        #endif
-        // enable, start, auto-retrigger, prescale
-        ADCSRA = (1 << ADEN) | (1 << ADSC) | (1 << ADATE) | ADC_PRSCL;
-        // end tiny25/45/85
-    #elif (ATTINY == 841)  // FIXME: not tested, missing left-adjust
-        ADCSRB = 0;  // Right adjusted, auto trigger bits cleared.
-        //ADCSRA = (1 << ADEN ) | 0b011;  // ADC on, prescaler division factor 8.
-        set_admux_voltage();
-        // enable, start, auto-retrigger, prescale
-        ADCSRA = (1 << ADEN) | (1 << ADSC) | (1 << ADATE) | ADC_PRSCL;
-        //ADCSRA |= (1 << ADSC);  // start measuring
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-        VREF.CTRLA |= VREF_ADC0REFSEL_1V1_gc; // Set Vbg ref to 1.1V
-        // Enabled, free-running (aka, auto-retrigger), run in standby
-        ADC0.CTRLA = ADC_ENABLE_bm | ADC_FREERUN_bm | ADC_RUNSTBY_bm;
-        // set a INITDLY value because the AVR manual says so (section 30.3.5)
-        // (delay 1st reading until Vref is stable)
-        ADC0.CTRLD |= ADC_INITDLY_DLY16_gc;
-        set_admux_voltage();
-    #else
-        #error Unrecognized MCU type
-    #endif
-}
-
-inline void ADC_off() {
-    #ifdef AVRXMEGA3  // ATTINY816, 817, etc
-        ADC0.CTRLA &= ~(ADC_ENABLE_bm);  // disable the ADC
-    #else
-        ADCSRA &= ~(1<<ADEN); //ADC off
-    #endif
-}
+#define ADC_on   mcu_adc_on
+// stop the ADC
+#define ADC_off  mcu_adc_off
 
 #ifdef USE_VOLTAGE_DIVIDER
 static inline uint8_t calc_voltage_divider(uint16_t value) {
@@ -171,15 +68,11 @@ static inline uint8_t calc_voltage_divider(uint16_t value) {
 #define ADC_CYCLES_PER_SECOND 2
 #endif
 
-#ifdef AVRXMEGA3  // ATTINY816, 817, etc
-#define ADC_vect ADC0_RESRDY_vect
-#endif
 // happens every time the ADC sampler finishes a measurement
 ISR(ADC_vect) {
 
-    #ifdef AVRXMEGA3  // ATTINY816, 817, etc
-    ADC0.INTFLAGS = ADC_RESRDY_bm; // clear the interrupt
-    #endif
+    // clear the interrupt flag
+    mcu_adc_vect_clear();
 
     if (adc_sample_count) {
 
@@ -188,22 +81,12 @@ ISR(ADC_vect) {
         uint8_t channel = adc_channel;
 
         // update the latest value
-        #ifdef AVRXMEGA3  // ATTINY816, 817, etc
-        // Use the factory calibrated values in SIGROW.TEMPSENSE0 and SIGROW.TEMPSENSE1
-        // to calculate a temperature reading in Kelvin, then left-align it. 
-        if (channel == 1) { // thermal, convert ADC reading to left-aligned Kelvin
-            int8_t sigrow_offset = SIGROW.TEMPSENSE1; // Read signed value from signature row
-            uint8_t sigrow_gain = SIGROW.TEMPSENSE0; // Read unsigned value from signature row
-            uint32_t temp = ADC0.RES - sigrow_offset;
-            temp *= sigrow_gain; // Result might overflow 16 bit variable (10bit+8bit)
-            temp += 0x80; // Add 1/2 to get correct rounding on division below
-            temp >>= 8; // Divide result to get Kelvin
-            m = (temp << 6); // left align it
-        }
-        else { m = (ADC0.RES << 6); } // voltage, force left-alignment
-
+        #ifdef MCU_ADC_RESULT_PER_TYPE
+            // thermal, convert ADC reading to left-aligned Kelvin
+            if (channel) m = mcu_adc_result_temp();
+            else m = mcu_adc_result_volts();
         #else
-        m = ADC;
+            m = mcu_adc_result();
         #endif
         adc_raw[channel] = m;
 
@@ -235,11 +118,7 @@ void adc_deferred() {
     // real-world entropy makes this a true random, not pseudo
     // Why here instead of the ISR?  Because it makes the time-critical ISR
     // code a few cycles faster and we don't need crypto-grade randomness.
-    #ifdef AVRXMEGA3  // ATTINY816, 817, etc
-    pseudo_rand_seed += ADC0.RESL; // right aligned, not left... so should be equivalent?
-    #else
-    pseudo_rand_seed += (ADCL >> 6) + (ADCH << 2);
-    #endif
+    pseudo_rand_seed += mcu_adc_lsb();
     #endif
 
     // the ADC triggers repeatedly when it's on, but we only need to run the
@@ -373,9 +252,9 @@ static inline void ADC_voltage_handler() {
     if (lvp_timer) {
         lvp_timer --;
     } else {  // it has been long enough since the last warning
-    	#ifdef DUAL_VOLTAGE_FLOOR
-    	if (((voltage < VOLTAGE_LOW) && (voltage > DUAL_VOLTAGE_FLOOR)) || (voltage < DUAL_VOLTAGE_LOW_LOW)) {
-    	#else
+        #ifdef DUAL_VOLTAGE_FLOOR
+        if (((voltage < VOLTAGE_LOW) && (voltage > DUAL_VOLTAGE_FLOOR)) || (voltage < DUAL_VOLTAGE_LOW_LOW)) {
+        #else
         if (voltage < VOLTAGE_LOW) {
         #endif
             // send out a warning
@@ -440,6 +319,8 @@ static inline void ADC_temperature_handler() {
 
     // let the UI see the current temperature in C
     // Convert ADC units to Celsius (ish)
+    // FIXME: call something in arch/$mcu.h or hwdef.h
+    //        instead of calculating this here
     #ifndef USE_EXTERNAL_TEMP_SENSOR
     // onboard sensor for attiny25/45/85/1634
     temperature = (measurement>>1) + THERM_CAL_OFFSET + (int16_t)TH_CAL - 275;
diff --git a/fsm/adc.h b/fsm/adc.h
index 1bb67ed..e4046a4 100644
--- a/fsm/adc.h
+++ b/fsm/adc.h
@@ -102,11 +102,15 @@ static inline void ADC_temperature_handler();
 #endif  // ifdef USE_THERMAL_REGULATION
 
 
-inline void ADC_on();
-inline void ADC_off();
-inline void ADC_start_measurement();
+//inline void ADC_on();
+#define ADC_on   mcu_adc_on
+//inline void ADC_off();
+#define ADC_off  mcu_adc_off
+//inline void ADC_start_measurement();
+#define ADC_start_measurement  mcu_adc_start_measurement
 
 #ifdef TICK_DURING_STANDBY
-inline void adc_sleep_mode();
+    //inline void adc_sleep_mode();
+    #define adc_sleep_mode  mcu_adc_sleep_mode
 #endif
 
diff --git a/fsm/main.c b/fsm/main.c
index 0524115..1c01878 100644
--- a/fsm/main.c
+++ b/fsm/main.c
@@ -23,66 +23,6 @@ ISR(TIMER1_COMPA_vect) {
 }
 #endif
 
-// 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() {
-    #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() {
-    // this gets tricky with so many pins...
-    // ... so punt it to the hwdef file
-    hwdef_setup();
-}
-#else
-    #error Unrecognized MCU type
-#endif
-
 
 //#ifdef USE_REBOOT
 static inline void prevent_reboot_loop() {
@@ -107,7 +47,7 @@ int main() {
     prevent_reboot_loop();
     //#endif
 
-    hw_setup();
+    hwdef_setup();
 
     #if 0
     #ifdef HALFSPEED
diff --git a/fsm/misc.c b/fsm/misc.c
index bc10ea1..5d58f52 100644
--- a/fsm/misc.c
+++ b/fsm/misc.c
@@ -288,25 +288,3 @@ uint8_t triangle_wave(uint8_t phase) {
 }
 #endif
 
-#ifdef USE_REBOOT
-void reboot() {
-    // put the WDT in hard reset mode, then trigger it
-    cli();
-    #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
-        WDTCR = 0xD8 | WDTO_15MS;
-    #elif (ATTINY == 1634)
-        // allow protected configuration changes for next 4 clock cycles
-        CCP = 0xD8;  // magic number
-        // reset (WDIF + WDE), no WDIE, fastest (16ms) timing (0000)
-        // (DS section 8.5.2 and table 8-4)
-        WDTCSR = 0b10001000;
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-        CCP = CCP_IOREG_gc;  // temporarily disable change protection
-        WDT.CTRLA = WDT_PERIOD_8CLK_gc;  // Enable, timeout 8ms
-    #endif
-    sei();
-    wdt_reset();
-    while (1) {}
-}
-#endif
-
diff --git a/fsm/misc.h b/fsm/misc.h
index 8de6b29..ba1f8d9 100644
--- a/fsm/misc.h
+++ b/fsm/misc.h
@@ -62,7 +62,3 @@ void rgb_led_set(uint8_t value);
 uint8_t triangle_wave(uint8_t phase);
 #endif
 
-#ifdef USE_REBOOT
-void reboot();
-#endif
-
diff --git a/fsm/pcint.c b/fsm/pcint.c
index 131d0c3..d00b51d 100644
--- a/fsm/pcint.c
+++ b/fsm/pcint.c
@@ -13,58 +13,8 @@ uint8_t button_is_pressed() {
     return value;
 }
 
-inline void PCINT_on() {
-    #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
-        // enable pin change interrupt
-        GIMSK |= (1 << PCIE);
-        // only pay attention to the e-switch pin
-        #if 0  // this is redundant; was already done in main()
-        PCMSK = (1 << SWITCH_PCINT);
-        #endif
-        // set bits 1:0 to 0b01 (interrupt on rising *and* falling edge) (default)
-        // MCUCR &= 0b11111101;  MCUCR |= 0b00000001;
-    #elif (ATTINY == 1634)
-        // enable pin change interrupt
-        #ifdef SWITCH2_PCIE
-        GIMSK |= ((1 << SWITCH_PCIE) | (1 << SWITCH2_PCIE));
-        #else
-        GIMSK |= (1 << SWITCH_PCIE);
-        #endif
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc)
-        SWITCH_ISC_REG |= PORT_ISC_BOTHEDGES_gc;
-    #else
-        #error Unrecognized MCU type
-    #endif
-}
-
-inline void PCINT_off() {
-    #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
-        // disable all pin-change interrupts
-        GIMSK &= ~(1 << PCIE);
-    #elif (ATTINY == 1634)
-        // disable all pin-change interrupts
-        GIMSK &= ~(1 << SWITCH_PCIE);
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc)
-        SWITCH_ISC_REG &= ~(PORT_ISC_gm);
-    #else
-        #error Unrecognized MCU type
-    #endif
-}
-
-//void button_change_interrupt() {
-#if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85) || (ATTINY == 1634)
-    #ifdef PCINT_vect
-    ISR(PCINT_vect) {
-    #else
-    ISR(PCINT0_vect) {
-    #endif
-#elif defined(AVRXMEGA3)  // ATTINY816, 817, etc)
-    ISR(SWITCH_VECT) {
-        // Write a '1' to clear the interrupt flag
-        SWITCH_INTFLG |= (1 << SWITCH_PIN);
-#else
-    #error Unrecognized MCU type
-#endif
+ISR(SWITCH_VECT) {
+    mcu_switch_vect_clear();
 
     irq_pcint = 1;  // let deferred code know an interrupt happened
 
diff --git a/fsm/pcint.h b/fsm/pcint.h
index cd7ba02..62f93ab 100644
--- a/fsm/pcint.h
+++ b/fsm/pcint.h
@@ -9,7 +9,9 @@ volatile uint8_t irq_pcint = 0;  // pin change interrupt happened?
 #define BP_SAMPLES 32
 volatile uint8_t button_last_state;
 uint8_t button_is_pressed();
-inline void PCINT_on();
-inline void PCINT_off();
+//inline void PCINT_on();
+//inline void PCINT_off();
+#define PCINT_on   mcu_pcint_on
+#define PCINT_off  mcu_pcint_off
 void PCINT_inner(uint8_t pressed);
 
diff --git a/fsm/spaghetti-monster.h b/fsm/spaghetti-monster.h
index c035d5b..7084ad4 100644
--- a/fsm/spaghetti-monster.h
+++ b/fsm/spaghetti-monster.h
@@ -13,10 +13,9 @@
  * - ...
  */
 
-#include "arch/mcu.h"
+////////// include all the .h files //////////
 
-#include <avr/eeprom.h>
-#include <avr/power.h>
+#include "arch/mcu.h"
 
 // include project definitions to help with recognizing symbols
 #include "fsm/events.h"
@@ -39,6 +38,10 @@
 #include "arch/delay.h"
 #endif
 
+////////// include all the .c files //////////
+
+#include "arch/mcu.c"
+
 #ifdef USE_DEBUG_BLINK
 #define DEBUG_FLASH PWM1_LVL = 64; delay_4ms(2); PWM1_LVL = 0;
 void debug_blink(uint8_t num) {
diff --git a/fsm/wdt.c b/fsm/wdt.c
index 64f006e..1095d44 100644
--- a/fsm/wdt.c
+++ b/fsm/wdt.c
@@ -7,85 +7,9 @@
 #include <avr/interrupt.h>
 #include <avr/wdt.h>
 
-// *** Note for the AVRXMEGA3 (1-Series, eg 816 and 817), the WDT 
-// is not used for time-based interrupts.  A new peripheral, the 
-// Periodic Interrupt Timer ("PIT") is used for this purpose.
-
-void WDT_on()
-{
-    #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
-        // interrupt every 16ms
-        //cli();                          // Disable interrupts
-        wdt_reset();                    // Reset the WDT
-        WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
-        WDTCR = (1<<WDIE);              // Enable interrupt every 16ms
-        //sei();                          // Enable interrupts
-    #elif (ATTINY == 1634)
-        wdt_reset();                    // Reset the WDT
-        WDTCSR = (1<<WDIE);             // Enable interrupt every 16ms
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-        RTC.PITINTCTRL = RTC_PI_bm;   // enable the Periodic Interrupt
-        while (RTC.PITSTATUS > 0) {}  // make sure the register is ready to be updated
-        RTC.PITCTRLA = RTC_PERIOD_CYC512_gc | RTC_PITEN_bm; // Period = 16ms, enable the PI Timer
-    #else
-        #error Unrecognized MCU type
-    #endif
-}
-
-#ifdef TICK_DURING_STANDBY
-inline void WDT_slow()
-{
-    #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
-        // interrupt slower
-        //cli();                          // Disable interrupts
-        wdt_reset();                    // Reset the WDT
-        WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
-        WDTCR = (1<<WDIE) | STANDBY_TICK_SPEED; // Enable interrupt every so often
-        //sei();                          // Enable interrupts
-    #elif (ATTINY == 1634)
-        wdt_reset();                    // Reset the WDT
-        WDTCSR = (1<<WDIE) | STANDBY_TICK_SPEED;
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-        RTC.PITINTCTRL = RTC_PI_bm;   // enable the Periodic Interrupt
-        while (RTC.PITSTATUS > 0) {}  // make sure the register is ready to be updated
-        RTC.PITCTRLA = (1<<6) | (STANDBY_TICK_SPEED<<3) | RTC_PITEN_bm; // Set period, enable the PI Timer
-    #else
-        #error Unrecognized MCU type
-    #endif
-}
-#endif
-
-inline void WDT_off()
-{
-    #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85)
-        //cli();                          // Disable interrupts
-        wdt_reset();                    // Reset the WDT
-        MCUSR &= ~(1<<WDRF);            // Clear Watchdog reset flag
-        WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence
-        WDTCR = 0x00;                   // Disable WDT
-        //sei();                          // Enable interrupts
-    #elif (ATTINY == 1634)
-        cli();                // needed because CCP, below
-        wdt_reset();          // Reset the WDT
-        MCUSR &= ~(1<<WDRF);  // clear watchdog reset flag
-        CCP = 0xD8;           // enable config changes
-        WDTCSR = 0;           // disable and clear all WDT settings
-        sei();
-    #elif defined(AVRXMEGA3)  // ATTINY816, 817, etc
-        while (RTC.PITSTATUS > 0) {}  // make sure the register is ready to be updated
-        RTC.PITCTRLA = 0; // Disable the PI Timer
-    #else
-        #error Unrecognized MCU type
-    #endif
-}
-
 // clock tick -- this runs every 16ms (62.5 fps)
-#ifdef AVRXMEGA3  // ATTINY816, 817, etc
-ISR(RTC_PIT_vect) {
-    RTC.PITINTFLAGS = RTC_PI_bm; // clear the PIT interrupt flag 
-#else
 ISR(WDT_vect) {
-#endif
+    mcu_wdt_vect_clear();
     irq_wdt = 1;  // WDT event happened
 }
 
diff --git a/fsm/wdt.h b/fsm/wdt.h
index abf34c5..98eaf25 100644
--- a/fsm/wdt.h
+++ b/fsm/wdt.h
@@ -6,8 +6,11 @@
 
 #define TICKS_PER_SECOND 62
 
-void WDT_on();
-inline void WDT_off();
+//void WDT_on();
+//inline void WDT_off();
+#define WDT_on    mcu_wdt_active
+#define WDT_slow  mcu_wdt_standby
+#define WDT_off   mcu_wdt_stop
 
 volatile uint8_t irq_wdt = 0;  // WDT interrupt happened?
 
diff --git a/hw/gchart/fet1-t1616/hwdef.h b/hw/gchart/fet1-t1616/hwdef.h
index ac4fd53..40083fc 100644
--- a/hw/gchart/fet1-t1616/hwdef.h
+++ b/hw/gchart/fet1-t1616/hwdef.h
@@ -11,11 +11,9 @@
  * Read voltage from VCC pin, has diode with ~0.4v drop
 */
 
-#include <avr/io.h>
-
 // nearly all t1616-based FET+1 drivers work pretty much the same
 // (this one has single-color aux like the TS10)
-#define HWDEF_C_FILE wurkkos/ts10/hwdef.c
+#define HWDEF_C  wurkkos/ts10/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-aux.h"
diff --git a/hw/hank/emisar-2ch/fet/hwdef.h b/hw/hank/emisar-2ch/fet/hwdef.h
index 0778e10..06dfeb8 100644
--- a/hw/hank/emisar-2ch/fet/hwdef.h
+++ b/hw/hank/emisar-2ch/fet/hwdef.h
@@ -32,9 +32,7 @@
  * The first channel also has a direct-drive FET for turbo.
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hank/emisar-2ch/fet/hwdef.c
+#define HWDEF_C  hank/emisar-2ch/fet/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -106,7 +104,7 @@ enum channel_modes_e {
 #define SWITCH_PCMSK PCMSK0  // PCMSK1 is for PCINT[7:0]
 #define SWITCH_PORT  PINA    // PINA or PINB or PINC
 #define SWITCH_PUE   PUEA    // pullup group A
-#define PCINT_vect   PCINT0_vect  // ISR for PCINT[7:0]
+#define SWITCH_VECT  PCINT0_vect  // ISR for PCINT[7:0]
 #endif
 
 #define USE_VOLTAGE_DIVIDER  // use a dedicated pin, not VCC, because VCC input is flattened
diff --git a/hw/hank/emisar-2ch/hwdef.h b/hw/hank/emisar-2ch/hwdef.h
index e3707c7..7fbac8e 100644
--- a/hw/hank/emisar-2ch/hwdef.h
+++ b/hw/hank/emisar-2ch/hwdef.h
@@ -31,9 +31,7 @@
  * and one pin to control the Opamp power level.
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hank/emisar-2ch/hwdef.c
+#define HWDEF_C  hank/emisar-2ch/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -103,7 +101,7 @@ enum channel_modes_e {
 #define SWITCH_PCMSK PCMSK0  // PCMSK1 is for PCINT[7:0]
 #define SWITCH_PORT  PINA    // PINA or PINB or PINC
 #define SWITCH_PUE   PUEA    // pullup group A
-#define PCINT_vect   PCINT0_vect  // ISR for PCINT[7:0]
+#define SWITCH_VECT  PCINT0_vect  // ISR for PCINT[7:0]
 #endif
 
 #define USE_VOLTAGE_DIVIDER  // use a dedicated pin, not VCC, because VCC input is flattened
diff --git a/hw/hank/emisar-d18/hwdef.h b/hw/hank/emisar-d18/hwdef.h
index 86c97c2..a0d3cd0 100644
--- a/hw/hank/emisar-d18/hwdef.h
+++ b/hw/hank/emisar-d18/hwdef.h
@@ -12,9 +12,7 @@
  *           ----
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE lumintop/fw3a/hwdef.c
+#define HWDEF_C  lumintop/fw3a/hwdef.c
 
 // channel modes
 // * 0. FET+N+1 stacked
diff --git a/hw/hank/emisar-d4/hwdef.h b/hw/hank/emisar-d4/hwdef.h
index 55ef72e..6257ddb 100644
--- a/hw/hank/emisar-d4/hwdef.h
+++ b/hw/hank/emisar-d4/hwdef.h
@@ -12,9 +12,7 @@
  *           ----
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hank/emisar-d4/hwdef.c
+#define HWDEF_C  hank/emisar-d4/hwdef.c
 
 // allow using aux LEDs as extra channel modes (when they exist)
 //#ifdef AUXLED_PIN
diff --git a/hw/hank/emisar-d4k-3ch/hwdef.h b/hw/hank/emisar-d4k-3ch/hwdef.h
index 7cfe699..002804c 100644
--- a/hw/hank/emisar-d4k-3ch/hwdef.h
+++ b/hw/hank/emisar-d4k-3ch/hwdef.h
@@ -35,9 +35,7 @@
  * So this code should support both wire layouts.
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hank/emisar-d4k-3ch/hwdef.c
+#define HWDEF_C  hank/emisar-d4k-3ch/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -132,7 +130,7 @@ uint8_t led4_pwm, led4_dsm;
 #define SWITCH_PCMSK PCMSK0  // PCMSK1 is for PCINT[7:0]
 #define SWITCH_PORT  PINA    // PINA or PINB or PINC
 #define SWITCH_PUE   PUEA    // pullup group A
-#define PCINT_vect   PCINT0_vect  // ISR for PCINT[7:0]
+#define SWITCH_VECT  PCINT0_vect  // ISR for PCINT[7:0]
 #endif
 
 #define USE_VOLTAGE_DIVIDER  // use a dedicated pin, not VCC, because VCC input is flattened
diff --git a/hw/hank/emisar-d4sv2/hwdef.h b/hw/hank/emisar-d4sv2/hwdef.h
index d1e0452..121593a 100644
--- a/hw/hank/emisar-d4sv2/hwdef.h
+++ b/hw/hank/emisar-d4sv2/hwdef.h
@@ -30,9 +30,7 @@
  *      ADC12   thermal sensor
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hank/emisar-d4sv2/hwdef.c
+#define HWDEF_C  hank/emisar-d4sv2/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -89,7 +87,7 @@ enum CHANNEL_MODES {
 #define SWITCH_PCMSK PCMSK0 // PCMSK0 is for PCINT[7:0]
 #define SWITCH_PORT  PINA   // PINA or PINB or PINC
 #define SWITCH_PUE   PUEA   // pullup group A
-#define PCINT_vect   PCINT0_vect  // ISR for PCINT[7:0]
+#define SWITCH_VECT  PCINT0_vect  // ISR for PCINT[7:0]
 
 
 #define ADC_PRSCL   0x07    // clk/128
diff --git a/hw/hank/emisar-d4v2/hwdef.h b/hw/hank/emisar-d4v2/hwdef.h
index 9e3f755..1c10004 100644
--- a/hw/hank/emisar-d4v2/hwdef.h
+++ b/hw/hank/emisar-d4v2/hwdef.h
@@ -28,10 +28,8 @@
  *      ADC12   thermal sensor
  */
 
-#include <avr/io.h>
-
-#ifndef HWDEF_C_FILE
-#define HWDEF_C_FILE hank/emisar-d4v2/hwdef.c
+#ifndef HWDEF_C
+#define HWDEF_C  hank/emisar-d4v2/hwdef.c
 #endif
 
 // allow using aux LEDs as extra channel modes
@@ -84,7 +82,7 @@ enum CHANNEL_MODES {
 #define SWITCH_PCMSK PCMSK0 // PCMSK0 is for PCINT[7:0]
 #define SWITCH_PORT  PINA   // PINA or PINB or PINC
 #define SWITCH_PUE   PUEA   // pullup group A
-#define PCINT_vect   PCINT0_vect  // ISR for PCINT[7:0]
+#define SWITCH_VECT  PCINT0_vect  // ISR for PCINT[7:0]
 
 
 #define ADC_PRSCL   0x07    // clk/128
diff --git a/hw/hank/emisar-d4v2/nofet/anduril.h b/hw/hank/emisar-d4v2/nofet/anduril.h
index b5f9304..e05fb2e 100644
--- a/hw/hank/emisar-d4v2/nofet/anduril.h
+++ b/hw/hank/emisar-d4v2/nofet/anduril.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // switch to 1-channel support functions
-#define HWDEF_C_FILE hank/emisar-d4v2/nofet/hwdef.c
+#define HWDEF_C  hank/emisar-d4v2/nofet/hwdef.c
 
 #include "hank/emisar-d4v2/anduril.h"
 
diff --git a/hw/hank/noctigon-dm11/boost/hwdef.h b/hw/hank/noctigon-dm11/boost/hwdef.h
index 5ac2daf..bef409f 100644
--- a/hw/hank/noctigon-dm11/boost/hwdef.h
+++ b/hw/hank/noctigon-dm11/boost/hwdef.h
@@ -36,9 +36,7 @@
  * not to change brightness.
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hank/noctigon-dm11/boost/hwdef.c
+#define HWDEF_C  hank/noctigon-dm11/boost/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -101,7 +99,7 @@ uint8_t ch1_pwm, ch1_dsm;
 #define SWITCH_PCMSK PCMSK0  // PCMSK0 is for PCINT[7:0]
 #define SWITCH_PORT  PINA    // PINA or PINB or PINC
 #define SWITCH_PUE   PUEA    // pullup group A
-#define PCINT_vect   PCINT0_vect  // ISR for PCINT[7:0]
+#define SWITCH_VECT  PCINT0_vect  // ISR for PCINT[7:0]
 
 #define USE_VOLTAGE_DIVIDER  // use a dedicated pin, not VCC, because VCC input is flattened
 #define VOLTAGE_PIN PB1      // Pin 18 / PB1 / ADC6
diff --git a/hw/hank/noctigon-dm11/hwdef.h b/hw/hank/noctigon-dm11/hwdef.h
index cd21eae..11cf3a0 100644
--- a/hw/hank/noctigon-dm11/hwdef.h
+++ b/hw/hank/noctigon-dm11/hwdef.h
@@ -37,10 +37,8 @@
  * Some models also have a direct-drive FET for turbo.
  */
 
-#include <avr/io.h>
-
-#ifndef HWDEF_C_FILE
-#define HWDEF_C_FILE hank/noctigon-kr4/hwdef.c
+#ifndef HWDEF_C
+#define HWDEF_C  hank/noctigon-kr4/hwdef.c
 #endif
 
 // allow using aux LEDs as extra channel modes
@@ -95,7 +93,7 @@ enum CHANNEL_MODES {
 #define SWITCH_PCMSK PCMSK0 // PCMSK0 is for PCINT[7:0]
 #define SWITCH_PORT  PINA   // PINA or PINB or PINC
 #define SWITCH_PUE   PUEA   // pullup group A
-#define PCINT_vect   PCINT0_vect  // ISR for PCINT[7:0]
+#define SWITCH_VECT  PCINT0_vect  // ISR for PCINT[7:0]
 
 
 #define USE_VOLTAGE_DIVIDER  // use a dedicated pin, not VCC, because VCC input is flattened
diff --git a/hw/hank/noctigon-dm11/nofet/anduril.h b/hw/hank/noctigon-dm11/nofet/anduril.h
index 12336f1..c13f4ab 100644
--- a/hw/hank/noctigon-dm11/nofet/anduril.h
+++ b/hw/hank/noctigon-dm11/nofet/anduril.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // same support functions as a KR4
-#define HWDEF_C_FILE hank/noctigon-kr4/nofet/hwdef.c
+#define HWDEF_C  hank/noctigon-kr4/nofet/hwdef.c
 #include "hank/noctigon-dm11/anduril.h"
 
 // turn off the DD FET
diff --git a/hw/hank/noctigon-k1/boost/hwdef.h b/hw/hank/noctigon-k1/boost/hwdef.h
index 951932a..e0a314c 100644
--- a/hw/hank/noctigon-k1/boost/hwdef.h
+++ b/hw/hank/noctigon-k1/boost/hwdef.h
@@ -34,9 +34,7 @@
  * not to change brightness.
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hank/noctigon-dm11/boost/hwdef.c
+#define HWDEF_C  hank/noctigon-dm11/boost/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -99,7 +97,7 @@ uint8_t ch1_pwm, ch1_dsm;
 #define SWITCH_PCMSK PCMSK0  // PCMSK0 is for PCINT[7:0]
 #define SWITCH_PORT  PINA    // PINA or PINB or PINC
 #define SWITCH_PUE   PUEA    // pullup group A
-#define PCINT_vect   PCINT0_vect  // ISR for PCINT[7:0]
+#define SWITCH_VECT  PCINT0_vect  // ISR for PCINT[7:0]
 
 #define USE_VOLTAGE_DIVIDER  // use a dedicated pin, not VCC, because VCC input is flattened
 #define VOLTAGE_PIN PB1      // Pin 18 / PB1 / ADC6
diff --git a/hw/hank/noctigon-k1/hwdef.h b/hw/hank/noctigon-k1/hwdef.h
index 9a68401..822b959 100644
--- a/hw/hank/noctigon-k1/hwdef.h
+++ b/hw/hank/noctigon-k1/hwdef.h
@@ -36,10 +36,8 @@
  * not to change brightness.
  */
 
-#include <avr/io.h>
-
-#ifndef HWDEF_C_FILE
-#define HWDEF_C_FILE hank/noctigon-k1/hwdef.c
+#ifndef HWDEF_C
+#define HWDEF_C  hank/noctigon-k1/hwdef.c
 #endif
 
 // allow using aux LEDs as extra channel modes
@@ -88,7 +86,7 @@ enum CHANNEL_MODES {
 #define SWITCH_PCMSK PCMSK0 // PCMSK0 is for PCINT[7:0]
 #define SWITCH_PORT  PINA   // PINA or PINB or PINC
 #define SWITCH_PUE   PUEA   // pullup group A
-#define PCINT_vect   PCINT0_vect  // ISR for PCINT[7:0]
+#define SWITCH_VECT  PCINT0_vect  // ISR for PCINT[7:0]
 
 
 #define USE_VOLTAGE_DIVIDER  // use a dedicated pin, not VCC, because VCC input is flattened
diff --git a/hw/hank/noctigon-k1/sbt90/hwdef.h b/hw/hank/noctigon-k1/sbt90/hwdef.h
index 8186b49..4c56bc0 100644
--- a/hw/hank/noctigon-k1/sbt90/hwdef.h
+++ b/hw/hank/noctigon-k1/sbt90/hwdef.h
@@ -37,9 +37,7 @@
  * Also has a direct-drive FET for turbo.
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hank/noctigon-kr4/hwdef.c
+#define HWDEF_C  hank/noctigon-kr4/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -93,7 +91,7 @@ enum CHANNEL_MODES {
 #define SWITCH_PCMSK PCMSK1  // PCMSK1 is for PCINT[11:8]
 #define SWITCH_PORT  PINB    // PINA or PINB or PINC
 #define SWITCH_PUE   PUEB    // pullup group B
-#define PCINT_vect   PCINT1_vect  // ISR for PCINT[11:8]
+#define SWITCH_VECT  PCINT1_vect  // ISR for PCINT[11:8]
 
 #define USE_VOLTAGE_DIVIDER  // use a dedicated pin, not VCC, because VCC input is flattened
 #define VOLTAGE_PIN PB1      // Pin 18 / PB1 / ADC6
diff --git a/hw/hank/noctigon-kr4/2ch/hwdef.h b/hw/hank/noctigon-kr4/2ch/hwdef.h
index b23c7cc..28a686d 100644
--- a/hw/hank/noctigon-kr4/2ch/hwdef.h
+++ b/hw/hank/noctigon-kr4/2ch/hwdef.h
@@ -30,8 +30,6 @@
  *      ADC12   thermal sensor
  */
 
-#include <avr/io.h>
-
 // move the switch to a different pin
 #define SWITCH_PIN   PB2     // pin 17
 #define SWITCH_PCINT PCINT10 // pin 17 pin change interrupt
@@ -39,7 +37,7 @@
 #define SWITCH_PCMSK PCMSK1  // PCMSK1 is for PCINT[11:8]
 #define SWITCH_PORT  PINB    // PINA or PINB or PINC
 #define SWITCH_PUE   PUEB    // pullup group B
-#define PCINT_vect   PCINT1_vect  // ISR for PCINT[11:8]
+#define SWITCH_VECT  PCINT1_vect  // ISR for PCINT[11:8]
 
 // the rest of the config is the same as the generic Emisar 2ch build
 #include "hank/emisar-2ch/hwdef.h"
diff --git a/hw/hank/noctigon-kr4/boost/hwdef.h b/hw/hank/noctigon-kr4/boost/hwdef.h
index f17d263..b923b30 100644
--- a/hw/hank/noctigon-kr4/boost/hwdef.h
+++ b/hw/hank/noctigon-kr4/boost/hwdef.h
@@ -46,12 +46,12 @@
 #undef SWITCH_PCMSK
 #undef SWITCH_PORT
 #undef SWITCH_PUE
-#undef PCINT_vect
+#undef SWITCH_VECT
 #define SWITCH_PIN   PB2     // pin 17
 #define SWITCH_PCINT PCINT10 // pin 17 pin change interrupt
 #define SWITCH_PCIE  PCIE1   // PCIE1 is for PCINT[11:8]
 #define SWITCH_PCMSK PCMSK1  // PCMSK1 is for PCINT[11:8]
 #define SWITCH_PORT  PINB    // PINA or PINB or PINC
 #define SWITCH_PUE   PUEB    // pullup group B
-#define PCINT_vect   PCINT1_vect  // ISR for PCINT[11:8]
+#define SWITCH_VECT  PCINT1_vect  // ISR for PCINT[11:8]
 
diff --git a/hw/hank/noctigon-kr4/hwdef.h b/hw/hank/noctigon-kr4/hwdef.h
index 586f848..be165bd 100644
--- a/hw/hank/noctigon-kr4/hwdef.h
+++ b/hw/hank/noctigon-kr4/hwdef.h
@@ -35,10 +35,8 @@
  * Some models also have a direct-drive FET for turbo.
  */
 
-#include <avr/io.h>
-
-#ifndef HWDEF_C_FILE
-#define HWDEF_C_FILE hank/noctigon-kr4/hwdef.c
+#ifndef HWDEF_C
+#define HWDEF_C  hank/noctigon-kr4/hwdef.c
 #endif
 
 // allow using aux LEDs as extra channel modes
@@ -93,7 +91,7 @@ enum CHANNEL_MODES {
 #define SWITCH_PCMSK PCMSK1  // PCMSK1 is for PCINT[11:8]
 #define SWITCH_PORT  PINB    // PINA or PINB or PINC
 #define SWITCH_PUE   PUEB    // pullup group B
-#define PCINT_vect   PCINT1_vect  // ISR for PCINT[11:8]
+#define SWITCH_VECT  PCINT1_vect  // ISR for PCINT[11:8]
 
 // the button tends to short out the voltage divider,
 // so ignore voltage while the button is being held
diff --git a/hw/hank/noctigon-kr4/nofet/anduril.h b/hw/hank/noctigon-kr4/nofet/anduril.h
index 4522cde..ad3f012 100644
--- a/hw/hank/noctigon-kr4/nofet/anduril.h
+++ b/hw/hank/noctigon-kr4/nofet/anduril.h
@@ -5,7 +5,7 @@
 
 // (and Noctigon KR1)
 // (and Emisar D4v2 E21A, a.k.a. "D4v2.5")
-#define HWDEF_C_FILE hank/noctigon-kr4/nofet/hwdef.c
+#define HWDEF_C  hank/noctigon-kr4/nofet/hwdef.c
 #include "hank/noctigon-kr4/anduril.h"
 
 // brightness w/ SST-20 4000K LEDs:
diff --git a/hw/hank/noctigon-m44/hwdef.h b/hw/hank/noctigon-m44/hwdef.h
index af942d9..6bdcef2 100644
--- a/hw/hank/noctigon-m44/hwdef.h
+++ b/hw/hank/noctigon-m44/hwdef.h
@@ -28,9 +28,7 @@
  *      ADC12   thermal sensor
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hank/noctigon-m44/hwdef.c
+#define HWDEF_C  hank/noctigon-m44/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -110,7 +108,7 @@ uint8_t ch2_pwm, ch2_dsm;
 #define SWITCH_PCMSK PCMSK0  // PCMSK0 is for PCINT[7:0]
 #define SWITCH_PORT  PINA    // PINA or PINB or PINC
 #define SWITCH_PUE   PUEA    // pullup group A
-#define PCINT_vect   PCINT0_vect  // ISR for PCINT[7:0]
+#define SWITCH_VECT  PCINT0_vect  // ISR for PCINT[7:0]
 
 #define USE_VOLTAGE_DIVIDER  // use a dedicated pin, not VCC, because VCC input is flattened
 #define VOLTAGE_PIN PB1      // Pin 18 / PB1 / ADC6
diff --git a/hw/lumintop/blf-gt/hwdef.h b/hw/lumintop/blf-gt/hwdef.h
index bf3790d..dbaf18e 100644
--- a/hw/lumintop/blf-gt/hwdef.h
+++ b/hw/lumintop/blf-gt/hwdef.h
@@ -16,9 +16,7 @@
  * and its output gets PWM'd by pin 5.
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hank/emisar-d4/hwdef.c
+#define HWDEF_C  hank/emisar-d4/hwdef.c
 
 // channel modes
 // * 0. main LEDs
diff --git a/hw/lumintop/fw3a/hwdef.h b/hw/lumintop/fw3a/hwdef.h
index 649dc19..7809fa9 100644
--- a/hw/lumintop/fw3a/hwdef.h
+++ b/hw/lumintop/fw3a/hwdef.h
@@ -12,9 +12,7 @@
  *           ----
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE lumintop/fw3a/hwdef.c
+#define HWDEF_C  lumintop/fw3a/hwdef.c
 
 // channel modes
 // * 0. FET+7+1 stacked
diff --git a/hw/lumintop/fw3x-lume1/hwdef.h b/hw/lumintop/fw3x-lume1/hwdef.h
index 943921f..ca412cc 100644
--- a/hw/lumintop/fw3x-lume1/hwdef.h
+++ b/hw/lumintop/fw3x-lume1/hwdef.h
@@ -34,9 +34,7 @@
  * Another pin is used for DD FET control.
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE lumintop/fw3x-lume1/hwdef.c
+#define HWDEF_C  lumintop/fw3x-lume1/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -95,7 +93,7 @@ enum CHANNEL_MODES {
 #define SWITCH_PCMSK PCMSK0 // PCMSK0 is for PCINT[7:0]
 #define SWITCH_PORT  PINA   // PINA or PINB or PINC
 #define SWITCH_PUE   PUEA   // pullup group A
-#define PCINT_vect   PCINT0_vect  // ISR for PCINT[7:0]
+#define SWITCH_VECT  PCINT0_vect  // ISR for PCINT[7:0]
 
 #define USE_VOLTAGE_DIVIDER  // use a dedicated pin, not VCC, because VCC input is flattened
 #define VOLTAGE_PIN PB0      // Pin 19  PB0  ADC5
diff --git a/hw/mateminco/mf01-mini/hwdef.h b/hw/mateminco/mf01-mini/hwdef.h
index f245042..82dafb2 100644
--- a/hw/mateminco/mf01-mini/hwdef.h
+++ b/hw/mateminco/mf01-mini/hwdef.h
@@ -12,9 +12,7 @@
  *           ----
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE lumintop/fw3a/hwdef.c
+#define HWDEF_C  lumintop/fw3a/hwdef.c
 
 // channel modes
 // * 0. FET+N+1 stacked
diff --git a/hw/mateminco/mf01s/hwdef.h b/hw/mateminco/mf01s/hwdef.h
index 12451d7..fef5050 100644
--- a/hw/mateminco/mf01s/hwdef.h
+++ b/hw/mateminco/mf01s/hwdef.h
@@ -12,9 +12,7 @@
  *           ----
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hank/emisar-d4/hwdef.c
+#define HWDEF_C  hank/emisar-d4/hwdef.c
 
 // channel modes
 // * 0. small FET + big FET stacked
diff --git a/hw/mateminco/mt35-mini/hwdef.h b/hw/mateminco/mt35-mini/hwdef.h
index aec4eaf..ac7bf07 100644
--- a/hw/mateminco/mt35-mini/hwdef.h
+++ b/hw/mateminco/mt35-mini/hwdef.h
@@ -12,9 +12,7 @@
  *           ----
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hank/emisar-d4/hwdef.c
+#define HWDEF_C  hank/emisar-d4/hwdef.c
 
 // channel modes
 // * 0. FET+7135 stacked
diff --git a/hw/sofirn/blf-lt1-t1616/hwdef.h b/hw/sofirn/blf-lt1-t1616/hwdef.h
index 66575de..c9ae1ea 100644
--- a/hw/sofirn/blf-lt1-t1616/hwdef.h
+++ b/hw/sofirn/blf-lt1-t1616/hwdef.h
@@ -12,9 +12,7 @@
  * Voltage:    VCC
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE sofirn/blf-lt1-t1616/hwdef.c
+#define HWDEF_C  sofirn/blf-lt1-t1616/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-aux.h"
diff --git a/hw/sofirn/blf-lt1/hwdef.h b/hw/sofirn/blf-lt1/hwdef.h
index 03f3568..a57b1c4 100644
--- a/hw/sofirn/blf-lt1/hwdef.h
+++ b/hw/sofirn/blf-lt1/hwdef.h
@@ -12,9 +12,7 @@
  *           ----
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE sofirn/blf-lt1/hwdef.c
+#define HWDEF_C  sofirn/blf-lt1/hwdef.c
 
 // channel modes:
 // * 0. channel 1 only
diff --git a/hw/sofirn/blf-q8-t1616/hwdef.h b/hw/sofirn/blf-q8-t1616/hwdef.h
index 29c2ffa..638a2c1 100644
--- a/hw/sofirn/blf-q8-t1616/hwdef.h
+++ b/hw/sofirn/blf-q8-t1616/hwdef.h
@@ -15,11 +15,9 @@
  * Voltage:    VCC
  */
 
-#include <avr/io.h>
-
 // nearly all t1616-based FET+1 drivers work pretty much the same
 // (this one has single-color aux like the TS10)
-#define HWDEF_C_FILE wurkkos/ts10/hwdef.c
+#define HWDEF_C  wurkkos/ts10/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-aux.h"
diff --git a/hw/sofirn/lt1s-pro/hwdef.h b/hw/sofirn/lt1s-pro/hwdef.h
index cd4dd4e..7708631 100644
--- a/hw/sofirn/lt1s-pro/hwdef.h
+++ b/hw/sofirn/lt1s-pro/hwdef.h
@@ -13,9 +13,7 @@
  * Voltage:    VCC
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE sofirn/lt1s-pro/hwdef.c
+#define HWDEF_C  sofirn/lt1s-pro/hwdef.c
 
 // channel modes:
 // * 0. warm/cool white blend
diff --git a/hw/sofirn/sp10-pro/hwdef.h b/hw/sofirn/sp10-pro/hwdef.h
index a52166d..cb1271d 100644
--- a/hw/sofirn/sp10-pro/hwdef.h
+++ b/hw/sofirn/sp10-pro/hwdef.h
@@ -12,9 +12,7 @@
  * PA1 : Boost Enable
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE sofirn/sp10-pro/hwdef.c
+#define HWDEF_C  sofirn/sp10-pro/hwdef.c
 
 // channel modes:
 // * 0. low+high PWM stacked
@@ -61,8 +59,6 @@ enum CHANNEL_MODES {
 #define SWITCH_ISC_REG  PORTB.PIN3CTRL
 #define SWITCH_VECT     PORTB_PORT_vect
 #define SWITCH_INTFLG   VPORTB.INTFLAGS
-#define SWITCH_PCINT    PCINT0
-#define PCINT_vect      PCINT0_vect  // ISR for PCINT[7:0]
 
 // Voltage divider battLVL
 #define USE_VOLTAGE_DIVIDER       // use a dedicated pin, not VCC, because VCC input is regulated
diff --git a/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h b/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h
index cd883fa..90fede3 100644
--- a/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h
+++ b/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h
@@ -36,9 +36,7 @@
  * IN- NFET : pull up after BST enable to eliminate startup flash, pull down otherwise
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
+#define HWDEF_C  thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -99,8 +97,6 @@ enum CHANNEL_MODES {
 #define SWITCH_ISC_REG  PORTC.PIN3CTRL
 #define SWITCH_VECT     PORTC_PORT_vect
 #define SWITCH_INTFLG   VPORTC.INTFLAGS
-#define SWITCH_PCINT    PCINT0
-#define PCINT_vect      PCINT0_vect
 #endif
 
 // Voltage divider battLVL
diff --git a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h
index 3f64287..72aa7b0 100644
--- a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h
+++ b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h
@@ -37,9 +37,7 @@
  * IN- NFET : pull up after BST enable to eliminate startup flash, pull down otherwise
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
+#define HWDEF_C  thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -100,8 +98,6 @@ enum CHANNEL_MODES {
 #define SWITCH_ISC_REG  PORTC.PIN2CTRL
 #define SWITCH_VECT     PORTC_PORT_vect
 #define SWITCH_INTFLG   VPORTC.INTFLAGS
-#define SWITCH_PCINT    PCINT0
-#define PCINT_vect      PCINT0_vect
 #endif
 
 // average drop across diode on this hardware
diff --git a/hw/thefreeman/lin16dac/hwdef.h b/hw/thefreeman/lin16dac/hwdef.h
index 2066d04..dc4377a 100644
--- a/hw/thefreeman/lin16dac/hwdef.h
+++ b/hw/thefreeman/lin16dac/hwdef.h
@@ -12,9 +12,7 @@
  * Read voltage from VCC pin, has PFET so no drop
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE thefreeman/lin16dac/hwdef.c
+#define HWDEF_C  thefreeman/lin16dac/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-aux.h"
diff --git a/hw/wurkkos/ts10/hwdef.h b/hw/wurkkos/ts10/hwdef.h
index b1239b8..92898fb 100644
--- a/hw/wurkkos/ts10/hwdef.h
+++ b/hw/wurkkos/ts10/hwdef.h
@@ -13,9 +13,7 @@
  * Voltage:    VCC
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE wurkkos/ts10/hwdef.c
+#define HWDEF_C  wurkkos/ts10/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-aux.h"
@@ -60,12 +58,10 @@ enum CHANNEL_MODES {
 
 // e-switch
 #define SWITCH_PIN      PIN5_bp
-//#define SWITCH_PCINT    PCINT0
 #define SWITCH_PORT     VPORTA.IN
 #define SWITCH_ISC_REG  PORTA.PIN2CTRL
 #define SWITCH_VECT     PORTA_PORT_vect
 #define SWITCH_INTFLG   VPORTA.INTFLAGS
-//#define PCINT_vect      PCINT0_vect
 
 // average drop across diode on this hardware
 #ifndef VOLTAGE_FUDGE_FACTOR
diff --git a/hw/wurkkos/ts25/hwdef.h b/hw/wurkkos/ts25/hwdef.h
index 024a18d..ac1e574 100644
--- a/hw/wurkkos/ts25/hwdef.h
+++ b/hw/wurkkos/ts25/hwdef.h
@@ -14,9 +14,7 @@
  * Aux Blue:   PC1
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE wurkkos/ts25/hwdef.c
+#define HWDEF_C  wurkkos/ts25/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -61,12 +59,10 @@ enum CHANNEL_MODES {
 
 // e-switch
 #define SWITCH_PIN      PIN5_bp
-//#define SWITCH_PCINT    PCINT0
 #define SWITCH_PORT     VPORTA.IN
 #define SWITCH_ISC_REG  PORTA.PIN2CTRL
 #define SWITCH_VECT     PORTA_PORT_vect
 #define SWITCH_INTFLG   VPORTA.INTFLAGS
-//#define PCINT_vect      PCINT0_vect
 
 // average drop across diode on this hardware
 #ifndef VOLTAGE_FUDGE_FACTOR
diff --git a/ui/anduril/anduril.c b/ui/anduril/anduril.c
index e72c3b5..c434518 100644
--- a/ui/anduril/anduril.c
+++ b/ui/anduril/anduril.c
@@ -34,16 +34,19 @@
  * as possible.  These are mostly "USE" flags.
  */
 
+/********* load up MCU info, like ROM size and such *********/
+#include "arch/mcu.h"
+
 /********* User-configurable options *********/
 #include "anduril/config-default.h"
 
 /********* specific settings for known driver types *********/
-// Anduril config file name (set it here or define it at the gcc command line)
-//#define CFG_H cfg-blf-q8.h
 
-#include "fsm/tk.h"
 #include incfile(CFG_H)
 
+#ifdef HWDEF_H
+#include incfile(HWDEF_H)
+#endif
 
 /********* Include headers which need to be before FSM *********/
 
@@ -77,11 +80,12 @@
 #include "fsm/spaghetti-monster.h"
 
 /********* does this build target have special code to include? *********/
-#ifdef HWDEF_C_FILE
-#include incfile(HWDEF_C_FILE)
+#ifdef CFG_C
+#include incfile(CFG_C)
 #endif
-#ifdef CFG_C_FILE
-#include incfile(CFG_C_FILE)
+
+#ifdef HWDEF_C
+#include incfile(HWDEF_C)
 #endif
 
 
diff --git a/ui/anduril/config-default.h b/ui/anduril/config-default.h
index 899bc4a..04fc956 100644
--- a/ui/anduril/config-default.h
+++ b/ui/anduril/config-default.h
@@ -20,7 +20,7 @@
 
 // overheat protection
 #define USE_THERMAL_REGULATION
-#if (ATTINY==85) || (ATTINY==1634)
+#if (MCU==0x85) || (MCU==0x1634)
 // sloppy temperature sensor needs bigger error margin
 #define DEFAULT_THERM_CEIL 45  // try not to get hotter than this (in C)
 #else
@@ -185,7 +185,7 @@
 // if the aux LEDs oscillate between "full battery" and "empty battery"
 // while in "voltage" mode, enable this to reduce the amplitude of
 // those oscillations
-#if (ATTINY==1616) || (ATTINY==1634)
+#if (ROM_SIZE > 10000)
 #define USE_LOWPASS_WHILE_ASLEEP
 #endif
 
@@ -195,7 +195,7 @@
 
 // Use "smooth steps" to soften on/off and step changes
 // on MCUs with enough room for extra stuff like this
-#if (ATTINY==1616) || (ATTINY==1634)
+#if (ROM_SIZE > 10000)
 #define USE_SMOOTH_STEPS
 #endif
 // 0 = none, 1 = smooth, 2+ = undefined
-- 
cgit v1.2.3