3 files changed, 7 insertions, 13 deletions
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