[Keyboard] Add Olly JF PCB (#14056)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

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 0000000000..66826aafa4
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/config.h
@@ -0,0 +1,74 @@
+/*
+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   0xD180
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Mechlovin.Studio
+#define PRODUCT      Olly JF
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#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 { D5, D6, A5, A4, A3, A6}
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+#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
+
+#define RGB_DI_PIN B3
+#define RGBLED_NUM 27
+#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
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
new file mode 100644
index 0000000000..ab57d31787
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -0,0 +1,119 @@
+{
+    "keyboard_name": "Mechlovin Olly",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"K00 (B0,B7)", "x":0, "y":0},
+                {"label":"K01 (B0,C0)", "x":1.5, "y":0},
+                {"label":"K02 (B0,C1)", "x":2.5, "y":0},
+                {"label":"K03 (B0,C2)", "x":3.5, "y":0},
+                {"label":"K04 (B0,C3)", "x":4.5, "y":0},
+                {"label":"K05 (B0,C4)", "x":6, "y":0},
+                {"label":"K06 (B0,C5)", "x":7, "y":0},
+                {"label":"K07 (B0,C6)", "x":8, "y":0},
+                {"label":"K08 (B0,C7)", "x":9, "y":0},
+                {"label":"K09 (B0,D0)", "x":10.5, "y":0},
+                {"label":"K0A (B0,D1)", "x":11.5, "y":0},
+                {"label":"K0B (B0,D2)", "x":12.5, "y":0},
+                {"label":"K0C (B0,D3)", "x":13.5, "y":0},
+                {"label":"K0E (B0,D5)", "x":15.25, "y":0},
+                {"label":"K0F (B0,D6)", "x":16.5, "y":0},
+                {"label":"K0G (B0,D7)", "x":17.5, "y":0},
+                {"label":"K0H (B0,E0)", "x":18.5, "y":0},
+                {"label":"K0I (B0,E1)", "x":19.5, "y":0},
+                {"label":"K10 (B1,B7)", "x":0, "y":1.5},
+                {"label":"K11 (B1,C0)", "x":1, "y":1.5},
+                {"label":"K12 (B1,C1)", "x":2, "y":1.5},
+                {"label":"K13 (B1,C2)", "x":3, "y":1.5},
+                {"label":"K14 (B1,C3)", "x":4, "y":1.5},
+                {"label":"K15 (B1,C4)", "x":5, "y":1.5},
+                {"label":"K16 (B1,C5)", "x":6, "y":1.5},
+                {"label":"K17 (B1,C6)", "x":7, "y":1.5},
+                {"label":"K18 (B1,C7)", "x":8, "y":1.5},
+                {"label":"K19 (B1,D0)", "x":9, "y":1.5},
+                {"label":"K1A (B1,D1)", "x":10, "y":1.5},
+                {"label":"K1B (B1,D2)", "x":11, "y":1.5},
+                {"label":"K1C (B1,D3)", "x":12, "y":1.5},
+                {"label":"K1D (B1,D4)", "x":13, "y":1.5},
+                {"label":"K0D (B0,D4)", "x":14, "y":1.5},
+                {"label":"K1E (B1,D5)", "x":15.25, "y":1.5},
+                {"label":"K1F (B1,D6)", "x":16.5, "y":1.5},
+                {"label":"K1G (B1,D7)", "x":17.5, "y":1.5},
+                {"label":"K1H (B1,E0)", "x":18.5, "y":1.5},
+                {"label":"K1I (B1,E1)", "x":19.5, "y":1.5},
+                {"label":"K20 (B2,B7)", "x":0, "y":2.5, "w":1.5},
+                {"label":"K21 (B2,C0)", "x":1.5, "y":2.5},
+                {"label":"K22 (B2,C1)", "x":2.5, "y":2.5},
+                {"label":"K23 (B2,C2)", "x":3.5, "y":2.5},
+                {"label":"K24 (B2,C3)", "x":4.5, "y":2.5},
+                {"label":"K25 (B2,C4)", "x":5.5, "y":2.5},
+                {"label":"K26 (B2,C5)", "x":6.5, "y":2.5},
+                {"label":"K27 (B2,C6)", "x":7.5, "y":2.5},
+                {"label":"K28 (B2,C7)", "x":8.5, "y":2.5},
+                {"label":"K29 (B2,D0)", "x":9.5, "y":2.5},
+                {"label":"K2A (B2,D1)", "x":10.5, "y":2.5},
+                {"label":"K2B (B2,D2)", "x":11.5, "y":2.5},
+                {"label":"K2C (B2,D3)", "x":12.5, "y":2.5},
+                {"label":"K2D (B2,D4)", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"K2E (B2,D5)", "x":15.25, "y":2.5},
+                {"label":"K2F (B2,D6)", "x":16.5, "y":2.5},
+                {"label":"K2G (B2,D7)", "x":17.5, "y":2.5},
+                {"label":"K2H (B2,E0)", "x":18.5, "y":2.5},
+                {"label":"K2I (B2,E1)", "x":19.5, "y":2.5},
+                {"label":"K30 (B3,B7)", "x":0, "y":3.5, "w":1.75},
+                {"label":"K31 (B3,C0)", "x":1.75, "y":3.5},
+                {"label":"K32 (B3,C1)", "x":2.75, "y":3.5},
+                {"label":"K33 (B3,C2)", "x":3.75, "y":3.5},
+                {"label":"K34 (B3,C3)", "x":4.75, "y":3.5},
+                {"label":"K35 (B3,C4)", "x":5.75, "y":3.5},
+                {"label":"K36 (B3,C5)", "x":6.75, "y":3.5},
+                {"label":"K37 (B3,C6)", "x":7.75, "y":3.5},
+                {"label":"K38 (B3,C7)", "x":8.75, "y":3.5},
+                {"label":"K39 (B3,D0)", "x":9.75, "y":3.5},
+                {"label":"K3A (B3,D1)", "x":10.75, "y":3.5},
+                {"label":"K3B (B3,D2)", "x":11.75, "y":3.5},
+                {"label":"K3C (B3,D3)", "x":12.75, "y":3.5},
+                {"label":"K3D (B3,D4)", "x":13.75, "y":3.5, "w":1.25},
+                {"label":"K3F (B3,D6)", "x":16.5, "y":3.5},
+                {"label":"K3G (B3,D7)", "x":17.5, "y":3.5},
+                {"label":"K3H (B3,E0)", "x":18.5, "y":3.5},
+                {"label":"K3I (B3,E1)", "x":19.5, "y":3.5},
+                {"label":"K40 (B4,B7)", "x":0, "y":4.5, "w":1.25},
+                {"label":"K41 (B4,C0)", "x":1.25, "y":4.5},
+                {"label":"K42 (B4,C1)", "x":2.25, "y":4.5},
+                {"label":"K43 (B4,C2)", "x":3.25, "y":4.5},
+                {"label":"K44 (B4,C3)", "x":4.25, "y":4.5},
+                {"label":"K45 (B4,C4)", "x":5.25, "y":4.5},
+                {"label":"K46 (B4,C5)", "x":6.25, "y":4.5},
+                {"label":"K47 (B4,C6)", "x":7.25, "y":4.5},
+                {"label":"K48 (B4,C7)", "x":8.25, "y":4.5},
+                {"label":"K49 (B4,D0)", "x":9.25, "y":4.5},
+                {"label":"K4A (B4,D1)", "x":10.25, "y":4.5},
+                {"label":"K4B (B4,D2)", "x":11.25, "y":4.5},
+                {"label":"K4C (B4,D3)", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"K4D (B4,D4)", "x":14, "y":4.5},
+                {"label":"K4E (B4,D5)", "x":15.25, "y":4.75},
+                {"label":"K4F (B4,D6)", "x":16.5, "y":4.5},
+                {"label":"K4G (B4,D7)", "x":17.5, "y":4.5},
+                {"label":"K4H (B4,E0)", "x":18.5, "y":4.5},
+                {"label":"K4I (B4,E1)", "x":19.5, "y":4.5},
+                {"label":"K50 (B5,B7)", "x":0, "y":5.5, "w":1.5},
+                {"label":"K51 (B5,C0)", "x":1.5, "y":5.5},
+                {"label":"K53 (B5,C2)", "x":2.5, "y":5.5, "w":1.5},
+                {"label":"K56 (B5,C5)", "x":4, "y":5.5, "w":6.25},
+                {"label":"K5A (B5,D1)", "x":10.25, "y":5.5, "w":1.25},
+                {"label":"K5B (B5,D2)", "x":11.5, "y":5.5, "w":1.25},
+                {"label":"K5C (B5,D3)", "x":12.75, "y":5.5, "w":1.25},
+                {"label":"K5D (B5,D4)", "x":14.25, "y":5.75},
+                {"label":"K5E (B5,D5)", "x":15.25, "y":5.75},
+                {"label":"K5F (B5,D6)", "x":16.25, "y":5.75},
+                {"label":"K5G (B5,D7)", "x":17.5, "y":5.5},
+                {"label":"K5H (B5,E0)", "x":18.5, "y":5.5},
+                {"label":"K5I (B5,E1)", "x":19.5, "y":5.5}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/mechlovin/olly/jf/jf.c b/keyboards/mechlovin/olly/jf/jf.c
new file mode 100644
index 0000000000..dc13e84ae2
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/jf.c
@@ -0,0 +1,39 @@
+/* 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 "jf.h"
+
+
+void led_init_ports(void) {
+  setPinOutput(C0);
+  setPinOutput(D0);
+  setPinOutput(D1);
+  setPinOutput(C1);
+  setPinOutput(C6);
+  setPinOutput(B0);
+  setPinOutput(B1);
+  setPinOutput(B2);
+}
+
+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/jf/jf.h b/keyboards/mechlovin/olly/jf/jf.h
new file mode 100644
index 0000000000..cbc5287e35
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/jf.h
@@ -0,0 +1,35 @@
+/* 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,           K0E,     K0F, K0G, K0H, K0I, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D, 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,               K3F, K3G, K3H, K3I, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4E,     K4F, K4G, K4H, K4I, \
+    K50, K51, K53,                K56,                K5A, K5B, K5C,      K5D, K5E, K5F,     K5G, K5H, K5I  \
+) { \
+    { 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,   KC_NO, K3F,   K3G,   K3H,   K3I   }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F,   K4G,   K4H,   K4I   }, \
+    { 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   }, \
+}
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 0000000000..e87d665a2b
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+/* 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_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,
+        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,
+        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,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  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,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  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,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  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/jf/keymaps/default/readme.md b/keyboards/mechlovin/olly/jf/keymaps/default/readme.md
new file mode 100644
index 0000000000..0dad971bdc
--- /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 0000000000..f330025a00
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/keymaps/via/config.h
@@ -0,0 +1,22 @@
+/*
+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
+
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 1607
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6
+
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 0000000000..c90eeb1830
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/* 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_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,
+        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,
+        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,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  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,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  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,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [4] = 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,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [5] = 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,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,  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/jf/keymaps/via/readme.md b/keyboards/mechlovin/olly/jf/keymaps/via/readme.md
new file mode 100644
index 0000000000..0453b5aef0
--- /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 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mechlovin/olly/jf/matrix.c b/keyboards/mechlovin/olly/jf/matrix.c
new file mode 100644
index 0000000000..c01879c9a5
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/matrix.c
@@ -0,0 +1,462 @@
+/*
+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 <stdint.h>
+#include <stdbool.h>
+#include "wait.h"
+#include "util.h"
+#include "matrix.h"
+#include "debounce.h"
+#include "quantum.h"
+
+#ifdef DIRECT_PINS
+static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
+#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+//static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#endif
+
+// matrix code
+
+#ifdef DIRECT_PINS
+
+static void init_pins(void) {
+    for (int row = 0; row < MATRIX_ROWS; row++) {
+        for (int col = 0; col < MATRIX_COLS; col++) {
+            pin_t pin = direct_pins[row][col];
+            if (pin != NO_PIN) {
+                setPinInputHigh(pin);
+            }
+        }
+    }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+    matrix_row_t last_row_value = current_matrix[current_row];
+    current_matrix[current_row] = 0;
+
+    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+        pin_t pin = direct_pins[current_row][col_index];
+        if (pin != NO_PIN) {
+            current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+        }
+    }
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+#elif (DIODE_DIRECTION == COL2ROW)
+
+static void select_row(uint8_t row) {
+    setPinOutput(row_pins[row]);
+    writePinLow(row_pins[row]);
+}
+
+static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
+
+static void unselect_rows(void) {
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+}
+
+static void init_pins(void) {
+    unselect_rows();
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        setPinInputHigh(col_pins[x]);
+    }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+    // Store last value of row prior to reading
+    matrix_row_t last_row_value = current_matrix[current_row];
+
+    // Clear data in matrix row
+    current_matrix[current_row] = 0;
+
+    // Select row and wait for row selecton to stabilize
+    select_row(current_row);
+    wait_us(30);
+
+    // For each col...
+    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+
+        // Select the col pin to read (active low)
+        uint8_t pin_state = readPin(col_pins[col_index]);
+
+        // Populate the matrix row with the state of the col pin
+        current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+    }
+
+    // Unselect row
+    unselect_row(current_row);
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+#elif (DIODE_DIRECTION == ROW2COL)
+
+/* 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);
+          writePi