From 44884c8b4e3c3beb15fa06e3ec7eb5c2f32ab35a Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Sun, 24 Jun 2018 20:17:15 -0600 Subject: re-applied D4S-specific config, got lost in the merge --- spaghetti-monster/anduril/anduril.c | 9 ++++++--- spaghetti-monster/anduril/cfg-emisar-d4s.h | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 spaghetti-monster/anduril/cfg-emisar-d4s.h diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c index a79220b..c96301c 100644 --- a/spaghetti-monster/anduril/anduril.c +++ b/spaghetti-monster/anduril/anduril.c @@ -100,6 +100,9 @@ #elif defined(FSM_EMISAR_D4_DRIVER) #include "cfg-emisar-d4.h" +#elif defined(FSM_EMISAR_D4S_DRIVER) +#include "cfg-emisar-d4s.h" + #elif defined(FSM_FW3A_DRIVER) #include "cfg-fw3a.h" @@ -230,11 +233,11 @@ uint8_t ramp_discrete_step_size; // don't set this // bits 2-3 control lockout mode // bits 0-1 control "off" mode // modes are: 0=off, 1=low, 2=high, 3=blinking (if TICK_DURING_STANDBY enabled) -#ifdef FSM_EMISAR_D4S_DRIVER -uint8_t indicator_led_mode = (3<<2) + 1; -#else +#ifdef USE_INDICATOR_LED_WHILE_RAMPING //uint8_t indicator_led_mode = (1<<2) + 2; uint8_t indicator_led_mode = (2<<2) + 1; +#else +uint8_t indicator_led_mode = (3<<2) + 1; #endif #endif diff --git a/spaghetti-monster/anduril/cfg-emisar-d4s.h b/spaghetti-monster/anduril/cfg-emisar-d4s.h new file mode 100644 index 0000000..676ac83 --- /dev/null +++ b/spaghetti-monster/anduril/cfg-emisar-d4s.h @@ -0,0 +1,20 @@ +// Emisar D4S config options for Anduril + +// the button lights up +#define USE_INDICATOR_LED +// the aux LEDs are behind the main LEDs +#ifdef USE_INDICATOR_LED_WHILE_RAMPING +#undef USE_INDICATOR_LED_WHILE_RAMPING +#endif +// enable blinking indicator LED while off +#define TICK_DURING_STANDBY + +// ceiling is level 120/150 +#define RAMP_SMOOTH_CEIL (MAX_LEVEL*4/5) + +// thermal regulation parameters +#undef MIN_THERM_STEPDOWN // this should be lower, because 3x7135 instead of 1x7135 +#define MIN_THERM_STEPDOWN 60 // lowest value it'll step down to +#undef THERM_DOUBLE_SPEED_LEVEL // this should be lower too, because this light is a hot rod +#define THERM_DOUBLE_SPEED_LEVEL (RAMP_LENGTH*2/3) // throttle back faster when high + -- cgit v1.2.3