From 08781957244b9a30c9abc7425ff023d36f7e9160 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 26 Apr 2020 22:12:31 -0600
Subject: applied ADC rewrite updates to most recent build targets

---
 hwdef-Noctigon_K1-12V.h                         |  2 +-
 hwdef-Noctigon_K1.h                             |  2 +-
 hwdef-Noctigon_KR4.h                            |  2 +-
 spaghetti-monster/anduril/cfg-noctigon-k1-12v.h | 12 ------------
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/hwdef-Noctigon_K1-12V.h b/hwdef-Noctigon_K1-12V.h
index 2294bac..7beb205 100644
--- a/hwdef-Noctigon_K1-12V.h
+++ b/hwdef-Noctigon_K1-12V.h
@@ -74,7 +74,7 @@
 // REFS[1:0] = 1, 0 for internal 1.1V reference
 // other bits reserved
 #define ADMUX_VOLTAGE_DIVIDER 0b10000110
-#define ADC_PRSCL   0x06    // clk/64
+#define ADC_PRSCL   0x07    // clk/128
 
 // Raw ADC readings at 4.4V and 2.2V
 // calibrate the voltage readout here
diff --git a/hwdef-Noctigon_K1.h b/hwdef-Noctigon_K1.h
index 031bec0..8c8a4db 100644
--- a/hwdef-Noctigon_K1.h
+++ b/hwdef-Noctigon_K1.h
@@ -71,7 +71,7 @@
 // REFS[1:0] = 1, 0 for internal 1.1V reference
 // other bits reserved
 #define ADMUX_VOLTAGE_DIVIDER 0b10000110
-#define ADC_PRSCL   0x06    // clk/64
+#define ADC_PRSCL   0x07    // clk/128
 
 // Raw ADC readings at 4.4V and 2.2V
 // calibrate the voltage readout here
diff --git a/hwdef-Noctigon_KR4.h b/hwdef-Noctigon_KR4.h
index f624e64..4eec585 100644
--- a/hwdef-Noctigon_KR4.h
+++ b/hwdef-Noctigon_KR4.h
@@ -80,7 +80,7 @@
 // REFS[1:0] = 1, 0 for internal 1.1V reference
 // other bits reserved
 #define ADMUX_VOLTAGE_DIVIDER 0b10000110
-#define ADC_PRSCL   0x06    // clk/64
+#define ADC_PRSCL   0x07    // clk/128
 
 // TODO: calibrate this
 // Raw ADC readings at 4.4V and 2.2V
diff --git a/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h b/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h
index 12f69de..10cdfa1 100644
--- a/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h
+++ b/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h
@@ -45,16 +45,8 @@
 #define MUGGLE_FLOOR RAMP_DISCRETE_FLOOR
 #define MUGGLE_CEILING 70
 
-// optional, makes initial turbo step-down faster so first peak isn't as hot
-// the D4 runs very very hot, so be extra careful
-//#define THERM_HARD_TURBO_DROP
-
 // stop panicking at ~70% power or ~600 lm
 #define THERM_FASTER_LEVEL 130
-// respond to thermal changes faster
-#define THERMAL_WARNING_SECONDS 3
-#define THERMAL_UPDATE_SPEED 1
-#define THERM_PREDICTION_STRENGTH 4
 
 // easier access to thermal config mode, for Noctigon
 #define USE_TENCLICK_THERMAL_CONFIG
@@ -64,7 +56,3 @@
 
 #define THERM_CAL_OFFSET 5
 
-// attiny1634 has enough space to smooth out voltage readings
-// (prevent the button from blinking during use)
-#define USE_VOLTAGE_LOWPASS
-
-- 
cgit v1.2.3