diff options
| author | Selene ToyKeeper | 2023-07-16 16:27:44 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2023-07-16 16:27:44 -0600 |
| commit | 723b5b1ffa8f12b29110a2133a8f09beaf528aad (patch) | |
| tree | 229a77ce7bc61ec065cef4ecee8be330ac7fd624 /spaghetti-monster | |
| parent | refactored how channel modes are defined, and converted emisar-2ch build (diff) | |
| download | anduril-723b5b1ffa8f12b29110a2133a8f09beaf528aad.tar.gz anduril-723b5b1ffa8f12b29110a2133a8f09beaf528aad.tar.bz2 anduril-723b5b1ffa8f12b29110a2133a8f09beaf528aad.zip | |
fixed d4v2, kr4, m44, emisar-2ch (using new refactor),
added RGB aux channel modes to models which didn't have it
Diffstat (limited to 'spaghetti-monster')
| -rw-r--r-- | spaghetti-monster/anduril/cfg-emisar-2ch.h | 4 | ||||
| -rw-r--r-- | spaghetti-monster/anduril/cfg-noctigon-m44.h | 6 | ||||
| -rw-r--r-- | spaghetti-monster/chan-rgbaux.h | 35 |
3 files changed, 29 insertions, 16 deletions
diff --git a/spaghetti-monster/anduril/cfg-emisar-2ch.h b/spaghetti-monster/anduril/cfg-emisar-2ch.h index d158b88..5f3384a 100644 --- a/spaghetti-monster/anduril/cfg-emisar-2ch.h +++ b/spaghetti-monster/anduril/cfg-emisar-2ch.h @@ -22,7 +22,8 @@ // channel modes... // CM_CH1, CM_CH2, CM_BOTH, CM_BLEND, CM_AUTO -#define DEFAULT_CHANNEL_MODE CM_BLEND +// enable max brightness out of the box +#define DEFAULT_CHANNEL_MODE CM_BOTH //#define FACTORY_RESET_WARN_CHANNEL CM_CH2 //#define FACTORY_RESET_SUCCESS_CHANNEL CM_BOTH @@ -97,6 +98,7 @@ #define THERM_CAL_OFFSET 5 +// don't blink while ramping #ifdef BLINK_AT_RAMP_MIDDLE #undef BLINK_AT_RAMP_MIDDLE #endif diff --git a/spaghetti-monster/anduril/cfg-noctigon-m44.h b/spaghetti-monster/anduril/cfg-noctigon-m44.h index aeded00..92cf38f 100644 --- a/spaghetti-monster/anduril/cfg-noctigon-m44.h +++ b/spaghetti-monster/anduril/cfg-noctigon-m44.h @@ -22,7 +22,8 @@ // channel modes... // CM_CH1, CM_CH2, CM_BOTH, CM_BLEND, CM_AUTO -#define DEFAULT_CHANNEL_MODE CM_AUTO +// enable max brightness out of the box +#define DEFAULT_CHANNEL_MODE CM_BOTH //#define FACTORY_RESET_WARN_CHANNEL CM_CH2 //#define FACTORY_RESET_SUCCESS_CHANNEL CM_BOTH @@ -31,6 +32,9 @@ //#define CONFIG_WAITING_CHANNEL CM_CH2 //#define CONFIG_BLINK_CHANNEL CM_BOTH +// blink numbers on the main LEDs by default (but allow user to change it) +#define DEFAULT_BLINK_CHANNEL CM_BLEND + #define POLICE_COLOR_STROBE_CH1 CM_CH1 #define POLICE_COLOR_STROBE_CH2 CM_CH2 diff --git a/spaghetti-monster/chan-rgbaux.h b/spaghetti-monster/chan-rgbaux.h index ebb1bb9..6ef5d89 100644 --- a/spaghetti-monster/chan-rgbaux.h +++ b/spaghetti-monster/chan-rgbaux.h @@ -16,41 +16,48 @@ #define NUM_RGB_AUX_CHANNEL_MODES 7 +// include / exclude field based on compile options +#ifdef USE_CHANNEL_MODE_ARGS + #define AUX_RGB_HAS_ARGS , .has_args = 0 +#else + #define AUX_RGB_HAS_ARGS +#endif + #define RGB_AUX_CHANNELS \ { \ .set_level = set_level_auxred, \ - .gradual_tick = gradual_tick_null, \ - .has_args = 0 \ + .gradual_tick = gradual_tick_null \ + AUX_RGB_HAS_ARGS \ }, \ { \ .set_level = set_level_auxyel, \ - .gradual_tick = gradual_tick_null, \ - .has_args = 0 \ + .gradual_tick = gradual_tick_null \ + AUX_RGB_HAS_ARGS \ }, \ { \ .set_level = set_level_auxgrn, \ - .gradual_tick = gradual_tick_null, \ - .has_args = 0 \ + .gradual_tick = gradual_tick_null \ + AUX_RGB_HAS_ARGS \ }, \ { \ .set_level = set_level_auxcyn, \ - .gradual_tick = gradual_tick_null, \ - .has_args = 0 \ + .gradual_tick = gradual_tick_null \ + AUX_RGB_HAS_ARGS \ }, \ { \ .set_level = set_level_auxblu, \ - .gradual_tick = gradual_tick_null, \ - .has_args = 0 \ + .gradual_tick = gradual_tick_null \ + AUX_RGB_HAS_ARGS \ }, \ { \ .set_level = set_level_auxprp, \ - .gradual_tick = gradual_tick_null, \ - .has_args = 0 \ + .gradual_tick = gradual_tick_null \ + AUX_RGB_HAS_ARGS \ }, \ { \ .set_level = set_level_auxwht, \ - .gradual_tick = gradual_tick_null, \ - .has_args = 0 \ + .gradual_tick = gradual_tick_null \ + AUX_RGB_HAS_ARGS \ } void set_level_auxred(uint8_t level); |