From becb1525aadc1039a99ecdc6f7ae5cf3a1beb2fb Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Fri, 28 Apr 2023 03:06:22 -0600 Subject: D4v2 FET+1 model: works again, and now uses dynamic PWM (lower lows) (also added generic channel modes for RGB aux LEDs) --- spaghetti-monster/chan-rgbaux.h | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 spaghetti-monster/chan-rgbaux.h (limited to 'spaghetti-monster/chan-rgbaux.h') diff --git a/spaghetti-monster/chan-rgbaux.h b/spaghetti-monster/chan-rgbaux.h new file mode 100644 index 0000000..5c1c5c3 --- /dev/null +++ b/spaghetti-monster/chan-rgbaux.h @@ -0,0 +1,11 @@ +// channel modes for RGB aux LEDs +// Copyright (C) 2023 Selene ToyKeeper +// SPDX-License-Identifier: GPL-3.0-or-later +#pragma once + +void set_level_auxred(uint8_t level); +void set_level_auxgrn(uint8_t level); +void set_level_auxblu(uint8_t level); + +bool gradual_tick_null(uint8_t gt); + -- cgit v1.2.3 From fbed17d3260d1fca312d655818cc2394654615aa Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Tue, 2 May 2023 08:47:42 -0600 Subject: D4v2: added the rest of the aux RGB colors as channel modes, and set aux "white" as the mode it uses to blink out numbers --- spaghetti-monster/chan-rgbaux.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'spaghetti-monster/chan-rgbaux.h') diff --git a/spaghetti-monster/chan-rgbaux.h b/spaghetti-monster/chan-rgbaux.h index 5c1c5c3..d19f6ad 100644 --- a/spaghetti-monster/chan-rgbaux.h +++ b/spaghetti-monster/chan-rgbaux.h @@ -4,8 +4,12 @@ #pragma once void set_level_auxred(uint8_t level); +void set_level_auxyel(uint8_t level); void set_level_auxgrn(uint8_t level); +void set_level_auxcyn(uint8_t level); void set_level_auxblu(uint8_t level); +void set_level_auxprp(uint8_t level); +void set_level_auxwht(uint8_t level); bool gradual_tick_null(uint8_t gt); -- cgit v1.2.3 From 95a9eb6b3078915a2686c7ec55320273ef429838 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Mon, 10 Jul 2023 11:56:04 -0600 Subject: refactored how channel modes are defined, and converted emisar-2ch build --- spaghetti-monster/chan-rgbaux.h | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'spaghetti-monster/chan-rgbaux.h') diff --git a/spaghetti-monster/chan-rgbaux.h b/spaghetti-monster/chan-rgbaux.h index d19f6ad..ebb1bb9 100644 --- a/spaghetti-monster/chan-rgbaux.h +++ b/spaghetti-monster/chan-rgbaux.h @@ -3,6 +3,56 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once +#define RGB_AUX_ENUMS \ + CM_AUXRED, \ + CM_AUXYEL, \ + CM_AUXGRN, \ + CM_AUXCYN, \ + CM_AUXBLU, \ + CM_AUXPRP, \ + CM_AUXWHT + +#define RGB_AUX_CM_ARGS 0,0,0,0,0,0,0 + +#define NUM_RGB_AUX_CHANNEL_MODES 7 + +#define RGB_AUX_CHANNELS \ + { \ + .set_level = set_level_auxred, \ + .gradual_tick = gradual_tick_null, \ + .has_args = 0 \ + }, \ + { \ + .set_level = set_level_auxyel, \ + .gradual_tick = gradual_tick_null, \ + .has_args = 0 \ + }, \ + { \ + .set_level = set_level_auxgrn, \ + .gradual_tick = gradual_tick_null, \ + .has_args = 0 \ + }, \ + { \ + .set_level = set_level_auxcyn, \ + .gradual_tick = gradual_tick_null, \ + .has_args = 0 \ + }, \ + { \ + .set_level = set_level_auxblu, \ + .gradual_tick = gradual_tick_null, \ + .has_args = 0 \ + }, \ + { \ + .set_level = set_level_auxprp, \ + .gradual_tick = gradual_tick_null, \ + .has_args = 0 \ + }, \ + { \ + .set_level = set_level_auxwht, \ + .gradual_tick = gradual_tick_null, \ + .has_args = 0 \ + } + void set_level_auxred(uint8_t level); void set_level_auxyel(uint8_t level); void set_level_auxgrn(uint8_t level); -- cgit v1.2.3 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