From 37feeae1ac48ae9b70c99b768943648fd6c354ff Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 27 Nov 2023 08:47:37 -0700
Subject: fixed ADC on attiny85 and related builds

(also enabled smooth steps on BLF GT, but had to remove stuff to make room)
---
 hw/lumintop/blf-gt/anduril.h | 7 +++++++
 hw/lumintop/blf-gt/hwdef.h   | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'hw/lumintop')

diff --git a/hw/lumintop/blf-gt/anduril.h b/hw/lumintop/blf-gt/anduril.h
index 2fc359e..cc2f940 100644
--- a/hw/lumintop/blf-gt/anduril.h
+++ b/hw/lumintop/blf-gt/anduril.h
@@ -54,7 +54,14 @@
 #undef BLINK_AT_RAMP_MIDDLE
 #undef BLINK_AT_RAMP_FLOOR
 
+#define USE_SMOOTH_STEPS
+
 // too big, turn off extra features
 //#undef USE_TACTICAL_MODE
 #undef USE_SOS_MODE
+#undef USE_BEACON_MODE
+#undef USE_RAMP_AFTER_MOON_CONFIG
+//#undef USE_RAMP_SPEED_CONFIG
+//#undef USE_VOLTAGE_CORRECTION
+#undef USE_2C_STYLE_CONFIG
 
diff --git a/hw/lumintop/blf-gt/hwdef.h b/hw/lumintop/blf-gt/hwdef.h
index dbaf18e..68197ac 100644
--- a/hw/lumintop/blf-gt/hwdef.h
+++ b/hw/lumintop/blf-gt/hwdef.h
@@ -67,14 +67,18 @@ enum CHANNEL_MODES {
 //#define ADMUX_VOLTAGE_DIVIDER ((1 << V_REF) | (1 << ADLAR) | VOLTAGE_CHANNEL)
 // 1.1V reference, no left-adjust, ADC1/PB2
 #define ADMUX_VOLTAGE_DIVIDER ((1 << V_REF) | VOLTAGE_CHANNEL)
+
+#undef voltage_raw2cooked
+#define voltage_raw2cooked  mcu_vdivider_raw2cooked
+
 #define ADC_PRSCL   0x07    // clk/128
 
 // Raw ADC readings at 4.4V and 2.2V (in-between, we assume values form a straight line)
 #ifndef ADC_44
-#define ADC_44 (184*4)
+#define ADC_44 (184*4*4)
 #endif
 #ifndef ADC_22
-#define ADC_22 (92*4)
+#define ADC_22 (92*4*4)
 #endif
 
 #define FAST 0xA3           // fast PWM both channels
-- 
cgit v1.2.3