From c0049b6d43da55fc82b3dd20f7707c22f1189b4b Mon Sep 17 00:00:00 2001 From: binaryDiv Date: Mon, 1 Jul 2024 10:10:51 +0200 Subject: [PATCH] Firmware: Add right half of keyboard, add Fn layer --- .../binarydiv/protoeepyboard/v1/config.h | 17 ++-------- .../binarydiv/protoeepyboard/v1/info.json | 2 +- .../v1/keymaps/default/keymap.c | 33 ++++++++++++------- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/qmk_keyboards/binarydiv/protoeepyboard/v1/config.h b/qmk_keyboards/binarydiv/protoeepyboard/v1/config.h index 428a0c4..ecd559c 100644 --- a/qmk_keyboards/binarydiv/protoeepyboard/v1/config.h +++ b/qmk_keyboards/binarydiv/protoeepyboard/v1/config.h @@ -3,18 +3,5 @@ #pragma once -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT +// Lock one-shot keys when tapping them twice +#define ONESHOT_TAP_TOGGLE 2 diff --git a/qmk_keyboards/binarydiv/protoeepyboard/v1/info.json b/qmk_keyboards/binarydiv/protoeepyboard/v1/info.json index ea9806c..dd0e468 100644 --- a/qmk_keyboards/binarydiv/protoeepyboard/v1/info.json +++ b/qmk_keyboards/binarydiv/protoeepyboard/v1/info.json @@ -20,7 +20,7 @@ }, "diode_direction": "COL2ROW", "matrix_pins": { - "cols": ["GP6", "GP7", "GP8", "GP9", "GP10", "GP5", "GP24", "GP23", "GP22", "GP21", "GP20", "GP25"], + "cols": ["GP6", "GP7", "GP8", "GP9", "GP10", "GP5", "GP20", "GP25", "GP24", "GP23", "GP22", "GP21"], "rows": ["GP17", "GP16", "GP15", "GP14", "GP13"] }, "layouts": { diff --git a/qmk_keyboards/binarydiv/protoeepyboard/v1/keymaps/default/keymap.c b/qmk_keyboards/binarydiv/protoeepyboard/v1/keymaps/default/keymap.c index 2efcc1d..c235c09 100644 --- a/qmk_keyboards/binarydiv/protoeepyboard/v1/keymaps/default/keymap.c +++ b/qmk_keyboards/binarydiv/protoeepyboard/v1/keymaps/default/keymap.c @@ -10,26 +10,35 @@ enum layer_names { // "Hyper" key layer L_HYPER, - // Keyboard control layer: Used for keyboard configuration - //L_KBDCTL, + // Fn / keyboard control layer: Used for keyboard configuration + L_FN, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Base layer [L_BASE] = LAYOUT_ortho_5x12( - KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQUAL, - KC_ESCAPE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SEMICOLON, KC_QUOTE, - KC_LEFT_SHIFT, KC_BACKSPACE, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, - KC_LEFT_CTRL, KC_LEFT_ALT, KC_LEFT_GUI, MO(L_HYPER), KC_ENTER, KC_SPACE, KC_ENTER, KC_RIGHT_ALT, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT + KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQUAL, + KC_ESCAPE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SEMICOLON, KC_QUOTE, + KC_LEFT_SHIFT, KC_BACKSLASH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, + KC_LEFT_CTRL, KC_LEFT_ALT, KC_LEFT_GUI, OSL(L_HYPER), KC_ENTER, KC_SPACE, KC_BACKSPACE, KC_RIGHT_ALT, MO(L_HYPER), MO(L_HYPER), MO(L_FN), KC_RIGHT_SHIFT ), // "Hyper" key layer [L_HYPER] = LAYOUT_ortho_5x12( - 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_HOME, KC_UP, KC_END, _______, _______, _______, _______, _______, KC_LEFT_BRACKET, KC_RIGHT_BRACKET, KC_F12, - _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_PIPE, - _______, KC_DELETE, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BACKSLASH, - _______, QK_BOOTLOADER, _______, _______, _______, KC_SPACE, KC_ENTER, _______, _______, _______, _______, _______ + 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_HOME, KC_UP, KC_END, _______, _______, _______, _______, _______, KC_LEFT_BRACKET, KC_RIGHT_BRACKET, KC_F12, + _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_PIPE, + _______, KC_DELETE, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BACKSLASH, + _______, _______, _______, _______, _______, KC_SPACE, KC_ENTER, _______, _______, _______, _______, _______ + ), + + // "Fn" key layer + [L_FN] = LAYOUT_ortho_5x12( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOTLOADER, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_REBOOT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_DEBUG_TOGGLE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_CLEAR_EEPROM, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) };