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

Add CannonKeys Bakeneko65 Hotswap ISO PCB to QMK (#20131 )
* Add CannonKeys Bakeneko65 Hotswap ISO PCB to QMK * Add 65_iso_blocker community layout support
2024-12-04 17:05:17 +00:00 · 2023-03-23 20:26:13 +00:00 · 2023-03-23 20:25:15 +00:00 · 2023-03-23 20:23:28 +00:00 · 2023-03-23 20:22:47 +00:00 · 2023-03-23 20:20:52 +00:00
44 changed files with 976 additions and 6 deletions
--- a/keyboards/25keys/cassette42/common/oled_helper.h
+++ b/keyboards/25keys/cassette42/common/oled_helper.h
@ -1,3 +1,5 @@
+#pragma once
+
 #ifdef OLED_ENABLE

 void render_logo(void);
--- a/keyboards/cannonkeys/bakeneko65_iso_hs/config.h
+++ b/keyboards/cannonkeys/bakeneko65_iso_hs/config.h
@ -0,0 +1,22 @@
+/*
+Copyright 2015 Jun Wako <wakojun@gmail.com>
+
+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
+
+#define BACKLIGHT_PWM_DRIVER    PWMD3
+#define BACKLIGHT_PWM_CHANNEL   1
+#define BACKLIGHT_PAL_MODE      1
--- a/keyboards/cannonkeys/bakeneko65_iso_hs/halconf.h
+++ b/keyboards/cannonkeys/bakeneko65_iso_hs/halconf.h
@ -0,0 +1,27 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/instant65/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
+
--- a/keyboards/cannonkeys/bakeneko65_iso_hs/info.json
+++ b/keyboards/cannonkeys/bakeneko65_iso_hs/info.json
@ -0,0 +1,107 @@
+{
+    "keyboard_name": "Bakeneko65 ISO HS",
+    "manufacturer": "CannonKeys",
+    "url": "https://cannonkeys.com",
+    "maintainer": "awkannan",
+    "usb": {
+        "vid": "0xCA04",
+        "pid": "0x001F",
+        "device_version": "0.0.1"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["A8", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A7", "A5", "A4", "A3", "A2", "A1"],
+        "rows": ["A14", "A15", "A0", "B1", "B0"]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "backlight": true
+    },
+    "backlight": {
+        "breathing": true,
+        "levels": 15,
+        "pin": "A6"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["65_iso_blocker"],
+    "layouts": {
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                { "label": "\u00ac", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+                { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+                { "label": "\"", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+                { "label": "\u00a3", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+                { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+                { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+                { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+                { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+                { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+                { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+                { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+                { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+                { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+                { "label": "Backspace", "matrix": [0, 13], "w": 2, "x": 13.0, "y": 0.0 },
+                { "label": "Home", "matrix": [0, 14], "x": 15.0, "y": 0.0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+                { "label": "PgUp", "matrix": [1, 14], "x": 15.0, "y": 1.0 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+                { "label": "@", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+                { "label": "~", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
+                { "h": 2, "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1.0 },
+                { "label": "PgDn", "matrix": [2, 14], "x": 15.0, "y": 2.0 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
+                { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
+                { "matrix": [3, 13], "x": 14.0, "y": 3.0 },
+                { "label": "End", "matrix": [3, 14], "x": 15.0, "y": 3.0 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
+                { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
+                { "label": "AltGr", "matrix": [4, 10], "w": 1.25, "x": 10.0, "y": 4.0 },
+                { "label": "Ctrl", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4.0 },
+                { "matrix": [4, 12], "x": 13.0, "y": 4.0 },
+                { "matrix": [4, 13], "x": 14.0, "y": 4.0 },
+                { "matrix": [4, 14], "x": 15.0, "y": 4.0 }
+            ]
+        }
+    }
+}
--- a/keyboards/cannonkeys/bakeneko65_iso_hs/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/bakeneko65_iso_hs/keymaps/default/keymap.c
@ -0,0 +1,46 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+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
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+    _BASE,
+    _FN1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[_BASE] = LAYOUT_65_iso_blocker(
+		QK_GESC, 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_INS,
+		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_DEL,
+		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_BSLS, KC_ENT, KC_PGUP,
+		KC_LSFT, KC_BSLS, 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(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_FN1] = LAYOUT_65_iso_blocker(
+		QK_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
+    )
+};
--- a/keyboards/cannonkeys/bakeneko65_iso_hs/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/bakeneko65_iso_hs/keymaps/via/keymap.c
@ -0,0 +1,66 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+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
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+    _BASE,
+    _FN1,
+	_FN2,
+	_FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[_BASE] = LAYOUT_65_iso_blocker(
+		QK_GESC, 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_INS,
+		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_DEL,
+		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_BSLS, KC_ENT, KC_PGUP,
+		KC_LSFT, KC_BSLS, 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(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_FN1] = LAYOUT_65_iso_blocker(
+		QK_GESC, KC_F1,   KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS
+    ),
+
+
+    [_FN2] = LAYOUT_65_iso_blocker(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+
+    [_FN3] = LAYOUT_65_iso_blocker(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
--- a/keyboards/cannonkeys/bakeneko65_iso_hs/keymaps/via/rules.mk
+++ b/keyboards/cannonkeys/bakeneko65_iso_hs/keymaps/via/rules.mk
@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/cannonkeys/bakeneko65_iso_hs/mcuconf.h
+++ b/keyboards/cannonkeys/bakeneko65_iso_hs/mcuconf.h
@ -0,0 +1,28 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/instant65/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
--- a/keyboards/cannonkeys/bakeneko65_iso_hs/readme.md
+++ b/keyboards/cannonkeys/bakeneko65_iso_hs/readme.md
@ -0,0 +1,24 @@
+# Bakeneko65 ISO Hotswap
+
+Bakeneko65 ISO Hotswap Keyboard
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/bakeneko65_iso_hs:default
+
+Flashing example for this keyboard:
+
+    make cannonkeys/bakeneko65_iso_hs: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**: Toggle the switch on the back of the pcb to "0" and briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
--- a/keyboards/cannonkeys/bakeneko65_iso_hs/rules.mk
+++ b/keyboards/cannonkeys/bakeneko65_iso_hs/rules.mk
@ -0,0 +1,5 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/doio/kb16/lib/bongocat/bongocat.h
+++ b/keyboards/doio/kb16/lib/bongocat/bongocat.h
@ -14,4 +14,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#pragma once
+
 void render_bongocat(void);
--- a/keyboards/doio/kb16/lib/layer_status/layer_status.h
+++ b/keyboards/doio/kb16/lib/layer_status/layer_status.h
@ -15,4 +15,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#pragma once
+
 void render_layer_status(void);
--- a/keyboards/doio/kb16/lib/logo.h
+++ b/keyboards/doio/kb16/lib/logo.h
@ -15,4 +15,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#pragma once
+
 void render_logo(void);
--- a/keyboards/gboards/engine/keymap_engine.h
+++ b/keyboards/gboards/engine/keymap_engine.h
@ -7,6 +7,8 @@
 * With this disgusting bodge, you can just edit your .defs and compile!
 */

+#pragma once
+
 // Clear all X Macros
 #define PRES BLANK
 #define KEYS BLANK
--- a/keyboards/gboards/g/config_default.h
+++ b/keyboards/gboards/g/config_default.h
@ -1,3 +1,5 @@
+#pragma once
+
 #include "engine.h"

 // Configuration options for the engine
--- a/keyboards/gboards/g/keymap_combo.h
+++ b/keyboards/gboards/g/keymap_combo.h
@ -1,3 +1,5 @@
+#pragma once
+
 // Keymap helpers
 // define reference layers per layer.
 #define REF_LAYER_FOR_LAYER(LAYER, REF_LAYER)   \
--- a/keyboards/gboards/g/keymap_engine.h
+++ b/keyboards/gboards/g/keymap_engine.h
@ -6,6 +6,9 @@
 * using a external generator (Like is done for the ASETNIOP base keymaps)
 * With this disgusting bodge, you can just edit your .defs and compile!
 */
+
+#pragma once
+
 #include "g/engine.h"

 // Clear all X Macros
--- a/keyboards/gopolar/gg86/lib/logo.h
+++ b/keyboards/gopolar/gg86/lib/logo.h
@ -14,4 +14,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#pragma once
+
 void render_logo(void);
--- a/keyboards/gopolar/gg86/lib/wave.h
+++ b/keyboards/gopolar/gg86/lib/wave.h
@ -15,6 +15,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#pragma once
+
 extern const unsigned char font[] PROGMEM;

 #define ROW_1 OLED_DISPLAY_WIDTH
--- a/keyboards/handwired/d48/taphold.h
+++ b/keyboards/handwired/d48/taphold.h
@ -1,3 +1,5 @@
+#pragma once
+
 #include "quantum.h"

 typedef enum taphold_mode_t {
--- a/keyboards/handwired/promethium/color.h
+++ b/keyboards/handwired/promethium/color.h
@ -1,3 +1,5 @@
+#pragma once
+
 #define COLOR_BLANK       0, 0, 0

 #define COLOR_BLACK       0, 0, 0
--- a/keyboards/handwired/promethium/rgbsps.h
+++ b/keyboards/handwired/promethium/rgbsps.h
@ -1,3 +1,5 @@
+#pragma once
+
 void rgbsps_set(uint8_t index, uint8_t r, uint8_t g, uint8_t b);
 void rgbsps_setall(uint8_t r, uint8_t g, uint8_t b);
 void rgbsps_turnoff(void);
--- a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config.h
+++ b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config.h
@ -1,3 +1,5 @@
+#pragma once
+
 // list of OUTPUT(row) ports
 #define MATRIX_OUT_PORTS (Port_D, MCU_GPIO, D0), (Port_C, MCU_GPIO, C0), (Port_E, MCU_GPIO, E0), (Port_B, MCU_GPIO, B0)
 // list of OUTPUT(row) pins
--- a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_74hc157.h
+++ b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_74hc157.h
@ -1,3 +1,5 @@
+#pragma once
+
 #define MATRIX_EXTENSION_74HC157 B2
 // #define MATRIX_EXTENSION_74HC153 B2, B6

--- a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_direct.h
+++ b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_direct.h
@ -1,3 +1,5 @@
+#pragma once
+
 #if defined(__AVR__)
 /* -------------------- AVR (Pro Micro) ----------------------- */

--- a/keyboards/hhkb/rn42/suart.h
+++ b/keyboards/hhkb/rn42/suart.h
@ -1,8 +1,5 @@
-#ifndef SUART
-#define SUART
+#pragma once

 void xmit(uint8_t);
 uint8_t rcvr(void);
 uint8_t recv(void);
-
-#endif	/* SUART */
--- a/keyboards/horrortroll/handwired_k552/lib/bongocat.h
+++ b/keyboards/horrortroll/handwired_k552/lib/bongocat.h
@ -14,4 +14,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#pragma once
+
 void render_bongocat(void);
--- a/keyboards/horrortroll/handwired_k552/lib/galaxy.h
+++ b/keyboards/horrortroll/handwired_k552/lib/galaxy.h
@ -14,4 +14,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#pragma once
+
 void render_galaxy(void);
--- a/keyboards/horrortroll/handwired_k552/lib/logo.h
+++ b/keyboards/horrortroll/handwired_k552/lib/logo.h
@ -14,4 +14,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#pragma once
+
 void render_logo(void);
--- a/keyboards/horrortroll/lemon40/lib/bongocat.h
+++ b/keyboards/horrortroll/lemon40/lib/bongocat.h
@ -14,4 +14,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#pragma once
+
 void render_bongocat(void);
--- a/keyboards/marksard/rhymestone/common/oled_helper.h
+++ b/keyboards/marksard/rhymestone/common/oled_helper.h
@ -1,3 +1,5 @@
+#pragma once
+
 #include <stdint.h>
 #include "action.h"

--- a/keyboards/marksard/treadstone48/common/oled_helper.h
+++ b/keyboards/marksard/treadstone48/common/oled_helper.h
@ -1,3 +1,5 @@
+#pragma once
+
 #ifdef OLED_ENABLE

 #include <stdint.h>
--- a/keyboards/viktus/minne/info.json
+++ b/keyboards/viktus/minne/info.json
@ -15,8 +15,8 @@
        "bootmagic": true,
        "command": false,
        "console": false,
-        "extrakey": false,
-        "mousekey": false,
+        "extrakey": true,
+        "mousekey": true,
        "nkro": true
    },
    "bootmagic": {
--- a/keyboards/viktus/minne_topre/ec.c
+++ b/keyboards/viktus/minne_topre/ec.c
@ -0,0 +1,179 @@
+/* Copyright 2023 Viktus Design LLC
+ *
+ * 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 "quantum.h"
+#include "ec.h"
+#include "analog.h"
+//#include "debug.h"  // needed for debugging
+
+// sensing channel definitions
+#define A0 0
+#define A1 1
+#define A2 2
+#define A3 3
+#define A4 4
+#define A5 5
+#define A6 6
+#define A7 7
+
+// analog connection settings
+#define DISCHARGE_PIN D5
+#define ANALOG_PORT D4
+
+#ifndef MUX_SEL_PIN
+#   define MUX_SEL_PINS \
+        { D1, D2, D3 }
+#endif
+
+// pin connections
+const uint8_t row_channels[] = MATRIX_ROW_PINS;
+const uint8_t col_pins[]     = MATRIX_COL_PINS;
+const uint8_t mux_sel_pins[] = MUX_SEL_PINS;
+
+_Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS");
+
+static ec_config_t config;
+static uint16_t    ec_sw_value[MATRIX_COLS][MATRIX_ROWS];
+
+static inline void discharge_capacitor(void) { setPinOutput(DISCHARGE_PIN); }
+static inline void charge_capacitor(uint8_t col) {
+    setPinInput(DISCHARGE_PIN);
+    writePinHigh(col_pins[col]);
+}
+
+static inline void clear_all_col_pins(void) {
+    for (int col = 0; col < sizeof(col_pins); col++) {
+        writePinLow(col_pins[col]);
+    }
+}
+
+void init_mux_sel(void) {
+    for (int idx = 0; idx < sizeof(mux_sel_pins); idx++) {
+        setPinOutput(mux_sel_pins[idx]);
+    }
+}
+
+void select_mux(uint8_t row) {
+    uint8_t ch = row_channels[row];
+    writePin(mux_sel_pins[0], ch & 1);
+    writePin(mux_sel_pins[1], ch & 2);
+    writePin(mux_sel_pins[2], ch & 4);
+}
+
+void init_col(void) {
+    for (int idx = 0; idx < sizeof(col_pins); idx++) {
+        setPinOutput(col_pins[idx]);
+        writePinLow(col_pins[idx]);
+    }
+}
+
+void ec_init(ec_config_t const* const ec_config) {
+    // save config
+    config = *ec_config;
+
+    // initialize discharge pin as discharge mode
+    writePinLow(DISCHARGE_PIN);
+    setPinOutput(DISCHARGE_PIN);
+
+    // set analog reference
+    analogReference(ADC_REF_POWER);
+
+    // initialize drive lines
+    init_col();
+
+    // initialize multiplexer select pin
+    init_mux_sel();
+
+    // set discharge pin to charge mode
+    setPinInput(DISCHARGE_PIN);
+}
+
+uint16_t ec_readkey_raw(uint8_t col, uint8_t row) {
+    uint16_t sw_value = 0;
+
+    discharge_capacitor();
+
+    select_mux(row);
+
+    clear_all_col_pins();
+
+    cli();
+
+    charge_capacitor(col);
+
+    sw_value = analogReadPin(ANALOG_PORT);
+
+    sei();
+
+    return sw_value;
+}
+
+bool ec_update_key(matrix_row_t* current_row, matrix_row_t col, uint16_t sw_value, uint16_t reset_pt, uint16_t actuation_pt) {
+    bool current_state = (*current_row >> col) & 1;
+
+    // press to release
+    if (current_state && sw_value < reset_pt) {
+        *current_row &= ~(MATRIX_ROW_SHIFTER << col);
+        return true;
+    }
+
+    // release to press
+    if ((!current_state) && sw_value > actuation_pt) {
+        *current_row |= (MATRIX_ROW_SHIFTER << col);
+        return true;
+    }
+
+    return false;
+}
+
+bool ec_matrix_scan(matrix_row_t current_matrix[]) {
+    bool updated = false;
+
+    for (int row = 0; row < sizeof(row_channels); row++) {
+        for (int col = 0; col < sizeof(col_pins); col++) {
+            uint16_t reset_pt = config.reset_pt;
+            uint16_t actuation_pt = config.actuation_pt;
+
+            //Modifying threshold values for overlapping pads
+            switch(row) {
+                case 3:
+                    switch(col) {
+                        case 1:
+                        case 10: // lower threshold for bottom outside mods (40 rest, 50 act, 58 btm)
+                            reset_pt = 45;
+                            actuation_pt = 50;
+                            break;
+                    }
+                    break;
+            }
+
+            ec_sw_value[col][row] = ec_readkey_raw(col, row);
+            updated |= ec_update_key(&current_matrix[row], col, ec_sw_value[col][row], reset_pt, actuation_pt);
+        }
+    }
+
+    return updated;
+}
+
+// console debugging for pad values
+/*void ec_dprint_matrix(void) {
+    for (int row = 0; row < sizeof(row_channels); row++) {
+        for (int col = 0; col < sizeof(col_pins); col++) {
+            dprintf("%5d", ec_sw_value[col][row]);
+        }
+        dprintf("\n");
+    }
+}*/
--- a/keyboards/viktus/minne_topre/ec.h
+++ b/keyboards/viktus/minne_topre/ec.h
@ -0,0 +1,31 @@
+/* Copyright 2023 Viktus Design LLC
+ *
+ * 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 <stdint.h>
+#include <stdbool.h>
+
+#include "matrix.h"
+
+typedef struct {
+    uint16_t reset_pt;
+    uint16_t actuation_pt;
+} ec_config_t;
+
+void     ec_init(ec_config_t const* const ec_config);
+bool     ec_matrix_scan(matrix_row_t current_matrix[]);
+//void     ec_dprint_matrix(void); // needed for debugging
+uint16_t ec_readkey_raw(uint8_t col, uint8_t row);
+bool     ec_update_key(matrix_row_t* current_row, matrix_row_t col, uint16_t sw_value, uint16_t reset_pt, uint16_t actuation_pt);
--- a/keyboards/viktus/minne_topre/info.json
+++ b/keyboards/viktus/minne_topre/info.json
@ -0,0 +1,256 @@
+{
+    "manufacturer": "Viktus Design LLC",
+    "keyboard_name": "Viktus Minne - Topre",
+    "maintainer": "BlindAssassin111",
+    "url": "https://viktus.design",
+    "usb": {
+        "device_version": "1.3.0",
+        "vid": "0x5644",
+        "pid": "0x4D54"
+    },
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "bootmagic": {
+        "matrix": [0,0]
+    },
+    "build": {
+        "lto": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["B7", "D0", "B6", "D6", "C6", "C7", "D7", "F7", "B4", "F6", "F5", "B5"],
+        "rows": ["A0", "A1", "A3", "A4"]
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
+                { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
+                { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
+                { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
+                { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
+                { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
+                { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
+                { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
+                { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
+                { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
+                { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
+                { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
+                { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
+                { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3 },
+                { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3 },
+                { "label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3 },
+                { "label": "K35", "matrix": [3, 5], "w": 1, "x": 5.875, "y": 3 },
+                { "label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3 },
+                { "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3 },
+                { "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3 }
+            ]
+        },
+        "LAYOUT_dual_3u": {
+            "layout": [
+                { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
+                { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
+                { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
+                { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
+                { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
+                { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
+                { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
+                { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
+                { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
+                { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
+                { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
+                { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
+                { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
+                { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3 },
+                { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3 },
+                { "label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3 },
+                { "label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3 },
+                { "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3 },
+                { "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3 }
+            ]
+        },
+        "LAYOUT_6u": {
+            "layout": [
+                { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
+                { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
+                { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
+                { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
+                { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
+                { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
+                { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
+                { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
+                { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
+                { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
+                { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
+                { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
+                { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
+                { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3 },
+                { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3 },
+                { "label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3 },
+                { "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3 },
+                { "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3 }
+            ]
+        },
+        "LAYOUT_7u": {
+            "layout": [
+                { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
+                { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
+                { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
+                { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
+                { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
+                { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
+                { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
+                { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
+                { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
+                { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
+                { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
+                { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
+                { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
+                { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3 },
+                { "label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3 },
+                { "label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3 }
+            ]
+        },
+        "LAYOUT_10u": {
+            "layout": [
+                { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 },
+                { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
+                { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
+                { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
+                { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
+                { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
+                { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 },
+                { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 },
+                { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 },
+                { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 },
+                { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 },
+                { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 },
+                { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 },
+                { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
+                { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
+                { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
+                { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
+                { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
+                { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
+                { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
+                { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
+                { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
+                { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
+                { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
+                { "label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3 }
+            ]
+        }
+    }
+}
--- a/keyboards/viktus/minne_topre/keymaps/default/keymap.c
+++ b/keyboards/viktus/minne_topre/keymaps/default/keymap.c
@ -0,0 +1,26 @@
+/* Copyright 2023 Viktus Design LLC
+ *
+ * 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_all(
+        KC_ESC,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,	     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, MO(1),
+                  KC_LCTL, KC_LALT,          KC_SPC,  KC_SPC,    KC_SPC,                    KC_RALT, KC_RCTL
+    )
+};
--- a/keyboards/viktus/minne_topre/keymaps/via/keymap.c
+++ b/keyboards/viktus/minne_topre/keymaps/via/keymap.c
@ -0,0 +1,26 @@
+/* Copyright 2023 Viktus Design LLC
+ *
+ * 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_all(
+        KC_ESC,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,	     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, MO(1),
+                  KC_LCTL, KC_LALT,          KC_SPC,  KC_SPC,    KC_SPC,                    KC_RALT, KC_RCTL
+    )
+};
--- a/keyboards/viktus/minne_topre/keymaps/via/rules.mk
+++ b/keyboards/viktus/minne_topre/keymaps/via/rules.mk
@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/viktus/minne_topre/minne_topre.c
+++ b/keyboards/viktus/minne_topre/minne_topre.c
@ -0,0 +1,49 @@
+/* Copyright 2023 Viktus Design LLC
+ *
+ * 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 "quantum.h"
+#include "ec.h"
+#include "matrix.h"
+//#include "debug.h"  // needed for debugging
+
+#define RESET_PT 55
+#define ACTUATION_PT 65
+
+// console debugging for pad values
+/*void keyboard_post_init_kb() {
+    debug_enable = true;
+    debug_matrix = true;
+}*/
+
+void matrix_init_custom(void) {
+    ec_config_t ec_config = {.reset_pt = RESET_PT, .actuation_pt = ACTUATION_PT};
+
+    ec_init(&ec_config);
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool updated = ec_matrix_scan(current_matrix);
+
+    // console debugging for pad values
+    /*static int cnt = 0;
+    if (cnt++ == 300) {
+        cnt = 0;
+        ec_dprint_matrix();
+        dprintf("\n");
+    }*/
+
+    return updated;
+}
--- a/keyboards/viktus/minne_topre/readme.md
+++ b/keyboards/viktus/minne_topre/readme.md
@ -0,0 +1,27 @@
+# Viktus Minne - Topre
+
+![minne_topre](https://i.imgur.com/OKnryxch.png)
+
+Minne is a 40% keyboard with an HHKB bottom row, Now with Topre.
+
+-   Keyboard Maintainer: BlindAssassin111
+-   Hardware Supported: Viktus Minne Topre PCB
+-   Hardware Availability: Viktus Design LLC
+
+Make example for this keyboard (after setting up your build environment):
+
+    make viktus/minne_topre:default
+
+Flashing example for this keyboard:
+
+    make viktus/minne_topre: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
--- a/keyboards/viktus/minne_topre/rules.mk
+++ b/keyboards/viktus/minne_topre/rules.mk
@ -0,0 +1,3 @@
+CUSTOM_MATRIX = lite
+QUANTUM_LIB_SRC += analog.c
+SRC += ec.c
--- a/keyboards/work_louder/rgb_functions.h
+++ b/keyboards/work_louder/rgb_functions.h
@ -14,6 +14,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#pragma once
+
 #include "quantum.h"

 #ifndef VIA_ENABLE
--- a/keyboards/yushakobo/quick17/quick17_prefs.h
+++ b/keyboards/yushakobo/quick17/quick17_prefs.h
@ -14,6 +14,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#pragma once
+
 #include "quantum.h"

 enum layer_names {
Author	SHA1	Message	Date
QMK Bot	141d15cd12	Merge remote-tracking branch 'origin/master' into develop	2023-03-23 20:26:13 +00:00
Andrew Kannan	153bcdcd8d	Add CannonKeys Bakeneko65 Hotswap ISO PCB to QMK (#20131 ) * Add CannonKeys Bakeneko65 Hotswap ISO PCB to QMK * Add 65_iso_blocker community layout support	2023-03-23 20:25:15 +00:00
QMK Bot	e84d1ca3e7	Merge remote-tracking branch 'origin/master' into develop	2023-03-23 20:23:28 +00:00
blindassassin111	37ac5e68e6	[Keyboard]Viktus Minne - Topre variant (#20044 ) * Adding the Viktus Minne topre pcb variant * Update keyboards/viktus/minne_topre/readme.md Co-authored-by: Drashna Jaelre <drashna@live.com> * Update rules.mk * Moving layouts from .h to info.json Removing minne_topre.h and updating others * fixing .c's Switch from int to void for ec_init * Update info.json * Update info.json --------- Co-authored-by: Drashna Jaelre <drashna@live.com>	2023-03-23 20:22:47 +00:00
QMK Bot	1cbbe64e18	Merge remote-tracking branch 'origin/master' into develop	2023-03-23 20:20:52 +00:00
blindassassin111	b035cd094b	[keyboard] Correcting info.JSON for Viktus Minne (#20244 )	2023-03-23 14:20:12 -06:00
Ryan	1e07ff1fb1	Fix some more missing `#pragma once`s (#20241 )	2023-03-23 17:21:37 +00:00