From d863b060780af735e19a2d4eb4149dde6b92e0d5 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 19 Aug 2024 13:19:24 -0600
Subject: ts25-boost: calibrated for new prototype - battery voltage readings -
 RGB button aux - less moon flicker (but brighter, less efficient moon) -
 reduced blink brightness   (old brightness was so high it was throwing off
 battery readings)

---
 hw/wurkkos/ts25/boost/anduril.h | 17 +++++++++++------
 hw/wurkkos/ts25/boost/hwdef.h   |  4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'hw/wurkkos')

diff --git a/hw/wurkkos/ts25/boost/anduril.h b/hw/wurkkos/ts25/boost/anduril.h
index 1f19a9b..f1c6868 100644
--- a/hw/wurkkos/ts25/boost/anduril.h
+++ b/hw/wurkkos/ts25/boost/anduril.h
@@ -10,9 +10,14 @@
 #define USE_AUX_RGB_LEDS
 
 // don't turn on the aux LEDs while main LEDs are on
-#ifdef USE_INDICATOR_LED_WHILE_RAMPING
-#undef USE_INDICATOR_LED_WHILE_RAMPING
-#endif
+//#ifdef USE_INDICATOR_LED_WHILE_RAMPING
+//#undef USE_INDICATOR_LED_WHILE_RAMPING
+//#endif
+// show real-time battery status on RGB button
+// when main LEDs are bright enough to overpower the front aux
+#define USE_INDICATOR_LED_WHILE_RAMPING
+#define USE_AUX_RGB_LEDS_WHILE_ON  20
+
 
 #define VOLTAGE_FUDGE_FACTOR 5  // add 0.25V, not 0.35V
 
@@ -28,8 +33,8 @@
 // moon at 1/4th speed for max runtime
 // the rest at full speed, to reduce PWM
 // (speed changes make a big visible bump because PWM)
-#define HALFSPEED_LEVEL      2
-#define QUARTERSPEED_LEVEL   2
+#define HALFSPEED_LEVEL      1
+#define QUARTERSPEED_LEVEL   1
 
 #define RAMP_SMOOTH_FLOOR    1
 #define RAMP_SMOOTH_CEIL     150
@@ -47,7 +52,7 @@
 // stop panicking at ~50% power
 #define THERM_FASTER_LEVEL 120  // throttle back faster when high
 
-#define BLINK_BRIGHTNESS 50
+#define BLINK_BRIGHTNESS 30
 #define BLINK_ONCE_TIME 12
 
 // show each channel while it scroll by in the menu
diff --git a/hw/wurkkos/ts25/boost/hwdef.h b/hw/wurkkos/ts25/boost/hwdef.h
index 4fd53a2..833c9f9 100644
--- a/hw/wurkkos/ts25/boost/hwdef.h
+++ b/hw/wurkkos/ts25/boost/hwdef.h
@@ -100,8 +100,8 @@ uint8_t ch1_pwm, ch1_dsm;
 // estimated / calculated values are:
 //   (voltage - D1) * (R2/(R2+R1) * 4096 / 1.1)
 // Resistors are 330k and 100k
-#define ADC_44  4274  // raw value at 4.40V
-#define ADC_22  2256  // raw value at 2.20V
+#define ADC_44  3830  // raw value at 4.40V
+#define ADC_22  1840  // raw value at 2.20V
 
 // this light has aux LEDs under the optic
 #define AUXLED_R_PIN    PIN3_bp    // pin 3
-- 
cgit v1.2.3