From dbd31564984bb621f4f6641c7b9a6ab0228cfbaa Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Tue, 27 Apr 2021 13:07:40 -0500 Subject: [PATCH 01/27] initial commit for SP Mini Begin SP Mini development --- keyboards/viktus/sp_mini/config.h | 94 +++++++++++++++++++ keyboards/viktus/sp_mini/info.json | 82 ++++++++++++++++ .../viktus/sp_mini/keymaps/default/config.h | 24 +++++ .../viktus/sp_mini/keymaps/default/keymap.c | 23 +++++ .../viktus/sp_mini/keymaps/default/rules.mk | 1 + keyboards/viktus/sp_mini/readme.md | 21 +++++ keyboards/viktus/sp_mini/rules.mk | 34 +++++++ keyboards/viktus/sp_mini/sp_mini.c | 1 + keyboards/viktus/sp_mini/sp_mini.h | 42 +++++++++ 9 files changed, 322 insertions(+) create mode 100644 keyboards/viktus/sp_mini/config.h create mode 100644 keyboards/viktus/sp_mini/info.json create mode 100644 keyboards/viktus/sp_mini/keymaps/default/config.h create mode 100644 keyboards/viktus/sp_mini/keymaps/default/keymap.c create mode 100644 keyboards/viktus/sp_mini/keymaps/default/rules.mk create mode 100644 keyboards/viktus/sp_mini/readme.md create mode 100644 keyboards/viktus/sp_mini/rules.mk create mode 100644 keyboards/viktus/sp_mini/sp_mini.c create mode 100644 keyboards/viktus/sp_mini/sp_mini.h diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h new file mode 100644 index 000000000000..f6d3c7f3af1e --- /dev/null +++ b/keyboards/viktus/sp_mini/config.h @@ -0,0 +1,94 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x5644 +#define PRODUCT_ID 0x5111 +#define DEVICE_VER 0x0100 +#define MANUFACTURER Viktus Design +#define PRODUCT SP Mini + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 10 +#define MATRIX_COLS 8 + + +// wiring of each half +#define MATRIX_ROW_PINS { F0, B5, B4, D7, D6 } +#define MATRIX_COL_PINS { B6, C6, C7, D4, D2, D3, D5 } // no B7 on left hand +#define MATRIX_ROW_PINS_RIGHT { F0, B5, B4, D7, D6 } +//#define MATRIX_COL_PINS_RIGHT { B6, C6, C7, D4, D2, D3, D5, B7 } +#define MATRIX_COL_PINS_RIGHT { B7, D5, D3, D2, D4, C7, C6, B6 } + +#define DIODE_DIRECTION COL2ROW + +/* Split Defines */ +#define MASTER_LEFT + +#define USE_I2C + +/* serial.c configuration for split keyboard */ +//#define SOFT_SERIAL_PIN D1 + + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* 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 + +/* ws2812 RGB LED */ +#define RGB_DI_PIN E6 +#define RGBLIGHT_ANIMATIONS +//#define RGBLIGHT_SPLIT +#define RGBLED_NUM 24 // Number of LEDs +#define RGBLED_SPLIT { 12, 12 } + +//#define ENCODERS_PAD_A {F4} +//#define ENCODERS_PAD_B {F1} +//#define ENCODERS_PAD_A_RIGHT {F4} +//#define ENCODERS_PAD_B_RIGHT {F1} + + +/* + * 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 +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json new file mode 100644 index 000000000000..2bbd25ff0a80 --- /dev/null +++ b/keyboards/viktus/sp_mini/info.json @@ -0,0 +1,82 @@ +{ + "keyboard_name": "sp_mini", + "url": "", + "maintainer": "jrfhoutx", + "width": 16, + "height": 5.5, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"F13", "x":0, "y":0}, + {"label":"Esc", "x":1.25, "y":0}, + {"label":"F1", "x":2.25, "y":0}, + {"label":"F2", "x":3.25, "y":0}, + {"label":"F3", "x":4.25, "y":0}, + {"label":"F4", "x":5.25, "y":0}, + {"label":"F5", "x":6.25, "y":0}, + {"label":"F6", "x":7.75, "y":0}, + {"label":"F7", "x":8.75, "y":0}, + {"label":"F8", "x":9.75, "y":0}, + {"label":"F9", "x":10.75, "y":0}, + {"label":"F10", "x":11.75, "y":0}, + {"label":"F11", "x":12.75, "y":0}, + {"label":"F12", "x":13.75, "y":0}, + {"label":"Delete", "x":15, "y":0}, + {"label":"F14", "x":0, "y":1.25}, + {"label":"Tab", "x":1.25, "y":1.25}, + {"label":"Q", "x":2.25, "y":1.25}, + {"label":"W", "x":3.25, "y":1.25}, + {"label":"E", "x":4.25, "y":1.25}, + {"label":"R", "x":5.25, "y":1.25}, + {"label":"T", "x":6.25, "y":1.25}, + {"label":"Y", "x":7.75, "y":1.25}, + {"label":"U", "x":8.75, "y":1.25}, + {"label":"I", "x":9.75, "y":1.25}, + {"label":"O", "x":10.75, "y":1.25}, + {"label":"P", "x":11.75, "y":1.25}, + {"label":"{", "x":12.75, "y":1.25}, + {"label":"}", "x":13.75, "y":1.25}, + {"label":"PgUp", "x":15, "y":1.25}, + {"label":"Backspace", "x":16.25, "y":1.25, "w":2}, + {"label":"F15", "x":0, "y":2.25}, + {"label":"Caps Lock", "x":1.25, "y":2.25, "w":1.25}, + {"label":"A", "x":2.5, "y":2.25}, + {"label":"S", "x":3.5, "y":2.25}, + {"label":"D", "x":4.5, "y":2.25}, + {"label":"F", "x":5.5, "y":2.25}, + {"label":"G", "x":6.5, "y":2.25}, + {"label":"H", "x":8, "y":2.25}, + {"label":"J", "x":9, "y":2.25}, + {"label":"K", "x":10, "y":2.25}, + {"label":"L", "x":11, "y":2.25}, + {"label":":", "x":12, "y":2.25}, + {"label":"Enter", "x":13, "y":2.25, "w":1.75}, + {"label":"PgDn", "x":15, "y":2.25}, + {"label":"F16", "x":0, "y":3.25}, + {"label":"Shift", "x":1.25, "y":3.25, "w":1.75}, + {"label":"Z", "x":3, "y":3.25}, + {"label":"X", "x":4, "y":3.25}, + {"label":"C", "x":5, "y":3.25}, + {"label":"V", "x":6, "y":3.25}, + {"label":"B", "x":7, "y":3.25}, + {"label":"N", "x":8.5, "y":3.25}, + {"label":"M", "x":9.5, "y":3.25}, + {"label":"<", "x":10.5, "y":3.25}, + {"label":">", "x":11.5, "y":3.25}, + {"label":"Shift", "x":12.5, "y":3.25, "w":1.25}, + {"label":"\u2191", "x":14, "y":3.5}, + {"label":"F17", "x":0, "y":4.25}, + {"label":"Ctrl", "x":1.25, "y":4.25, "w":1.25}, + {"label":"Win", "x":2.5, "y":4.25, "w":1.25}, + {"label":"Alt", "x":3.75, "y":4.25, "w":1.25}, + {"x":5, "y":4.25, "w":2.75}, + {"x":8.25, "y":4.25, "w":2.25}, + {"label":"Alt", "x":10.5, "y":4.25, "w":1.25}, + {"label":"Ctrl", "x":11.75, "y":4.25}, + {"label":"\u2190", "x":13, "y":4.5}, + {"label":"\u2193", "x":14, "y":4.5}, + {"label":"\u2192", "x":15, "y":4.5} + ] + } + } +} diff --git a/keyboards/viktus/sp_mini/keymaps/default/config.h b/keyboards/viktus/sp_mini/keymaps/default/config.h new file mode 100644 index 000000000000..c21e9fc82515 --- /dev/null +++ b/keyboards/viktus/sp_mini/keymaps/default/config.h @@ -0,0 +1,24 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ + +#pragma once + +/* Use I2C or Serial, not both */ +//#define USE_I2C diff --git a/keyboards/viktus/sp_mini/keymaps/default/keymap.c b/keyboards/viktus/sp_mini/keymaps/default/keymap.c new file mode 100644 index 000000000000..ff99a33be443 --- /dev/null +++ b/keyboards/viktus/sp_mini/keymaps/default/keymap.c @@ -0,0 +1,23 @@ +#include QMK_KEYBOARD_H + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. + + +enum custom_keycodes { + QWERTY = SAFE_RANGE, +}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_F13, 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_DEL, + KC_F14, 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_PGUP, + KC_F15, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_PGDN, + KC_FN1, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, + KC_FN2, KC_LCTL, KC_LGUI, KC_TRNS, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT + ), + +}; diff --git a/keyboards/viktus/sp_mini/keymaps/default/rules.mk b/keyboards/viktus/sp_mini/keymaps/default/rules.mk new file mode 100644 index 000000000000..e8645f50b66f --- /dev/null +++ b/keyboards/viktus/sp_mini/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENABLE_VIA = yes diff --git a/keyboards/viktus/sp_mini/readme.md b/keyboards/viktus/sp_mini/readme.md new file mode 100644 index 000000000000..525ab96da6a2 --- /dev/null +++ b/keyboards/viktus/sp_mini/readme.md @@ -0,0 +1,21 @@ +# sp_mini + +![sp_mini](imgur.com image replace me!) + +The SP Mini is a 40% version of the SP-111 created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner). All design done by BlindAssassin111. The layout includes an F Row, left macro column, and arrows. Rotary encoders are supported in the top left and right positions. + +The SP Mini has dual ATMEGA32U4 controllers linked with USB Type C. Each PCB half has a single reset button and a standard AVR ISP header for reflashing the MCU in case of a bootloader issue. + +* Keyboard Maintainer: [jrfhoutx](https://github.com/jrfhoutx) +* Hardware Supported: SP Mini FE (Founder's Edition), SP Mini LC (Low Cal) +* Hardware Availability: Viktus Designs, LLC. + +Make example for this keyboard (after setting up your build environment): + + make viktus/sp_mini:default + +Flashing example for this keyboard: + + make viktus/sp_mini: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). diff --git a/keyboards/viktus/sp_mini/rules.mk b/keyboards/viktus/sp_mini/rules.mk new file mode 100644 index 000000000000..ae8c96db4fc7 --- /dev/null +++ b/keyboards/viktus/sp_mini/rules.mk @@ -0,0 +1,34 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +SPLIT_KEYBOARD = yes diff --git a/keyboards/viktus/sp_mini/sp_mini.c b/keyboards/viktus/sp_mini/sp_mini.c new file mode 100644 index 000000000000..56859068c1ec --- /dev/null +++ b/keyboards/viktus/sp_mini/sp_mini.c @@ -0,0 +1 @@ +#include "sp_mini.h" diff --git a/keyboards/viktus/sp_mini/sp_mini.h b/keyboards/viktus/sp_mini/sp_mini.h new file mode 100644 index 000000000000..f10eea0d9646 --- /dev/null +++ b/keyboards/viktus/sp_mini/sp_mini.h @@ -0,0 +1,42 @@ +#pragma once + +#include "quantum.h" + +#define ___ KC_NO + +#define LAYOUT_all( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R26, R27, \ + L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, R42, R43, R44, R45, R46, R47 \ + ) \ + { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, L36 }, \ + { L40, L41, L42, L43, L44, L45, ___ }, \ + { R00, R01, R02, R03, R04, R05, R06, R07}, \ + { R10, R11, R12, R13, R14, R15, R16, R17}, \ + { R20, R21, R22, R23, R24, ___, R26, R27}, \ + { ___, R31, R32, R33, R34, R35, R36, ___}, \ + { ___, ___, R42, R43, R44, R45, R46, R47} \ +} + + +// Used to create a keymap using only KC_ prefixed keys +#define LAYOUT_kc( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R26, R27, \ + L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, R42, R43, R44, R45, R46, R47 \ + ) \ + LAYOUT( \ + KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, KC_##R07, \ + KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, KC_##R17, \ + KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R26, KC_##R27, \ + KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, KC_##R36, \ + KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R42, KC_##R43, KC_##R44, KC_##R45, KC_##R46, KC_##R47 \ + ) From c133f72a4e7881f299c4eefdc655a3af2a0097d5 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Tue, 27 Apr 2021 13:37:18 -0500 Subject: [PATCH 02/27] Update to config.h made corrections to config.h --- keyboards/viktus/sp_mini/config.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h index f6d3c7f3af1e..ba6e801eae7e 100644 --- a/keyboards/viktus/sp_mini/config.h +++ b/keyboards/viktus/sp_mini/config.h @@ -37,12 +37,14 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F0, B5, B4, D7, D6 } #define MATRIX_COL_PINS { B6, C6, C7, D4, D2, D3, D5 } // no B7 on left hand #define MATRIX_ROW_PINS_RIGHT { F0, B5, B4, D7, D6 } -//#define MATRIX_COL_PINS_RIGHT { B6, C6, C7, D4, D2, D3, D5, B7 } -#define MATRIX_COL_PINS_RIGHT { B7, D5, D3, D2, D4, C7, C6, B6 } +#define MATRIX_COL_PINS_RIGHT { B6, C6, C7, D4, D2, D3, D5, B7 } +//#define MATRIX_COL_PINS_RIGHT { B7, D5, D3, D2, D4, C7, C6, B6 } #define DIODE_DIRECTION COL2ROW /* Split Defines */ +#define SPLIT_USB_DETECT + #define MASTER_LEFT #define USE_I2C From 1ff46aaa6a9eb73de023cadcd314eed8a8163705 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Sun, 11 Jul 2021 16:41:39 -0500 Subject: [PATCH 03/27] more changes changes to spumoni firmware --- keyboards/viktus/sp_mini/config.h | 12 ++-- keyboards/viktus/sp_mini/info.json | 71 ++++++++++--------- .../viktus/sp_mini/keymaps/default/keymap.c | 39 ++++++++-- .../viktus/sp_mini/keymaps/default/rules.mk | 1 - keyboards/viktus/sp_mini/keymaps/via/keymap.c | 48 +++++++++++++ keyboards/viktus/sp_mini/keymaps/via/rules.mk | 1 + keyboards/viktus/sp_mini/rules.mk | 3 +- 7 files changed, 125 insertions(+), 50 deletions(-) delete mode 100644 keyboards/viktus/sp_mini/keymaps/default/rules.mk create mode 100644 keyboards/viktus/sp_mini/keymaps/via/keymap.c create mode 100644 keyboards/viktus/sp_mini/keymaps/via/rules.mk diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h index ba6e801eae7e..781c2f5f6390 100644 --- a/keyboards/viktus/sp_mini/config.h +++ b/keyboards/viktus/sp_mini/config.h @@ -22,10 +22,10 @@ along with this program. If not, see . /* USB Device descriptor parameter */ #define VENDOR_ID 0x5644 -#define PRODUCT_ID 0x5111 -#define DEVICE_VER 0x0100 -#define MANUFACTURER Viktus Design -#define PRODUCT SP Mini +#define PRODUCT_ID 0x534D +#define DEVICE_VER 0x0001 +#define MANUFACTURER Viktus_Design +#define PRODUCT SP_Mini /* key matrix size */ // Rows are doubled-up @@ -38,15 +38,13 @@ along with this program. If not, see . #define MATRIX_COL_PINS { B6, C6, C7, D4, D2, D3, D5 } // no B7 on left hand #define MATRIX_ROW_PINS_RIGHT { F0, B5, B4, D7, D6 } #define MATRIX_COL_PINS_RIGHT { B6, C6, C7, D4, D2, D3, D5, B7 } -//#define MATRIX_COL_PINS_RIGHT { B7, D5, D3, D2, D4, C7, C6, B6 } + #define DIODE_DIRECTION COL2ROW /* Split Defines */ #define SPLIT_USB_DETECT - #define MASTER_LEFT - #define USE_I2C /* serial.c configuration for split keyboard */ diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json index 2bbd25ff0a80..c5f1f14048bc 100644 --- a/keyboards/viktus/sp_mini/info.json +++ b/keyboards/viktus/sp_mini/info.json @@ -7,23 +7,24 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"F13", "x":0, "y":0}, - {"label":"Esc", "x":1.25, "y":0}, - {"label":"F1", "x":2.25, "y":0}, - {"label":"F2", "x":3.25, "y":0}, - {"label":"F3", "x":4.25, "y":0}, - {"label":"F4", "x":5.25, "y":0}, - {"label":"F5", "x":6.25, "y":0}, - {"label":"F6", "x":7.75, "y":0}, - {"label":"F7", "x":8.75, "y":0}, - {"label":"F8", "x":9.75, "y":0}, - {"label":"F9", "x":10.75, "y":0}, - {"label":"F10", "x":11.75, "y":0}, - {"label":"F11", "x":12.75, "y":0}, - {"label":"F12", "x":13.75, "y":0}, - {"label":"Delete", "x":15, "y":0}, - {"label":"F14", "x":0, "y":1.25}, - {"label":"Tab", "x":1.25, "y":1.25}, + {"x":0, "y":0}, + {"x":1.25, "y":0}, + {"x":2.25, "y":0}, + {"x":3.25, "y":0}, + {"x":4.25, "y":0}, + {"x":5.25, "y":0}, + {"x":6.25, "y":0}, + {"x":7.75, "y":0}, + {"x":8.75, "y":0}, + {"x":9.75, "y":0}, + {"x":10.75, "y":0}, + {"x":11.75, "y":0}, + {"x":12.75, "y":0}, + {"x":13.75, "y":0}, + {"x":15, "y":0}, + + {"x":0, "y":1.25}, + {"label":"Esc", "x":1.25, "y":1.25}, {"label":"Q", "x":2.25, "y":1.25}, {"label":"W", "x":3.25, "y":1.25}, {"label":"E", "x":4.25, "y":1.25}, @@ -34,12 +35,12 @@ {"label":"I", "x":9.75, "y":1.25}, {"label":"O", "x":10.75, "y":1.25}, {"label":"P", "x":11.75, "y":1.25}, - {"label":"{", "x":12.75, "y":1.25}, - {"label":"}", "x":13.75, "y":1.25}, - {"label":"PgUp", "x":15, "y":1.25}, - {"label":"Backspace", "x":16.25, "y":1.25, "w":2}, - {"label":"F15", "x":0, "y":2.25}, - {"label":"Caps Lock", "x":1.25, "y":2.25, "w":1.25}, + {"label":"Delete", "x":12.75, "y":1.25}, + {"label":"Back", "x":13.75, "y":1.25}, + {"x":15, "y":1.25}, + + {"x":0, "y":2.25}, + {"label":"Tab", "x":1.25, "y":2.25, "w":1.25}, {"label":"A", "x":2.5, "y":2.25}, {"label":"S", "x":3.5, "y":2.25}, {"label":"D", "x":4.5, "y":2.25}, @@ -49,10 +50,11 @@ {"label":"J", "x":9, "y":2.25}, {"label":"K", "x":10, "y":2.25}, {"label":"L", "x":11, "y":2.25}, - {"label":":", "x":12, "y":2.25}, + {"label":"\"", "x":12, "y":2.25}, {"label":"Enter", "x":13, "y":2.25, "w":1.75}, - {"label":"PgDn", "x":15, "y":2.25}, - {"label":"F16", "x":0, "y":3.25}, + {"x":15, "y":2.25}, + + {"x":0, "y":3.25}, {"label":"Shift", "x":1.25, "y":3.25, "w":1.75}, {"label":"Z", "x":3, "y":3.25}, {"label":"X", "x":4, "y":3.25}, @@ -65,18 +67,19 @@ {"label":">", "x":11.5, "y":3.25}, {"label":"Shift", "x":12.5, "y":3.25, "w":1.25}, {"label":"\u2191", "x":14, "y":3.5}, - {"label":"F17", "x":0, "y":4.25}, + + {"x":0, "y":4.25}, {"label":"Ctrl", "x":1.25, "y":4.25, "w":1.25}, - {"label":"Win", "x":2.5, "y":4.25, "w":1.25}, - {"label":"Alt", "x":3.75, "y":4.25, "w":1.25}, - {"x":5, "y":4.25, "w":2.75}, - {"x":8.25, "y":4.25, "w":2.25}, + {"label":"LAlt", "x":2.5, "y":4.25}, + {"label":"LGUI", "x":3.5, "y":4.25}, + {"label":"Fn1", "x":4.5, "y":4.25, "w":1.25}, + {"label":"SPFn1", "x":5.75, "y":4.25, "w":2}, + {"label":"BSFn2", "x":8.25, "y":4.25, "w":2.25}, {"label":"Alt", "x":10.5, "y":4.25, "w":1.25}, - {"label":"Ctrl", "x":11.75, "y":4.25}, + {"label":"Fn2", "x":11.75, "y":4.25}, {"label":"\u2190", "x":13, "y":4.5}, {"label":"\u2193", "x":14, "y":4.5}, - {"label":"\u2192", "x":15, "y":4.5} - ] + {"label":"\u2192", "x":15, "y":4.5}] } } } diff --git a/keyboards/viktus/sp_mini/keymaps/default/keymap.c b/keyboards/viktus/sp_mini/keymaps/default/keymap.c index ff99a33be443..8d2f90186196 100644 --- a/keyboards/viktus/sp_mini/keymaps/default/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/default/keymap.c @@ -6,18 +6,43 @@ // entirely and just use numbers. +#define _BASE 0 +#define _FN1 1 +#define _FN2 2 + enum custom_keycodes { QWERTY = SAFE_RANGE, }; +#define KC_FN1 MO(_FN1) +#define KC_FN2 MO(_FN2) +#define SPFN1 LT(_FN1, KC_SPACE) +#define BSFN2 LT(_FN2, KC_BSPC) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( - KC_F13, 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_DEL, - KC_F14, 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_PGUP, - KC_F15, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_PGDN, - KC_FN1, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, - KC_FN2, KC_LCTL, KC_LGUI, KC_TRNS, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT - ), + [_BASE] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, _______, + _______, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, 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_RSFT, KC_UP, + _______, KC_LCTL, KC_LALT, KC_LGUI, KC_FN1, SPFN1, BSFN2, KC_RALT, KC_FN2, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_FN1] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, 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, _______, + _______, RESET, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, _______, + _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, _______, KC_UP, + _______, RGB_TOG, _______, _______, _______, _______, KC_DEL, KC_0, _______, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_FN2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, + _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, _______, _______, _______, KC_COLN, _______, _______, + _______, _______, _______, _______, KC_DEL, KC_PGDN, KC_END, _______, _______, _______, _______, _______, KC_UP, + _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT + ) }; diff --git a/keyboards/viktus/sp_mini/keymaps/default/rules.mk b/keyboards/viktus/sp_mini/keymaps/default/rules.mk deleted file mode 100644 index e8645f50b66f..000000000000 --- a/keyboards/viktus/sp_mini/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENABLE_VIA = yes diff --git a/keyboards/viktus/sp_mini/keymaps/via/keymap.c b/keyboards/viktus/sp_mini/keymaps/via/keymap.c new file mode 100644 index 000000000000..8d2f90186196 --- /dev/null +++ b/keyboards/viktus/sp_mini/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +#include QMK_KEYBOARD_H + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. + + +#define _BASE 0 +#define _FN1 1 +#define _FN2 2 + +enum custom_keycodes { + QWERTY = SAFE_RANGE, +}; + +#define KC_FN1 MO(_FN1) +#define KC_FN2 MO(_FN2) +#define SPFN1 LT(_FN1, KC_SPACE) +#define BSFN2 LT(_FN2, KC_BSPC) + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, _______, + _______, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, 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_RSFT, KC_UP, + _______, KC_LCTL, KC_LALT, KC_LGUI, KC_FN1, SPFN1, BSFN2, KC_RALT, KC_FN2, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_FN1] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, 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, _______, + _______, RESET, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, _______, + _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, _______, KC_UP, + _______, RGB_TOG, _______, _______, _______, _______, KC_DEL, KC_0, _______, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_FN2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, _______, + _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, _______, _______, _______, KC_COLN, _______, _______, + _______, _______, _______, _______, KC_DEL, KC_PGDN, KC_END, _______, _______, _______, _______, _______, KC_UP, + _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT + ) + +}; diff --git a/keyboards/viktus/sp_mini/keymaps/via/rules.mk b/keyboards/viktus/sp_mini/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/viktus/sp_mini/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/viktus/sp_mini/rules.mk b/keyboards/viktus/sp_mini/rules.mk index ae8c96db4fc7..24a6b04be157 100644 --- a/keyboards/viktus/sp_mini/rules.mk +++ b/keyboards/viktus/sp_mini/rules.mk @@ -9,7 +9,8 @@ MCU = atmega32u4 # QMK DFU qmk-dfu # ATmega32A bootloadHID # ATmega328P USBasp -BOOTLOADER = atmel-dfu +# BOOTLOADER = atmel-dfu +BOOTLOADER = qmk-dfu # Build Options # change to "no" to disable the options, or define them in the Makefile in From b7b3a1267c6ba544b3395e5c15fd1b4f93138a20 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Thu, 29 Jul 2021 18:12:17 -0500 Subject: [PATCH 04/27] updates corrections or changes to code --- keyboards/viktus/sp_mini/config.h | 17 ++++-- .../viktus/sp_mini/keymaps/default/keymap.c | 49 +++++++++++++++ keyboards/viktus/sp_mini/keymaps/via/keymap.c | 59 ++++++++++++++++++- keyboards/viktus/sp_mini/readme.md | 7 ++- keyboards/viktus/sp_mini/rules.mk | 12 +--- 5 files changed, 125 insertions(+), 19 deletions(-) diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h index 781c2f5f6390..372c0115289f 100644 --- a/keyboards/viktus/sp_mini/config.h +++ b/keyboards/viktus/sp_mini/config.h @@ -44,8 +44,13 @@ along with this program. If not, see . /* Split Defines */ #define SPLIT_USB_DETECT -#define MASTER_LEFT +// #define MASTER_LEFTf +//#define RIGHT_HALF_INT_I2C_PULLUPS_OFF +#define LEFT_HALF_INT_I2C_PULLUPS_ON #define USE_I2C +//#define SPLIT_TRANSPORT_MIRROR +#define SPLIT_USB_TIMEOUT 2500 // This sets the maximum timeout when detecting master/slave when using SPLIT_USB_DETECT +#define SPLIT_USB_TIMEOUT_POLL 5 // This sets the poll frequency when detecting master/slave when using SPLIT_USB_DETECT /* serial.c configuration for split keyboard */ //#define SOFT_SERIAL_PIN D1 @@ -65,14 +70,14 @@ along with this program. If not, see . /* ws2812 RGB LED */ #define RGB_DI_PIN E6 #define RGBLIGHT_ANIMATIONS -//#define RGBLIGHT_SPLIT +#define RGBLIGHT_SPLIT #define RGBLED_NUM 24 // Number of LEDs #define RGBLED_SPLIT { 12, 12 } -//#define ENCODERS_PAD_A {F4} -//#define ENCODERS_PAD_B {F1} -//#define ENCODERS_PAD_A_RIGHT {F4} -//#define ENCODERS_PAD_B_RIGHT {F1} +#define ENCODERS_PAD_A {F4} +#define ENCODERS_PAD_B {F1} +#define ENCODERS_PAD_A_RIGHT {F4} +#define ENCODERS_PAD_B_RIGHT {F1} /* diff --git a/keyboards/viktus/sp_mini/keymaps/default/keymap.c b/keyboards/viktus/sp_mini/keymaps/default/keymap.c index 8d2f90186196..048160d43316 100644 --- a/keyboards/viktus/sp_mini/keymaps/default/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/default/keymap.c @@ -46,3 +46,52 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; + +void keyboard_pre_init_user(void) { + setPinOutput(F5); // initialize F5 for left LED + setPinOutput(F6); // initialize F6 for center LED + setPinOutput(F7); // initialize F7 for right LED + +} + +layer_state_t layer_state_set_user(layer_state_t state) { + switch (get_highest_layer(state)) { + case _FN1: + writePinHigh(F5); + writePinLow(F6); + writePinLow(F7); + break; + case _FN2: + writePinHigh(F6); + writePinLow(F5); + writePinLow(F7); + break; +// case _XXXX: // replace 'XXXX' with the layer or function name +// writePinHigh(F7); +// writePinLow(F5); +// writePinLow(F6); +// break; + default: + writePinLow(F5); + writePinLow(F6); + writePinLow(F7); + break; + } + return state; +} + +// void encoder_update_user(uint8_t index, bool clockwise) { +// if (index == 0) { /* First encoder */ +// if (clockwise) { +// tap_code(KC_PGDN); +// } else { +// tap_code(KC_PGUP); +// } +// } else if (index == 1) { /* Second encoder */ +// if (clockwise) { +// tap_code(KC_VOLU); +// } else { +// tap_code(KC_VOLD); +// } +// } +// } diff --git a/keyboards/viktus/sp_mini/keymaps/via/keymap.c b/keyboards/viktus/sp_mini/keymaps/via/keymap.c index 8d2f90186196..9708823e09bb 100644 --- a/keyboards/viktus/sp_mini/keymaps/via/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/via/keymap.c @@ -9,6 +9,7 @@ #define _BASE 0 #define _FN1 1 #define _FN2 2 +#define _FN3 3 enum custom_keycodes { QWERTY = SAFE_RANGE, @@ -43,6 +44,62 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, _______, _______, _______, KC_COLN, _______, _______, _______, _______, _______, _______, KC_DEL, KC_PGDN, KC_END, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT - ) + ), + [_FN3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) }; + +void keyboard_pre_init_user(void) { + setPinOutput(F5); // initialize F5 for left LED + setPinOutput(F6); // initialize F6 for center LED + setPinOutput(F7); // initialize F7 for right LED + +} + +layer_state_t layer_state_set_user(layer_state_t state) { + switch (get_highest_layer(state)) { + case _FN1: + writePinHigh(F5); + writePinLow(F6); + writePinLow(F7); + break; + case _FN2: + writePinHigh(F6); + writePinLow(F5); + writePinLow(F7); + break; +// case _XXXX: // replace 'XXXX' with the layer or function name +// writePinHigh(F7); +// writePinLow(F5); +// writePinLow(F6); +// break; + default: + writePinLow(F5); + writePinLow(F6); + writePinLow(F7); + break; + } + return state; +} + +// void encoder_update_user(uint8_t index, bool clockwise) { +// if (index == 0) { /* First encoder */ +// if (clockwise) { +// tap_code(KC_PGDN); +// } else { +// tap_code(KC_PGUP); +// } +// } else if (index == 1) { /* Second encoder */ +// if (clockwise) { +// tap_code(KC_VOLU); +// } else { +// tap_code(KC_VOLD); +// } +// } +// } diff --git a/keyboards/viktus/sp_mini/readme.md b/keyboards/viktus/sp_mini/readme.md index 525ab96da6a2..e187aa7df7ed 100644 --- a/keyboards/viktus/sp_mini/readme.md +++ b/keyboards/viktus/sp_mini/readme.md @@ -2,13 +2,14 @@ ![sp_mini](imgur.com image replace me!) -The SP Mini is a 40% version of the SP-111 created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner). All design done by BlindAssassin111. The layout includes an F Row, left macro column, and arrows. Rotary encoders are supported in the top left and right positions. +The SP Mini is a 40% version of the SP-111 created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner). All design done by BlindAssassin111. The layout includes an F Row, left macro column, and arrows. Rotary encoders are supported in the top left and right positions. The board also features three through hole LED indicators and RGB underglow. -The SP Mini has dual ATMEGA32U4 controllers linked with USB Type C. Each PCB half has a single reset button and a standard AVR ISP header for reflashing the MCU in case of a bootloader issue. + +The SP Mini has dual ATMEGA32U4 controllers linked with USB Type C. Each PCB half needs to be flashed with the firmware file, and each has a single reset button used for entering DFU mode. Each half also has a standard AVR ISP header for reprogramming the MCU in case of a bootloader issue. * Keyboard Maintainer: [jrfhoutx](https://github.com/jrfhoutx) * Hardware Supported: SP Mini FE (Founder's Edition), SP Mini LC (Low Cal) -* Hardware Availability: Viktus Designs, LLC. +* Hardware Availability: Viktus Designs, LLC. (https://viktus.design/) Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/viktus/sp_mini/rules.mk b/keyboards/viktus/sp_mini/rules.mk index 24a6b04be157..6af398b0cfc1 100644 --- a/keyboards/viktus/sp_mini/rules.mk +++ b/keyboards/viktus/sp_mini/rules.mk @@ -2,15 +2,8 @@ MCU = atmega32u4 # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -# BOOTLOADER = atmel-dfu -BOOTLOADER = qmk-dfu +BOOTLOADER = atmel-dfu +# BOOTLOADER = qmk-dfu # Build Options # change to "no" to disable the options, or define them in the Makefile in @@ -33,3 +26,4 @@ RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend SPLIT_KEYBOARD = yes +ENCODER_ENABLE = yes From b3800d849be6ae50dd5056ad949214c46f47970b Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Thu, 29 Jul 2021 21:35:46 -0500 Subject: [PATCH 05/27] updates corrections and changes made to fix bugs and errors --- keyboards/viktus/sp_mini/config.h | 17 ++-- .../viktus/sp_mini/keymaps/default/keymap.c | 94 ++++++++++++------ keyboards/viktus/sp_mini/keymaps/via/keymap.c | 96 ++++++++++++------- keyboards/viktus/sp_mini/keymaps/via/rules.mk | 1 + keyboards/viktus/sp_mini/readme.md | 7 +- keyboards/viktus/sp_mini/rules.mk | 8 +- keyboards/viktus/sp_mini/sp_mini.c | 8 ++ 7 files changed, 154 insertions(+), 77 deletions(-) diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h index 372c0115289f..9ec53b1f3408 100644 --- a/keyboards/viktus/sp_mini/config.h +++ b/keyboards/viktus/sp_mini/config.h @@ -26,6 +26,7 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 #define MANUFACTURER Viktus_Design #define PRODUCT SP_Mini +//#define VIAL_KEYBOARD_UID {0xC5, 0x02, 0x78, 0x7D, 0x10, 0xBF, 0x5C, 0x55} /* key matrix size */ // Rows are doubled-up @@ -44,13 +45,8 @@ along with this program. If not, see . /* Split Defines */ #define SPLIT_USB_DETECT -// #define MASTER_LEFTf -//#define RIGHT_HALF_INT_I2C_PULLUPS_OFF -#define LEFT_HALF_INT_I2C_PULLUPS_ON +#define MASTER_LEFT #define USE_I2C -//#define SPLIT_TRANSPORT_MIRROR -#define SPLIT_USB_TIMEOUT 2500 // This sets the maximum timeout when detecting master/slave when using SPLIT_USB_DETECT -#define SPLIT_USB_TIMEOUT_POLL 5 // This sets the poll frequency when detecting master/slave when using SPLIT_USB_DETECT /* serial.c configuration for split keyboard */ //#define SOFT_SERIAL_PIN D1 @@ -70,15 +66,18 @@ along with this program. If not, see . /* ws2812 RGB LED */ #define RGB_DI_PIN E6 #define RGBLIGHT_ANIMATIONS -#define RGBLIGHT_SPLIT +//#define RGBLIGHT_SPLIT #define RGBLED_NUM 24 // Number of LEDs #define RGBLED_SPLIT { 12, 12 } + + #define ENCODERS_PAD_A {F4} #define ENCODERS_PAD_B {F1} -#define ENCODERS_PAD_A_RIGHT {F4} -#define ENCODERS_PAD_B_RIGHT {F1} +//#define ENCODERS_PAD_A_RIGHT {F4} +//#define ENCODERS_PAD_B_RIGHT {F1} +#define ENCODER_RESOLUTIONS { 8, 8 } /* * Feature disable options diff --git a/keyboards/viktus/sp_mini/keymaps/default/keymap.c b/keyboards/viktus/sp_mini/keymaps/default/keymap.c index 048160d43316..68074bd91a16 100644 --- a/keyboards/viktus/sp_mini/keymaps/default/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/default/keymap.c @@ -9,6 +9,7 @@ #define _BASE 0 #define _FN1 1 #define _FN2 2 +#define _FN3 3 enum custom_keycodes { QWERTY = SAFE_RANGE, @@ -22,19 +23,19 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, _______, - _______, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F24, _______, _______, + MO(1), KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, _______, + MO(2), KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, 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_RSFT, KC_UP, _______, KC_LCTL, KC_LALT, KC_LGUI, KC_FN1, SPFN1, BSFN2, KC_RALT, KC_FN2, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN1] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 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, _______, - _______, RESET, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, _______, + _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, _______, KC_UP, - _______, RGB_TOG, _______, _______, _______, _______, KC_DEL, KC_0, _______, KC_LEFT, KC_DOWN, KC_RGHT + _______, _______, _______, _______, _______, _______, KC_DEL, KC_0, _______, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN2] = LAYOUT_all( @@ -43,14 +44,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, _______, _______, _______, KC_COLN, _______, _______, _______, _______, _______, _______, KC_DEL, KC_PGDN, KC_END, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_FN3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F24, _______, _______, + MO(1), KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, _______, + MO(2), KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, 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_RSFT, KC_UP, + _______, KC_LCTL, KC_LALT, KC_LGUI, KC_FN1, SPFN1, BSFN2, KC_RALT, KC_FN2, KC_LEFT, KC_DOWN, KC_RGHT ) }; void keyboard_pre_init_user(void) { - setPinOutput(F5); // initialize F5 for left LED - setPinOutput(F6); // initialize F6 for center LED - setPinOutput(F7); // initialize F7 for right LED + setPinOutput(F5); // initialize F5 for LED + setPinOutput(F6); // initialize F6 for LED + setPinOutput(F7); // initialize F7 for LED } @@ -66,11 +75,16 @@ layer_state_t layer_state_set_user(layer_state_t state) { writePinLow(F5); writePinLow(F7); break; -// case _XXXX: // replace 'XXXX' with the layer or function name -// writePinHigh(F7); -// writePinLow(F5); -// writePinLow(F6); -// break; + case _FN3: // replace 'XXXX' with the layer or function name + writePinHigh(F7); + writePinLow(F5); + writePinLow(F6); + break; + case KC_F24: + writePinHigh(F7); + writePinHigh(F5); + writePinHigh(F6); + break; default: writePinLow(F5); writePinLow(F6); @@ -80,18 +94,40 @@ layer_state_t layer_state_set_user(layer_state_t state) { return state; } -// void encoder_update_user(uint8_t index, bool clockwise) { -// if (index == 0) { /* First encoder */ -// if (clockwise) { -// tap_code(KC_PGDN); -// } else { -// tap_code(KC_PGUP); -// } -// } else if (index == 1) { /* Second encoder */ -// if (clockwise) { -// tap_code(KC_VOLU); -// } else { -// tap_code(KC_VOLD); -// } -// } -// } +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code(KC_PGDN); + } else { + tap_code(KC_PGUP); + } + } else if (index == 1) { /* Second encoder */ + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } +} + +bool spongebob_mode = false; +bool spongebob_case = false; +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (spongebob_mode) { + switch(keycode) { + case KC_A...KC_Z: + if (record->event.pressed) { + (spongebob_case ^= 1) == 0 ? tap_code16(S(keycode)) : tap_code(keycode); + return false; break; + } + } + } + switch(keycode) { + case KC_F24: + if (record->event.pressed) { + spongebob_mode ^= 1; + } + return false; break; + } + return true; +} diff --git a/keyboards/viktus/sp_mini/keymaps/via/keymap.c b/keyboards/viktus/sp_mini/keymaps/via/keymap.c index 9708823e09bb..68074bd91a16 100644 --- a/keyboards/viktus/sp_mini/keymaps/via/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/via/keymap.c @@ -23,19 +23,19 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, _______, - _______, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F24, _______, _______, + MO(1), KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, _______, + MO(2), KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, 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_RSFT, KC_UP, _______, KC_LCTL, KC_LALT, KC_LGUI, KC_FN1, SPFN1, BSFN2, KC_RALT, KC_FN2, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN1] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 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, _______, - _______, RESET, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, _______, + _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, _______, KC_UP, - _______, RGB_TOG, _______, _______, _______, _______, KC_DEL, KC_0, _______, KC_LEFT, KC_DOWN, KC_RGHT + _______, _______, _______, _______, _______, _______, KC_DEL, KC_0, _______, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN2] = LAYOUT_all( @@ -47,18 +47,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F24, _______, _______, + MO(1), KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, _______, + MO(2), KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, 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_RSFT, KC_UP, + _______, KC_LCTL, KC_LALT, KC_LGUI, KC_FN1, SPFN1, BSFN2, KC_RALT, KC_FN2, KC_LEFT, KC_DOWN, KC_RGHT ) + }; void keyboard_pre_init_user(void) { - setPinOutput(F5); // initialize F5 for left LED - setPinOutput(F6); // initialize F6 for center LED - setPinOutput(F7); // initialize F7 for right LED + setPinOutput(F5); // initialize F5 for LED + setPinOutput(F6); // initialize F6 for LED + setPinOutput(F7); // initialize F7 for LED } @@ -74,11 +75,16 @@ layer_state_t layer_state_set_user(layer_state_t state) { writePinLow(F5); writePinLow(F7); break; -// case _XXXX: // replace 'XXXX' with the layer or function name -// writePinHigh(F7); -// writePinLow(F5); -// writePinLow(F6); -// break; + case _FN3: // replace 'XXXX' with the layer or function name + writePinHigh(F7); + writePinLow(F5); + writePinLow(F6); + break; + case KC_F24: + writePinHigh(F7); + writePinHigh(F5); + writePinHigh(F6); + break; default: writePinLow(F5); writePinLow(F6); @@ -88,18 +94,40 @@ layer_state_t layer_state_set_user(layer_state_t state) { return state; } -// void encoder_update_user(uint8_t index, bool clockwise) { -// if (index == 0) { /* First encoder */ -// if (clockwise) { -// tap_code(KC_PGDN); -// } else { -// tap_code(KC_PGUP); -// } -// } else if (index == 1) { /* Second encoder */ -// if (clockwise) { -// tap_code(KC_VOLU); -// } else { -// tap_code(KC_VOLD); -// } -// } -// } +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code(KC_PGDN); + } else { + tap_code(KC_PGUP); + } + } else if (index == 1) { /* Second encoder */ + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } +} + +bool spongebob_mode = false; +bool spongebob_case = false; +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (spongebob_mode) { + switch(keycode) { + case KC_A...KC_Z: + if (record->event.pressed) { + (spongebob_case ^= 1) == 0 ? tap_code16(S(keycode)) : tap_code(keycode); + return false; break; + } + } + } + switch(keycode) { + case KC_F24: + if (record->event.pressed) { + spongebob_mode ^= 1; + } + return false; break; + } + return true; +} diff --git a/keyboards/viktus/sp_mini/keymaps/via/rules.mk b/keyboards/viktus/sp_mini/keymaps/via/rules.mk index 1e5b99807cb7..16d33cd89fe4 100644 --- a/keyboards/viktus/sp_mini/keymaps/via/rules.mk +++ b/keyboards/viktus/sp_mini/keymaps/via/rules.mk @@ -1 +1,2 @@ VIA_ENABLE = yes + diff --git a/keyboards/viktus/sp_mini/readme.md b/keyboards/viktus/sp_mini/readme.md index e187aa7df7ed..e9febe3a5da8 100644 --- a/keyboards/viktus/sp_mini/readme.md +++ b/keyboards/viktus/sp_mini/readme.md @@ -2,14 +2,13 @@ ![sp_mini](imgur.com image replace me!) -The SP Mini is a 40% version of the SP-111 created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner). All design done by BlindAssassin111. The layout includes an F Row, left macro column, and arrows. Rotary encoders are supported in the top left and right positions. The board also features three through hole LED indicators and RGB underglow. +The SP Mini is a 40% version of the SP-111 created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner). All design done by BlindAssassin111. The layout includes an F Row, left macro column, and arrows. Rotary encoders are supported in the top left and right positions. - -The SP Mini has dual ATMEGA32U4 controllers linked with USB Type C. Each PCB half needs to be flashed with the firmware file, and each has a single reset button used for entering DFU mode. Each half also has a standard AVR ISP header for reprogramming the MCU in case of a bootloader issue. +The SP Mini has dual ATMEGA32U4 controllers linked with USB Type C. Each PCB half has a single reset button and a standard AVR ISP header. * Keyboard Maintainer: [jrfhoutx](https://github.com/jrfhoutx) * Hardware Supported: SP Mini FE (Founder's Edition), SP Mini LC (Low Cal) -* Hardware Availability: Viktus Designs, LLC. (https://viktus.design/) +* Hardware Availability: Viktus Designs, LLC. Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/viktus/sp_mini/rules.mk b/keyboards/viktus/sp_mini/rules.mk index 6af398b0cfc1..06307a57c063 100644 --- a/keyboards/viktus/sp_mini/rules.mk +++ b/keyboards/viktus/sp_mini/rules.mk @@ -2,8 +2,14 @@ MCU = atmega32u4 # Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp BOOTLOADER = atmel-dfu -# BOOTLOADER = qmk-dfu # Build Options # change to "no" to disable the options, or define them in the Makefile in diff --git a/keyboards/viktus/sp_mini/sp_mini.c b/keyboards/viktus/sp_mini/sp_mini.c index 56859068c1ec..2eb79341239d 100644 --- a/keyboards/viktus/sp_mini/sp_mini.c +++ b/keyboards/viktus/sp_mini/sp_mini.c @@ -1 +1,9 @@ #include "sp_mini.h" + +void keyboard_pre_init_kb(void) { + // enable built in pullups to avoid timeouts when right hand not connected + setPinInputHigh(D0); + setPinInputHigh(D1); + + keyboard_pre_init_user(); +} From 5ba8a37d721b976a7f0d8e43cb8205d9b5016a42 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Wed, 18 Aug 2021 20:57:51 -0500 Subject: [PATCH 06/27] production commit for spumoni files for final production version --- keyboards/sck/test/config.h | 104 ++++++++++++++++++++ keyboards/sck/test/info.json | 0 keyboards/sck/test/keymaps/default/config.h | 18 ++++ keyboards/sck/test/keymaps/default/keymap.c | 66 +++++++++++++ keyboards/sck/test/readme.md | 19 ++++ keyboards/sck/test/rules.mk | 31 ++++++ keyboards/sck/test/test.c | 17 ++++ keyboards/sck/test/test.h | 52 ++++++++++ 8 files changed, 307 insertions(+) create mode 100644 keyboards/sck/test/config.h create mode 100644 keyboards/sck/test/info.json create mode 100644 keyboards/sck/test/keymaps/default/config.h create mode 100644 keyboards/sck/test/keymaps/default/keymap.c create mode 100644 keyboards/sck/test/readme.md create mode 100644 keyboards/sck/test/rules.mk create mode 100644 keyboards/sck/test/test.c create mode 100644 keyboards/sck/test/test.h diff --git a/keyboards/sck/test/config.h b/keyboards/sck/test/config.h new file mode 100644 index 000000000000..19db14eff164 --- /dev/null +++ b/keyboards/sck/test/config.h @@ -0,0 +1,104 @@ +/* +Copyright 2021 jrfhoutx + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x5343 // "SC" +#define PRODUCT_ID 0x0031 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Unknown +#define PRODUCT test + +/* key matrix size */ +#define MATRIX_ROWS 11 +#define MATRIX_COLS 9 + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 18 + +/* + * 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 { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 } +#define MATRIX_COL_PINS { D0, D2, D3, D5, D4, D6, D7, B4, D1 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +#define LED_NUM_LOCK_PIN B5 +#define LED_CAPS_LOCK_PIN C6 +#define LED_SCROLL_LOCK_PIN C7 + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + +// #define RGB_DI_PIN E2 +// #ifdef RGB_DI_PIN +// #define RGBLED_NUM 16 +// #define RGBLIGHT_HUE_STEP 8 +// #define RGBLIGHT_SAT_STEP 8 +// #define RGBLIGHT_VAL_STEP 8 +// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +// /*== all animations enable ==*/ +// #define RGBLIGHT_ANIMATIONS +// /*== or choose animations ==*/ +// #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 +// /*== customize breathing effect ==*/ +// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +// /*==== use exp() and sin() ====*/ +// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +// #endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* 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 diff --git a/keyboards/sck/test/info.json b/keyboards/sck/test/info.json new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/sck/test/keymaps/default/config.h b/keyboards/sck/test/keymaps/default/config.h new file mode 100644 index 000000000000..80bb9c51fed2 --- /dev/null +++ b/keyboards/sck/test/keymaps/default/config.h @@ -0,0 +1,18 @@ +/* Copyright 2021 jrfhoutx + * + * 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 . + */ + +#pragma once + diff --git a/keyboards/sck/test/keymaps/default/keymap.c b/keyboards/sck/test/keymaps/default/keymap.c new file mode 100644 index 000000000000..aebe3214eadb --- /dev/null +++ b/keyboards/sck/test/keymaps/default/keymap.c @@ -0,0 +1,66 @@ +/* Copyright 2021 jrfhoutx + * + * 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 . + */ +#include QMK_KEYBOARD_H + +#define _BASE 0 +#define _FN1 1 +#define _FN2 2 +#define _FN3 3 +help +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _FN1, + _FN2, + _FN3 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_BASE] = LAYOUT_default( + 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_PSCR, KC_SLCK, KC_PAUS, + 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_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_END, KC_PGDN, + 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_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_TRNS, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [_FN1] = LAYOUT_default( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + [_FN2] = LAYOUT_default( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + [_FN3] = LAYOUT_default( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/sck/test/readme.md b/keyboards/sck/test/readme.md new file mode 100644 index 000000000000..ab2a9e779e37 --- /dev/null +++ b/keyboards/sck/test/readme.md @@ -0,0 +1,19 @@ +# test + +![test](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [jrfhoutx](https://github.com/yourusername) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make test:default + +Flashing example for this keyboard: + + make test: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). diff --git a/keyboards/sck/test/rules.mk b/keyboards/sck/test/rules.mk new file mode 100644 index 000000000000..61ecafb71281 --- /dev/null +++ b/keyboards/sck/test/rules.mk @@ -0,0 +1,31 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # 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 = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = yes # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 diff --git a/keyboards/sck/test/test.c b/keyboards/sck/test/test.c new file mode 100644 index 000000000000..5048149c83ac --- /dev/null +++ b/keyboards/sck/test/test.c @@ -0,0 +1,17 @@ +/* Copyright 2021 jrfhoutx + * + * 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 . + */ + +#include "test.h" diff --git a/keyboards/sck/test/test.h b/keyboards/sck/test/test.h new file mode 100644 index 000000000000..bcccae2038d8 --- /dev/null +++ b/keyboards/sck/test/test.h @@ -0,0 +1,52 @@ +/* Copyright 2021 jrfhoutx + * + * 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 . + */ + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ + +#define ___ KC_NO + +#define LAYOUT_default( \ + k00, k01, k02, k03, k04, k05, k06, k07, k67, k66, k64, k63, k62, k65, k61, k68, \ + k10, k18, k11, k12, k13, k14, k15, k16, k17, k77, k70, k76, k74, k72, k75, k71, k78, \ + k20, k28, k21, k22, k23, k24, k25, k26, k27, k27, k86, k84, k83, k82, k85, k81, k88, \ + k30, k38, k31, k32, k33, k34, k35, k36, k37, k97, k96, k94, k92, \ + k40, k41, k42, k43, k44, k45, k46, k47, ka7, ka6, ka4, ka3, k91, \ + k50, k58, k51, k55, k56, k54, k53, k52, ka5, ka1, ka8, + ) + { \ + { k00, k01, k02, k03, k04, k05, k06, k07, ___ }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, ___ }, \ + { k50, k51, k52, k53, k54, k55, k56, ___, k58 }, \ + { ___, k61, k62, k63, k64, k65, k66, k67, k68 }, \ + { k70, k71, k72, ___, k74, k75, k76, k77, k78 }, \ + { ___, k81, k82, k83, k84, k85, k86, ___, k88 }, \ + { ___, k91, k92, ___, k94, ___, k96, k97, ___ }, \ + { ___, ka1, ___, ka3, ka4, ka5, ka6, ka7, ka8 }, +} From 75b2809aff172373abd655d12f7b41d6e34e08e4 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Wed, 18 Aug 2021 22:20:01 -0500 Subject: [PATCH 07/27] Revert "production commit for spumoni" This reverts commit 5ba8a37d721b976a7f0d8e43cb8205d9b5016a42. --- keyboards/sck/test/config.h | 104 -------------------- keyboards/sck/test/info.json | 0 keyboards/sck/test/keymaps/default/config.h | 18 ---- keyboards/sck/test/keymaps/default/keymap.c | 66 ------------- keyboards/sck/test/readme.md | 19 ---- keyboards/sck/test/rules.mk | 31 ------ keyboards/sck/test/test.c | 17 ---- keyboards/sck/test/test.h | 52 ---------- 8 files changed, 307 deletions(-) delete mode 100644 keyboards/sck/test/config.h delete mode 100644 keyboards/sck/test/info.json delete mode 100644 keyboards/sck/test/keymaps/default/config.h delete mode 100644 keyboards/sck/test/keymaps/default/keymap.c delete mode 100644 keyboards/sck/test/readme.md delete mode 100644 keyboards/sck/test/rules.mk delete mode 100644 keyboards/sck/test/test.c delete mode 100644 keyboards/sck/test/test.h diff --git a/keyboards/sck/test/config.h b/keyboards/sck/test/config.h deleted file mode 100644 index 19db14eff164..000000000000 --- a/keyboards/sck/test/config.h +++ /dev/null @@ -1,104 +0,0 @@ -/* -Copyright 2021 jrfhoutx - -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 . -*/ - -#pragma once - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5343 // "SC" -#define PRODUCT_ID 0x0031 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Unknown -#define PRODUCT test - -/* key matrix size */ -#define MATRIX_ROWS 11 -#define MATRIX_COLS 9 - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 18 - -/* - * 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 { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 } -#define MATRIX_COL_PINS { D0, D2, D3, D5, D4, D6, D7, B4, D1 } -#define UNUSED_PINS - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define LED_NUM_LOCK_PIN B5 -#define LED_CAPS_LOCK_PIN C6 -#define LED_SCROLL_LOCK_PIN C7 - -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - -// #define RGB_DI_PIN E2 -// #ifdef RGB_DI_PIN -// #define RGBLED_NUM 16 -// #define RGBLIGHT_HUE_STEP 8 -// #define RGBLIGHT_SAT_STEP 8 -// #define RGBLIGHT_VAL_STEP 8 -// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -// /*== all animations enable ==*/ -// #define RGBLIGHT_ANIMATIONS -// /*== or choose animations ==*/ -// #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 -// /*== customize breathing effect ==*/ -// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -// /*==== use exp() and sin() ====*/ -// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -// #endif - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* 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 diff --git a/keyboards/sck/test/info.json b/keyboards/sck/test/info.json deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/keyboards/sck/test/keymaps/default/config.h b/keyboards/sck/test/keymaps/default/config.h deleted file mode 100644 index 80bb9c51fed2..000000000000 --- a/keyboards/sck/test/keymaps/default/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 jrfhoutx - * - * 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 . - */ - -#pragma once - diff --git a/keyboards/sck/test/keymaps/default/keymap.c b/keyboards/sck/test/keymaps/default/keymap.c deleted file mode 100644 index aebe3214eadb..000000000000 --- a/keyboards/sck/test/keymaps/default/keymap.c +++ /dev/null @@ -1,66 +0,0 @@ -/* Copyright 2021 jrfhoutx - * - * 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 . - */ -#include QMK_KEYBOARD_H - -#define _BASE 0 -#define _FN1 1 -#define _FN2 2 -#define _FN3 3 -help -// Defines names for use in layer keycodes and the keymap -enum layer_names { - _BASE, - _FN1, - _FN2, - _FN3 -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [_BASE] = LAYOUT_default( - 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_PSCR, KC_SLCK, KC_PAUS, - 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_BSPC, KC_INS, KC_HOME, KC_PGUP, - 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_END, KC_PGDN, - 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_NUHS, KC_ENT, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_TRNS, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [_FN1] = LAYOUT_default( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - [_FN2] = LAYOUT_default( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - [_FN3] = LAYOUT_default( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/sck/test/readme.md b/keyboards/sck/test/readme.md deleted file mode 100644 index ab2a9e779e37..000000000000 --- a/keyboards/sck/test/readme.md +++ /dev/null @@ -1,19 +0,0 @@ -# test - -![test](imgur.com image replace me!) - -*A short description of the keyboard/project* - -* Keyboard Maintainer: [jrfhoutx](https://github.com/yourusername) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* - -Make example for this keyboard (after setting up your build environment): - - make test:default - -Flashing example for this keyboard: - - make test: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). diff --git a/keyboards/sck/test/rules.mk b/keyboards/sck/test/rules.mk deleted file mode 100644 index 61ecafb71281..000000000000 --- a/keyboards/sck/test/rules.mk +++ /dev/null @@ -1,31 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # 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 = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -UNICODE_ENABLE = yes # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 diff --git a/keyboards/sck/test/test.c b/keyboards/sck/test/test.c deleted file mode 100644 index 5048149c83ac..000000000000 --- a/keyboards/sck/test/test.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 jrfhoutx - * - * 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 . - */ - -#include "test.h" diff --git a/keyboards/sck/test/test.h b/keyboards/sck/test/test.h deleted file mode 100644 index bcccae2038d8..000000000000 --- a/keyboards/sck/test/test.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2021 jrfhoutx - * - * 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define ___ KC_NO - -#define LAYOUT_default( \ - k00, k01, k02, k03, k04, k05, k06, k07, k67, k66, k64, k63, k62, k65, k61, k68, \ - k10, k18, k11, k12, k13, k14, k15, k16, k17, k77, k70, k76, k74, k72, k75, k71, k78, \ - k20, k28, k21, k22, k23, k24, k25, k26, k27, k27, k86, k84, k83, k82, k85, k81, k88, \ - k30, k38, k31, k32, k33, k34, k35, k36, k37, k97, k96, k94, k92, \ - k40, k41, k42, k43, k44, k45, k46, k47, ka7, ka6, ka4, ka3, k91, \ - k50, k58, k51, k55, k56, k54, k53, k52, ka5, ka1, ka8, - ) - { \ - { k00, k01, k02, k03, k04, k05, k06, k07, ___ }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, ___ }, \ - { k50, k51, k52, k53, k54, k55, k56, ___, k58 }, \ - { ___, k61, k62, k63, k64, k65, k66, k67, k68 }, \ - { k70, k71, k72, ___, k74, k75, k76, k77, k78 }, \ - { ___, k81, k82, k83, k84, k85, k86, ___, k88 }, \ - { ___, k91, k92, ___, k94, ___, k96, k97, ___ }, \ - { ___, ka1, ___, ka3, ka4, ka5, ka6, ka7, ka8 }, -} From b975ed1cec5f5c8ea6773a3f77792b27f3008f3d Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Wed, 18 Aug 2021 22:34:10 -0500 Subject: [PATCH 08/27] Update readme.md --- keyboards/viktus/sp_mini/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/viktus/sp_mini/readme.md b/keyboards/viktus/sp_mini/readme.md index e9febe3a5da8..4397c043712b 100644 --- a/keyboards/viktus/sp_mini/readme.md +++ b/keyboards/viktus/sp_mini/readme.md @@ -2,7 +2,7 @@ ![sp_mini](imgur.com image replace me!) -The SP Mini is a 40% version of the SP-111 created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner). All design done by BlindAssassin111. The layout includes an F Row, left macro column, and arrows. Rotary encoders are supported in the top left and right positions. +The SP Mini is a 40% version of the SP-111 created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner). All design done by BlindAssassin111. The layout includes an F Row, left macro column, and arrows. Rotary encoders are supported in the top left and right positions. The board also features three through hole LED indicators and RGB underglow. The SP Mini has dual ATMEGA32U4 controllers linked with USB Type C. Each PCB half has a single reset button and a standard AVR ISP header. From 409b7e630d5b660def69d1391a3214fb30224846 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 20 Aug 2021 09:43:22 -0500 Subject: [PATCH 09/27] Update keyboards/viktus/sp_mini/sp_mini.h Co-authored-by: Ryan --- keyboards/viktus/sp_mini/sp_mini.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/keyboards/viktus/sp_mini/sp_mini.h b/keyboards/viktus/sp_mini/sp_mini.h index f10eea0d9646..54424b9e1b66 100644 --- a/keyboards/viktus/sp_mini/sp_mini.h +++ b/keyboards/viktus/sp_mini/sp_mini.h @@ -23,20 +23,3 @@ { ___, R31, R32, R33, R34, R35, R36, ___}, \ { ___, ___, R42, R43, R44, R45, R46, R47} \ } - - -// Used to create a keymap using only KC_ prefixed keys -#define LAYOUT_kc( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R26, R27, \ - L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, R42, R43, R44, R45, R46, R47 \ - ) \ - LAYOUT( \ - KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, KC_##R07, \ - KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, KC_##R17, \ - KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R26, KC_##R27, \ - KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, KC_##R36, \ - KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R42, KC_##R43, KC_##R44, KC_##R45, KC_##R46, KC_##R47 \ - ) From 03b5ec93fdbb94e5f801c19cba65352c22569b72 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 20 Aug 2021 09:43:30 -0500 Subject: [PATCH 10/27] Update keyboards/viktus/sp_mini/rules.mk Co-authored-by: Ryan --- keyboards/viktus/sp_mini/rules.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/viktus/sp_mini/rules.mk b/keyboards/viktus/sp_mini/rules.mk index 06307a57c063..8693fb2437f0 100644 --- a/keyboards/viktus/sp_mini/rules.mk +++ b/keyboards/viktus/sp_mini/rules.mk @@ -2,13 +2,6 @@ MCU = atmega32u4 # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = atmel-dfu # Build Options From cc755ee7c5511cd48f7cb77cf4864f066055bfc4 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 20 Aug 2021 09:43:40 -0500 Subject: [PATCH 11/27] Update keyboards/viktus/sp_mini/rules.mk Co-authored-by: Ryan --- keyboards/viktus/sp_mini/rules.mk | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/keyboards/viktus/sp_mini/rules.mk b/keyboards/viktus/sp_mini/rules.mk index 8693fb2437f0..43b0ae8e5a5e 100644 --- a/keyboards/viktus/sp_mini/rules.mk +++ b/keyboards/viktus/sp_mini/rules.mk @@ -5,24 +5,20 @@ MCU = atmega32u4 BOOTLOADER = atmel-dfu # Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically +# change yes to no to disable # BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - +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 +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output SPLIT_KEYBOARD = yes ENCODER_ENABLE = yes From aec99cb81e9428c7954ac84faa861bd4f0738556 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 20 Aug 2021 09:44:00 -0500 Subject: [PATCH 12/27] Update keyboards/viktus/sp_mini/info.json Co-authored-by: Ryan --- keyboards/viktus/sp_mini/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json index c5f1f14048bc..5b207ce8177c 100644 --- a/keyboards/viktus/sp_mini/info.json +++ b/keyboards/viktus/sp_mini/info.json @@ -5,7 +5,7 @@ "width": 16, "height": 5.5, "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ {"x":0, "y":0}, {"x":1.25, "y":0}, From f51e26437c1edace8102b3d4d637e2f81a97115b Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 20 Aug 2021 09:44:08 -0500 Subject: [PATCH 13/27] Update keyboards/viktus/sp_mini/config.h Co-authored-by: Ryan --- keyboards/viktus/sp_mini/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h index 9ec53b1f3408..afc2e9f1f266 100644 --- a/keyboards/viktus/sp_mini/config.h +++ b/keyboards/viktus/sp_mini/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 #define MANUFACTURER Viktus_Design #define PRODUCT SP_Mini -//#define VIAL_KEYBOARD_UID {0xC5, 0x02, 0x78, 0x7D, 0x10, 0xBF, 0x5C, 0x55} /* key matrix size */ // Rows are doubled-up From 0f5e187ffc2c3421e7749cd87c3154d768a8cb47 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 20 Aug 2021 09:44:15 -0500 Subject: [PATCH 14/27] Update keyboards/viktus/sp_mini/config.h Co-authored-by: Ryan --- keyboards/viktus/sp_mini/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h index afc2e9f1f266..57b9fabb682d 100644 --- a/keyboards/viktus/sp_mini/config.h +++ b/keyboards/viktus/sp_mini/config.h @@ -47,10 +47,6 @@ along with this program. If not, see . #define MASTER_LEFT #define USE_I2C -/* serial.c configuration for split keyboard */ -//#define SOFT_SERIAL_PIN D1 - - /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST From b642bfa29d331166614d326d7953fcc5b0cc4432 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 20 Aug 2021 09:45:18 -0500 Subject: [PATCH 15/27] Update keyboards/viktus/sp_mini/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/viktus/sp_mini/keymaps/default/keymap.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/keyboards/viktus/sp_mini/keymaps/default/keymap.c b/keyboards/viktus/sp_mini/keymaps/default/keymap.c index 68074bd91a16..ec56bd77f732 100644 --- a/keyboards/viktus/sp_mini/keymaps/default/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/default/keymap.c @@ -6,10 +6,12 @@ // entirely and just use numbers. -#define _BASE 0 -#define _FN1 1 -#define _FN2 2 -#define _FN3 3 +enum custom_layers { + _BASE, + _FN1, + _FN2, + _FN3, +}; enum custom_keycodes { QWERTY = SAFE_RANGE, From aea5eb53b57d4d0cdba7d124dd99e01fcd0feed5 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 20 Aug 2021 09:45:32 -0500 Subject: [PATCH 16/27] Update keyboards/viktus/sp_mini/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/viktus/sp_mini/keymaps/default/keymap.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/keyboards/viktus/sp_mini/keymaps/default/keymap.c b/keyboards/viktus/sp_mini/keymaps/default/keymap.c index ec56bd77f732..bfc5848ea327 100644 --- a/keyboards/viktus/sp_mini/keymaps/default/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/default/keymap.c @@ -66,32 +66,24 @@ void keyboard_pre_init_user(void) { } layer_state_t layer_state_set_user(layer_state_t state) { + writePinLow(F5); + writePinLow(F6); + writePinLow(F7); switch (get_highest_layer(state)) { case _FN1: writePinHigh(F5); - writePinLow(F6); - writePinLow(F7); break; case _FN2: writePinHigh(F6); - writePinLow(F5); - writePinLow(F7); break; case _FN3: // replace 'XXXX' with the layer or function name writePinHigh(F7); - writePinLow(F5); - writePinLow(F6); break; case KC_F24: writePinHigh(F7); writePinHigh(F5); writePinHigh(F6); break; - default: - writePinLow(F5); - writePinLow(F6); - writePinLow(F7); - break; } return state; } From bc522a5e3f3712a1468ab0ad6642edffdf95bb92 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 20 Aug 2021 09:49:28 -0500 Subject: [PATCH 17/27] Updates Updates to files per requests --- .../viktus/sp_mini/keymaps/default/config.h | 24 ------------------- .../viktus/sp_mini/keymaps/default/keymap.c | 19 ++++++++++++++- keyboards/viktus/sp_mini/keymaps/via/keymap.c | 16 +++++++++++++ keyboards/viktus/sp_mini/readme.md | 2 +- 4 files changed, 35 insertions(+), 26 deletions(-) delete mode 100644 keyboards/viktus/sp_mini/keymaps/default/config.h diff --git a/keyboards/viktus/sp_mini/keymaps/default/config.h b/keyboards/viktus/sp_mini/keymaps/default/config.h deleted file mode 100644 index c21e9fc82515..000000000000 --- a/keyboards/viktus/sp_mini/keymaps/default/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -This is the c configuration file for the keymap - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 . -*/ - -#pragma once - -/* Use I2C or Serial, not both */ -//#define USE_I2C diff --git a/keyboards/viktus/sp_mini/keymaps/default/keymap.c b/keyboards/viktus/sp_mini/keymaps/default/keymap.c index bfc5848ea327..1772edf92b8f 100644 --- a/keyboards/viktus/sp_mini/keymaps/default/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/default/keymap.c @@ -1,3 +1,19 @@ + /* Copyright 2021 jrfhoutx + * + * 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 . + */ + #include QMK_KEYBOARD_H // Each layer gets a name for readability, which is then used in the keymap matrix below. @@ -88,7 +104,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { return state; } -void encoder_update_user(uint8_t index, bool clockwise) { +bool encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { /* First encoder */ if (clockwise) { tap_code(KC_PGDN); @@ -102,6 +118,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { tap_code(KC_VOLD); } } + return true; } bool spongebob_mode = false; diff --git a/keyboards/viktus/sp_mini/keymaps/via/keymap.c b/keyboards/viktus/sp_mini/keymaps/via/keymap.c index 68074bd91a16..a881047fd1b5 100644 --- a/keyboards/viktus/sp_mini/keymaps/via/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/via/keymap.c @@ -1,3 +1,19 @@ + /* Copyright 2021 jrfhoutx + * + * 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 . + */ + #include QMK_KEYBOARD_H // Each layer gets a name for readability, which is then used in the keymap matrix below. diff --git a/keyboards/viktus/sp_mini/readme.md b/keyboards/viktus/sp_mini/readme.md index 4397c043712b..fc990a71ad22 100644 --- a/keyboards/viktus/sp_mini/readme.md +++ b/keyboards/viktus/sp_mini/readme.md @@ -1,6 +1,6 @@ # sp_mini -![sp_mini](imgur.com image replace me!) +![sp_mini](https://i.imgur.com/ayX0wnX.jpg) The SP Mini is a 40% version of the SP-111 created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner). All design done by BlindAssassin111. The layout includes an F Row, left macro column, and arrows. Rotary encoders are supported in the top left and right positions. The board also features three through hole LED indicators and RGB underglow. From 11deb8bbc22e95dc697eb7148ef7dc3ee6d956be Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 20 Aug 2021 14:58:45 -0500 Subject: [PATCH 18/27] Update keyboards/viktus/sp_mini/config.h Co-authored-by: Drashna Jaelre --- keyboards/viktus/sp_mini/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h index 57b9fabb682d..9d956fe124b6 100644 --- a/keyboards/viktus/sp_mini/config.h +++ b/keyboards/viktus/sp_mini/config.h @@ -53,10 +53,6 @@ along with this program. If not, see . /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 -/* 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 /* ws2812 RGB LED */ #define RGB_DI_PIN E6 From 71125743fb8af8f2c94f318a194db83cdaa7738a Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 20 Aug 2021 15:08:38 -0500 Subject: [PATCH 19/27] changes changes made per request --- keyboards/viktus/sp_mini/config.h | 48 +++++++++++++++++------------- keyboards/viktus/sp_mini/sp_mini.c | 16 ++++++++++ keyboards/viktus/sp_mini/sp_mini.h | 16 ++++++++++ 3 files changed, 60 insertions(+), 20 deletions(-) diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h index 57b9fabb682d..4d039954010a 100644 --- a/keyboards/viktus/sp_mini/config.h +++ b/keyboards/viktus/sp_mini/config.h @@ -1,20 +1,18 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 . -*/ + /* Copyright 2021 jrfhoutx + * + * 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 . + */ #pragma once @@ -54,13 +52,23 @@ along with this program. If not, see . #define DEBOUNCE 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE +// #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE +// #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ #define RGB_DI_PIN E6 -#define RGBLIGHT_ANIMATIONS +#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 + //#define RGBLIGHT_SPLIT #define RGBLED_NUM 24 // Number of LEDs #define RGBLED_SPLIT { 12, 12 } diff --git a/keyboards/viktus/sp_mini/sp_mini.c b/keyboards/viktus/sp_mini/sp_mini.c index 2eb79341239d..dd9c0162d625 100644 --- a/keyboards/viktus/sp_mini/sp_mini.c +++ b/keyboards/viktus/sp_mini/sp_mini.c @@ -1,3 +1,19 @@ + /* Copyright 2021 jrfhoutx + * + * 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 . + */ + #include "sp_mini.h" void keyboard_pre_init_kb(void) { diff --git a/keyboards/viktus/sp_mini/sp_mini.h b/keyboards/viktus/sp_mini/sp_mini.h index 54424b9e1b66..6474a4f71ee7 100644 --- a/keyboards/viktus/sp_mini/sp_mini.h +++ b/keyboards/viktus/sp_mini/sp_mini.h @@ -1,3 +1,19 @@ + /* Copyright 2021 jrfhoutx + * + * 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 . + */ + #pragma once #include "quantum.h" From 334a704b28339cc4617d3f89b2807458b5bb00df Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Fri, 20 Aug 2021 15:10:53 -0500 Subject: [PATCH 20/27] Update config.h changes per request --- keyboards/viktus/sp_mini/config.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h index 9d956fe124b6..06b8c2f51a82 100644 --- a/keyboards/viktus/sp_mini/config.h +++ b/keyboards/viktus/sp_mini/config.h @@ -56,7 +56,17 @@ along with this program. If not, see . /* ws2812 RGB LED */ #define RGB_DI_PIN E6 -#define RGBLIGHT_ANIMATIONS +#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 + //#define RGBLIGHT_SPLIT #define RGBLED_NUM 24 // Number of LEDs #define RGBLED_SPLIT { 12, 12 } From 4a5e11e71b013cf4097ba083d6ef2dd90f200c71 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Sun, 22 Aug 2021 14:58:51 -0500 Subject: [PATCH 21/27] Update keyboards/viktus/sp_mini/readme.md Co-authored-by: Ryan --- keyboards/viktus/sp_mini/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/viktus/sp_mini/readme.md b/keyboards/viktus/sp_mini/readme.md index fc990a71ad22..339977be6dc0 100644 --- a/keyboards/viktus/sp_mini/readme.md +++ b/keyboards/viktus/sp_mini/readme.md @@ -1,6 +1,6 @@ # sp_mini -![sp_mini](https://i.imgur.com/ayX0wnX.jpg) +![sp_mini](https://i.imgur.com/ayX0wnXh.jpg) The SP Mini is a 40% version of the SP-111 created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner). All design done by BlindAssassin111. The layout includes an F Row, left macro column, and arrows. Rotary encoders are supported in the top left and right positions. The board also features three through hole LED indicators and RGB underglow. From 65b85c5a1f9060986613824985a7ca36dfbbede8 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Thu, 26 Aug 2021 12:42:32 -0500 Subject: [PATCH 22/27] Update keyboards/viktus/sp_mini/sp_mini.c Co-authored-by: Drashna Jaelre --- keyboards/viktus/sp_mini/sp_mini.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/keyboards/viktus/sp_mini/sp_mini.c b/keyboards/viktus/sp_mini/sp_mini.c index dd9c0162d625..c2ccc6db2ff5 100644 --- a/keyboards/viktus/sp_mini/sp_mini.c +++ b/keyboards/viktus/sp_mini/sp_mini.c @@ -23,3 +23,23 @@ void keyboard_pre_init_kb(void) { keyboard_pre_init_user(); } + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code(KC_PGDN); + } else { + tap_code(KC_PGUP); + } + } else if (index == 1) { /* Second encoder */ + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } + return true; +} +#endif From 98daa6710ad7d3499552f2bb4c8d14ba2eca86f3 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Thu, 26 Aug 2021 12:42:46 -0500 Subject: [PATCH 23/27] Update keyboards/viktus/sp_mini/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- .../viktus/sp_mini/keymaps/default/keymap.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/keyboards/viktus/sp_mini/keymaps/default/keymap.c b/keyboards/viktus/sp_mini/keymaps/default/keymap.c index 1772edf92b8f..e01b6083d7d6 100644 --- a/keyboards/viktus/sp_mini/keymaps/default/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/default/keymap.c @@ -104,22 +104,6 @@ layer_state_t layer_state_set_user(layer_state_t state) { return state; } -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code(KC_PGDN); - } else { - tap_code(KC_PGUP); - } - } else if (index == 1) { /* Second encoder */ - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - return true; -} bool spongebob_mode = false; bool spongebob_case = false; From e72fa77a2b88323c376fcccdb21a6e293fa1d4f8 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Thu, 26 Aug 2021 12:43:00 -0500 Subject: [PATCH 24/27] Update keyboards/viktus/sp_mini/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/viktus/sp_mini/keymaps/via/keymap.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/keyboards/viktus/sp_mini/keymaps/via/keymap.c b/keyboards/viktus/sp_mini/keymaps/via/keymap.c index a881047fd1b5..e54d49a7b32e 100644 --- a/keyboards/viktus/sp_mini/keymaps/via/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/via/keymap.c @@ -22,10 +22,12 @@ // entirely and just use numbers. -#define _BASE 0 -#define _FN1 1 -#define _FN2 2 -#define _FN3 3 +enum custom_layers { + _BASE, + _FN1, + _FN2, + _FN3, +}; enum custom_keycodes { QWERTY = SAFE_RANGE, From 4b397a19278e0f18c5ee3172909682e53e84db59 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Thu, 26 Aug 2021 12:43:14 -0500 Subject: [PATCH 25/27] Update keyboards/viktus/sp_mini/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/viktus/sp_mini/keymaps/via/keymap.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/keyboards/viktus/sp_mini/keymaps/via/keymap.c b/keyboards/viktus/sp_mini/keymaps/via/keymap.c index e54d49a7b32e..128bd949197b 100644 --- a/keyboards/viktus/sp_mini/keymaps/via/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/via/keymap.c @@ -112,21 +112,6 @@ layer_state_t layer_state_set_user(layer_state_t state) { return state; } -void encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code(KC_PGDN); - } else { - tap_code(KC_PGUP); - } - } else if (index == 1) { /* Second encoder */ - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } -} bool spongebob_mode = false; bool spongebob_case = false; From efdc549ad7c4c25be7249f47988821e600a8c8ea Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Thu, 26 Aug 2021 13:04:05 -0500 Subject: [PATCH 26/27] Update keyboards/viktus/sp_mini/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/viktus/sp_mini/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/viktus/sp_mini/keymaps/via/keymap.c b/keyboards/viktus/sp_mini/keymaps/via/keymap.c index 128bd949197b..c3f81fd9d839 100644 --- a/keyboards/viktus/sp_mini/keymaps/via/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/via/keymap.c @@ -126,7 +126,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } } switch(keycode) { - case KC_F24: + case USER00: if (record->event.pressed) { spongebob_mode ^= 1; } From e2f7b23a0ec463275ac1ab652a3d5eb5aac0d5a4 Mon Sep 17 00:00:00 2001 From: "J.Flanagan" Date: Thu, 26 Aug 2021 13:08:58 -0500 Subject: [PATCH 27/27] Update keymap.c --- keyboards/viktus/sp_mini/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/viktus/sp_mini/keymaps/via/keymap.c b/keyboards/viktus/sp_mini/keymaps/via/keymap.c index c3f81fd9d839..e1242d5b9cf4 100644 --- a/keyboards/viktus/sp_mini/keymaps/via/keymap.c +++ b/keyboards/viktus/sp_mini/keymaps/via/keymap.c @@ -41,7 +41,7 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F24, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(1), KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, _______, MO(2), KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, 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_RSFT, KC_UP,