diff options
| author | QMK Bot <hello@qmk.fm> | 2021-10-03 21:17:56 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-10-03 21:17:56 +0000 |
| commit | d785282df7c60f6fa564f8607d304bd4af6cb344 (patch) | |
| tree | 94b6e5c3230080281145f4b3bbff6a3a3fbee35b | |
| parent | db6bf9be2b78e974234f134dcc0b023990052926 (diff) | |
| parent | 6279399425c8893b586f68da06a719b94b48b4e2 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/mechlovin/olly/bb/matrix.c | 69 | ||||
| -rw-r--r-- | keyboards/mokey/mokey64/rules.mk | 2 |
2 files changed, 36 insertions, 35 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 <http://www.gnu.org/licenses/>. */ #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) { 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 |