summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-10-02 15:00:21 +0000
committerQMK Bot <hello@qmk.fm>2021-10-02 15:00:21 +0000
commit64a118a58c4be03098ddd61602558435c77c8f81 (patch)
tree7dff3dc0abf74c6c5197b5df124acaf753016558 /keyboards
parent79c67570812481214472d63bced67ba269b287f7 (diff)
parent0eaefb2a6c35fdf15b067181529eacb7335fd562 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/mechlovin/olly/bb/bb.c36
-rw-r--r--keyboards/mechlovin/olly/bb/bb.h33
-rw-r--r--keyboards/mechlovin/olly/bb/config.h72
-rw-r--r--keyboards/mechlovin/olly/bb/info.json101
-rw-r--r--keyboards/mechlovin/olly/bb/keymaps/default/keymap.c48
-rw-r--r--keyboards/mechlovin/olly/bb/keymaps/default/readme.md1
-rw-r--r--keyboards/mechlovin/olly/bb/keymaps/via/keymap.c48
-rw-r--r--keyboards/mechlovin/olly/bb/keymaps/via/readme.md1
-rw-r--r--keyboards/mechlovin/olly/bb/keymaps/via/rules.mk2
-rw-r--r--keyboards/mechlovin/olly/bb/matrix.c362
-rw-r--r--keyboards/mechlovin/olly/bb/readme.md23
-rw-r--r--keyboards/mechlovin/olly/bb/rules.mk27
-rw-r--r--keyboards/mokey/README.md2
-rw-r--r--keyboards/mokey/mokey64/config.h17
-rw-r--r--keyboards/mokey/mokey64/keymaps/default/keymap.c1
-rw-r--r--keyboards/mokey/mokey64/keymaps/via/keymap.c26
-rw-r--r--keyboards/mokey/mokey64/readme.md4
-rw-r--r--keyboards/mokey/mokey64/rules.mk10
18 files changed, 789 insertions, 25 deletions
diff --git a/keyboards/mechlovin/olly/bb/bb.c b/keyboards/mechlovin/olly/bb/bb.c
new file mode 100644
index 0000000000..6ec4a15ee5
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/bb.c
@@ -0,0 +1,36 @@
+/* Copyright 2021 mechlovin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bb.h"
+
+
+void led_init_ports(void) {
+ setPinOutput(C0);
+ setPinOutput(D0);
+ setPinOutput(D1);
+ setPinOutput(C1);
+ setPinOutput(C6);
+}
+
+__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
+ writePin(D1, layer_state_cmp(state, 1));
+ writePin(D0, layer_state_cmp(state, 2));
+ writePin(C1, layer_state_cmp(state, 3));
+ writePin(C0, layer_state_cmp(state, 4));
+ writePin(C6, layer_state_cmp(state, 5));
+
+ return state;
+}
diff --git a/keyboards/mechlovin/olly/bb/bb.h b/keyboards/mechlovin/olly/bb/bb.h
new file mode 100644
index 0000000000..91a8f23896
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/bb.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 mechlovin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E, K0F, K0G, K0H, K0I, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2E, K1E, K1F, K1G, K1H, K1I, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, K2G, K2H, K2I, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, \
+ K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I }, \
+ { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I }, \
+}
diff --git a/keyboards/mechlovin/olly/bb/config.h b/keyboards/mechlovin/olly/bb/config.h
new file mode 100644
index 0000000000..3110a9589c
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/config.h
@@ -0,0 +1,72 @@
+/*
+Copyright 2021 mechlovin
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x4D4C
+#define PRODUCT_ID 0xD181
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Mechlovin.Studio
+#define PRODUCT Olly BB
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 19
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS {D6, A5, A4, A3, A6}
+#define UNUSED_PINS
+
+#define BACKLIGHT_PIN D4
+#define BACKLIGHT_BREATHING
+
+#define LED_NUM_LOCK_PIN B1
+#define LED_CAPS_LOCK_PIN B0
+#define LED_SCROLL_LOCK_PIN B2
+#define LED_PIN_ON_STATE 1
+
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN B3
+#define RGBLED_NUM 24
+#define RGBLIGHT_LIMIT_VAL 255
+#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#endif
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json
new file mode 100644
index 0000000000..90e07662fd
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/info.json
@@ -0,0 +1,101 @@
+{
+ "keyboard_name": "Mechlovin Olly",
+ "url": "",
+ "maintainer": "Mechlovin' Studio",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "label": "K00 (B0,B5)", "x": 0, "y": 0 },
+ { "label": "K01 (B0,B6)", "x": 1, "y": 0 },
+ { "label": "K02 (B0,B7)", "x": 2, "y": 0 },
+ { "label": "K03 (B0,C0)", "x": 3, "y": 0 },
+ { "label": "K04 (B0,C1)", "x": 4, "y": 0 },
+ { "label": "K05 (B0,C2)", "x": 5, "y": 0 },
+ { "label": "K06 (B0,C3)", "x": 6, "y": 0 },
+ { "label": "K07 (B0,C4)", "x": 7, "y": 0 },
+ { "label": "K08 (B0,C5)", "x": 8, "y": 0 },
+ { "label": "K09 (B0,C6)", "x": 9, "y": 0 },
+ { "label": "K0A (B0,C7)", "x": 10, "y": 0 },
+ { "label": "K0B (B0,D0)", "x": 11, "y": 0 },
+ { "label": "K0C (B0,D1)", "x": 12, "y": 0 },
+ { "label": "K0D (B0,D2)", "x": 13, "y": 0 },
+ { "label": "K1D (B1,D2)", "x": 14, "y": 0 },
+ { "label": "K0E (B0,D3)", "x": 15.25, "y": 0 },
+ { "label": "K0F (B0,D4)", "x": 16.5, "y": 0 },
+ { "label": "K0G (B0,D5)", "x": 17.5, "y": 0 },
+ { "label": "K0H (B0,D6)", "x": 18.5, "y": 0 },
+ { "label": "K0I (B0,D7)", "x": 19.5, "y": 0 },
+ { "label": "K10 (B1,B5)", "x": 0, "y": 1, "w": 1.5 },
+ { "label": "K11 (B1,B6)", "x": 1.5, "y": 1 },
+ { "label": "K12 (B1,B7)", "x": 2.5, "y": 1 },
+ { "label": "K13 (B1,C0)", "x": 3.5, "y": 1 },
+ { "label": "K14 (B1,C1)", "x": 4.5, "y": 1 },
+ { "label": "K15 (B1,C2)", "x": 5.5, "y": 1 },
+ { "label": "K16 (B1,C3)", "x": 6.5, "y": 1 },
+ { "label": "K17 (B1,C4)", "x": 7.5, "y": 1 },
+ { "label": "K18 (B1,C5)", "x": 8.5, "y": 1 },
+ { "label": "K19 (B1,C6)", "x": 9.5, "y": 1 },
+ { "label": "K1A (B1,C7)", "x": 10.5, "y": 1 },
+ { "label": "K1B (B1,D0)", "x": 11.5, "y": 1 },
+ { "label": "K1C (B1,D1)", "x": 12.5, "y": 1 },
+ { "label": "K2E (B2,D3)", "x": 13.5, "y": 1, "w": 1.5 },
+ { "label": "K1E (B1,D3)", "x": 15.25, "y": 1 },
+ { "label": "K1F (B1,D4)", "x": 16.5, "y": 1 },
+ { "label": "K1G (B1,D5)", "x": 17.5, "y": 1 },
+ { "label": "K1H (B1,D6)", "x": 18.5, "y": 1 },
+ { "label": "K1I (B1,D7)", "x": 19.5, "y": 1 },
+ { "label": "K20 (B2,B5)", "x": 0, "y": 2, "w": 1.75 },
+ { "label": "K21 (B2,B6)", "x": 1.75, "y": 2 },
+ { "label": "K22 (B2,B7)", "x": 2.75, "y": 2 },
+ { "label": "K23 (B2,C0)", "x": 3.75, "y": 2 },
+ { "label": "K24 (B2,C1)", "x": 4.75, "y": 2 },
+ { "label": "K25 (B2,C2)", "x": 5.75, "y": 2 },
+ { "label": "K26 (B2,C3)", "x": 6.75, "y": 2 },
+ { "label": "K27 (B2,C4)", "x": 7.75, "y": 2 },
+ { "label": "K28 (B2,C5)", "x": 8.75, "y": 2 },
+ { "label": "K29 (B2,C6)", "x": 9.75, "y": 2 },
+ { "label": "K2A (B2,C7)", "x": 10.75, "y": 2 },
+ { "label": "K2B (B2,D0)", "x": 11.75, "y": 2 },
+ { "label": "K2C (B2,D1)", "x": 12.75, "y": 2 },
+ { "label": "K2D (B2,D2)", "x": 13.75, "y": 2, "w": 1.25 },
+ { "label": "K2F (B2,D4)", "x": 16.5, "y": 2 },
+ { "label": "K2G (B2,D5)", "x": 17.5, "y": 2 },
+ { "label": "K2H (B2,D6)", "x": 18.5, "y": 2 },
+ { "label": "K2I (B2,D7)", "x": 19.5, "y": 2 },
+ { "label": "K30 (B3,B5)", "x": 0, "y": 3, "w": 1.25 },
+ { "label": "K31 (B3,B6)", "x": 1.25, "y": 3 },
+ { "label": "K32 (B3,B7)", "x": 2.25, "y": 3 },
+ { "label": "K33 (B3,C0)", "x": 3.25, "y": 3 },
+ { "label": "K34 (B3,C1)", "x": 4.25, "y": 3 },
+ { "label": "K35 (B3,C2)", "x": 5.25, "y": 3 },
+ { "label": "K36 (B3,C3)", "x": 6.25, "y": 3 },
+ { "label": "K37 (B3,C4)", "x": 7.25, "y": 3 },
+ { "label": "K38 (B3,C5)", "x": 8.25, "y": 3 },
+ { "label": "K39 (B3,C6)", "x": 9.25, "y": 3 },
+ { "label": "K3A (B3,C7)", "x": 10.25, "y": 3 },
+ { "label": "K3B (B3,D0)", "x": 11.25, "y": 3 },
+ { "label": "K3C (B3,D1)", "x": 12.25, "y": 3, "w": 1.75 },
+ { "label": "K3D (B3,D2)", "x": 14, "y": 3 },
+ { "label": "K3F (B3,D4)", "x": 16.5, "y": 3 },
+ { "label": "K3G (B3,D5)", "x": 17.5, "y": 3 },
+ { "label": "K3H (B3,D6)", "x": 18.5, "y": 3 },
+ { "label": "K3I (B3,D7)", "x": 19.5, "y": 3 },
+ { "label": "K3E (B3,D3)", "x": 15.25, "y": 3.25 },
+ { "label": "K40 (B4,B5)", "x": 0, "y": 4, "w": 1.5 },
+ { "label": "K41 (B4,B6)", "x": 1.5, "y": 4 },
+ { "label": "K43 (B4,C0)", "x": 2.5, "y": 4, "w": 1.5 },
+ { "label": "K46 (B4,C3)", "x": 4, "y": 4, "w": 6.25 },
+ { "label": "K4A (B4,C7)", "x": 10.25, "y": 4, "w": 1.25 },
+ { "label": "K4B (B4,D0)", "x": 11.5, "y": 4, "w": 1.25 },
+ { "label": "K4C (B4,D1)", "x": 12.75, "y": 4, "w": 1.25 },
+ { "label": "K4G (B4,D5)", "x": 17.5, "y": 4 },
+ { "label": "K4H (B4,D6)", "x": 18.5, "y": 4 },
+ { "label": "K4I (B4,D7)", "x": 19.5, "y": 4 },
+ { "label": "K4D (B4,D2)", "x": 14.25, "y": 4.25 },
+ { "label": "K4E (B4,D3)", "x": 15.25, "y": 4.25 },
+ { "label": "K4F (B4,D4)", "x": 16.25, "y": 4.25 }
+ ]
+ }
+ }
+ ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c7c0da223e
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 mechlovin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PMNS,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_LSFT, KC_SPC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT
+ ),
+ [1] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [2] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [3] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+
+}; \ No newline at end of file
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default/readme.md b/keyboards/mechlovin/olly/bb/keymaps/default/readme.md
new file mode 100644
index 0000000000..2fa087aa1d
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Olly BB
diff --git a/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c7c0da223e
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 mechlovin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PMNS,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_LSFT, KC_SPC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT
+ ),
+ [1] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [2] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [3] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+
+}; \ No newline at end of file
diff --git a/keyboards/mechlovin/olly/bb/keymaps/via/readme.md b/keyboards/mechlovin/olly/bb/keymaps/via/readme.md
new file mode 100644
index 0000000000..bc577158bb
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA keymap for Olly BB \ No newline at end of file
diff --git a/keyboards/mechlovin/olly/bb/keymaps/via/rules.mk b/keyboards/mechlovin/olly/bb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mechlovin/olly/bb/matrix.c b/keyboards/mechlovin/olly/bb/matrix.c
new file mode 100644
index 0000000000..d745f7d2cd
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/matrix.c
@@ -0,0 +1,362 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+Copyright 2019 Evy Dekkers
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "matrix.h"
+
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+
+/* Cols 0 - 16
+ * These columns use two 74HC138 3 to 8 bit demultiplexer. B4, C7 is the enable pin, must be set high (1) to use it.
+ *
+ * col / pin: PA0 PA1 PA2 PB4 PC7 PC2 PC3 PC5
+ * 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
+ *
+ */
+static void select_col(uint8_t col) {
+ switch (col) {
+ case 0:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinHigh(B4);
+ break;
+ case 1:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinHigh(B4);
+ break;
+ case 2:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinHigh(B4);
+ break;
+ case 3:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinHigh(B4);
+ break;
+ case 4:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinHigh(B4);
+ break;
+ case 5:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinHigh(B4);
+ break;
+ case 6:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinHigh(B4);
+ break;
+ case 7:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinHigh(B4);
+ break;
+ case 8:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinHigh(C7);
+ break;
+ case 9:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinHigh(C7);
+ break;
+ case 10:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinHigh(C7);
+ break;
+ case 11:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinHigh(C7);
+ break;
+ case 12:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinHigh(C7);
+ break;
+ case 13:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinHigh(C7);
+ break;
+ case 14:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinHigh(C7);
+ break;
+ case 15:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinHigh(C7);
+ break;
+ case 16:
+ writePinLow(C2);
+ break;
+ case 17:
+ writePinLow(C3);
+ break;
+ case 18:
+ writePinLow(C5);
+ break;
+ }
+}
+
+static void unselect_col(uint8_t col) {
+ switch (col) {
+ case 0:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinLow(B4);
+ break;
+ case 1:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinLow(B4);
+ break;
+ case 2:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinLow(B4);
+ break;
+ case 3:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinLow(B4);
+ break;
+ case 4:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinLow(B4);
+ break;
+ case 5:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinLow(B4);
+ break;
+ case 6:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinLow(B4);
+ break;
+ case 7:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinLow(B4);
+ break;
+ case 8:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinLow(C7);
+ break;
+ case 9:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinLow(C7);
+ break;
+ case 10:
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinLow(C7);
+ break;
+ case 11:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinLow(C7);
+ break;
+ case 12:
+ writePinHigh(A0);
+ writePinLow(A1);
+ writePinLow(A2);
+ writePinLow(C7);
+ break;
+ case 13:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+ writePinLow(C7);
+ break;
+ case 14:
+ writePinLow(A0);
+ writePinHigh(A1);
+ writePinLow(A2);
+ writePinLow(C7);
+ break;
+ case 15:
+ writePinLow(A0);
+ writePinLow(A1);
+ writePinHigh(A2);
+ writePinLow(C7);
+ break;
+ case 16:
+ writePinHigh(C2);
+ break;
+ case 17:
+ writePinHigh(C3);
+ break;
+ case 18:
+ writePinHigh(C5);
+ break;
+ }
+}
+
+static void unselect_cols(void) {
+ //Native
+ writePinHigh(C2);
+ writePinHigh(C3);
+ writePinHigh(C5);
+
+ //Demultiplexer
+ writePinLow(B4);
+ writePinLow(C7);
+ writePinHigh(A0);
+ writePinHigh(A1);
+ writePinHigh(A2);
+}
+
+static void init_pins(void) {
+ unselect_cols();
+ for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+ setPinInputHigh(row_pins[x]);
+ }
+ setPinOutput(A0);
+ setPinOutput(A1);
+ setPinOutput(A2);
+ setPinOutput(B4);
+ setPinOutput(C7);
+ setPinOutput(C2);
+ setPinOutput(C3);
+ setPinOutput(C5);
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
+ bool matrix_changed = false;
+
+ // Select col and wait for col selecton to stabilize
+ select_col(current_col);
+ matrix_io_delay();
+
+ // For each row...
+ for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
+ // Store last value of row prior to reading
+ matrix_row_t last_row_value = current_matrix[row_index];
+
+ // Check row pin state
+ if (readPin(row_pins[row_index]) == 0) {
+ // Pin LO, set col bit
+ current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
+ } else {
+ // Pin HI, clear col bit
+ current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
+ }
+
+ // Determine if the matrix changed state
+ if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) {
+ matrix_changed = true;
+ }
+ }
+
+ // Unselect col
+ unselect_col(current_col);
+
+ return matrix_changed;
+}
+
+void matrix_init_custom(void) {
+ // initialize key pins
+ init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+ bool changed = false;
+
+ // Set col, read rows
+ for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+ changed |= read_rows_on_col(current_matrix, current_col);
+ }
+
+ return changed;
+}
diff --git a/keyboards/mechlovin/olly/bb/readme.md b/keyboards/mechlovin/olly/bb/readme.md
new file mode 100644
index 0000000000..0e41a3072f
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/readme.md
@@ -0,0 +1,23 @@
+# Mechlovin Olly BB
+
+![jf](https://i.imgur.com/3QzHisYl.png)
+
+Olly BB PCB, compatible Duck Black Bird keyboard.
+
+* Keyboard Maintainer: [Mechlovin' Studio](https://mechlovin.studio/)
+* Hardware Supported: Duck Black Bird Korean Kustom
+* Hardware Availability: [Mechlovin' Studio](https://mechlovin.studio/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/olly/bb:default
+
+Flashing example for this keyboard:
+
+ make mechlovin/olly/bb:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+**Reset Key:** 2 ways to put the Olly JF into bootloader:
+By keycode: Tap RESET keycode.
+By bootloader: hold ESC key while plugging in \ No newline at end of file
diff --git a/keyboards/mechlovin/olly/bb/rules.mk b/keyboards/mechlovin/olly/bb/rules.mk
new file mode 100644
index 0000000000..b5b3be65b2
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = atmega32a
+
+# Processor frequency
+F_CPU = 16000000
+
+# Bootloader selection
+BOOTLOADER = usbasploader
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+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 = yes # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/mokey/README.md b/keyboards/mokey/README.md
index 3a878ea8ee..f66e1ed71a 100644
--- a/keyboards/mokey/README.md
+++ b/keyboards/mokey/README.md
@@ -2,6 +2,6 @@
This is a series of PCB
* Mokey63 multi-column,The chip is ATmega32U4
-* Mokey64 The chip is STM32F401
+* Mokey64 The chip is ATmega32U4
diff --git a/keyboards/mokey/mokey64/config.h b/keyboards/mokey/mokey64/config.h
index d410f8fafe..79b96b4e27 100644
--- a/keyboards/mokey/mokey64/config.h
+++ b/keyboards/mokey/mokey64/config.h
@@ -26,19 +26,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
-#define MATRIX_ROW_PINS { A1, A2, A3, A4, A5 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13 }
+#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5 }
+#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, E6, D0, D2, D1, D3, D5, D4, D6, D7 }
#define UNUSED_PINS
+/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-#define DEBOUNCE 5
-
-#define RGB_DI_PIN A7
-#define RGBLED_NUM 68
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE \ No newline at end of file
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5 \ No newline at end of file
diff --git a/keyboards/mokey/mokey64/keymaps/default/keymap.c b/keyboards/mokey/mokey64/keymaps/default/keymap.c
index 5d6e8f4d43..de38570e91 100644
--- a/keyboards/mokey/mokey64/keymaps/default/keymap.c
+++ b/keyboards/mokey/mokey64/keymaps/default/keymap.c
@@ -18,7 +18,6 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT(
- /*0 1 2 3 4 5 6 7 8 9 a b c d*/
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
diff --git a/keyboards/mokey/mokey64/keymaps/via/keymap.c b/keyboards/mokey/mokey64/keymaps/via/keymap.c
index 8a1ae3dba7..f44f38e8ea 100644
--- a/keyboards/mokey/mokey64/keymaps/via/keymap.c
+++ b/keyboards/mokey/mokey64/keymaps/via/keymap.c
@@ -18,12 +18,32 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- LAYOUT(
- /*0 1 2 3 4 5 6 7 8 9 a b c d*/
+ [0] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT)
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [1] = LAYOUT(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+ [2] = LAYOUT(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+ [3] = LAYOUT(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};
diff --git a/keyboards/mokey/mokey64/readme.md b/keyboards/mokey/mokey64/readme.md
index c25f61c040..5feb849bc4 100644
--- a/keyboards/mokey/mokey64/readme.md
+++ b/keyboards/mokey/mokey64/readme.md
@@ -2,10 +2,10 @@
![mokey](https://rhmokey.github.io/update/index/64v13.jpg)
-Support STM32F401 keyboard.
+Support Atmega32u4 keyboard.
* Keyboard Maintainer: [rhmokey](https://github.com/rhmokey)
-* Hardware Supported: STM32F401
+* Hardware Supported: Atmega32u4
## Bootloader
* **Physical reset button**: Short press the button on the back of the PCB to enter the Bootloader and flash the firmware
diff --git a/keyboards/mokey/mokey64/rules.mk b/keyboards/mokey/mokey64/rules.mk
index 186091bf2f..6da271964f 100644
--- a/keyboards/mokey/mokey64/rules.mk
+++ b/keyboards/mokey/mokey64/rules.mk
@@ -1,23 +1,21 @@
# MCU name
-MCU = STM32F401
+MCU = atmega32u4
# Bootloader selection
-BOOTLOADER = stm32-dfu
+BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes # Mouse keys
+MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
-KEYBOARD_SHARED_EP = yes
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
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 = yes # USB Nkey Rollover
+NKRO_ENABLE = no # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-