From 640869257f996b9f505e73f531b5343dc9124444 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sun, 3 Oct 2021 14:17:23 -0700 Subject: [PATCH 1/2] [Keyboard] Disable RGBLIGHT on mokey64 (#14681) --- keyboards/mokey/mokey64/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mokey/mokey64/rules.mk b/keyboards/mokey/mokey64/rules.mk index 6da271964f..a181895095 100644 --- a/keyboards/mokey/mokey64/rules.mk +++ b/keyboards/mokey/mokey64/rules.mk @@ -17,5 +17,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output From 6279399425c8893b586f68da06a719b94b48b4e2 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sun, 3 Oct 2021 14:17:46 -0700 Subject: [PATCH 2/2] [Keyboard] Fix Mechlovin's Olly/BB keyboard matrix file (#14680) --- keyboards/mechlovin/olly/bb/matrix.c | 69 ++++++++++++++-------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/keyboards/mechlovin/olly/bb/matrix.c b/keyboards/mechlovin/olly/bb/matrix.c index d745f7d2cd..e045299bae 100644 --- a/keyboards/mechlovin/olly/bb/matrix.c +++ b/keyboards/mechlovin/olly/bb/matrix.c @@ -17,6 +17,7 @@ along with this program. If not, see . */ #include "matrix.h" +#include "gpio.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; @@ -27,40 +28,40 @@ static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; * 0: 0 ── 0 ── 0 1 ── 0 0 0 0 * ──────────────────────────────────────────── * 1: 0 ── 0 ── 1 1 ── 0 0 0 0 - * ──────────────────────────────────────────── - * 2: 0 ── 1 ── 0 1 ── 0 0 0 0 - * ──────────────────────────────────────────── - * 3: 0 ── 1 ── 1 1 ── 0 0 0 0 - * ──────────────────────────────────────────── - * 4: 1 ── 0 ── 0 1 ── 0 0 0 0 - * ──────────────────────────────────────────── - * 5: 1 ── 0 ── 1 1 ── 0 0 0 0 - * ──────────────────────────────────────────── - * 6: 1 ── 1 ── 0 1 ── 0 0 0 0 - * ──────────────────────────────────────────── - * 7: 1 ── 1 ── 1 1 ── 0 0 0 0 - * ──────────────────────────────────────────── - * 8: 1 ── 1 ── 1 0 ── 1 0 0 0 - * ──────────────────────────────────────────── - * 9: 0 ── 0 ── 0 0 ── 1 0 0 0 - * ──────────────────────────────────────────── - *10: 0 ── 0 ── 1 0 ── 1 0 0 0 - * ──────────────────────────────────────────── - *11: 0 ── 1 ── 0 0 ── 1 0 0 0 - * ──────────────────────────────────────────── - *12: 0 ── 1 ── 1 0 ── 1 0 0 0 - * ──────────────────────────────────────────── - *13: 1 ── 0 ── 0 0 ── 1 0 0 0 - * ──────────────────────────────────────────── - *14: 1 ── 0 ── 1 0 ── 1 0 0 0 - * ──────────────────────────────────────────── - *15: 1 ── 1 ── 0 0 ── 1 0 0 0 - * ──────────────────────────────────────────── - *16: 0 ── 0 ── 0 0 ── 0 1 0 0 - * ──────────────────────────────────────────── - *17: 0 ── 0 ── 0 0 ── 0 0 1 0 - * ──────────────────────────────────────────── - *18: 0 ── 0 ── 0 0 ── 0 0 0 1 + * ──────────────────────────────────────────── + * 2: 0 ── 1 ── 0 1 ── 0 0 0 0 + * ──────────────────────────────────────────── + * 3: 0 ── 1 ── 1 1 ── 0 0 0 0 + * ──────────────────────────────────────────── + * 4: 1 ── 0 ── 0 1 ── 0 0 0 0 + * ──────────────────────────────────────────── + * 5: 1 ── 0 ── 1 1 ── 0 0 0 0 + * ──────────────────────────────────────────── + * 6: 1 ── 1 ── 0 1 ── 0 0 0 0 + * ──────────────────────────────────────────── + * 7: 1 ── 1 ── 1 1 ── 0 0 0 0 + * ──────────────────────────────────────────── + * 8: 1 ── 1 ── 1 0 ── 1 0 0 0 + * ──────────────────────────────────────────── + * 9: 0 ── 0 ── 0 0 ── 1 0 0 0 + * ──────────────────────────────────────────── + *10: 0 ── 0 ── 1 0 ── 1 0 0 0 + * ──────────────────────────────────────────── + *11: 0 ── 1 ── 0 0 ── 1 0 0 0 + * ──────────────────────────────────────────── + *12: 0 ── 1 ── 1 0 ── 1 0 0 0 + * ──────────────────────────────────────────── + *13: 1 ── 0 ── 0 0 ── 1 0 0 0 + * ──────────────────────────────────────────── + *14: 1 ── 0 ── 1 0 ── 1 0 0 0 + * ──────────────────────────────────────────── + *15: 1 ── 1 ── 0 0 ── 1 0 0 0 + * ──────────────────────────────────────────── + *16: 0 ── 0 ── 0 0 ── 0 1 0 0 + * ──────────────────────────────────────────── + *17: 0 ── 0 ── 0 0 ── 0 0 1 0 + * ──────────────────────────────────────────── + *18: 0 ── 0 ── 0 0 ── 0 0 0 1 * */ static void select_col(uint8_t col) {