From 06c22c84e934d24c43413800c0598ebf43a5dce7 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 03:46:31 +0400 Subject: [PATCH 01/31] Create readme.md --- keyboards/keyten/kt3700/readme.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 keyboards/keyten/kt3700/readme.md diff --git a/keyboards/keyten/kt3700/readme.md b/keyboards/keyten/kt3700/readme.md new file mode 100644 index 000000000000..128871bd700d --- /dev/null +++ b/keyboards/keyten/kt3700/readme.md @@ -0,0 +1,27 @@ +# keyten kt3700 + +Replacement pcb for Cherry G80-3700. + +![kt60-M image](https://i.imgur.com/s5NhDAbl.png) + +* Keyboard Maintainer: [keyten](https://github.com/key10iq) +* Hardware Supported: keyten kt3700 +* Hardware Availability: [GB](https://t.me/keytenspcb/44) + +Make example for this keyboard (after setting up your build environment): + + make keyten/kt3700:default + +Flashing example for this keyboard: + + make keyten/kt3700: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 +* Keycode in layout: Press the key mapped to RESET if it is available +* Physical reset button: Hold down the BOOT0 button on the back of the PCB for a couple of seconds, then hold down the RESET button for a second From 8798a5b7b1f795cc6d181a4e8ff82d168f9593ef Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 03:47:20 +0400 Subject: [PATCH 02/31] Add files via upload --- keyboards/keyten/kt3700/config.h | 45 ++++++++++++++++++++++++++ keyboards/keyten/kt3700/info.json | 46 ++++++++++++++++++++++++++ keyboards/keyten/kt3700/kt3700.c | 18 +++++++++++ keyboards/keyten/kt3700/kt3700.h | 54 +++++++++++++++++++++++++++++++ keyboards/keyten/kt3700/rules.mk | 20 ++++++++++++ 5 files changed, 183 insertions(+) create mode 100644 keyboards/keyten/kt3700/config.h create mode 100644 keyboards/keyten/kt3700/info.json create mode 100644 keyboards/keyten/kt3700/kt3700.c create mode 100644 keyboards/keyten/kt3700/kt3700.h create mode 100644 keyboards/keyten/kt3700/rules.mk diff --git a/keyboards/keyten/kt3700/config.h b/keyboards/keyten/kt3700/config.h new file mode 100644 index 000000000000..d77ac6f41697 --- /dev/null +++ b/keyboards/keyten/kt3700/config.h @@ -0,0 +1,45 @@ +/* +Copyright 2022 Ivan Gromov (@key10iq) + +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" + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 4 + +/* + * 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 { B12, B7, B5, B4, B3, A15 } +#define MATRIX_COL_PINS { B0, B13, B9, B8 } + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +#define LED_NUM_LOCK_PIN B6 + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 diff --git a/keyboards/keyten/kt3700/info.json b/keyboards/keyten/kt3700/info.json new file mode 100644 index 000000000000..c83bc9c3ca7d --- /dev/null +++ b/keyboards/keyten/kt3700/info.json @@ -0,0 +1,46 @@ +{ + "keyboard_name": "kt3700", + "manufacturer": "keyten", + "url": "", + "maintainer": "key10iq", + "usb": { + "vid": "0xEB69", + "pid": "0x3700", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT_numpad_6x4": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":3, "y":1}, + + {"x":0, "y":2}, + {"x":1, "y":2}, + {"x":2, "y":2}, + {"x":3, "y":2}, + + {"x":0, "y":3}, + {"x":1, "y":3}, + {"x":2, "y":3}, + {"x":3, "y":3}, + + {"x":0, "y":4}, + {"x":1, "y":4}, + {"x":2, "y":4}, + {"x":3, "y":4}, + + {"x":0, "y":5}, + {"x":1, "y":5}, + {"x":2, "y":5}, + {"x":3, "y":5} + ] + } + } +} diff --git a/keyboards/keyten/kt3700/kt3700.c b/keyboards/keyten/kt3700/kt3700.c new file mode 100644 index 000000000000..0cf60fb46178 --- /dev/null +++ b/keyboards/keyten/kt3700/kt3700.c @@ -0,0 +1,18 @@ + /* Copyright 2022 Ivan Gromov (@key10iq) + * + * 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 "kt3700.h" diff --git a/keyboards/keyten/kt3700/kt3700.h b/keyboards/keyten/kt3700/kt3700.h new file mode 100644 index 000000000000..db59fee01ba7 --- /dev/null +++ b/keyboards/keyten/kt3700/kt3700.h @@ -0,0 +1,54 @@ + /* Copyright 2022 Ivan Gromov (@key10iq) + * + * 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" + +#define XXX KC_NO + +/* LAYOUT_numpad_6x4 + * ┌───┬───┬───┬───┐ + * │00 │01 │02 │03 │ + * ├───┴───┴───┴───┤ + * │ │ + * ├───┬───┬───┬───┤ + * │10 │11 │12 │13 │ + * ├───┼───┼───┼───┤ + * │20 │21 │22 │23 │ + * ├───┼───┼───┼───┤ + * │30 │31 │32 │33 │ + * ├───┼───┼───┼───┤ + * │40 │41 │42 │43 │ + * ├───┼───┼───┼───┤ + * │50 │51 │52 │53 │ + * └───┴───┴───┴───┘ + */ +#define LAYOUT_numpad_6x4( \ + K00, K01, K02, K03, \ + K10, K11, K12, K13, \ + K20, K21, K22, K23, \ + K30, K31, K32, K33, \ + K40, K41, K42, K43, \ + K50, K51, K52, K53 \ +) { \ + { K00, K01, K02, K03 }, \ + { K10, K11, K12, K13 }, \ + { K20, K21, K22, K23 }, \ + { K30, K31, K32, K33 }, \ + { K40, K41, K42, K43 }, \ + { K50, K51, K52, K53 } \ +} diff --git a/keyboards/keyten/kt3700/rules.mk b/keyboards/keyten/kt3700/rules.mk new file mode 100644 index 000000000000..9e19b3bd2f64 --- /dev/null +++ b/keyboards/keyten/kt3700/rules.mk @@ -0,0 +1,20 @@ +# MCU name +MCU = STM32F401 +BOARD = GENERIC_STM32_F401XC + +# Bootloader selection +BOOTLOADER = stm32-dfu + +# Build Options +# change yes to no to disable + +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # 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 # Enable N-key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +LTO_ENABLE = yes From 5883ba39275f055f22f0e46d64eaf6ee40097903 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 03:48:50 +0400 Subject: [PATCH 03/31] Create readme.md --- keyboards/keyten/kt3700/keymaps/default/readme.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/keyten/kt3700/keymaps/default/readme.md diff --git a/keyboards/keyten/kt3700/keymaps/default/readme.md b/keyboards/keyten/kt3700/keymaps/default/readme.md new file mode 100644 index 000000000000..2d315a8536b4 --- /dev/null +++ b/keyboards/keyten/kt3700/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for kt3700 From c332d3b55cb977eede3e68b3c74bca34ec68cea3 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 03:49:05 +0400 Subject: [PATCH 04/31] Add files via upload --- .../keyten/kt3700/keymaps/default/keymap.c | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 keyboards/keyten/kt3700/keymaps/default/keymap.c diff --git a/keyboards/keyten/kt3700/keymaps/default/keymap.c b/keyboards/keyten/kt3700/keymaps/default/keymap.c new file mode 100644 index 000000000000..75cf06970cc1 --- /dev/null +++ b/keyboards/keyten/kt3700/keymaps/default/keymap.c @@ -0,0 +1,36 @@ + /* Copyright 2022 Ivan Gromov (@key10iq) + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_numpad_6x4( + KC_ESC, KC_LCTL, KC_LALT, KC_BSPC, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PSCR, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_DEL, + KC_INS, KC_P0, KC_PDOT, KC_PENT), + + [1] = LAYOUT_numpad_6x4( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______) +}; From d295d8ed26b87724edc78d93f0eddd3c7b61e63f Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 03:49:46 +0400 Subject: [PATCH 05/31] Create readme.md --- keyboards/keyten/kt3700/keymaps/via/readme.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/keyten/kt3700/keymaps/via/readme.md diff --git a/keyboards/keyten/kt3700/keymaps/via/readme.md b/keyboards/keyten/kt3700/keymaps/via/readme.md new file mode 100644 index 000000000000..eb53ddbfe13a --- /dev/null +++ b/keyboards/keyten/kt3700/keymaps/via/readme.md @@ -0,0 +1 @@ +# The VIA keymap for kt3700 From 196378c730c1cae0e2b0436822d2c444af9199b5 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 03:50:09 +0400 Subject: [PATCH 06/31] Add files via upload --- keyboards/keyten/kt3700/keymaps/via/keymap.c | 52 ++++++++++++++++++++ keyboards/keyten/kt3700/keymaps/via/rules.mk | 1 + 2 files changed, 53 insertions(+) create mode 100644 keyboards/keyten/kt3700/keymaps/via/keymap.c create mode 100644 keyboards/keyten/kt3700/keymaps/via/rules.mk diff --git a/keyboards/keyten/kt3700/keymaps/via/keymap.c b/keyboards/keyten/kt3700/keymaps/via/keymap.c new file mode 100644 index 000000000000..4162c7ff3dc1 --- /dev/null +++ b/keyboards/keyten/kt3700/keymaps/via/keymap.c @@ -0,0 +1,52 @@ + /* Copyright 2022 Ivan Gromov (@key10iq) + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_numpad_6x4( + KC_ESC, KC_LCTL, KC_LALT, KC_BSPC, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PSCR, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_DEL, + KC_INS, KC_P0, KC_PDOT, KC_PENT), + + [1] = LAYOUT_numpad_6x4( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______), + + [2] = LAYOUT_numpad_6x4( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______), + + [3] = LAYOUT_numpad_6x4( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______) +}; diff --git a/keyboards/keyten/kt3700/keymaps/via/rules.mk b/keyboards/keyten/kt3700/keymaps/via/rules.mk new file mode 100644 index 000000000000..69de2e4c5a0c --- /dev/null +++ b/keyboards/keyten/kt3700/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From 1962c4e00e85d9c41c8bdea7a3f956752b6d19d5 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:13:30 +0400 Subject: [PATCH 07/31] Update keyboards/keyten/kt3700/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov --- .../keyten/kt3700/keymaps/default/keymap.c | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/keyten/kt3700/keymaps/default/keymap.c b/keyboards/keyten/kt3700/keymaps/default/keymap.c index 75cf06970cc1..86cdc0a55750 100644 --- a/keyboards/keyten/kt3700/keymaps/default/keymap.c +++ b/keyboards/keyten/kt3700/keymaps/default/keymap.c @@ -1,18 +1,18 @@ - /* Copyright 2022 Ivan Gromov (@key10iq) - * - * 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 2022 Ivan Gromov (@key10iq) + * + * 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 From 4dc2e3217583b566ddc225bba6fc7a8507dfcdc5 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:13:47 +0400 Subject: [PATCH 08/31] Update keyboards/keyten/kt3700/kt3700.c Co-authored-by: Sergey Vlasov --- keyboards/keyten/kt3700/kt3700.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/keyten/kt3700/kt3700.c b/keyboards/keyten/kt3700/kt3700.c index 0cf60fb46178..85dee6d6bee1 100644 --- a/keyboards/keyten/kt3700/kt3700.c +++ b/keyboards/keyten/kt3700/kt3700.c @@ -1,18 +1,18 @@ - /* Copyright 2022 Ivan Gromov (@key10iq) - * - * 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 2022 Ivan Gromov (@key10iq) + * + * 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 "kt3700.h" From d973df969b98e5c39364e81681c5606430be7300 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:14:03 +0400 Subject: [PATCH 09/31] Update keyboards/keyten/kt3700/keymaps/via/keymap.c Co-authored-by: Sergey Vlasov --- keyboards/keyten/kt3700/keymaps/via/keymap.c | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/keyten/kt3700/keymaps/via/keymap.c b/keyboards/keyten/kt3700/keymaps/via/keymap.c index 4162c7ff3dc1..7d6149be4699 100644 --- a/keyboards/keyten/kt3700/keymaps/via/keymap.c +++ b/keyboards/keyten/kt3700/keymaps/via/keymap.c @@ -1,18 +1,18 @@ - /* Copyright 2022 Ivan Gromov (@key10iq) - * - * 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 2022 Ivan Gromov (@key10iq) + * + * 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 From 05c6157f134dcbacf88d8d120731b304e15acf85 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:14:12 +0400 Subject: [PATCH 10/31] Update keyboards/keyten/kt3700/kt3700.h Co-authored-by: Sergey Vlasov --- keyboards/keyten/kt3700/kt3700.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/keyten/kt3700/kt3700.h b/keyboards/keyten/kt3700/kt3700.h index db59fee01ba7..fb4873b4c788 100644 --- a/keyboards/keyten/kt3700/kt3700.h +++ b/keyboards/keyten/kt3700/kt3700.h @@ -1,18 +1,18 @@ - /* Copyright 2022 Ivan Gromov (@key10iq) - * - * 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 2022 Ivan Gromov (@key10iq) + * + * 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 From f084d2efaa1f7d8b947e7bcb001eb9a8eba4d342 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:14:34 +0400 Subject: [PATCH 11/31] Update keyboards/keyten/kt3700/readme.md Co-authored-by: Sergey Vlasov --- keyboards/keyten/kt3700/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keyten/kt3700/readme.md b/keyboards/keyten/kt3700/readme.md index 128871bd700d..3e6c35098976 100644 --- a/keyboards/keyten/kt3700/readme.md +++ b/keyboards/keyten/kt3700/readme.md @@ -2,7 +2,7 @@ Replacement pcb for Cherry G80-3700. -![kt60-M image](https://i.imgur.com/s5NhDAbl.png) +![kt3700 image](https://i.imgur.com/s5NhDAbl.png) * Keyboard Maintainer: [keyten](https://github.com/key10iq) * Hardware Supported: keyten kt3700 From b5a82392a59ebce732900315eef80c2c5434e08c Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:15:08 +0400 Subject: [PATCH 12/31] Update keyboards/keyten/kt3700/rules.mk Co-authored-by: Sergey Vlasov --- keyboards/keyten/kt3700/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/keyten/kt3700/rules.mk b/keyboards/keyten/kt3700/rules.mk index 9e19b3bd2f64..6cce425b1eae 100644 --- a/keyboards/keyten/kt3700/rules.mk +++ b/keyboards/keyten/kt3700/rules.mk @@ -17,4 +17,3 @@ NKRO_ENABLE = yes # Enable N-key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes From 4e36f3ca444ef2245e3e1fd3edded35b651df84d Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:21:31 +0400 Subject: [PATCH 13/31] Update kt3700.c --- keyboards/keyten/kt3700/kt3700.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/keyten/kt3700/kt3700.c b/keyboards/keyten/kt3700/kt3700.c index 85dee6d6bee1..63596e1d21af 100644 --- a/keyboards/keyten/kt3700/kt3700.c +++ b/keyboards/keyten/kt3700/kt3700.c @@ -14,5 +14,4 @@ * along with this program. If not, see . */ - #include "kt3700.h" From 852b005aeec8509840d31e5785d36e293077c04b Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:23:51 +0400 Subject: [PATCH 14/31] Update keymap.c --- keyboards/keyten/kt3700/keymaps/via/keymap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/keyten/kt3700/keymaps/via/keymap.c b/keyboards/keyten/kt3700/keymaps/via/keymap.c index 7d6149be4699..034482c07699 100644 --- a/keyboards/keyten/kt3700/keymaps/via/keymap.c +++ b/keyboards/keyten/kt3700/keymaps/via/keymap.c @@ -14,6 +14,7 @@ * along with this program. If not, see . */ + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 852a2a65c1048c92df859e10718c40a4af48020f Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 20:30:09 +0400 Subject: [PATCH 15/31] Update info.json --- keyboards/keyten/kt3700/info.json | 81 +++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 9 deletions(-) diff --git a/keyboards/keyten/kt3700/info.json b/keyboards/keyten/kt3700/info.json index c83bc9c3ca7d..b8598b3e53be 100644 --- a/keyboards/keyten/kt3700/info.json +++ b/keyboards/keyten/kt3700/info.json @@ -8,23 +8,81 @@ "pid": "0x3700", "device_version": "0.0.1" }, + "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { - "LAYOUT_numpad_6x4": { + "LAYOUT_all": { "layout": [ - {"x":0, "y":0}, + {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, + {"x":3, "y":0}, + + {"x":0, "y":2}, + {"x":1, "y":2}, + {"x":2, "y":2}, + {"x":3, "y":2}, + + {"x":0, "y":3}, + {"x":1, "y":3}, + {"x":2, "y":3}, + {"x":3, "y":3}, + + {"x":0, "y":4}, + {"x":1, "y":4}, + {"x":2, "y":4}, + {"x":3, "y":4}, + + {"x":0, "y":5}, + {"x":1, "y":5}, + {"x":2, "y":5}, + {"x":3, "y":5}, + + {"x":0, "y":6}, + {"x":1, "y":6}, + {"x":2, "y":6}, + {"x":3, "y":6} + ] + }, + "LAYOUT_numpad_6x4": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, {"x":3, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, + {"x":0, "y":2}, + {"x":1, "y":2}, + {"x":2, "y":2}, + {"x":3, "y":2}, + + {"x":0, "y":3}, + {"x":1, "y":3}, + {"x":2, "y":3}, + {"x":3, "y":3, "h":2}, + + {"x":0, "y":4}, + {"x":1, "y":4}, + {"x":2, "y":4}, + {"x":0, "y":5}, + {"x":1, "y":5}, + {"x":2, "y":5}, + {"x":3, "y":5, "h":2}, + + {"x":0, "y":6, "w":2}, + {"x":2, "y":6} + ] + }, + "LAYOUT_ortho_6x4": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, - {"x":3, "y":2}, + {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, @@ -34,12 +92,17 @@ {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, - {"x":3, "y":4}, + {"x":3, "y":4}, {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, - {"x":3, "y":5} + {"x":3, "y":5}, + + {"x":0, "y":6}, + {"x":1, "y":6}, + {"x":2, "y":6}, + {"x":3, "y":6} ] } } From 61e2f5f9da877ca99fcd8339c4bc9f09097f1fe5 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 20:30:51 +0400 Subject: [PATCH 16/31] Update kt3700.h --- keyboards/keyten/kt3700/kt3700.h | 68 +++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/keyboards/keyten/kt3700/kt3700.h b/keyboards/keyten/kt3700/kt3700.h index fb4873b4c788..16707fef4db1 100644 --- a/keyboards/keyten/kt3700/kt3700.h +++ b/keyboards/keyten/kt3700/kt3700.h @@ -20,7 +20,7 @@ #define XXX KC_NO -/* LAYOUT_numpad_6x4 +/* LAYOUT_all * ┌───┬───┬───┬───┐ * │00 │01 │02 │03 │ * ├───┴───┴───┴───┤ @@ -37,7 +37,73 @@ * │50 │51 │52 │53 │ * └───┴───┴───┴───┘ */ +#define LAYOUT_all( \ + K00, K01, K02, K03, \ + K10, K11, K12, K13, \ + K20, K21, K22, K23, \ + K30, K31, K32, K33, \ + K40, K41, K42, K43, \ + K50, K51, K52, K53 \ +) { \ + { K00, K01, K02, K03 }, \ + { K10, K11, K12, K13 }, \ + { K20, K21, K22, K23 }, \ + { K30, K31, K32, K33 }, \ + { K40, K41, K42, K43 }, \ + { K50, K51, K52, K53 } \ +} + +/* LAYOUT_numpad_6x4 + * ┌───┬───┬───┬───┐ + * │00 │01 │02 │03 │ + * ├───┴───┴───┴───┤ + * │ │ + * ├───┬───┬───┬───┤ + * │10 │11 │12 │13 │ + * ├───┼───┼───┼───┤ + * │20 │21 │22 │ │ + * ├───┼───┼───┤33 │ + * │30 │31 │32 │ │ + * ├───┼───┼───┼───┤ + * │40 │41 │42 │ │ + * ├───┴───┼───┤53 │ + * │ 51 │52 │ │ + * └───────┴───┴───┘ + */ #define LAYOUT_numpad_6x4( \ + K00, K01, K02, K03, \ + K10, K11, K12, K13, \ + K20, K21, K22, \ + K30, K31, K32, K33, \ + K40, K41, K42, \ + K51, K52, K53 \ +) { \ + { K00, K01, K02, K03 }, \ + { K10, K11, K12, K13 }, \ + { K20, K21, K22, XXX }, \ + { K30, K31, K32, K33 }, \ + { K40, K41, K42, XXX }, \ + { XXX, K51, K52, K53 } \ +} + +/* LAYOUT_ortho_6x4 + * ┌───┬───┬───┬───┐ + * │00 │01 │02 │03 │ + * ├───┴───┴───┴───┤ + * │ │ + * ├───┬───┬───┬───┤ + * │10 │11 │12 │13 │ + * ├───┼───┼───┼───┤ + * │20 │21 │22 │23 │ + * ├───┼───┼───┼───┤ + * │30 │31 │32 │33 │ + * ├───┼───┼───┼───┤ + * │40 │41 │42 │43 │ + * ├───┼───┼───┼───┤ + * │50 │51 │52 │53 │ + * └───┴───┴───┴───┘ + */ +#define LAYOUT_ortho_6x4( \ K00, K01, K02, K03, \ K10, K11, K12, K13, \ K20, K21, K22, K23, \ From 4df3252099ca46565898ddc15b26ea803fd129f0 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 20:31:32 +0400 Subject: [PATCH 17/31] Update keymap.c --- keyboards/keyten/kt3700/keymaps/via/keymap.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/keyboards/keyten/kt3700/keymaps/via/keymap.c b/keyboards/keyten/kt3700/keymaps/via/keymap.c index 034482c07699..d7bc693a701a 100644 --- a/keyboards/keyten/kt3700/keymaps/via/keymap.c +++ b/keyboards/keyten/kt3700/keymaps/via/keymap.c @@ -14,12 +14,11 @@ * along with this program. If not, see . */ - #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_numpad_6x4( + [0] = LAYOUT_all( KC_ESC, KC_LCTL, KC_LALT, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_P7, KC_P8, KC_P9, KC_PSCR, @@ -27,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, KC_P3, KC_DEL, KC_INS, KC_P0, KC_PDOT, KC_PENT), - [1] = LAYOUT_numpad_6x4( + [1] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -35,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______), - [2] = LAYOUT_numpad_6x4( + [2] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -43,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______), - [3] = LAYOUT_numpad_6x4( + [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 26a43068790cfec5c990d51addda46ae1e925b45 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 20:31:56 +0400 Subject: [PATCH 18/31] Update keymap.c --- keyboards/keyten/kt3700/keymaps/default/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/keyten/kt3700/keymaps/default/keymap.c b/keyboards/keyten/kt3700/keymaps/default/keymap.c index 86cdc0a55750..1beb0bc72762 100644 --- a/keyboards/keyten/kt3700/keymaps/default/keymap.c +++ b/keyboards/keyten/kt3700/keymaps/default/keymap.c @@ -12,13 +12,13 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - */ + */ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_numpad_6x4( + [0] = LAYOUT_all( KC_ESC, KC_LCTL, KC_LALT, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_P7, KC_P8, KC_P9, KC_PSCR, @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, KC_P3, KC_DEL, KC_INS, KC_P0, KC_PDOT, KC_PENT), - [1] = LAYOUT_numpad_6x4( + [1] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From a4143f064cc3c28362f036a0dd0690b2bdc0c471 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 20:44:53 +0400 Subject: [PATCH 19/31] Update keyboards/keyten/kt3700/readme.md Co-authored-by: Joel Challis --- keyboards/keyten/kt3700/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keyten/kt3700/readme.md b/keyboards/keyten/kt3700/readme.md index 3e6c35098976..a645013fb23d 100644 --- a/keyboards/keyten/kt3700/readme.md +++ b/keyboards/keyten/kt3700/readme.md @@ -14,7 +14,7 @@ Make example for this keyboard (after setting up your build environment): Flashing example for this keyboard: - make keyten/kt3700:default:flash + make keyten/kt3700: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). From 40bd5bd47ad7403218f01b6aeb90fced0c42401a Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 20:45:09 +0400 Subject: [PATCH 20/31] Update keyboards/keyten/kt3700/rules.mk Co-authored-by: Joel Challis --- keyboards/keyten/kt3700/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/keyten/kt3700/rules.mk b/keyboards/keyten/kt3700/rules.mk index 6cce425b1eae..26b596e6d936 100644 --- a/keyboards/keyten/kt3700/rules.mk +++ b/keyboards/keyten/kt3700/rules.mk @@ -1,6 +1,5 @@ # MCU name MCU = STM32F401 -BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu From c705ee080d45ea339a30391b119464999adc7447 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 21:02:46 +0400 Subject: [PATCH 21/31] Update kt3700.h --- keyboards/keyten/kt3700/kt3700.h | 33 -------------------------------- 1 file changed, 33 deletions(-) diff --git a/keyboards/keyten/kt3700/kt3700.h b/keyboards/keyten/kt3700/kt3700.h index 16707fef4db1..7b65d4ba71ad 100644 --- a/keyboards/keyten/kt3700/kt3700.h +++ b/keyboards/keyten/kt3700/kt3700.h @@ -20,39 +20,6 @@ #define XXX KC_NO -/* LAYOUT_all - * ┌───┬───┬───┬───┐ - * │00 │01 │02 │03 │ - * ├───┴───┴───┴───┤ - * │ │ - * ├───┬───┬───┬───┤ - * │10 │11 │12 │13 │ - * ├───┼───┼───┼───┤ - * │20 │21 │22 │23 │ - * ├───┼───┼───┼───┤ - * │30 │31 │32 │33 │ - * ├───┼───┼───┼───┤ - * │40 │41 │42 │43 │ - * ├───┼───┼───┼───┤ - * │50 │51 │52 │53 │ - * └───┴───┴───┴───┘ - */ -#define LAYOUT_all( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ - { K50, K51, K52, K53 } \ -} - /* LAYOUT_numpad_6x4 * ┌───┬───┬───┬───┐ * │00 │01 │02 │03 │ From ee103a2bc5d729e62fae792d455eadfcd783c374 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 21:03:12 +0400 Subject: [PATCH 22/31] Update info.json --- keyboards/keyten/kt3700/info.json | 36 +++---------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/keyboards/keyten/kt3700/info.json b/keyboards/keyten/kt3700/info.json index b8598b3e53be..20c8698ab9df 100644 --- a/keyboards/keyten/kt3700/info.json +++ b/keyboards/keyten/kt3700/info.json @@ -8,41 +8,11 @@ "pid": "0x3700", "device_version": "0.0.1" }, + "layout_aliases": { + "LAYOUT_all": "LAYOUT_ortho_6x4" + }, "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { - "LAYOUT_all": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - - {"x":0, "y":5}, - {"x":1, "y":5}, - {"x":2, "y":5}, - {"x":3, "y":5}, - - {"x":0, "y":6}, - {"x":1, "y":6}, - {"x":2, "y":6}, - {"x":3, "y":6} - ] - }, "LAYOUT_numpad_6x4": { "layout": [ {"x":0, "y":0}, From a800c52a16ccda9072c4cf491825a6e6a6ffc68c Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 21:04:23 +0400 Subject: [PATCH 23/31] Update keymap.c --- keyboards/keyten/kt3700/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/keyten/kt3700/keymaps/default/keymap.c b/keyboards/keyten/kt3700/keymaps/default/keymap.c index 1beb0bc72762..6859a7023538 100644 --- a/keyboards/keyten/kt3700/keymaps/default/keymap.c +++ b/keyboards/keyten/kt3700/keymaps/default/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT_ortho_6x4( KC_ESC, KC_LCTL, KC_LALT, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_P7, KC_P8, KC_P9, KC_PSCR, @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, KC_P3, KC_DEL, KC_INS, KC_P0, KC_PDOT, KC_PENT), - [1] = LAYOUT_all( + [1] = LAYOUT_ortho_6x4( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 9698a7ed2272c83d2f60489bde693ace5630092b Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 21:04:40 +0400 Subject: [PATCH 24/31] Update keymap.c --- keyboards/keyten/kt3700/keymaps/via/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/keyten/kt3700/keymaps/via/keymap.c b/keyboards/keyten/kt3700/keymaps/via/keymap.c index d7bc693a701a..46d733eeaed8 100644 --- a/keyboards/keyten/kt3700/keymaps/via/keymap.c +++ b/keyboards/keyten/kt3700/keymaps/via/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT_ortho_6x4( KC_ESC, KC_LCTL, KC_LALT, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_P7, KC_P8, KC_P9, KC_PSCR, @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, KC_P3, KC_DEL, KC_INS, KC_P0, KC_PDOT, KC_PENT), - [1] = LAYOUT_all( + [1] = LAYOUT_ortho_6x4( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______), - [2] = LAYOUT_all( + [2] = LAYOUT_ortho_6x4( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______), - [3] = LAYOUT_all( + [3] = LAYOUT_ortho_6x4( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 225e2fb4230e755105ca313a49b5cdff8b72c91d Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 28 Dec 2022 21:50:57 +0400 Subject: [PATCH 25/31] Update keyboards/keyten/kt3700/keymaps/default/keymap.c Co-authored-by: Joel Challis --- keyboards/keyten/kt3700/keymaps/default/keymap.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/keyboards/keyten/kt3700/keymaps/default/keymap.c b/keyboards/keyten/kt3700/keymaps/default/keymap.c index 6859a7023538..b1d1e5168f3c 100644 --- a/keyboards/keyten/kt3700/keymaps/default/keymap.c +++ b/keyboards/keyten/kt3700/keymaps/default/keymap.c @@ -24,13 +24,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P7, KC_P8, KC_P9, KC_PSCR, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P1, KC_P2, KC_P3, KC_DEL, - KC_INS, KC_P0, KC_PDOT, KC_PENT), - - [1] = LAYOUT_ortho_6x4( - _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, _______) + KC_INS, KC_P0, KC_PDOT, KC_PENT) }; From 4bae272e1ca2cf70d3bed98592f327135e83766a Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 4 Jan 2023 13:27:00 +0400 Subject: [PATCH 26/31] Update keyboards/keyten/kt3700/rules.mk Co-authored-by: Ryan --- keyboards/keyten/kt3700/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keyten/kt3700/rules.mk b/keyboards/keyten/kt3700/rules.mk index 26b596e6d936..bf61fd7c6ec7 100644 --- a/keyboards/keyten/kt3700/rules.mk +++ b/keyboards/keyten/kt3700/rules.mk @@ -6,7 +6,7 @@ BOOTLOADER = stm32-dfu # Build Options # change yes to no to disable - +# BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control From dc116b5ed86ffae8b1f7dd8d36e00b048a8919d8 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Sun, 15 Jan 2023 00:14:25 +0400 Subject: [PATCH 27/31] Update keyboards/keyten/kt3700/info.json Co-authored-by: Sergey Vlasov --- keyboards/keyten/kt3700/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/keyten/kt3700/info.json b/keyboards/keyten/kt3700/info.json index 20c8698ab9df..8c685619ead3 100644 --- a/keyboards/keyten/kt3700/info.json +++ b/keyboards/keyten/kt3700/info.json @@ -28,18 +28,18 @@ {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, - {"x":3, "y":3, "h":2}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, + {"x":3, "y":3, "h":2}, {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, - {"x":3, "y":5, "h":2}, {"x":0, "y":6, "w":2}, {"x":2, "y":6} + {"x":3, "y":5, "h":2}, ] }, "LAYOUT_ortho_6x4": { From 4267b732bd3865db05c9bb8b257625f93c04436c Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Sun, 15 Jan 2023 00:15:02 +0400 Subject: [PATCH 28/31] Update info.json --- keyboards/keyten/kt3700/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/keyten/kt3700/info.json b/keyboards/keyten/kt3700/info.json index 8c685619ead3..27cd7f6339b0 100644 --- a/keyboards/keyten/kt3700/info.json +++ b/keyboards/keyten/kt3700/info.json @@ -38,8 +38,8 @@ {"x":2, "y":5}, {"x":0, "y":6, "w":2}, - {"x":2, "y":6} - {"x":3, "y":5, "h":2}, + {"x":2, "y":6}, + {"x":3, "y":5, "h":2} ] }, "LAYOUT_ortho_6x4": { From d16432e549dbc6a7187b5149fa7f3bebbd3164af Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Sun, 15 Jan 2023 19:12:55 +0400 Subject: [PATCH 29/31] Update keyboards/keyten/kt3700/config.h Co-authored-by: Ryan --- keyboards/keyten/kt3700/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/keyten/kt3700/config.h b/keyboards/keyten/kt3700/config.h index d77ac6f41697..ba1a69c0bd2e 100644 --- a/keyboards/keyten/kt3700/config.h +++ b/keyboards/keyten/kt3700/config.h @@ -19,10 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 4 - /* * Keyboard Matrix Assignments * From 7c4a4e66bba798cabb5c14ce51e1b9f77b4b5714 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Sun, 15 Jan 2023 19:13:12 +0400 Subject: [PATCH 30/31] Update keyboards/keyten/kt3700/rules.mk Co-authored-by: Ryan --- keyboards/keyten/kt3700/rules.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/keyboards/keyten/kt3700/rules.mk b/keyboards/keyten/kt3700/rules.mk index bf61fd7c6ec7..e3ecf72b0853 100644 --- a/keyboards/keyten/kt3700/rules.mk +++ b/keyboards/keyten/kt3700/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F401 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # From ef48f50ee1a3c3ae2abbf93405503dcd6e744ab4 Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Sun, 15 Jan 2023 19:13:33 +0400 Subject: [PATCH 31/31] Update keyboards/keyten/kt3700/info.json Co-authored-by: Ryan --- keyboards/keyten/kt3700/info.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/keyten/kt3700/info.json b/keyboards/keyten/kt3700/info.json index 27cd7f6339b0..fe33c49fa87c 100644 --- a/keyboards/keyten/kt3700/info.json +++ b/keyboards/keyten/kt3700/info.json @@ -8,6 +8,8 @@ "pid": "0x3700", "device_version": "0.0.1" }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", "layout_aliases": { "LAYOUT_all": "LAYOUT_ortho_6x4" },