Merge remote-tracking branch 'origin/master' into develop

keyboards/keyten/kt3700/config.h

@@ -0,0 +1,41 @@
+/*
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/*
+ * 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

keyboards/keyten/kt3700/info.json

@@ -0,0 +1,81 @@
+{
+    "keyboard_name": "kt3700",
+	"manufacturer": "keyten",
+    "url": "", 
+    "maintainer": "key10iq",
+	"usb": {
+        "vid": "0xEB69",
+        "pid": "0x3700",
+        "device_version": "0.0.1"
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+	"layout_aliases": {
+		"LAYOUT_all": "LAYOUT_ortho_6x4"
+	},
+    "community_layouts": ["numpad_6x4", "ortho_6x4"],
+    "layouts": {
+		"LAYOUT_numpad_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":0, "y":3}, 
+				{"x":1, "y":3}, 
+				{"x":2, "y":3}, 
+
+				{"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":0, "y":6, "w":2}, 
+				{"x":2, "y":6},
+				{"x":3, "y":5, "h":2}
+            ]
+        },
+		"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":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}
+			]
+        }
+    }
+}

keyboards/keyten/kt3700/keymaps/default/keymap.c

@@ -0,0 +1,28 @@
+/* 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 <http://www.gnu.org/licenses/>. 
+ */  
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[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,
+		KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+		KC_P1,   KC_P2,   KC_P3,   KC_DEL,
+		KC_INS,  KC_P0,   KC_PDOT, KC_PENT)
+};

keyboards/keyten/kt3700/keymaps/default/readme.md

@@ -0,0 +1 @@
+# The default keymap for kt3700

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 <http://www.gnu.org/licenses/>. 
+ */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[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,
+		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(
+		_______, _______, _______, _______,
+		_______, _______, _______, _______,
+		_______, _______, _______, _______,
+		_______, _______, _______, _______,
+		_______, _______, _______, _______,
+		_______, _______, _______, _______),
+
+	[2] = LAYOUT_ortho_6x4(
+		_______, _______, _______, _______,
+		_______, _______, _______, _______,
+		_______, _______, _______, _______,
+		_______, _______, _______, _______,
+		_______, _______, _______, _______,
+		_______, _______, _______, _______),
+
+	[3] = LAYOUT_ortho_6x4(
+		_______, _______, _______, _______,
+		_______, _______, _______, _______,
+		_______, _______, _______, _______,
+		_______, _______, _______, _______,
+		_______, _______, _______, _______,
+		_______, _______, _______, _______)	
+};

keyboards/keyten/kt3700/keymaps/via/readme.md

@@ -0,0 +1 @@
+# The VIA keymap for kt3700

keyboards/keyten/kt3700/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/keyten/kt3700/kt3700.c

@@ -0,0 +1,17 @@
+/* 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 <http://www.gnu.org/licenses/>. 
+ */ 
+
+#include "kt3700.h"

keyboards/keyten/kt3700/kt3700.h

@@ -0,0 +1,87 @@
+/* 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 <http://www.gnu.org/licenses/>. 
+ */ 
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/* 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, \
+	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 }  \
+}

keyboards/keyten/kt3700/readme.md

@@ -0,0 +1,27 @@
+# keyten kt3700
+
+Replacement pcb for Cherry G80-3700.
+
+![kt3700 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

keyboards/keyten/kt3700/rules.mk

@@ -0,0 +1,12 @@
+# 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