From 723b5b1ffa8f12b29110a2133a8f09beaf528aad Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Sun, 16 Jul 2023 16:27:44 -0600 Subject: fixed d4v2, kr4, m44, emisar-2ch (using new refactor), added RGB aux channel modes to models which didn't have it --- spaghetti-monster/chan-rgbaux.h | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'spaghetti-monster/chan-rgbaux.h') 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); -- cgit v1.2.3