From 1445aff8d10036ea6ee3294cb36a37f2544529fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyuezp=E2=80=9D?= <“yuezpchn@126.com”> Date: Fri, 27 Oct 2023 16:48:38 +0800 Subject: [PATCH 1/6] add enter67_pcb --- keyboards/enter67/config.h | 18 ++++ keyboards/enter67/halconf.h | 18 ++++ keyboards/enter67/info.json | 105 +++++++++++++++++++++ keyboards/enter67/keymaps/default/keymap.c | 35 +++++++ keyboards/enter67/keymaps/via/keymap.c | 35 +++++++ keyboards/enter67/keymaps/via/rules.mk | 1 + keyboards/enter67/mcuconf.h | 18 ++++ keyboards/enter67/readme.md | 26 +++++ keyboards/enter67/rules.mk | 1 + 9 files changed, 257 insertions(+) create mode 100644 keyboards/enter67/config.h create mode 100644 keyboards/enter67/halconf.h create mode 100644 keyboards/enter67/info.json create mode 100644 keyboards/enter67/keymaps/default/keymap.c create mode 100644 keyboards/enter67/keymaps/via/keymap.c create mode 100644 keyboards/enter67/keymaps/via/rules.mk create mode 100644 keyboards/enter67/mcuconf.h create mode 100644 keyboards/enter67/readme.md create mode 100644 keyboards/enter67/rules.mk diff --git a/keyboards/enter67/config.h b/keyboards/enter67/config.h new file mode 100644 index 000000000000..4cd53889a1f3 --- /dev/null +++ b/keyboards/enter67/config.h @@ -0,0 +1,18 @@ +/* Copyright 2022 LXF-YZP(yuezp) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#pragma once + diff --git a/keyboards/enter67/halconf.h b/keyboards/enter67/halconf.h new file mode 100644 index 000000000000..9666f7185a36 --- /dev/null +++ b/keyboards/enter67/halconf.h @@ -0,0 +1,18 @@ +/* Copyright 2022 LXF-YZP(yuezp) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#pragma once + +#include_next <halconf.h> diff --git a/keyboards/enter67/info.json b/keyboards/enter67/info.json new file mode 100644 index 000000000000..550b837e66ab --- /dev/null +++ b/keyboards/enter67/info.json @@ -0,0 +1,105 @@ +{ + "manufacturer": "KipperSun", + "keyboard_name": "enter67", + "maintainer": "KipperSun", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "url": "", + "usb": { + "device_version": "0.0.1", + "pid": "0xAA66", + "vid": "0x1000" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "B15", + "on_state": 0 + }, + "matrix_pins": { + "cols": ["A7", "B0", "B1", "B2", "B10", "B11", "B12", "B14", "A9", "A10", "A8", "B6", "B7", "B5", "B4"], + "rows": ["A1", "A2", "A3", "A4", "A5"] + }, + "processor": "STM32F072", + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"label": "!", "matrix": [0, 1], "x": 1, "y": 0, "w": 1}, + {"label": "@", "matrix": [0, 2], "x": 2, "y": 0, "w": 1}, + {"label": "#", "matrix": [0, 3], "x": 3, "y": 0, "w": 1}, + {"label": "$", "matrix": [0, 4], "x": 4, "y": 0, "w": 1}, + {"label": "%", "matrix": [0, 5], "x": 5, "y": 0, "w": 1}, + {"label": "^", "matrix": [0, 6], "x": 6, "y": 0, "w": 1}, + {"label": "&", "matrix": [0, 7], "x": 7, "y": 0, "w": 1}, + {"label": "*", "matrix": [0, 8], "x": 8, "y": 0, "w": 1}, + {"label": "(", "matrix": [0, 9], "x": 9, "y": 0, "w": 1}, + {"label": ")", "matrix": [0, 10], "x": 10, "y": 0, "w": 1}, + {"label": "_", "matrix": [0, 11], "x": 11, "y": 0, "w": 1}, + {"label": "+", "matrix": [0, 12], "x": 12, "y": 0, "w": 1}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0, "w": 1}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1, "w": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1, "w": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1, "w": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1, "w": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1, "w": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1, "w": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1, "w": 1}, + {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1}, + {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1, "w": 1}, + {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1, "w": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2, "w": 1}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2, "w": 1}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2, "w": 1}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2, "w": 1}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2, "w": 1}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2, "w": 1}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2, "w": 1}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2, "w": 1}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2, "w": 1}, + {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1}, + {"label": "k90", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1}, + {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2, "w": 1}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3, "w": 1}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3, "w": 1}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3, "w": 1}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3, "w": 1}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3, "w": 1}, + {"label": "Z", "matrix": [3, 7], "x": 2.25, "y": 3, "w": 1}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3, "w": 1}, + {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3, "w": 1}, + {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3, "w": 1}, + {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3, "w": 1}, + {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3, "w": 1}, + {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3, "w": 1}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "K91", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"label": "K92", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4, "w": 1}, + {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4, "w": 1}, + {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4, "w": 1} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/enter67/keymaps/default/keymap.c b/keyboards/enter67/keymaps/default/keymap.c new file mode 100644 index 000000000000..cafa753971fb --- /dev/null +++ b/keyboards/enter67/keymaps/default/keymap.c @@ -0,0 +1,35 @@ +/* Copyright 2022 LXF-YZP(yuezp) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0]=LAYOUT( + KC_ESC, 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_HOME, + 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_END, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + +[1]=LAYOUT( + KC_GRV, 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/enter67/keymaps/via/keymap.c b/keyboards/enter67/keymaps/via/keymap.c new file mode 100644 index 000000000000..cafa753971fb --- /dev/null +++ b/keyboards/enter67/keymaps/via/keymap.c @@ -0,0 +1,35 @@ +/* Copyright 2022 LXF-YZP(yuezp) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0]=LAYOUT( + KC_ESC, 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_HOME, + 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_END, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + +[1]=LAYOUT( + KC_GRV, 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/enter67/keymaps/via/rules.mk b/keyboards/enter67/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/enter67/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/enter67/mcuconf.h b/keyboards/enter67/mcuconf.h new file mode 100644 index 000000000000..94c66dc8967f --- /dev/null +++ b/keyboards/enter67/mcuconf.h @@ -0,0 +1,18 @@ +/* Copyright 2022 LXF-YZP(yuezp) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#pragma once + +#include_next <mcuconf.h> diff --git a/keyboards/enter67/readme.md b/keyboards/enter67/readme.md new file mode 100644 index 000000000000..635e93381274 --- /dev/null +++ b/keyboards/enter67/readme.md @@ -0,0 +1,26 @@ +# ENTER67 - PCB + + + +A 67 layout pcb. + +* Keyboard Maintainer: https://github.com/LXF-YZP +* Hardware Supported: enter67 PCB + +Make example for this keyboard (after setting up your build environment): + + make enter67:default + +Flashing example for this keyboard: + + make enter67: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 `QK_BOOT` if it is available \ No newline at end of file diff --git a/keyboards/enter67/rules.mk b/keyboards/enter67/rules.mk new file mode 100644 index 000000000000..7ff128fa692e --- /dev/null +++ b/keyboards/enter67/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From 0fa566d4525b4d0d6afc845615b0edd184a4a8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyuezp=E2=80=9D?= <“yuezpchn@126.com”> Date: Sat, 28 Oct 2023 00:34:35 +0800 Subject: [PATCH 2/6] format file --- keyboards/enter67/info.json | 205 ++++++++++----------- keyboards/enter67/keymaps/default/keymap.c | 4 +- keyboards/enter67/keymaps/via/keymap.c | 4 +- 3 files changed, 105 insertions(+), 108 deletions(-) diff --git a/keyboards/enter67/info.json b/keyboards/enter67/info.json index 550b837e66ab..901770575b7d 100644 --- a/keyboards/enter67/info.json +++ b/keyboards/enter67/info.json @@ -1,105 +1,102 @@ { - "manufacturer": "KipperSun", - "keyboard_name": "enter67", - "maintainer": "KipperSun", - "bootloader": "stm32-dfu", - "diode_direction": "COL2ROW", - "url": "", - "usb": { - "device_version": "0.0.1", - "pid": "0xAA66", - "vid": "0x1000" - }, - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "nkro": true - }, - "indicators": { - "caps_lock": "B15", - "on_state": 0 - }, - "matrix_pins": { - "cols": ["A7", "B0", "B1", "B2", "B10", "B11", "B12", "B14", "A9", "A10", "A8", "B6", "B7", "B5", "B4"], - "rows": ["A1", "A2", "A3", "A4", "A5"] - }, - "processor": "STM32F072", - "layouts": { - "LAYOUT": { - "layout": [ - {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0, "w": 1}, - {"label": "!", "matrix": [0, 1], "x": 1, "y": 0, "w": 1}, - {"label": "@", "matrix": [0, 2], "x": 2, "y": 0, "w": 1}, - {"label": "#", "matrix": [0, 3], "x": 3, "y": 0, "w": 1}, - {"label": "$", "matrix": [0, 4], "x": 4, "y": 0, "w": 1}, - {"label": "%", "matrix": [0, 5], "x": 5, "y": 0, "w": 1}, - {"label": "^", "matrix": [0, 6], "x": 6, "y": 0, "w": 1}, - {"label": "&", "matrix": [0, 7], "x": 7, "y": 0, "w": 1}, - {"label": "*", "matrix": [0, 8], "x": 8, "y": 0, "w": 1}, - {"label": "(", "matrix": [0, 9], "x": 9, "y": 0, "w": 1}, - {"label": ")", "matrix": [0, 10], "x": 10, "y": 0, "w": 1}, - {"label": "_", "matrix": [0, 11], "x": 11, "y": 0, "w": 1}, - {"label": "+", "matrix": [0, 12], "x": 12, "y": 0, "w": 1}, - {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0, "w": 1}, - - {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1}, - {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1}, - {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1, "w": 1}, - {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1}, - {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1, "w": 1}, - {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1, "w": 1}, - {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1, "w": 1}, - {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1, "w": 1}, - {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1, "w": 1}, - {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1, "w": 1}, - {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1}, - {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1, "w": 1}, - {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1, "w": 1}, - - {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2, "w": 1}, - {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2, "w": 1}, - {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2, "w": 1}, - {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2, "w": 1}, - {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2, "w": 1}, - {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2, "w": 1}, - {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2, "w": 1}, - {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2, "w": 1}, - {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2, "w": 1}, - {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1}, - {"label": "k90", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1}, - {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2, "w": 1}, - - {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, - {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3, "w": 1}, - {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1}, - {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3, "w": 1}, - {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3, "w": 1}, - {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3, "w": 1}, - {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3, "w": 1}, - {"label": "Z", "matrix": [3, 7], "x": 2.25, "y": 3, "w": 1}, - {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3, "w": 1}, - {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3, "w": 1}, - {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3, "w": 1}, - {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3, "w": 1}, - {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3, "w": 1}, - {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3, "w": 1}, - - {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, - {"label": "K91", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"label": "K92", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, - {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4, "w": 1}, - {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4, "w": 1}, - {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4, "w": 1} - ] - } - } -} \ No newline at end of file + "manufacturer": "KipperSun", + "keyboard_name": "enter67", + "maintainer": "KipperSun", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "B15", + "on_state": 0 + }, + "matrix_pins": { + "cols": ["A7", "B0", "B1", "B2", "B10", "B11", "B12", "B14", "A9", "A10", "A8", "B6", "B7", "B5", "B4"], + "rows": ["A1", "A2", "A3", "A4", "A5"] + }, + "processor": "STM32F072", + "url": "", + "usb": { + "device_version": "0.0.1", + "pid": "0xAA66", + "vid": "0x1000" + }, + "community_layouts": ["65_ansi_blocker"], + "layouts": { + "LAYOUT_65_ansi_blocker": { + "layout": [ + {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "!", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "@", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "#", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "$", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "%", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "^", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "&", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "*", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "(", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": ")", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "_", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "+", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1}, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "k90", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 8], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 9], "x": 10.25, "y": 3}, + {"label": "?", "matrix": [3, 10], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3}, + {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3}, + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "K91", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"label": "K92", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4}, + {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4}, + {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/enter67/keymaps/default/keymap.c b/keyboards/enter67/keymaps/default/keymap.c index cafa753971fb..1f3d16c0953d 100644 --- a/keyboards/enter67/keymaps/default/keymap.c +++ b/keyboards/enter67/keymaps/default/keymap.c @@ -18,14 +18,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0]=LAYOUT( +[0]=LAYOUT_65_ansi_blocker( KC_ESC, 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_HOME, 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_END, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), -[1]=LAYOUT( +[1]=LAYOUT_65_ansi_blocker( KC_GRV, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/enter67/keymaps/via/keymap.c b/keyboards/enter67/keymaps/via/keymap.c index cafa753971fb..1f3d16c0953d 100644 --- a/keyboards/enter67/keymaps/via/keymap.c +++ b/keyboards/enter67/keymaps/via/keymap.c @@ -18,14 +18,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0]=LAYOUT( +[0]=LAYOUT_65_ansi_blocker( KC_ESC, 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_HOME, 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_END, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), -[1]=LAYOUT( +[1]=LAYOUT_65_ansi_blocker( KC_GRV, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, From 7966e23732b3cfbd5ad71f402cd5bf8edf8ffb23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyuezp=E2=80=9D?= <“yuezpchn@126.com”> Date: Sat, 28 Oct 2023 03:27:53 +0800 Subject: [PATCH 3/6] format file --- keyboards/enter67/info.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/enter67/info.json b/keyboards/enter67/info.json index 901770575b7d..d89e10984761 100644 --- a/keyboards/enter67/info.json +++ b/keyboards/enter67/info.json @@ -44,6 +44,7 @@ {"label": "+", "matrix": [0, 12], "x": 12, "y": 0}, {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, @@ -59,6 +60,7 @@ {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1}, {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1}, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, @@ -73,6 +75,7 @@ {"label": "k90", "matrix": [2, 11], "x": 11.75, "y": 2}, {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3}, {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3}, @@ -87,6 +90,7 @@ {"label": "Shift", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3}, {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3}, + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, From 1bc7379138f3c3817d801845afe4188be0349c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyuezp=E2=80=9D?= <“yuezpchn@126.com”> Date: Sat, 28 Oct 2023 03:33:30 +0800 Subject: [PATCH 4/6] delete .h file --- keyboards/enter67/config.h | 18 ------------------ keyboards/enter67/halconf.h | 18 ------------------ keyboards/enter67/mcuconf.h | 18 ------------------ 3 files changed, 54 deletions(-) delete mode 100644 keyboards/enter67/config.h delete mode 100644 keyboards/enter67/halconf.h delete mode 100644 keyboards/enter67/mcuconf.h diff --git a/keyboards/enter67/config.h b/keyboards/enter67/config.h deleted file mode 100644 index 4cd53889a1f3..000000000000 --- a/keyboards/enter67/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2022 LXF-YZP(yuezp) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - diff --git a/keyboards/enter67/halconf.h b/keyboards/enter67/halconf.h deleted file mode 100644 index 9666f7185a36..000000000000 --- a/keyboards/enter67/halconf.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2022 LXF-YZP(yuezp) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#pragma once - -#include_next <halconf.h> diff --git a/keyboards/enter67/mcuconf.h b/keyboards/enter67/mcuconf.h deleted file mode 100644 index 94c66dc8967f..000000000000 --- a/keyboards/enter67/mcuconf.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2022 LXF-YZP(yuezp) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#pragma once - -#include_next <mcuconf.h> From 5ec5f0851fc77cfcca5eb5ccb753c7e365493c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyuezp=E2=80=9D?= <“yuezpchn@126.com”> Date: Sat, 28 Oct 2023 14:18:30 +0800 Subject: [PATCH 5/6] modify vid --- keyboards/enter67/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/enter67/info.json b/keyboards/enter67/info.json index d89e10984761..df1d7f6b5b33 100644 --- a/keyboards/enter67/info.json +++ b/keyboards/enter67/info.json @@ -23,7 +23,7 @@ "usb": { "device_version": "0.0.1", "pid": "0xAA66", - "vid": "0x1000" + "vid": "0x4040" }, "community_layouts": ["65_ansi_blocker"], "layouts": { @@ -90,7 +90,7 @@ {"label": "Shift", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3}, {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3}, - + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, From 53e79cc962afd03b0b5e9e99b219b9ef67ba4447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyuezp=E2=80=9D?= <“yuezpchn@126.com”> Date: Sat, 28 Oct 2023 14:20:52 +0800 Subject: [PATCH 6/6] modify md file --- keyboards/enter67/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/enter67/readme.md b/keyboards/enter67/readme.md index 635e93381274..8a4890ff1d5b 100644 --- a/keyboards/enter67/readme.md +++ b/keyboards/enter67/readme.md @@ -2,7 +2,7 @@  -A 67 layout pcb. +67 layout PCB, with option for stepped Caps Lock * Keyboard Maintainer: https://github.com/LXF-YZP * Hardware Supported: enter67 PCB