From ccacc3931e1dd3e27483c930b40326c968f1e91e Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 3 Nov 2021 02:42:12 -0600
Subject: added KR4-tintramp build (is basically identical to D4Sv2-tintramp,
 but with the switch on a different pin,  and no button LED)

---
 hwdef-Emisar_D4Sv2-tintramp.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'hwdef-Emisar_D4Sv2-tintramp.h')

diff --git a/hwdef-Emisar_D4Sv2-tintramp.h b/hwdef-Emisar_D4Sv2-tintramp.h
index 76f6097..3291c8b 100644
--- a/hwdef-Emisar_D4Sv2-tintramp.h
+++ b/hwdef-Emisar_D4Sv2-tintramp.h
@@ -52,6 +52,7 @@
 #define SWITCH_PCIE  PCIE0   // PCIE1 is for PCINT[7:0]
 #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]
 
 // usually PWM1_LVL would be a hardware register, but we need to abstract
@@ -173,7 +174,7 @@ inline void hwdef_setup() {
   PWM1_TOP = PWM_TOP;
 
   // set up e-switch
-  PUEA = (1 << SWITCH_PIN);  // pull-up for e-switch
+  SWITCH_PUE = (1 << SWITCH_PIN);  // pull-up for e-switch
   SWITCH_PCMSK = (1 << SWITCH_PCINT);  // enable pin change interrupt
 }
 
-- 
cgit v1.2.3


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 ++
 1 file changed, 2 insertions(+)

(limited to 'hwdef-Emisar_D4Sv2-tintramp.h')

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
-- 
cgit v1.2.3