aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSelene ToyKeeper2018-12-19 15:36:53 -0700
committerSelene ToyKeeper2018-12-19 15:36:53 -0700
commitc08e69271078a2d1807fa8b2f905490692befbec (patch)
treef0b82c05fdd5bddf31267598715bee5617764ed7
parentmerged include-fix branch for cleaner config file mechanisms (diff)
downloadanduril-c08e69271078a2d1807fa8b2f905490692befbec.tar.gz
anduril-c08e69271078a2d1807fa8b2f905490692befbec.tar.bz2
anduril-c08e69271078a2d1807fa8b2f905490692befbec.zip
configured lantern stepped ramp and button LED mode, set default tint to 128 (balanced)
-rw-r--r--spaghetti-monster/anduril/cfg-blf-lantern.h8
-rw-r--r--spaghetti-monster/fsm-ramping.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/spaghetti-monster/anduril/cfg-blf-lantern.h b/spaghetti-monster/anduril/cfg-blf-lantern.h
index de593d4..a1bda7d 100644
--- a/spaghetti-monster/anduril/cfg-blf-lantern.h
+++ b/spaghetti-monster/anduril/cfg-blf-lantern.h
@@ -17,6 +17,11 @@
#define USE_INDICATOR_LED_WHILE_RAMPING
// enable blinking indicator LED while off
#define TICK_DURING_STANDBY
+#define STANDBY_TICK_SPEED 3 // every 0.128 s
+#define USE_FANCIER_BLINKING_INDICATOR
+// off mode: high (2)
+// lockout: blinking (3)
+#define INDICATOR_LED_DEFAULT_MODE ((3<<2) + 2)
// the lantern has two PWM channels, but they drive different sets of emitters
// (one channel for warm emitters, one channel for cold)
@@ -38,8 +43,9 @@
// because this lantern isn't overpowered
#define RAMP_SMOOTH_FLOOR 1
#define RAMP_SMOOTH_CEIL 150
-#define RAMP_DISCRETE_FLOOR RAMP_SMOOTH_FLOOR
+#define RAMP_DISCRETE_FLOOR 20
#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL
+#define RAMP_DISCRETE_STEPS 5
// the sensor (attiny85) is nowhere near the emitters
// so thermal regulation can't work
diff --git a/spaghetti-monster/fsm-ramping.h b/spaghetti-monster/fsm-ramping.h
index 9732b9c..4ce8015 100644
--- a/spaghetti-monster/fsm-ramping.h
+++ b/spaghetti-monster/fsm-ramping.h
@@ -27,7 +27,7 @@
volatile uint8_t actual_level = 0;
#ifdef USE_TINT_RAMPING
-uint8_t tint = 0;
+uint8_t tint = 128;
#endif
#ifdef USE_SET_LEVEL_GRADUALLY