From 4b121ee694cb74c4185d50f3eb3194bdbf8df5ec Mon Sep 17 00:00:00 2001 From: Nabos Date: Sat, 5 Mar 2022 11:09:57 +0100 Subject: [PATCH 1/6] new keyboard: 10k (1x5) --- keyboards/handwired/10k/10k.c | 2 ++ keyboards/handwired/10k/10k.h | 12 +++++++ keyboards/handwired/10k/config.h | 36 +++++++++++++++++++ .../handwired/10k/keymaps/default/config.h | 1 + .../handwired/10k/keymaps/default/keymap.c | 11 ++++++ .../handwired/10k/keymaps/default/rules.mk | 1 + keyboards/handwired/10k/keymaps/via/keymap.c | 11 ++++++ keyboards/handwired/10k/keymaps/via/rules.mk | 1 + keyboards/handwired/10k/rules.mk | 29 +++++++++++++++ 9 files changed, 104 insertions(+) create mode 100644 keyboards/handwired/10k/10k.c create mode 100644 keyboards/handwired/10k/10k.h create mode 100644 keyboards/handwired/10k/config.h create mode 100644 keyboards/handwired/10k/keymaps/default/config.h create mode 100644 keyboards/handwired/10k/keymaps/default/keymap.c create mode 100644 keyboards/handwired/10k/keymaps/default/rules.mk create mode 100644 keyboards/handwired/10k/keymaps/via/keymap.c create mode 100644 keyboards/handwired/10k/keymaps/via/rules.mk create mode 100644 keyboards/handwired/10k/rules.mk diff --git a/keyboards/handwired/10k/10k.c b/keyboards/handwired/10k/10k.c new file mode 100644 index 000000000000..4413a031b723 --- /dev/null +++ b/keyboards/handwired/10k/10k.c @@ -0,0 +1,2 @@ +#include "10k.h" + diff --git a/keyboards/handwired/10k/10k.h b/keyboards/handwired/10k/10k.h new file mode 100644 index 000000000000..a07755f97e1c --- /dev/null +++ b/keyboards/handwired/10k/10k.h @@ -0,0 +1,12 @@ +#pragma once + +#include "quantum.h" + +#define LAYOUT_1x5(\ + L00, L01, L02, L03, L04, R04, R03, R02, R01, R00 \ + )\ + {\ + { L00, L01 , L02, L03, L04 }, \ +\ + { R00, R01 , R02, R03, R04 } \ +} diff --git a/keyboards/handwired/10k/config.h b/keyboards/handwired/10k/config.h new file mode 100644 index 000000000000..4269bce81e60 --- /dev/null +++ b/keyboards/handwired/10k/config.h @@ -0,0 +1,36 @@ +#pragma once +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x6869 // nabos +#define PRODUCT_ID 0x0001 // 10k +#define DEVICE_VER 0x0001 +#define MANUFACTURER nabos +#define PRODUCT 10k (1x5) +#define DESCRIPTION A simple chord keyboard + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 2 +#define MATRIX_COLS 5 + +// wiring of each half +#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } +#define MATRIX_ROW_PINS { B6 } + +#define DIODE_DIRECTION COL2ROW + + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* Enables This makes it easier for fast typists to use dual-function keys */ +#define PERMISSIVE_HOLD + +//#define COMBO_ALLOW_ACTION_KEYS +//#define COMBO_VARIABLE_LEN + +#define USE_I2C +#define MASTER_RIGHT +//#define MASTER_LEFT +//#define EE_HAND diff --git a/keyboards/handwired/10k/keymaps/default/config.h b/keyboards/handwired/10k/keymaps/default/config.h new file mode 100644 index 000000000000..70ace016c483 --- /dev/null +++ b/keyboards/handwired/10k/keymaps/default/config.h @@ -0,0 +1 @@ +//#define COMBO_COUNT 2 diff --git a/keyboards/handwired/10k/keymaps/default/keymap.c b/keyboards/handwired/10k/keymaps/default/keymap.c new file mode 100644 index 000000000000..a7c5c7bdeca7 --- /dev/null +++ b/keyboards/handwired/10k/keymaps/default/keymap.c @@ -0,0 +1,11 @@ +#include QMK_KEYBOARD_H + +extern keymap_config_t keymap_config; + +#define _QWERTY 0 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT_1x5( + KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 + ), +}; diff --git a/keyboards/handwired/10k/keymaps/default/rules.mk b/keyboards/handwired/10k/keymaps/default/rules.mk new file mode 100644 index 000000000000..0c754d7b3ebd --- /dev/null +++ b/keyboards/handwired/10k/keymaps/default/rules.mk @@ -0,0 +1 @@ +#COMBO_ENABLE = yes diff --git a/keyboards/handwired/10k/keymaps/via/keymap.c b/keyboards/handwired/10k/keymaps/via/keymap.c new file mode 100644 index 000000000000..a7c5c7bdeca7 --- /dev/null +++ b/keyboards/handwired/10k/keymaps/via/keymap.c @@ -0,0 +1,11 @@ +#include QMK_KEYBOARD_H + +extern keymap_config_t keymap_config; + +#define _QWERTY 0 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT_1x5( + KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 + ), +}; diff --git a/keyboards/handwired/10k/keymaps/via/rules.mk b/keyboards/handwired/10k/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/handwired/10k/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/10k/rules.mk b/keyboards/handwired/10k/rules.mk new file mode 100644 index 000000000000..387f0d829188 --- /dev/null +++ b/keyboards/handwired/10k/rules.mk @@ -0,0 +1,29 @@ +MCU = atmega32u4 + +BOOTLOADER = caterina + +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = no # Mouse keys(+4700) +EXTRAKEY_ENABLE = no # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # 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 = no # Enable WS2812 RGB underlight. +RGB_MATRIX_ENABLE = no +FAUXCLICKY_ENABLE = no +KEY_LOCK_ENABLE = no +TERMINAL_ENABLE = no + +# 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 +LEADER_ENABLE = no +LTO_ENABLE = yes + +COMBOS_ENABLE = no From 68755991ee6bc41ec6353048d0106fbe03f8d568 Mon Sep 17 00:00:00 2001 From: Nabos Date: Sat, 5 Mar 2022 12:33:06 +0100 Subject: [PATCH 2/6] [Keyboard] 10k Update helper files --- keyboards/handwired/10k/10k.c | 16 ++++++++++ keyboards/handwired/10k/10k.h | 16 ++++++++++ keyboards/handwired/10k/config.h | 16 ++++++++++ keyboards/handwired/10k/info.json | 30 +++++++++++++++++++ .../handwired/10k/keymaps/default/config.h | 1 - .../handwired/10k/keymaps/default/keymap.c | 18 ++++++++++- .../handwired/10k/keymaps/default/rules.mk | 1 - keyboards/handwired/10k/keymaps/via/keymap.c | 18 ++++++++++- keyboards/handwired/10k/readme.md | 24 +++++++++++++++ 9 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 keyboards/handwired/10k/info.json delete mode 100644 keyboards/handwired/10k/keymaps/default/config.h delete mode 100644 keyboards/handwired/10k/keymaps/default/rules.mk create mode 100644 keyboards/handwired/10k/readme.md diff --git a/keyboards/handwired/10k/10k.c b/keyboards/handwired/10k/10k.c index 4413a031b723..bd0babd9569b 100644 --- a/keyboards/handwired/10k/10k.c +++ b/keyboards/handwired/10k/10k.c @@ -1,2 +1,18 @@ +/* +Copyright 2022 Nabos + +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 "10k.h" diff --git a/keyboards/handwired/10k/10k.h b/keyboards/handwired/10k/10k.h index a07755f97e1c..0cada686ad98 100644 --- a/keyboards/handwired/10k/10k.h +++ b/keyboards/handwired/10k/10k.h @@ -1,3 +1,19 @@ +/* +Copyright 2022 Nabos + +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" diff --git a/keyboards/handwired/10k/config.h b/keyboards/handwired/10k/config.h index 4269bce81e60..f34745ed8c4c 100644 --- a/keyboards/handwired/10k/config.h +++ b/keyboards/handwired/10k/config.h @@ -1,3 +1,19 @@ +/* +Copyright 2022 Nabos + +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" diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json new file mode 100644 index 000000000000..cc6b0de39478 --- /dev/null +++ b/keyboards/handwired/10k/info.json @@ -0,0 +1,30 @@ +{ + "keyboard_name": "10k", + "maintainer": "Nabos", + "url": "", + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["B6"] + }, + "usb": { + "device_ver": "0x0001", + "pid": "0x0001", + "vid": "0x6869" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "L00", "x":0.4295, "y":1.011}, + {"label": "L01", "x":1.445, "y":0.819}, + {"label": "L02", "x":2.5385, "y":0.7555}, + {"label": "L03", "x":3.568, "y":1.3745}, + {"label": "L04", "x":4.2, "y":3.987}, + {"label": "R00", "x":5.2, "y":3.987}, + {"label": "R01", "x":5.832, "y":1.3745}, + {"label": "R02", "x":6.8615, "y":0.7555}, + {"label": "R03", "x":7.955, "y":0.819}, + {"label": "R04", "x":8.9705, "y":1.011} + ] + } + } +} diff --git a/keyboards/handwired/10k/keymaps/default/config.h b/keyboards/handwired/10k/keymaps/default/config.h deleted file mode 100644 index 70ace016c483..000000000000 --- a/keyboards/handwired/10k/keymaps/default/config.h +++ /dev/null @@ -1 +0,0 @@ -//#define COMBO_COUNT 2 diff --git a/keyboards/handwired/10k/keymaps/default/keymap.c b/keyboards/handwired/10k/keymaps/default/keymap.c index a7c5c7bdeca7..bc2e7c41314c 100644 --- a/keyboards/handwired/10k/keymaps/default/keymap.c +++ b/keyboards/handwired/10k/keymaps/default/keymap.c @@ -1,3 +1,19 @@ +/* +Copyright 2022 Nabos + +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 extern keymap_config_t keymap_config; @@ -6,6 +22,6 @@ extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_1x5( - KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 + KC_A , KC_S , KC_D , KC_F , KC_SPACE , KC_SPACE , KC_J , KC_K , KC_L , KC_SEMICOLON ), }; diff --git a/keyboards/handwired/10k/keymaps/default/rules.mk b/keyboards/handwired/10k/keymaps/default/rules.mk deleted file mode 100644 index 0c754d7b3ebd..000000000000 --- a/keyboards/handwired/10k/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -#COMBO_ENABLE = yes diff --git a/keyboards/handwired/10k/keymaps/via/keymap.c b/keyboards/handwired/10k/keymaps/via/keymap.c index a7c5c7bdeca7..bc2e7c41314c 100644 --- a/keyboards/handwired/10k/keymaps/via/keymap.c +++ b/keyboards/handwired/10k/keymaps/via/keymap.c @@ -1,3 +1,19 @@ +/* +Copyright 2022 Nabos + +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 extern keymap_config_t keymap_config; @@ -6,6 +22,6 @@ extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_1x5( - KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 + KC_A , KC_S , KC_D , KC_F , KC_SPACE , KC_SPACE , KC_J , KC_K , KC_L , KC_SEMICOLON ), }; diff --git a/keyboards/handwired/10k/readme.md b/keyboards/handwired/10k/readme.md new file mode 100644 index 000000000000..be98f0501d64 --- /dev/null +++ b/keyboards/handwired/10k/readme.md @@ -0,0 +1,24 @@ +# 10k + +*Simple 10 keys chord keyboard* + +* Keyboard Maintainer: [Nabos](https://github.com/nab-os) +* Hardware Supported: *Tested with Elite-C V4 and ProMicro* + +Make example for this keyboard (after setting up your build environment): + + make handwired/10k:default + +Flashing example for this keyboard: + + make handwired/10k: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available From ece4982ae467ce52d53629880c8e79a39bf9e4aa Mon Sep 17 00:00:00 2001 From: Nicolas Ballet Date: Mon, 7 Mar 2022 15:53:01 +0100 Subject: [PATCH 3/6] [Keyboard]: cleaned 10k default config --- keyboards/handwired/10k/config.h | 1 - .../handwired/10k/keymaps/default/keymap.c | 6 ++-- keyboards/handwired/10k/keymaps/via/keymap.c | 6 ++-- keyboards/handwired/10k/rules.mk | 34 +++++++------------ 4 files changed, 19 insertions(+), 28 deletions(-) diff --git a/keyboards/handwired/10k/config.h b/keyboards/handwired/10k/config.h index f34745ed8c4c..01fa2fd2a2f2 100644 --- a/keyboards/handwired/10k/config.h +++ b/keyboards/handwired/10k/config.h @@ -23,7 +23,6 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 #define MANUFACTURER nabos #define PRODUCT 10k (1x5) -#define DESCRIPTION A simple chord keyboard /* key matrix size */ // Rows are doubled-up diff --git a/keyboards/handwired/10k/keymaps/default/keymap.c b/keyboards/handwired/10k/keymaps/default/keymap.c index bc2e7c41314c..c4c723e9a410 100644 --- a/keyboards/handwired/10k/keymaps/default/keymap.c +++ b/keyboards/handwired/10k/keymaps/default/keymap.c @@ -16,9 +16,9 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -extern keymap_config_t keymap_config; - -#define _QWERTY 0 +enum layer_names { + _QWERTY +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_1x5( diff --git a/keyboards/handwired/10k/keymaps/via/keymap.c b/keyboards/handwired/10k/keymaps/via/keymap.c index bc2e7c41314c..c4c723e9a410 100644 --- a/keyboards/handwired/10k/keymaps/via/keymap.c +++ b/keyboards/handwired/10k/keymaps/via/keymap.c @@ -16,9 +16,9 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -extern keymap_config_t keymap_config; - -#define _QWERTY 0 +enum layer_names { + _QWERTY +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_1x5( diff --git a/keyboards/handwired/10k/rules.mk b/keyboards/handwired/10k/rules.mk index 387f0d829188..3b56452159e6 100644 --- a/keyboards/handwired/10k/rules.mk +++ b/keyboards/handwired/10k/rules.mk @@ -1,29 +1,21 @@ +# MCU name MCU = atmega32u4 +# Bootloader selection BOOTLOADER = caterina -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = no # Mouse keys(+4700) -EXTRAKEY_ENABLE = no # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # 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 +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -RGB_MATRIX_ENABLE = no -FAUXCLICKY_ENABLE = no -KEY_LOCK_ENABLE = no -TERMINAL_ENABLE = no - -# 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 -LEADER_ENABLE = no LTO_ENABLE = yes - -COMBOS_ENABLE = no From b6512b1aee648d7894d40b281c1bdc54e26a0180 Mon Sep 17 00:00:00 2001 From: Nicolas Ballet Date: Tue, 8 Mar 2022 10:23:56 +0100 Subject: [PATCH 4/6] [Keyboard]: cleaned 10k default config --- keyboards/handwired/10k/10k.h | 8 ---- keyboards/handwired/10k/config.h | 24 ---------- keyboards/handwired/10k/info.json | 45 ++++++++++++------- .../handwired/10k/keymaps/default/keymap.c | 21 +++++++-- keyboards/handwired/10k/keymaps/via/keymap.c | 21 +++++++-- keyboards/handwired/10k/readme.md | 4 +- keyboards/handwired/10k/rules.mk | 13 ------ 7 files changed, 68 insertions(+), 68 deletions(-) diff --git a/keyboards/handwired/10k/10k.h b/keyboards/handwired/10k/10k.h index 0cada686ad98..8fbabcf6ca1b 100644 --- a/keyboards/handwired/10k/10k.h +++ b/keyboards/handwired/10k/10k.h @@ -18,11 +18,3 @@ along with this program. If not, see . #include "quantum.h" -#define LAYOUT_1x5(\ - L00, L01, L02, L03, L04, R04, R03, R02, R01, R00 \ - )\ - {\ - { L00, L01 , L02, L03, L04 }, \ -\ - { R00, R01 , R02, R03, R04 } \ -} diff --git a/keyboards/handwired/10k/config.h b/keyboards/handwired/10k/config.h index 01fa2fd2a2f2..fff1738ea84b 100644 --- a/keyboards/handwired/10k/config.h +++ b/keyboards/handwired/10k/config.h @@ -18,34 +18,10 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0x6869 // nabos -#define PRODUCT_ID 0x0001 // 10k -#define DEVICE_VER 0x0001 -#define MANUFACTURER nabos #define PRODUCT 10k (1x5) -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 2 -#define MATRIX_COLS 5 - -// wiring of each half -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { B6 } - -#define DIODE_DIRECTION COL2ROW - - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD -//#define COMBO_ALLOW_ACTION_KEYS -//#define COMBO_VARIABLE_LEN - #define USE_I2C #define MASTER_RIGHT -//#define MASTER_LEFT -//#define EE_HAND diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json index cc6b0de39478..30cf48ec30cb 100644 --- a/keyboards/handwired/10k/info.json +++ b/keyboards/handwired/10k/info.json @@ -1,29 +1,44 @@ { "keyboard_name": "10k", "maintainer": "Nabos", - "url": "", + "debounce": 5, + "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5"], - "rows": ["B6"] + "rows": ["B6", "B6"] + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": false }, "usb": { - "device_ver": "0x0001", + "vid": "0x6869", "pid": "0x0001", - "vid": "0x6869" + "device_ver": "0x0001" + }, + "layout_aliases": { + "LAYOUT": "LAYOUT_split_1x5" }, "layouts": { - "LAYOUT": { + "LAYOUT_split_1x5": { "layout": [ - {"label": "L00", "x":0.4295, "y":1.011}, - {"label": "L01", "x":1.445, "y":0.819}, - {"label": "L02", "x":2.5385, "y":0.7555}, - {"label": "L03", "x":3.568, "y":1.3745}, - {"label": "L04", "x":4.2, "y":3.987}, - {"label": "R00", "x":5.2, "y":3.987}, - {"label": "R01", "x":5.832, "y":1.3745}, - {"label": "R02", "x":6.8615, "y":0.7555}, - {"label": "R03", "x":7.955, "y":0.819}, - {"label": "R04", "x":8.9705, "y":1.011} + {"label": "L00", "matrix": [0, 0], "x":0.4295, "y":1.011}, + {"label": "L01", "matrix": [0, 1], "x":1.445, "y":0.819}, + {"label": "L02", "matrix": [0, 2], "x":2.5385, "y":0.7555}, + {"label": "L03", "matrix": [0, 3], "x":3.568, "y":1.3745}, + {"label": "L04", "matrix": [0, 4], "x":4.2, "y":3.987}, + {"label": "R00", "matrix": [1, 0], "x":5.2, "y":3.987}, + {"label": "R01", "matrix": [1, 1], "x":5.832, "y":1.3745}, + {"label": "R02", "matrix": [1, 2], "x":6.8615, "y":0.7555}, + {"label": "R03", "matrix": [1, 3], "x":7.955, "y":0.819}, + {"label": "R04", "matrix": [1, 4], "x":8.9705, "y":1.011} ] } } diff --git a/keyboards/handwired/10k/keymaps/default/keymap.c b/keyboards/handwired/10k/keymaps/default/keymap.c index c4c723e9a410..3bbcff563cca 100644 --- a/keyboards/handwired/10k/keymaps/default/keymap.c +++ b/keyboards/handwired/10k/keymaps/default/keymap.c @@ -17,11 +17,26 @@ along with this program. If not, see . #include QMK_KEYBOARD_H enum layer_names { - _QWERTY + _QWERTY, + _LOWER, + _RAISE, + _ADJUST }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_1x5( - KC_A , KC_S , KC_D , KC_F , KC_SPACE , KC_SPACE , KC_J , KC_K , KC_L , KC_SEMICOLON + [_QWERTY] = LAYOUT_split_1x5( + KC_A , KC_S , KC_D , KC_F ,KC_SPC , KC_SPC , KC_J , KC_K , KC_L ,KC_SCLN ), + + [_LOWER] = LAYOUT_split_1x5( + _______,_______,_______,_______,_______, _______,_______,_______,_______,_______ + ), + + [_RAISE] = LAYOUT_split_1x5( + _______,_______,_______,_______,_______, _______,_______,_______,_______,_______ + ), + + [_ADJUST] = LAYOUT_split_1x5( + _______,_______,_______,_______,_______, _______,_______,_______,_______,_______ + ) }; diff --git a/keyboards/handwired/10k/keymaps/via/keymap.c b/keyboards/handwired/10k/keymaps/via/keymap.c index c4c723e9a410..3bbcff563cca 100644 --- a/keyboards/handwired/10k/keymaps/via/keymap.c +++ b/keyboards/handwired/10k/keymaps/via/keymap.c @@ -17,11 +17,26 @@ along with this program. If not, see . #include QMK_KEYBOARD_H enum layer_names { - _QWERTY + _QWERTY, + _LOWER, + _RAISE, + _ADJUST }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_1x5( - KC_A , KC_S , KC_D , KC_F , KC_SPACE , KC_SPACE , KC_J , KC_K , KC_L , KC_SEMICOLON + [_QWERTY] = LAYOUT_split_1x5( + KC_A , KC_S , KC_D , KC_F ,KC_SPC , KC_SPC , KC_J , KC_K , KC_L ,KC_SCLN ), + + [_LOWER] = LAYOUT_split_1x5( + _______,_______,_______,_______,_______, _______,_______,_______,_______,_______ + ), + + [_RAISE] = LAYOUT_split_1x5( + _______,_______,_______,_______,_______, _______,_______,_______,_______,_______ + ), + + [_ADJUST] = LAYOUT_split_1x5( + _______,_______,_______,_______,_______, _______,_______,_______,_______,_______ + ) }; diff --git a/keyboards/handwired/10k/readme.md b/keyboards/handwired/10k/readme.md index be98f0501d64..270297e92787 100644 --- a/keyboards/handwired/10k/readme.md +++ b/keyboards/handwired/10k/readme.md @@ -1,9 +1,9 @@ # 10k -*Simple 10 keys chord keyboard* +Simple 10 keys chord keyboard * Keyboard Maintainer: [Nabos](https://github.com/nab-os) -* Hardware Supported: *Tested with Elite-C V4 and ProMicro* +* Hardware Supported: Tested with Elite-C V4 and ProMicro Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/handwired/10k/rules.mk b/keyboards/handwired/10k/rules.mk index 3b56452159e6..af5f432a635d 100644 --- a/keyboards/handwired/10k/rules.mk +++ b/keyboards/handwired/10k/rules.mk @@ -4,18 +4,5 @@ MCU = atmega32u4 # Bootloader selection BOOTLOADER = caterina -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - SPLIT_KEYBOARD = yes LTO_ENABLE = yes From b4e14bdf590472645fe47c6b5d5285b4895911a8 Mon Sep 17 00:00:00 2001 From: Nicolas Ballet Date: Thu, 10 Mar 2022 08:58:12 +0100 Subject: [PATCH 5/6] [Keyboard]: cleaned 10k default config --- keyboards/handwired/10k/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json index 30cf48ec30cb..27516953af59 100644 --- a/keyboards/handwired/10k/info.json +++ b/keyboards/handwired/10k/info.json @@ -5,7 +5,7 @@ "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5"], - "rows": ["B6", "B6"] + "rows": ["B6"] }, "features": { "audio": false, @@ -21,7 +21,7 @@ "usb": { "vid": "0x6869", "pid": "0x0001", - "device_ver": "0x0001" + "device_version": "0.0.1" }, "layout_aliases": { "LAYOUT": "LAYOUT_split_1x5" From 774dccbca0984b50cdea6a0f0cc9aeed73a680dd Mon Sep 17 00:00:00 2001 From: Nabos <9805355+nab-os@users.noreply.github.com> Date: Mon, 21 Mar 2022 11:48:59 +0100 Subject: [PATCH 6/6] [Keyboard] 10k: Apply suggestions from code review Co-authored-by: Ryan --- keyboards/handwired/10k/config.h | 3 --- keyboards/handwired/10k/info.json | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/handwired/10k/config.h b/keyboards/handwired/10k/config.h index fff1738ea84b..4ec6d941285c 100644 --- a/keyboards/handwired/10k/config.h +++ b/keyboards/handwired/10k/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT 10k (1x5) - /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json index 27516953af59..7601788ddced 100644 --- a/keyboards/handwired/10k/info.json +++ b/keyboards/handwired/10k/info.json @@ -1,6 +1,7 @@ { "keyboard_name": "10k", "maintainer": "Nabos", + "manufacturer": "Nabos", "debounce": 5, "diode_direction": "COL2ROW", "matrix_pins": {