From c3f547d5edfbca0ed78190d9d8b8f3609baebb5f Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 3 Nov 2021 20:33:01 -0600
Subject: fixed KR4-tintramp build (switch wasn't working) and added it to
 MODELS

---
 hwdef-Emisar_D4Sv2-tintramp.h    |  2 ++
 hwdef-Noctigon_KR4-tintramp.h    | 13 +++++--------
 spaghetti-monster/anduril/MODELS |  1 +
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hwdef-Emisar_D4Sv2-tintramp.h b/hwdef-Emisar_D4Sv2-tintramp.h
index 3291c8b..90545f4 100644
--- a/hwdef-Emisar_D4Sv2-tintramp.h
+++ b/hwdef-Emisar_D4Sv2-tintramp.h
@@ -47,6 +47,7 @@
 #define USE_DYN_PWM  // dynamic frequency and speed
 #define PWM_DATATYPE2 uint32_t  // only needs 32-bit if ramp values go over 255
 
+#ifndef SWITCH_PIN
 #define SWITCH_PIN   PA7     // pin 20
 #define SWITCH_PCINT PCINT7  // pin 20 pin change interrupt
 #define SWITCH_PCIE  PCIE0   // PCIE1 is for PCINT[7:0]
@@ -54,6 +55,7 @@
 #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]
+#endif
 
 // usually PWM1_LVL would be a hardware register, but we need to abstract
 // it out to a soft brightness value, in order to handle tint ramping
diff --git a/hwdef-Noctigon_KR4-tintramp.h b/hwdef-Noctigon_KR4-tintramp.h
index 9857431..3bd57fe 100644
--- a/hwdef-Noctigon_KR4-tintramp.h
+++ b/hwdef-Noctigon_KR4-tintramp.h
@@ -28,16 +28,10 @@
  *      ADC12   thermal sensor
  */
 
-#include "hwdef-Emisar_D4Sv2-tintramp.h"
+#define ATTINY 1634
+#include <avr/io.h>
 
 // move the switch to a different pin
-#undef SWITCH_PIN
-#undef SWITCH_PCINT
-#undef SWITCH_PCIE
-#undef SWITCH_PCMSK
-#undef SWITCH_PORT
-#undef SWITCH_PUE
-#undef PCINT_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]
@@ -46,4 +40,7 @@
 #define SWITCH_PUE   PUEB    // pullup group B
 #define PCINT_vect   PCINT1_vect  // ISR for PCINT[11:8]
 
+// the rest of the config is the same as D4Sv2-tintramp
+#include "hwdef-Emisar_D4Sv2-tintramp.h"
+
 #endif
diff --git a/spaghetti-monster/anduril/MODELS b/spaghetti-monster/anduril/MODELS
index ca9da30..a125f53 100644
--- a/spaghetti-monster/anduril/MODELS
+++ b/spaghetti-monster/anduril/MODELS
@@ -20,6 +20,7 @@ Model	Name                          	MCU
 0212	noctigon-kr4-nofet            	attiny1634
 0213	noctigon-kr4-219              	attiny1634
 0214	noctigon-kr4-219b             	attiny1634
+0215	noctigon-kr4-tintramp         	attiny1634
 0251	noctigon-k1                   	attiny1634
 0252	noctigon-k1-sbt90             	attiny1634
 0253	noctigon-k1-12v               	attiny1634
-- 
cgit v1.2.3