aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormechlovin <57231893+mechlovin@users.noreply.github.com>2021-09-08 22:23:26 -0700
committerGitHub <noreply@github.com>2021-09-08 22:23:26 -0700
commit82ee9bd475be9723d53ea3e8e101a038bbfa1b25 (patch)
tree1e00af70f4a308213ea8c885d2d447e6f89f49b5
parent6d43a5daf4225cf677840d11b151d28f49e8f9e9 (diff)
downloadqmk_firmware-82ee9bd475be9723d53ea3e8e101a038bbfa1b25.tar.gz
qmk_firmware-82ee9bd475be9723d53ea3e8e101a038bbfa1b25.zip
[Keyboard] Add Olly JF PCB (#14056)
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat
-rw-r--r--keyboards/mechlovin/olly/jf/config.h74
-rw-r--r--keyboards/mechlovin/olly/jf/info.json119
-rw-r--r--keyboards/mechlovin/olly/jf/jf.c39
-rw-r--r--keyboards/mechlovin/olly/jf/jf.h35
-rw-r--r--keyboards/mechlovin/olly/jf/keymaps/default/keymap.c52
-rw-r--r--keyboards/mechlovin/olly/jf/keymaps/default/readme.md1
-rw-r--r--keyboards/mechlovin/olly/jf/keymaps/via/config.h22
-rw-r--r--keyboards/mechlovin/olly/jf/keymaps/via/keymap.c68
-rw-r--r--keyboards/mechlovin/olly/jf/keymaps/via/readme.md1
-rw-r--r--keyboards/mechlovin/olly/jf/keymaps/via/rules.mk2
-rw-r--r--keyboards/mechlovin/olly/jf/matrix.c462
-rw-r--r--keyboards/mechlovin/olly/jf/readme.md23
-rw-r--r--keyboards/mechlovin/olly/jf/rules.mk28
13 files changed, 926 insertions, 0 deletions
diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h
new file mode 100644
index 000000000..66826aafa
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/config.h
@@ -0,0 +1,74 @@
1/*
2Copyright 2021 mechlovin
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "config_common.h"
21
22/* USB Device descriptor parameter */
23#define VENDOR_ID 0x4D4C
24#define PRODUCT_ID 0xD180
25#define DEVICE_VER 0x0001
26#define MANUFACTURER Mechlovin.Studio
27#define PRODUCT Olly JF
28
29/* key matrix size */
30#define MATRIX_ROWS 6
31#define MATRIX_COLS 19
32
33/*
34 * Keyboard Matrix Assignments
35 *
36 * Change this to how you wired your keyboard
37 * COLS: AVR pins used for columns, left to right
38 * ROWS: AVR pins used for rows, top to bottom
39 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
40 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
41 *
42 */
43#define MATRIX_ROW_PINS { D5, D6, A5, A4, A3, A6}
44#define UNUSED_PINS
45
46/* COL2ROW, ROW2COL */
47#define DIODE_DIRECTION ROW2COL
48
49#define BACKLIGHT_PIN D4
50#define BACKLIGHT_BREATHING
51
52#define LED_NUM_LOCK_PIN B1
53#define LED_CAPS_LOCK_PIN B0
54#define LED_SCROLL_LOCK_PIN B2
55#define LED_PIN_ON_STATE 1
56
57#define RGB_DI_PIN B3
58#define RGBLED_NUM 27
59#define RGBLIGHT_LIMIT_VAL 255
60#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
61/*== all animations enable ==*/
62#define RGBLIGHT_EFFECT_BREATHING
63#define RGBLIGHT_EFFECT_RAINBOW_MOOD
64#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
65#define RGBLIGHT_EFFECT_SNAKE
66#define RGBLIGHT_EFFECT_KNIGHT
67#define RGBLIGHT_EFFECT_CHRISTMAS
68#define RGBLIGHT_EFFECT_STATIC_GRADIENT
69#define RGBLIGHT_EFFECT_RGB_TEST
70#define RGBLIGHT_EFFECT_ALTERNATING
71#define RGBLIGHT_EFFECT_TWINKLE
72
73/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
74#define DEBOUNCE 5
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
new file mode 100644
index 000000000..ab57d3178
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -0,0 +1,119 @@
1{
2 "keyboard_name": "Mechlovin Olly",
3 "url": "",
4 "maintainer": "Mechlovin' Studio",
5 "layouts": {
6 "LAYOUT_all": {
7 "layout": [
8 {"label":"K00 (B0,B7)", "x":0, "y":0},
9 {"label":"K01 (B0,C0)", "x":1.5, "y":0},
10 {"label":"K02 (B0,C1)", "x":2.5, "y":0},
11 {"label":"K03 (B0,C2)", "x":3.5, "y":0},
12 {"label":"K04 (B0,C3)", "x":4.5, "y":0},
13 {"label":"K05 (B0,C4)", "x":6, "y":0},
14 {"label":"K06 (B0,C5)", "x":7, "y":0},
15 {"label":"K07 (B0,C6)", "x":8, "y":0},
16 {"label":"K08 (B0,C7)", "x":9, "y":0},
17 {"label":"K09 (B0,D0)", "x":10.5, "y":0},
18 {"label":"K0A (B0,D1)", "x":11.5, "y":0},
19 {"label":"K0B (B0,D2)", "x":12.5, "y":0},
20 {"label":"K0C (B0,D3)", "x":13.5, "y":0},
21 {"label":"K0E (B0,D5)", "x":15.25, "y":0},
22 {"label":"K0F (B0,D6)", "x":16.5, "y":0},
23 {"label":"K0G (B0,D7)", "x":17.5, "y":0},
24 {"label":"K0H (B0,E0)", "x":18.5, "y":0},
25 {"label":"K0I (B0,E1)", "x":19.5, "y":0},
26 {"label":"K10 (B1,B7)", "x":0, "y":1.5},
27 {"label":"K11 (B1,C0)", "x":1, "y":1.5},
28 {"label":"K12 (B1,C1)", "x":2, "y":1.5},
29 {"label":"K13 (B1,C2)", "x":3, "y":1.5},
30 {"label":"K14 (B1,C3)", "x":4, "y":1.5},
31 {"label":"K15 (B1,C4)", "x":5, "y":1.5},
32 {"label":"K16 (B1,C5)", "x":6, "y":1.5},
33 {"label":"K17 (B1,C6)", "x":7, "y":1.5},
34 {"label":"K18 (B1,C7)", "x":8, "y":1.5},
35 {"label":"K19 (B1,D0)", "x":9, "y":1.5},
36 {"label":"K1A (B1,D1)", "x":10, "y":1.5},
37 {"label":"K1B (B1,D2)", "x":11, "y":1.5},
38 {"label":"K1C (B1,D3)", "x":12, "y":1.5},
39 {"label":"K1D (B1,D4)", "x":13, "y":1.5},
40 {"label":"K0D (B0,D4)", "x":14, "y":1.5},
41 {"label":"K1E (B1,D5)", "x":15.25, "y":1.5},
42 {"label":"K1F (B1,D6)", "x":16.5, "y":1.5},
43 {"label":"K1G (B1,D7)", "x":17.5, "y":1.5},
44 {"label":"K1H (B1,E0)", "x":18.5, "y":1.5},
45 {"label":"K1I (B1,E1)", "x":19.5, "y":1.5},
46 {"label":"K20 (B2,B7)", "x":0, "y":2.5, "w":1.5},
47 {"label":"K21 (B2,C0)", "x":1.5, "y":2.5},
48 {"label":"K22 (B2,C1)", "x":2.5, "y":2.5},
49 {"label":"K23 (B2,C2)", "x":3.5, "y":2.5},
50 {"label":"K24 (B2,C3)", "x":4.5, "y":2.5},
51 {"label":"K25 (B2,C4)", "x":5.5, "y":2.5},
52 {"label":"K26 (B2,C5)", "x":6.5, "y":2.5},
53 {"label":"K27 (B2,C6)", "x":7.5, "y":2.5},
54 {"label":"K28 (B2,C7)", "x":8.5, "y":2.5},
55 {"label":"K29 (B2,D0)", "x":9.5, "y":2.5},
56 {"label":"K2A (B2,D1)", "x":10.5, "y":2.5},
57 {"label":"K2B (B2,D2)", "x":11.5, "y":2.5},
58 {"label":"K2C (B2,D3)", "x":12.5, "y":2.5},
59 {"label":"K2D (B2,D4)", "x":13.5, "y":2.5, "w":1.5},
60 {"label":"K2E (B2,D5)", "x":15.25, "y":2.5},
61 {"label":"K2F (B2,D6)", "x":16.5, "y":2.5},
62 {"label":"K2G (B2,D7)", "x":17.5, "y":2.5},
63 {"label":"K2H (B2,E0)", "x":18.5, "y":2.5},
64 {"label":"K2I (B2,E1)", "x":19.5, "y":2.5},
65 {"label":"K30 (B3,B7)", "x":0, "y":3.5, "w":1.75},
66 {"label":"K31 (B3,C0)", "x":1.75, "y":3.5},
67 {"label":"K32 (B3,C1)", "x":2.75, "y":3.5},
68 {"label":"K33 (B3,C2)", "x":3.75, "y":3.5},
69 {"label":"K34 (B3,C3)", "x":4.75, "y":3.5},
70 {"label":"K35 (B3,C4)", "x":5.75, "y":3.5},
71 {"label":"K36 (B3,C5)", "x":6.75, "y":3.5},
72 {"label":"K37 (B3,C6)", "x":7.75, "y":3.5},
73 {"label":"K38 (B3,C7)", "x":8.75, "y":3.5},
74 {"label":"K39 (B3,D0)", "x":9.75, "y":3.5},
75 {"label":"K3A (B3,D1)", "x":10.75, "y":3.5},
76 {"label":"K3B (B3,D2)", "x":11.75, "y":3.5},
77 {"label":"K3C (B3,D3)", "x":12.75, "y":3.5},
78 {"label":"K3D (B3,D4)", "x":13.75, "y":3.5, "w":1.25},
79 {"label":"K3F (B3,D6)", "x":16.5, "y":3.5},
80 {"label":"K3G (B3,D7)", "x":17.5, "y":3.5},
81 {"label":"K3H (B3,E0)", "x":18.5, "y":3.5},
82 {"label":"K3I (B3,E1)", "x":19.5, "y":3.5},
83 {"label":"K40 (B4,B7)", "x":0, "y":4.5, "w":1.25},
84 {"label":"K41 (B4,C0)", "x":1.25, "y":4.5},
85 {"label":"K42 (B4,C1)", "x":2.25, "y":4.5},
86 {"label":"K43 (B4,C2)", "x":3.25, "y":4.5},
87 {"label":"K44 (B4,C3)", "x":4.25, "y":4.5},
88 {"label":"K45 (B4,C4)", "x":5.25, "y":4.5},
89 {"label":"K46 (B4,C5)", "x":6.25, "y":4.5},
90 {"label":"K47 (B4,C6)", "x":7.25, "y":4.5},
91 {"label":"K48 (B4,C7)", "x":8.25, "y":4.5},
92 {"label":"K49 (B4,D0)", "x":9.25, "y":4.5},
93 {"label":"K4A (B4,D1)", "x":10.25, "y":4.5},
94 {"label":"K4B (B4,D2)", "x":11.25, "y":4.5},
95 {"label":"K4C (B4,D3)", "x":12.25, "y":4.5, "w":1.75},
96 {"label":"K4D (B4,D4)", "x":14, "y":4.5},
97 {"label":"K4E (B4,D5)", "x":15.25, "y":4.75},
98 {"label":"K4F (B4,D6)", "x":16.5, "y":4.5},
99 {"label":"K4G (B4,D7)", "x":17.5, "y":4.5},
100 {"label":"K4H (B4,E0)", "x":18.5, "y":4.5},
101 {"label":"K4I (B4,E1)", "x":19.5, "y":4.5},
102 {"label":"K50 (B5,B7)", "x":0, "y":5.5, "w":1.5},
103 {"label":"K51 (B5,C0)", "x":1.5, "y":5.5},
104 {"label":"K53 (B5,C2)", "x":2.5, "y":5.5, "w":1.5},
105 {"label":"K56 (B5,C5)", "x":4, "y":5.5, "w":6.25},
106 {"label":"K5A (B5,D1)", "x":10.25, "y":5.5, "w":1.25},
107 {"label":"K5B (B5,D2)", "x":11.5, "y":5.5, "w":1.25},
108 {"label":"K5C (B5,D3)", "x":12.75, "y":5.5, "w":1.25},
109 {"label":"K5D (B5,D4)", "x":14.25, "y":5.75},
110 {"label":"K5E (B5,D5)", "x":15.25, "y":5.75},
111 {"label":"K5F (B5,D6)", "x":16.25, "y":5.75},
112 {"label":"K5G (B5,D7)", "x":17.5, "y":5.5},
113 {"label":"K5H (B5,E0)", "x":18.5, "y":5.5},
114 {"label":"K5I (B5,E1)", "x":19.5, "y":5.5}
115 ]
116 }
117 }
118 ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
119}
diff --git a/keyboards/mechlovin/olly/jf/jf.c b/keyboards/mechlovin/olly/jf/jf.c
new file mode 100644
index 000000000..dc13e84ae
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/jf.c
@@ -0,0 +1,39 @@
1/* Copyright 2021 mechlovin
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include "jf.h"
18
19
20void led_init_ports(void) {
21 setPinOutput(C0);
22 setPinOutput(D0);
23 setPinOutput(D1);
24 setPinOutput(C1);
25 setPinOutput(C6);
26 setPinOutput(B0);
27 setPinOutput(B1);
28 setPinOutput(B2);
29}
30
31layer_state_t layer_state_set_user(layer_state_t state) {
32 writePin(D1, layer_state_cmp(state, 1));
33 writePin(D0, layer_state_cmp(state, 2));
34 writePin(C1, layer_state_cmp(state, 3));
35 writePin(C0, layer_state_cmp(state, 4));
36 writePin(C6, layer_state_cmp(state, 5));
37
38 return state;
39}
diff --git a/keyboards/mechlovin/olly/jf/jf.h b/keyboards/mechlovin/olly/jf/jf.h
new file mode 100644
index 000000000..cbc5287e3
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/jf.h
@@ -0,0 +1,35 @@
1/* Copyright 2021 mechlovin
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define LAYOUT_all( \
22 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, K0H, K0I, \
23 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D, K1E, K1F, K1G, K1H, K1I, \
24 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, \
25 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, K3G, K3H, K3I, \
26 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, \
27 K50, K51, K53, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I \
28) { \
29 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
30 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
31 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I }, \
32 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, K3F, K3G, K3H, K3I }, \
33 { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I }, \
34 { K50, K51, KC_NO, K53, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I }, \
35}
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default/keymap.c b/keyboards/mechlovin/olly/jf/keymaps/default/keymap.c
new file mode 100644
index 000000000..e87d665a2
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
1/* Copyright 2021 mechlovin
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 [0] = LAYOUT_all(
20 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_INS, KC_HOME, KC_PGUP, KC_PSCR,
21 KC_GRV, 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,
22 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,
23 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,
24 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,
25 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
26 ),
27 [1] = LAYOUT_all(
28 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
29 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
34 ),
35 [2] = LAYOUT_all(
36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
42 ),
43 [3] = LAYOUT_all(
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
50 ),
51
52}; \ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default/readme.md b/keyboards/mechlovin/olly/jf/keymaps/default/readme.md
new file mode 100644
index 000000000..0dad971bd
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/keymaps/default/readme.md
@@ -0,0 +1 @@
# The default keymap for Olly JF
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/config.h b/keyboards/mechlovin/olly/jf/keymaps/via/config.h
new file mode 100644
index 000000000..f330025a0
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/keymaps/via/config.h
@@ -0,0 +1,22 @@
1/*
2Copyright 2021 mechlovin
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 1607
21#define DYNAMIC_KEYMAP_LAYER_COUNT 6
22
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c b/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
new file mode 100644
index 000000000..c90eeb183
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
1/* Copyright 2021 mechlovin
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 [0] = LAYOUT_all(
20 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_INS, KC_HOME, KC_PGUP, KC_PSCR,
21 KC_GRV, 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,
22 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,
23 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,
24 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,
25 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
26 ),
27 [1] = LAYOUT_all(
28 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
29 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
34 ),
35 [2] = LAYOUT_all(
36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
42 ),
43 [3] = LAYOUT_all(
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
50 ),
51 [4] = LAYOUT_all(
52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
53 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
54 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
55 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
56 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
57 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
58 ),
59 [5] = LAYOUT_all(
60 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
61 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
62 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
63 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
64 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
65 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
66 ),
67
68}; \ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/readme.md b/keyboards/mechlovin/olly/jf/keymaps/via/readme.md
new file mode 100644
index 000000000..0453b5aef
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/keymaps/via/readme.md
@@ -0,0 +1 @@
# The VIA keymap for Olly JF \ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/rules.mk b/keyboards/mechlovin/olly/jf/keymaps/via/rules.mk
new file mode 100644
index 000000000..36b7ba9cb
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
1VIA_ENABLE = yes
2LTO_ENABLE = yes
diff --git a/keyboards/mechlovin/olly/jf/matrix.c b/keyboards/mechlovin/olly/jf/matrix.c
new file mode 100644
index 000000000..c01879c9a
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/matrix.c
@@ -0,0 +1,462 @@
1/*
2Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
3Copyright 2019 Evy Dekkers
4
5This program is free software: you can redistribute it and/or modify
6it under the terms of the GNU General Public License as published by
7the Free Software Foundation, either version 2 of the License, or
8(at your option) any later version.
9
10This program is distributed in the hope that it will be useful,
11but WITHOUT ANY WARRANTY; without even the implied warranty of
12MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13GNU General Public License for more details.
14
15You should have received a copy of the GNU General Public License
16along with this program. If not, see <http://www.gnu.org/licenses/>.
17*/
18
19#include <stdint.h>
20#include <stdbool.h>
21#include "wait.h"
22#include "util.h"
23#include "matrix.h"
24#include "debounce.h"
25#include "quantum.h"
26
27#ifdef DIRECT_PINS
28static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
29#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
30static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
31//static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
32#endif
33
34// matrix code
35
36#ifdef DIRECT_PINS
37
38static void init_pins(void) {
39 for (int row = 0; row < MATRIX_ROWS; row++) {
40 for (int col = 0; col < MATRIX_COLS; col++) {
41 pin_t pin = direct_pins[row][col];
42 if (pin != NO_PIN) {
43 setPinInputHigh(pin);
44 }
45 }
46 }
47}
48
49static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
50 matrix_row_t last_row_value = current_matrix[current_row];
51 current_matrix[current_row] = 0;
52
53 for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
54 pin_t pin = direct_pins[current_row][col_index];
55 if (pin != NO_PIN) {
56 current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
57 }
58 }
59
60 return (last_row_value != current_matrix[current_row]);
61}
62
63#elif (DIODE_DIRECTION == COL2ROW)
64
65static void select_row(uint8_t row) {
66 setPinOutput(row_pins[row]);
67 writePinLow(row_pins[row]);
68}
69
70static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
71
72static void unselect_rows(void) {
73 for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
74 setPinInputHigh(row_pins[x]);
75 }
76}
77
78static void init_pins(void) {
79 unselect_rows();
80 for (uint8_t x = 0; x < MATRIX_COLS; x++) {
81 setPinInputHigh(col_pins[x]);
82 }
83}
84
85static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
86 // Store last value of row prior to reading
87 matrix_row_t last_row_value = current_matrix[current_row];
88
89 // Clear data in matrix row
90 current_matrix[current_row] = 0;
91
92 // Select row and wait for row selecton to stabilize
93 select_row(current_row);
94 wait_us(30);
95
96 // For each col...
97 for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
98
99 // Select the col pin to read (active low)
100 uint8_t pin_state = readPin(col_pins[col_index]);
101
102 // Populate the matrix row with the state of the col pin
103 current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
104 }
105
106 // Unselect row
107 unselect_row(current_row);
108
109 return (last_row_value != current_matrix[current_row]);
110}
111
112#elif (DIODE_DIRECTION == ROW2COL)
113
114/* Cols 0 - 16
115 * These columns use two 74HC138 3 to 8 bit demultiplexer. B4, C7 is the enable pin, must be set high (1) to use it.
116 *
117 * col / pin: PA0 PA1 PA2 PB4 PC7 PC2 PC3 PC5
118 * 0: 0 ── 0 ── 0 1 ── 0 0 0 0
119 * ────────────────────────────────────────────
120 * 1: 0 ── 0 ── 1 1 ── 0 0 0 0
121 * ────────────────────────────────────────────
122 * 2: 0 ── 1 ── 0 1 ── 0 0 0 0
123 * ────────────────────────────────────────────
124 * 3: 0 ── 1 ── 1 1 ── 0 0 0 0
125 * ────────────────────────────────────────────
126 * 4: 1 ── 0 ── 0 1 ── 0 0 0 0
127 * ────────────────────────────────────────────
128 * 5: 1 ── 0 ── 1 1 ── 0 0 0 0
129 * ────────────────────────────────────────────
130 * 6: 1 ── 1 ── 0 1 ── 0 0 0 0
131 * ────────────────────────────────────────────
132 * 7: 1 ── 1 ── 1 1 ── 0 0 0 0
133 * ────────────────────────────────────────────
134 * 8: 1 ── 1 ── 1 0 ── 1 0 0 0
135 * ────────────────────────────────────────────
136 * 9: 0 ── 0 ── 0 0 ── 1 0 0 0
137 * ────────────────────────────────────────────
138 *10: 0 ── 0 ── 1 0 ── 1 0 0 0
139 * ────────────────────────────────────────────
140 *11: 0 ── 1 ── 0 0 ── 1 0 0 0
141 * ────────────────────────────────────────────
142 *12: 0 ── 1 ── 1 0 ── 1 0 0 0
143 * ────────────────────────────────────────────
144 *13: 1 ── 0 ── 0 0 ── 1 0 0 0
145 * ────────────────────────────────────────────
146 *14: 1 ── 0 ── 1 0 ── 1 0 0 0
147 * ────────────────────────────────────────────
148 *15: 1 ── 1 ── 0 0 ── 1 0 0 0
149 * ────────────────────────────────────────────
150 *16: 0 ── 0 ── 0 0 ── 0 1 0 0
151 * ────────────────────────────────────────────
152 *17: 0 ── 0 ── 0 0 ── 0 0 1 0
153 * ────────────────────────────────────────────
154 *18: 0 ── 0 ── 0 0 ── 0 0 0 1
155 *
156 */
157static void select_col(uint8_t col) {
158 switch (col) {
159 case 0:
160 writePinLow(A0);
161 writePinLow(A1);
162 writePinLow(A2);
163 writePinHigh(B4);
164 break;
165 case 1:
166 writePinLow(A0);
167 writePinLow(A1);
168 writePinHigh(A2);
169 writePinHigh(B4);
170 break;
171 case 2:
172 writePinLow(A0);
173 writePinHigh(A1);
174 writePinLow(A2);
175 writePinHigh(B4);
176 break;
177 case 3:
178 writePinLow(A0);
179 writePinHigh(A1);
180 writePinHigh(A2);
181 writePinHigh(B4);
182 break;
183 case 4:
184 writePinHigh(A0);
185 writePinLow(A1);
186 writePinLow(A2);
187 writePinHigh(B4);
188 break;
189 case 5:
190 writePinHigh(A0);
191 writePinLow(A1);
192 writePinHigh(A2);
193 writePinHigh(B4);
194 break;
195 case 6:
196 writePinHigh(A0);
197 writePinHigh(A1);
198 writePinLow(A2);
199 writePinHigh(B4);
200 break;
201 case 7:
202 writePinHigh(A0);
203 writePinHigh(A1);
204 writePinHigh(A2);
205 writePinHigh(B4);
206 break;
207 case 8:
208 writePinHigh(A0);
209 writePinHigh(A1);
210 writePinHigh(A2);
211 writePinHigh(C7);
212 break;
213 case 9:
214 writePinLow(A0);
215 writePinLow(A1);
216 writePinLow(A2);
217 writePinHigh(C7);
218 break;
219 case 10:
220 writePinLow(A0);
221 writePinLow(A1);
222 writePinHigh(A2);
223 writePinHigh(C7);
224 break;
225 case 11:
226 writePinLow(A0);
227 writePinHigh(A1);
228 writePinLow(A2);
229 writePinHigh(C7);
230 break;
231 case 12:
232 writePinLow(A0);
233 writePinHigh(A1);
234 writePinHigh(A2);
235 writePinHigh(C7);
236 break;
237 case 13:
238 writePinHigh(A0);
239 writePinLow(A1);
240 writePinLow(A2);
241 writePinHigh(C7);
242 break;
243 case 14:
244 writePinHigh(A0);
245 writePinLow(A1);
246 writePinHigh(A2);
247 writePinHigh(C7);
248 break;
249 case 15:
250 writePinHigh(A0);
251 writePinHigh(A1);
252 writePinLow(A2);
253 writePinHigh(C7);
254 break;
255 case 16:
256 writePinLow(C2);
257 break;
258 case 17:
259 writePinLow(C3);
260 break;
261 case 18:
262 writePinLow(C5);
263 break;
264 }
265}
266
267static void unselect_col(uint8_t col) {
268 switch (col) {
269 case 0:
270 writePinHigh(A0);
271 writePinHigh(A1);
272 writePinHigh(A2);
273 writePinLow(B4);
274 break;
275 case 1:
276 writePinHigh(A0);
277 writePinHigh(A1);
278 writePinLow(A2);
279 writePinLow(B4);
280 break;
281 case 2:
282 writePinHigh(A0);
283 writePinLow(A1);
284 writePinHigh(A2);
285 writePinLow(B4);
286 break;
287 case 3:
288 writePinHigh(A0);
289 writePinLow(A1);
290 writePinLow(A2);
291 writePinLow(B4);
292 break;
293 case 4:
294 writePinLow(A0);
295 writePinHigh(A1);
296 writePinHigh(A2);
297 writePinLow(B4);
298 break;
299 case 5:
300 writePinLow(A0);
301 writePinHigh(A1);
302 writePinLow(A2);
303 writePinLow(B4);
304 break;
305 case 6:
306 writePinLow(A0);
307 writePinLow(A1);
308 writePinHigh(A2);
309 writePinLow(B4);
310 break;
311 case 7:
312 writePinLow(A0);
313 writePinLow(A1);
314 writePinLow(A2);
315 writePinLow(B4);
316 break;
317 case 8:
318 writePinLow(A0);
319 writePinLow(A1);
320 writePinLow(A2);
321 writePinLow(C7);
322 break;
323 case 9:
324 writePinHigh(A0);
325 writePinHigh(A1);
326 writePinHigh(A2);
327 writePinLow(C7);
328 break;
329 case 10:
330 writePinHigh(A0);
331 writePinHigh(A1);
332 writePinLow(A2);
333 writePinLow(C7);
334 break;
335 case 11:
336 writePinHigh(A0);
337 writePinLow(A1);
338 writePinHigh(A2);
339 writePinLow(C7);
340 break;
341 case 12:
342 writePinHigh(A0);
343 writePinLow(A1);
344 writePinLow(A2);
345 writePinLow(C7);
346 break;
347 case 13:
348 writePinLow(A0);
349 writePinHigh(A1);
350 writePinHigh(A2);
351 writePinLow(C7);
352 break;
353 case 14:
354 writePinLow(A0);
355 writePinHigh(A1);
356 writePinLow(A2);
357 writePinLow(C7);
358 break;
359 case 15:
360 writePinLow(A0);
361 writePinLow(A1);
362 writePinHigh(A2);
363 writePinLow(C7);
364 break;
365 case 16:
366 writePinHigh(C2);
367 break;
368 case 17:
369 writePinHigh(C3);
370 break;
371 case 18:
372 writePinHigh(C5);
373 break;
374 }
375}
376
377static void unselect_cols(void) {
378 //Native
379 writePinHigh(C2);
380 writePinHigh(C3);
381 writePinHigh(C5);
382
383 //Demultiplexer
384 writePinLow(B4);
385 writePinLow(C7);
386 writePinHigh(A0);
387 writePinHigh(A1);
388 writePinHigh(A2);
389}
390
391static void init_pins(void) {
392 unselect_cols();
393 for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
394 setPinInputHigh(row_pins[x]);
395 }
396 setPinOutput(A0);
397 setPinOutput(A1);
398 setPinOutput(A2);
399 setPinOutput(B4);
400 setPinOutput(C7);
401 setPinOutput(C2);
402 setPinOutput(C3);
403 setPinOutput(C5);
404}
405
406static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
407 bool matrix_changed = false;
408
409 // Select col and wait for col selecton to stabilize
410 select_col(current_col);
411 wait_us(30);
412
413 // For each row...
414 for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
415 // Store last value of row prior to reading
416 matrix_row_t last_row_value = current_matrix[row_index];
417
418 // Check row pin state
419 if (readPin(row_pins[row_index]) == 0) {
420 // Pin LO, set col bit
421 current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
422 } else {
423 // Pin HI, clear col bit
424 current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
425 }
426
427 // Determine if the matrix changed state
428 if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) {
429 matrix_changed = true;
430 }
431 }
432
433 // Unselect col
434 unselect_col(current_col);
435
436 return matrix_changed;
437}
438
439#endif
440
441void matrix_init_custom(void) {
442 // initialize key pins
443 init_pins();
444}
445
446bool matrix_scan_custom(matrix_row_t current_matrix[]) {
447 bool changed = false;
448
449#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
450 // Set row, read cols
451 for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
452 changed |= read_cols_on_row(current_matrix, current_row);
453 }
454#elif (DIODE_DIRECTION == ROW2COL)
455 // Set col, read rows
456 for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
457 changed |= read_rows_on_col(current_matrix, current_col);
458 }
459#endif
460
461 return changed;
462}
diff --git a/keyboards/mechlovin/olly/jf/readme.md b/keyboards/mechlovin/olly/jf/readme.md
new file mode 100644
index 000000000..b45498f84
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/readme.md
@@ -0,0 +1,23 @@
1# Mechlovin Olly JF
2
3![jf](https://i.imgur.com/IrfTGE7l.png)
4
5Olly JF PCB, compatible Duck Jetfire keyboard.
6
7* Keyboard Maintainer: [Mechlovin' Studio](https://mechlovin.studio/)
8* Hardware Supported: Jetfire Korean Kustom
9* Hardware Availability: [Mechlovin' Studio](https://mechlovin.studio/)
10
11Make example for this keyboard (after setting up your build environment):
12
13 make mechlovin/olly/jf:default
14
15Flashing example for this keyboard:
16
17 make mechlovin/olly/jf:default:flash
18
19See 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).
20
21**Reset Key:** 2 ways to put the Olly JF into bootloader:
22By keycode: Tap RESET keycode.
23By bootloader: hold ESC key while plugging in \ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/rules.mk b/keyboards/mechlovin/olly/jf/rules.mk
new file mode 100644
index 000000000..abb2bd2fe
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rules.mk
@@ -0,0 +1,28 @@
1# MCU name
2MCU = atmega32a
3
4# Processor frequency
5F_CPU = 16000000
6
7# Bootloader selection
8BOOTLOADER = USBasp
9
10# Build Options
11# change yes to no to disable
12#
13BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
14MOUSEKEY_ENABLE = yes # Mouse keys
15EXTRAKEY_ENABLE = yes # Audio control and System control
16CONSOLE_ENABLE = no # Console for debug
17COMMAND_ENABLE = no # Commands for debug and configuration
18# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
19SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
20# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
21NKRO_ENABLE = no # USB Nkey Rollover
22BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
23RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
24BLUETOOTH_ENABLE = no # Enable Bluetooth
25AUDIO_ENABLE = no # Audio output
26CUSTOM_MATRIX = lite
27
28SRC += matrix.c \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-09 12:30:00 +0000