aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-10-03 21:17:56 +0000
committerQMK Bot <hello@qmk.fm>2021-10-03 21:17:56 +0000
commitd785282df7c60f6fa564f8607d304bd4af6cb344 (patch)
tree94b6e5c3230080281145f4b3bbff6a3a3fbee35b
parentdb6bf9be2b78e974234f134dcc0b023990052926 (diff)
parent6279399425c8893b586f68da06a719b94b48b4e2 (diff)
downloadqmk_firmware-d785282df7c60f6fa564f8607d304bd4af6cb344.tar.gz
qmk_firmware-d785282df7c60f6fa564f8607d304bd4af6cb344.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/mechlovin/olly/bb/matrix.c69
-rw-r--r--keyboards/mokey/mokey64/rules.mk2
2 files changed, 36 insertions, 35 deletions
diff --git a/keyboards/mechlovin/olly/bb/matrix.c b/keyboards/mechlovin/olly/bb/matrix.c
index d745f7d2c..e045299ba 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/>.
17*/ 17*/
18 18
19#include "matrix.h" 19#include "matrix.h"
20#include "gpio.h"
20 21
21static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; 22static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
22 23
@@ -27,40 +28,40 @@ static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
27 * 0: 0 ── 0 ── 0 1 ── 0 0 0 0 28 * 0: 0 ── 0 ── 0 1 ── 0 0 0 0
28 * ──────────────────────────────────────────── 29 * ────────────────────────────────────────────
29 * 1: 0 ── 0 ── 1 1 ── 0 0 0 0 30 * 1: 0 ── 0 ── 1 1 ── 0 0 0 0
30 * ──────────────────────────────────────────── 31 * ────────────────────────────────────────────
31 * 2: 0 ── 1 ── 0 1 ── 0 0 0 0 32 * 2: 0 ── 1 ── 0 1 ── 0 0 0 0
32 * ──────────────────────────────────────────── 33 * ────────────────────────────────────────────
33 * 3: 0 ── 1 ── 1 1 ── 0 0 0 0 34 * 3: 0 ── 1 ── 1 1 ── 0 0 0 0
34 * ──────────────────────────────────────────── 35 * ────────────────────────────────────────────
35 * 4: 1 ── 0 ── 0 1 ── 0 0 0 0 36 * 4: 1 ── 0 ── 0 1 ── 0 0 0 0
36 * ──────────────────────────────────────────── 37 * ────────────────────────────────────────────
37 * 5: 1 ── 0 ── 1 1 ── 0 0 0 0 38 * 5: 1 ── 0 ── 1 1 ── 0 0 0 0
38 * ──────────────────────────────────────────── 39 * ────────────────────────────────────────────
39 * 6: 1 ── 1 ── 0 1 ── 0 0 0 0 40 * 6: 1 ── 1 ── 0 1 ── 0 0 0 0
40 * ──────────────────────────────────────────── 41 * ────────────────────────────────────────────
41 * 7: 1 ── 1 ── 1 1 ── 0 0 0 0 42 * 7: 1 ── 1 ── 1 1 ── 0 0 0 0
42 * ──────────────────────────────────────────── 43 * ────────────────────────────────────────────
43 * 8: 1 ── 1 ── 1 0 ── 1 0 0 0 44 * 8: 1 ── 1 ── 1 0 ── 1 0 0 0
44 * ──────────────────────────────────────────── 45 * ────────────────────────────────────────────
45 * 9: 0 ── 0 ── 0 0 ── 1 0 0 0 46 * 9: 0 ── 0 ── 0 0 ── 1 0 0 0
46 * ──────────────────────────────────────────── 47 * ────────────────────────────────────────────
47 *10: 0 ── 0 ── 1 0 ── 1 0 0 0 48 *10: 0 ── 0 ── 1 0 ── 1 0 0 0
48 * ──────────────────────────────────────────── 49 * ────────────────────────────────────────────
49 *11: 0 ── 1 ── 0 0 ── 1 0 0 0 50 *11: 0 ── 1 ── 0 0 ── 1 0 0 0
50 * ──────────────────────────────────────────── 51 * ────────────────────────────────────────────
51 *12: 0 ── 1 ── 1 0 ── 1 0 0 0 52 *12: 0 ── 1 ── 1 0 ── 1 0 0 0
52 * ──────────────────────────────────────────── 53 * ────────────────────────────────────────────
53 *13: 1 ── 0 ── 0 0 ── 1 0 0 0 54 *13: 1 ── 0 ── 0 0 ── 1 0 0 0
54 * ──────────────────────────────────────────── 55 * ────────────────────────────────────────────
55 *14: 1 ── 0 ── 1 0 ── 1 0 0 0 56 *14: 1 ── 0 ── 1 0 ── 1 0 0 0
56 * ──────────────────────────────────────────── 57 * ────────────────────────────────────────────
57 *15: 1 ── 1 ── 0 0 ── 1 0 0 0 58 *15: 1 ── 1 ── 0 0 ── 1 0 0 0
58 * ──────────────────────────────────────────── 59 * ────────────────────────────────────────────
59 *16: 0 ── 0 ── 0 0 ── 0 1 0 0 60 *16: 0 ── 0 ── 0 0 ── 0 1 0 0
60 * ──────────────────────────────────────────── 61 * ────────────────────────────────────────────
61 *17: 0 ── 0 ── 0 0 ── 0 0 1 0 62 *17: 0 ── 0 ── 0 0 ── 0 0 1 0
62 * ──────────────────────────────────────────── 63 * ────────────────────────────────────────────
63 *18: 0 ── 0 ── 0 0 ── 0 0 0 1 64 *18: 0 ── 0 ── 0 0 ── 0 0 0 1
64 * 65 *
65 */ 66 */
66static void select_col(uint8_t col) { 67static void select_col(uint8_t col) {
diff --git a/keyboards/mokey/mokey64/rules.mk b/keyboards/mokey/mokey64/rules.mk
index 6da271964..a18189509 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
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = no # USB Nkey Rollover 18NKRO_ENABLE = no # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality 19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21AUDIO_ENABLE = no # Audio output 21AUDIO_ENABLE = no # Audio output
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-21 07:09:25 +0000