[BUG] Massdrop develop rgb fix (qmk#12022)

* Allow for disabling RGB_MATRIX on Massdrop boards. * Fixup init sequence. * Make some functions static as they've got very generic names.
4pplet · Feb 26, 2021 · abe1893 · abe1893
1 parent 4dc8a2d
commit abe1893
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/keyboards/massdrop/ctrl/config_led.c b/keyboards/massdrop/ctrl/config_led.c
@@ -79,4 +79,4 @@ void rgb_matrix_indicators_kb(void)
 }
 #endif // USB_LED_INDICATOR_ENABLE
 
-#endif
+#endif // RGB_MATRIX_ENABLE
diff --git a/quantum/quantum.c b/quantum/quantum.c
@@ -621,6 +621,9 @@ void matrix_init_quantum() {
 #ifdef AUDIO_ENABLE
  audio_init();
 #endif
+#ifdef RGB_MATRIX_ENABLE
+ rgb_matrix_init();
+#endif
 #if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
  unicode_input_mode_init();
 #endif

diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
@@ -307,9 +307,6 @@ void keyboard_init(void) {
 #ifdef RGBLIGHT_ENABLE
  rgblight_init();
 #endif
-#ifdef RGB_MATRIX_ENABLE
- rgb_matrix_init();
-#endif
 #ifdef ENCODER_ENABLE
  encoder_init();
 #endif

diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
@@ -15,6 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 */
 
+#ifdef RGB_MATRIX_ENABLE
 #include "arm_atsam_protocol.h"
 #include "led.h"
 #include "rgb_matrix.h"
@@ -196,7 +197,7 @@ void md_rgb_matrix_prepare(void) {
  }
 }
 
-void led_set_one(int i, uint8_t r, uint8_t g, uint8_t b) {
+static void led_set_one(int i, uint8_t r, uint8_t g, uint8_t b) {
  if (i < ISSI3733_LED_COUNT) {
 #ifdef USE_MASSDROP_CONFIGURATOR
  md_rgb_matrix_config_override(i);
@@ -208,13 +209,13 @@ void led_set_one(int i, uint8_t r, uint8_t g, uint8_t b) {
  }
 }
 
-void led_set_all(uint8_t r, uint8_t g, uint8_t b) {
+static void led_set_all(uint8_t r, uint8_t g, uint8_t b) {
  for (uint8_t i = 0; i < ISSI3733_LED_COUNT; i++) {
  led_set_one(i, r, g, b);
  }
 }
 
-void init(void) {
+static void init(void) {
  DBGC(DC_LED_MATRIX_INIT_BEGIN);
 
  issi3733_prepare_arrays();
@@ -227,7 +228,7 @@ void init(void) {
  DBGC(DC_LED_MATRIX_INIT_COMPLETE);
 }
 
-void flush(void) {
+static void flush(void) {
 #ifdef USE_MASSDROP_CONFIGURATOR
  if (!led_enabled) {
  return;
@@ -470,3 +471,4 @@ static void md_rgb_matrix_config_override(int i) {
 }
 
 #endif // USE_MASSDROP_CONFIGURATOR
+#endif // RGB_MATRIX_ENABLE
diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c b/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
@@ -15,6 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 */
 
+#ifdef RGB_MATRIX_ENABLE
 #ifdef USE_MASSDROP_CONFIGURATOR
 
 # include "md_rgb_matrix.h"
@@ -96,4 +97,5 @@ void *led_setups[] = {leds_rainbow_s, leds_rainbow_ns, leds_teal_salmon, leds_ye
 
 const uint8_t led_setups_count = sizeof(led_setups) / sizeof(led_setups[0]);
 
-#endif
+#endif // USE_MASSDROP_CONFIGURATOR
+#endif // RGB_MATRIX_ENABLE