Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUG] Massdrop develop rgb fix #12022

Merged
merged 3 commits into from
Feb 26, 2021
+13 −9
Merged

[BUG] Massdrop develop rgb fix #12022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
103e1a0
Allow for disabling RGB_MATRIX on Massdrop boards.
tzarc Feb 26, 2021
46db380
Fixup init sequence.
tzarc Feb 26, 2021
97fbef1
Make some functions static as they've got very generic names.
tzarc Feb 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keyboards/massdrop/ctrl/config_led.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ void rgb_matrix_indicators_kb(void)
}
#endif // USB_LED_INDICATOR_ENABLE

#endif
#endif // RGB_MATRIX_ENABLE
3 changes: 3 additions & 0 deletions quantum/quantum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions tmk_core/common/keyboard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions tmk_core/protocol/arm_atsam/md_rgb_matrix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifdef RGB_MATRIX_ENABLE
#include "arm_atsam_protocol.h"
#include "led.h"
#include "rgb_matrix.h"
Expand Down Expand Up @@ -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);
Expand All @@ -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();
Expand All @@ -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;
Expand Down Expand Up @@ -470,3 +471,4 @@ static void md_rgb_matrix_config_override(int i) {
}

#endif // USE_MASSDROP_CONFIGURATOR
#endif // RGB_MATRIX_ENABLE
4 changes: 3 additions & 1 deletion tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifdef RGB_MATRIX_ENABLE
#ifdef USE_MASSDROP_CONFIGURATOR

# include "md_rgb_matrix.h"
Expand Down Expand Up @@ -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