From b0dc99fbd87e62b1ae84177eea1266cd067bf7da Mon Sep 17 00:00:00 2001
From: mechlovin <57231893+mechlovin@users.noreply.github.com>
Date: Mon, 3 Apr 2023 00:47:07 +0700
Subject: [Keyboard] Add Mechlovin9 rev.3 (#20119)
Co-authored-by: jack <0x6a73@protonmail.com>
---
keyboards/mechlovin/mechlovin9/rev1/info.json | 3 +++
keyboards/mechlovin/mechlovin9/rev2/info.json | 3 +++
keyboards/mechlovin/mechlovin9/rev3/info.json | 22 ++++++++++++++++++++++
keyboards/mechlovin/mechlovin9/rev3/readme.md | 23 +++++++++++++++++++++++
keyboards/mechlovin/mechlovin9/rev3/rules.mk | 0
keyboards/mechlovin/mechlovin9/rules.mk | 1 -
6 files changed, 51 insertions(+), 1 deletion(-)
create mode 100644 keyboards/mechlovin/mechlovin9/rev3/info.json
create mode 100644 keyboards/mechlovin/mechlovin9/rev3/readme.md
create mode 100644 keyboards/mechlovin/mechlovin9/rev3/rules.mk
diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json
index 66b4a3c2ed..aa8e9e94e3 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev1/info.json
@@ -4,6 +4,9 @@
"pid": "0x6509",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true
+ },
"backlight": {
"pin": "B8",
"breathing": true
diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json
index c0e94e7638..85a20210b2 100644
--- a/keyboards/mechlovin/mechlovin9/rev2/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev2/info.json
@@ -4,6 +4,9 @@
"pid": "0x6509",
"device_version": "0.0.2"
},
+ "features": {
+ "backlight": true
+ },
"backlight": {
"pin": "D4",
"breathing": true
diff --git a/keyboards/mechlovin/mechlovin9/rev3/info.json b/keyboards/mechlovin/mechlovin9/rev3/info.json
new file mode 100644
index 0000000000..d5da28d3ed
--- /dev/null
+++ b/keyboards/mechlovin/mechlovin9/rev3/info.json
@@ -0,0 +1,22 @@
+{
+ "keyboard_name": "Mechlovin9 Rev3",
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "usb": {
+ "pid": "0x6509",
+ "device_version": "0.0.3"
+ },
+ "features": {
+ "backlight": false
+ },
+ "bootmagic": {
+ "matrix": [0, 13]
+ },
+ "matrix_pins": {
+ "rows": ["B12", "B13", "B14", "B15", "A1"],
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A6", "A5", "A4", "A3", "C13", "B7", "B6", "B5", "B4", "B3"]
+ },
+ "indicators": {
+ "caps_lock": "B9"
+ }
+}
diff --git a/keyboards/mechlovin/mechlovin9/rev3/readme.md b/keyboards/mechlovin/mechlovin9/rev3/readme.md
new file mode 100644
index 0000000000..3b98b5383d
--- /dev/null
+++ b/keyboards/mechlovin/mechlovin9/rev3/readme.md
@@ -0,0 +1,23 @@
+# mechlovin9
+
+![mechlovin9](https://i.imgur.com/T5Lm6OYlh.png)
+
+A 65% PCB, compatible with Kyuu.
+
+* Keyboard Maintainer: [Team Mechlovin](https://github.com/mechlovin)
+* Hardware Supported: Kyuu Keyboard.
+* Hardware Availability: [Reddit GB](https://www.reddit.com/r/mechmarket/comments/i61par/gb_mechlovin_9_a_kyuu_65_keyboard_compatible_pcb/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/mechlovin9/rev3:default
+
+Flashing example for this keyboard:
+
+ make mechlovin/mechlovin9/rev3: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
+
+**Reset Key:** To put the mechlovin9 PCB into bootloader, hold ESC and plug cable.
\ No newline at end of file
diff --git a/keyboards/mechlovin/mechlovin9/rev3/rules.mk b/keyboards/mechlovin/mechlovin9/rev3/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/mechlovin/mechlovin9/rules.mk b/keyboards/mechlovin/mechlovin9/rules.mk
index c32039871c..3c4e38888c 100644
--- a/keyboards/mechlovin/mechlovin9/rules.mk
+++ b/keyboards/mechlovin/mechlovin9/rules.mk
@@ -7,7 +7,6 @@ EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
--
cgit v1.2.3
From d0e0b9e583447fe3e8cc3d6dde3b839ceb1972b3 Mon Sep 17 00:00:00 2001
From: Thomaz Peres <58439854+Thomaz-Peres@users.noreply.github.com>
Date: Sun, 2 Apr 2023 14:49:05 -0300
Subject: [Keyboard] Add Royal Kludge RKG-68 (#20138)
---
keyboards/rkg68/info.json | 105 +++++++++++++++++++++++++++++++
keyboards/rkg68/keymaps/default/keymap.c | 34 ++++++++++
keyboards/rkg68/keymaps/via/keymap.c | 34 ++++++++++
keyboards/rkg68/keymaps/via/rules.mk | 1 +
keyboards/rkg68/readme.md | 31 +++++++++
keyboards/rkg68/rules.mk | 1 +
6 files changed, 206 insertions(+)
create mode 100644 keyboards/rkg68/info.json
create mode 100644 keyboards/rkg68/keymaps/default/keymap.c
create mode 100644 keyboards/rkg68/keymaps/via/keymap.c
create mode 100644 keyboards/rkg68/keymaps/via/rules.mk
create mode 100644 keyboards/rkg68/readme.md
create mode 100644 keyboards/rkg68/rules.mk
diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/info.json
new file mode 100644
index 0000000000..f318019dd6
--- /dev/null
+++ b/keyboards/rkg68/info.json
@@ -0,0 +1,105 @@
+{
+ "manufacturer": "Royal Kludge",
+ "keyboard_name": "rkg68",
+ "maintainer": "Thomaz-Peres",
+ "bootloader": "atmel-dfu",
+ "processor": "atmega32u4",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true
+ },
+ "matrix_pins": {
+ "cols": [ "F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "F4" ],
+ "rows": [ "D0", "D1", "D2", "D3", "D5" ]
+ },
+ "rgblight": {
+ "animations": {
+ "knight": true,
+ "rainbow_swirl": true
+ },
+ "led_count": 4,
+ "pin": "B3"
+ },
+ "url": "http://en.rkgaming.com/",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0049",
+ "vid": "0x0049"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/rkg68/keymaps/default/keymap.c b/keyboards/rkg68/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2631452b5b
--- /dev/null
+++ b/keyboards/rkg68/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 DeskDaily
+ *
+ * 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(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_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_ENT, KC_PGUP,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_PSCR,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, RGB_MOD, KC_INS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BRK,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_SCRL,
+ QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD
+ )
+};
\ No newline at end of file
diff --git a/keyboards/rkg68/keymaps/via/keymap.c b/keyboards/rkg68/keymaps/via/keymap.c
new file mode 100644
index 0000000000..2631452b5b
--- /dev/null
+++ b/keyboards/rkg68/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 DeskDaily
+ *
+ * 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(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_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_ENT, KC_PGUP,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_PSCR,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, RGB_MOD, KC_INS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BRK,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_SCRL,
+ QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD
+ )
+};
\ No newline at end of file
diff --git a/keyboards/rkg68/keymaps/via/rules.mk b/keyboards/rkg68/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/rkg68/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/rkg68/readme.md b/keyboards/rkg68/readme.md
new file mode 100644
index 0000000000..8069a53169
--- /dev/null
+++ b/keyboards/rkg68/readme.md
@@ -0,0 +1,31 @@
+# RK G68
+
+![Keyboard picture](https://imgur.com/UnOJPZrh.jpg)
+
+* Keyboard Maintainer: [Royal Kludge](https://rkgamingstore.com/)
+* Hardware Supported: Royal Kludge RK G68
+* Hardware Availability: [RKG 68](http://en.rkgaming.com/download/1/)
+
+After setting up your build environment, you can compile the default keymap by using:
+
+ make rkg68:default
+
+Flashing example for this keyboard:
+
+ make rkg68: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 `FN` and `Left CTRL`.
+
+## Layouts
+
+- ANSI layout;
+
+![Imgur](https://i.imgur.com/l7ka1gkh.png)
diff --git a/keyboards/rkg68/rules.mk b/keyboards/rkg68/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/rkg68/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
--
cgit v1.2.3
From b5d0c4469067ca81e3a8a60fc349f5ad6d92c363 Mon Sep 17 00:00:00 2001
From: butterkeebs <124812866+butterkeebs@users.noreply.github.com>
Date: Sun, 2 Apr 2023 18:50:14 +0100
Subject: [Keyboard] Add pocketpad (#20229)
Co-authored-by: jack <0x6a73@protonmail.com>
---
keyboards/butterkeebs/pocketpad/info.json | 56 ++++++++++++++++++++++
.../butterkeebs/pocketpad/keymaps/default/keymap.c | 14 ++++++
keyboards/butterkeebs/pocketpad/readme.md | 27 +++++++++++
keyboards/butterkeebs/pocketpad/rules.mk | 1 +
4 files changed, 98 insertions(+)
create mode 100644 keyboards/butterkeebs/pocketpad/info.json
create mode 100644 keyboards/butterkeebs/pocketpad/keymaps/default/keymap.c
create mode 100644 keyboards/butterkeebs/pocketpad/readme.md
create mode 100644 keyboards/butterkeebs/pocketpad/rules.mk
diff --git a/keyboards/butterkeebs/pocketpad/info.json b/keyboards/butterkeebs/pocketpad/info.json
new file mode 100644
index 0000000000..96adda2cee
--- /dev/null
+++ b/keyboards/butterkeebs/pocketpad/info.json
@@ -0,0 +1,56 @@
+{
+ "manufacturer": "ButterKeebs",
+ "keyboard_name": "PocketPad",
+ "maintainer": "qmk",
+ "diode_direction": "ROW2COL",
+
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x1475",
+ "vid": "0xFEED"
+ },
+
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F1", "C7", "D5", "B7"],
+ "rows": ["F7", "F6", "F5", "F4", "B1"]
+ },
+
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0,0]},
+ {"x": 1, "y": 0, "matrix": [0,1]},
+ {"x": 2, "y": 0, "matrix": [0,2]},
+ {"x": 3, "y": 0, "matrix": [0,3]},
+
+ {"x": 0, "y": 1, "matrix": [1,0]},
+ {"x": 1, "y": 1, "matrix": [1,1]},
+ {"x": 2, "y": 1, "matrix": [1,2]},
+ {"x": 3, "y": 1, "matrix": [1,3]},
+
+ {"x": 0, "y": 2, "matrix": [2,0]},
+ {"x": 1, "y": 2, "matrix": [2,1]},
+ {"x": 2, "y": 2, "matrix": [2,2]},
+ {"x": 3, "y": 2, "matrix": [2,3]},
+
+ {"x": 0, "y": 3, "matrix": [3,0]},
+ {"x": 1, "y": 3, "matrix": [3,1]},
+ {"x": 2, "y": 3, "matrix": [3,2]},
+ {"x": 3, "y": 3, "matrix": [3,3]},
+
+ {"x": 0, "y": 4, "matrix": [4,0]},
+ {"x": 1, "y": 4, "matrix": [4,1]}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/butterkeebs/pocketpad/keymaps/default/keymap.c b/keyboards/butterkeebs/pocketpad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..0591fde140
--- /dev/null
+++ b/keyboards/butterkeebs/pocketpad/keymaps/default/keymap.c
@@ -0,0 +1,14 @@
+// ButterKeebs
+// SPDX-License-Identifier: GPL-2.0+
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ LAYOUT(
+ KC_NUM_LOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,
+ KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,
+ KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ENTER,
+ KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_DOT,
+ KC_F, KC_KP_0)
+};
\ No newline at end of file
diff --git a/keyboards/butterkeebs/pocketpad/readme.md b/keyboards/butterkeebs/pocketpad/readme.md
new file mode 100644
index 0000000000..0af8b7a3c6
--- /dev/null
+++ b/keyboards/butterkeebs/pocketpad/readme.md
@@ -0,0 +1,27 @@
+# PocketPad
+
+![PocketPad](https://tinyurl.com/2hffvnvb)
+
+*The PocketPad is a tiny 18 key macropad/numpad using 6mm tactile switches.*
+
+* Keyboard Maintainer: [ButterKeebs](https://github.com/butterkeebs)
+* Hardware Supported: *Supports current V1.0.0 PocketPad PCB and Elite C / pin compatible MCU boards.*
+* Hardware Availability: *Currently not for sale*
+
+Make example for this keyboard (after setting up your build environment):
+
+ make butterkeebs/pocketpad:default
+
+Flashing example for this keyboard:
+
+ make butterkeebs/pocketpad: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. (Not available on Revision 1.0.0 PCB)
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/butterkeebs/pocketpad/rules.mk b/keyboards/butterkeebs/pocketpad/rules.mk
new file mode 100644
index 0000000000..f886ea2e8e
--- /dev/null
+++ b/keyboards/butterkeebs/pocketpad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally blank
\ No newline at end of file
--
cgit v1.2.3
From 6b205c30648a3d5334eeb027daab6f1de3f196f7 Mon Sep 17 00:00:00 2001
From: cttt <57359810+ctt-t@users.noreply.github.com>
Date: Mon, 3 Apr 2023 01:55:20 +0800
Subject: [Keyboard] Add Erdnuss 65 (#20202)
Co-authored-by: jack <0x6a73@protonmail.com>
---
keyboards/citrus/erdnuss65/config.h | 23 +++++
keyboards/citrus/erdnuss65/erdnuss65.c | 28 ++++++
keyboards/citrus/erdnuss65/info.json | 109 +++++++++++++++++++++
.../citrus/erdnuss65/keymaps/default/keymap.c | 23 +++++
keyboards/citrus/erdnuss65/keymaps/via/keymap.c | 39 ++++++++
keyboards/citrus/erdnuss65/keymaps/via/rules.mk | 1 +
keyboards/citrus/erdnuss65/readme.md | 22 +++++
keyboards/citrus/erdnuss65/rules.mk | 2 +
keyboards/citrus/readme.md | 2 +
9 files changed, 249 insertions(+)
create mode 100644 keyboards/citrus/erdnuss65/config.h
create mode 100644 keyboards/citrus/erdnuss65/erdnuss65.c
create mode 100644 keyboards/citrus/erdnuss65/info.json
create mode 100644 keyboards/citrus/erdnuss65/keymaps/default/keymap.c
create mode 100644 keyboards/citrus/erdnuss65/keymaps/via/keymap.c
create mode 100644 keyboards/citrus/erdnuss65/keymaps/via/rules.mk
create mode 100644 keyboards/citrus/erdnuss65/readme.md
create mode 100644 keyboards/citrus/erdnuss65/rules.mk
create mode 100644 keyboards/citrus/readme.md
diff --git a/keyboards/citrus/erdnuss65/config.h b/keyboards/citrus/erdnuss65/config.h
new file mode 100644
index 0000000000..5e4a88b9e2
--- /dev/null
+++ b/keyboards/citrus/erdnuss65/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2023 Citrus Lab
+ *
+ * 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
+
+// The pin connected to the data pin of the LEDs
+#define RGBLIGHT_LAYERS//允许您定义可打开或关闭的照明层。非常适合显示当前键盘层或大写锁定状态。
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF//如果已定义,则即使 RGB 光源处于关闭状态,也会显示照明图层。
+
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE//尝试使开关状态与键盘指示灯状态保持一致
\ No newline at end of file
diff --git a/keyboards/citrus/erdnuss65/erdnuss65.c b/keyboards/citrus/erdnuss65/erdnuss65.c
new file mode 100644
index 0000000000..d10f476c66
--- /dev/null
+++ b/keyboards/citrus/erdnuss65/erdnuss65.c
@@ -0,0 +1,28 @@
+/* Copyright 2023 Citrus Lab
+ *
+ * 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 "quantum.h"
+
+//Indicator light function
+bool led_update_kb(led_t led_state) {
+ if (led_update_user(led_state)) {
+ if (led_state.caps_lock) {
+ rgblight_setrgb_at(255, 255, 255, 0); //white
+ } else {
+ rgblight_setrgb_at(0, 0, 0, 0);
+ }
+ }
+ return true;
+}
\ No newline at end of file
diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/info.json
new file mode 100644
index 0000000000..a33d44561d
--- /dev/null
+++ b/keyboards/citrus/erdnuss65/info.json
@@ -0,0 +1,109 @@
+{
+ "keyboard_name": "Erdnuss65",
+ "manufacturer": "Citrus Lab",
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "maintainer": "ctt",
+ "usb": {
+ "vid": "0x636C",
+ "pid": "0x6374",
+ "device_version": "0.0.1"
+ },
+
+ "matrix_pins": {
+ "rows":
+ ["B10","B1", "B0","A7","A6"],
+ "cols":
+ ["B12","B14","B15","A8","B13","B3","B4","B5","A1","A2","A0","A3","A4","A5","B11"]
+ },
+
+ "diode_direction": "COL2ROW",
+
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "backlight": false,
+ "rgblight": true,
+ "audio": false
+ },
+ "rgblight": {
+ "pin": "A15",
+ "led_count": 1
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "ESC K00 (B10,B12)", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1 K01 (B10,B14)", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2 K02 (B10,B15)", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3 K03 (B10,A8)", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4 K04 (B10,B13)", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5 K05 (B10,B3)", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6 K06 (B10,B4)", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7 K07 (B10,B5)", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8 K08 (B10,A1)", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9 K09 (B10,A2)", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0 K0A (B10,A0)", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "- K0B (B10,A3)", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "= K0C (B10,A4)", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "BACKSPACE K0D (B10,A5)", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "INS (B10,B11)", "matrix": [0, 14], "x": 15, "y": 0},
+ {"label": "TAB (B1,B12)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q (B1,B14)", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W (B1,B15)", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E (B1,A8)", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R (B1,B13)", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T (B1,B3)", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y (B1,B4)", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U (B1,B5)", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I (B1,A1)", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O (B1,A2)", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P (B1,A0)", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[ (B1,A3)", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "] (B1,A4)", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\" (B1,A5)", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "DEL (B1,B11)", "matrix": [1, 14], "x": 15, "y": 1},
+ {"label": "CAPSLOCK (B0,B12)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+ {"label": "A (B0,B14)", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S (B0,B15)", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D (B0,A8)", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F (B0,B13)", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G (B0,B3)", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H (B0,B4)", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J (B0,B5)", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K (B0,A1)", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L (B0,A2)", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "; (B0,A0)", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "' (B0,A3)", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "ENTER (B0,A5)", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "PGUP (B0,B11)", "matrix": [2, 14], "x": 15, "y": 2},
+ {"label": "LSHIFT (A7,B12)", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z (A7,B14)", "matrix": [3, 1], "x": 2.25, "y": 3},
+ {"label": "X (A7,B15)", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "C (A7,A8)", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "V (A7,B13)", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "B (A7,B3)", "matrix": [3, 5], "x": 6.25, "y": 3},
+ {"label": "N (A7,B4)", "matrix": [3, 6], "x": 7.25, "y": 3},
+ {"label": "M (A7,B5)", "matrix": [3, 7], "x": 8.25, "y": 3},
+ {"label": ", (A7,A1)", "matrix": [3, 8], "x": 9.25, "y": 3},
+ {"label": ". (A7,A2)", "matrix": [3, 9], "x": 10.25, "y": 3},
+ {"label": "/ (A7,A0)", "matrix": [3, 10], "x": 11.25, "y": 3},
+ {"label": "RSHIFT (A7,A4)", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "UP (A7,A5)", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "PGDN (A7,B11)", "matrix": [3, 14], "x": 15, "y": 3},
+ {"label": "LCTRL (A6,B12)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "WIN (A6,B14)", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "ALT (A6,B15)", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "SPACE (A6,A8)", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
+ {"label": "FN (A6,A0)", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"label": "LEFT (A6,A4)", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "DOWN (A6,A5)", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "RIGHT (A6,B11)", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/citrus/erdnuss65/keymaps/default/keymap.c b/keyboards/citrus/erdnuss65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..0daef5af64
--- /dev/null
+++ b/keyboards/citrus/erdnuss65/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 Citrus Lab
+// SPDX-License-Identifier: GPL-2.0
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_BSLS, 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_ENT, KC_PGUP,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [1] = LAYOUT(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPRV,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, RESET, KC_MNXT,
+ _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, KC_HOME,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MYCM, KC_VOLU, KC_END,
+ _______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_MPLY
+ )
+};
+
diff --git a/keyboards/citrus/erdnuss65/keymaps/via/keymap.c b/keyboards/citrus/erdnuss65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0f1bf9525e
--- /dev/null
+++ b/keyboards/citrus/erdnuss65/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2023 Citrus Lab
+// SPDX-License-Identifier: GPL-2.0
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_BSLS, 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_ENT, KC_PGUP,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [1] = LAYOUT(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MPRV,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, RESET, KC_MNXT,
+ _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, KC_HOME,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MYCM, KC_VOLU, KC_END,
+ _______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_MPLY
+ ),
+
+ [2] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+ [3] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+};
diff --git a/keyboards/citrus/erdnuss65/keymaps/via/rules.mk b/keyboards/citrus/erdnuss65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/citrus/erdnuss65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/citrus/erdnuss65/readme.md b/keyboards/citrus/erdnuss65/readme.md
new file mode 100644
index 0000000000..0bb952c111
--- /dev/null
+++ b/keyboards/citrus/erdnuss65/readme.md
@@ -0,0 +1,22 @@
+# Erdnuss65
+
+* Keyboard Maintainer: [Citrus Lab](https://github.com/ctt-t)
+* Hardware Supported: STM32F103C8T6
+
+Make example for this keyboard (after setting up your build environment):
+
+ make citrus/erdnuss65:default
+
+Flashing example for this keyboard:
+
+ make citrus/erdnuss65:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/citrus/erdnuss65/rules.mk b/keyboards/citrus/erdnuss65/rules.mk
new file mode 100644
index 0000000000..80b5a0b8f5
--- /dev/null
+++ b/keyboards/citrus/erdnuss65/rules.mk
@@ -0,0 +1,2 @@
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
\ No newline at end of file
diff --git a/keyboards/citrus/readme.md b/keyboards/citrus/readme.md
new file mode 100644
index 0000000000..bde8a9620f
--- /dev/null
+++ b/keyboards/citrus/readme.md
@@ -0,0 +1,2 @@
+# Citrus Lab
+QMK folders for PCB commissions.
\ No newline at end of file
--
cgit v1.2.3
From ebe36ea83c860fc26e4e8344a133eb0355b411f0 Mon Sep 17 00:00:00 2001
From: Travis Reed
Date: Sun, 2 Apr 2023 11:01:06 -0700
Subject: [Keymap] Add dancxjo hotdox76v2 keymap (#20016)
---
keyboards/hotdox76v2/keymaps/dancxjo/config.h | 6 +
keyboards/hotdox76v2/keymaps/dancxjo/keymap.c | 177 ++++++++++++++++++++++++++
keyboards/hotdox76v2/keymaps/dancxjo/rules.mk | 4 +
3 files changed, 187 insertions(+)
create mode 100644 keyboards/hotdox76v2/keymaps/dancxjo/config.h
create mode 100644 keyboards/hotdox76v2/keymaps/dancxjo/keymap.c
create mode 100644 keyboards/hotdox76v2/keymaps/dancxjo/rules.mk
diff --git a/keyboards/hotdox76v2/keymaps/dancxjo/config.h b/keyboards/hotdox76v2/keymaps/dancxjo/config.h
new file mode 100644
index 0000000000..fac328091d
--- /dev/null
+++ b/keyboards/hotdox76v2/keymaps/dancxjo/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Travis Reed (@dancxjo)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#define DYNAMIC_KEYMAP_LAYER_COUNT 5
+#define EE_HANDS
diff --git a/keyboards/hotdox76v2/keymaps/dancxjo/keymap.c b/keyboards/hotdox76v2/keymaps/dancxjo/keymap.c
new file mode 100644
index 0000000000..1f55685de0
--- /dev/null
+++ b/keyboards/hotdox76v2/keymaps/dancxjo/keymap.c
@@ -0,0 +1,177 @@
+// Copyright 2023 Travis Reed (@dancxjo)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer {
+ _ENGRAM = 0,
+ _QWERTY,
+ _ENGRAM_SHIFT,
+ _FUNCTION,
+ _MEDIA
+};
+
+/* Combines the compose key (right super) and the AltGr */
+#define KC_COMP MT(MOD_RALT, KC_RGUI)
+#define KC_SCMP MT(MOD_RSFT | MOD_RALT, KC_RGUI)
+
+#define KC_STAB MT(MOD_LSFT, KC_TAB)
+
+/* Use a fake shift layer since Engram switches level 2 assignments */
+#define KC_PSFT MO(_ENGRAM_SHIFT)
+
+#define KC_FUNC TT(_FUNCTION)
+#define KC_MEDI TT(_MEDIA)
+
+/* Easily switch between MacOS & other OSes*/
+#define KC_HLM1 LM(1, MOD_LCTL)
+#define KC_HLM2 LM(1, MOD_LGUI)
+#define KC_SHM1 LM(1, MOD_LCTL | MOD_LSFT)
+#define KC_SHM2 LM(1, MOD_LGUI | MOD_LSFT)
+#define KC_STRN RSFT(KC_TRNS)
+
+#define KC_FORW LGUI(KC_TAB)
+#define KC_BACK LGUI(LSFT(KC_TAB))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Differs slightly from official Engram in that {} are the level 1 and [] are the level 2 */
+ [_ENGRAM] = LAYOUT_ergodox_pretty(
+ KC_LCBR, KC_1, KC_2, KC_3, KC_4, KC_5, CG_NORM, KC_PAUSE, KC_6, KC_7, KC_8, KC_9, KC_0, KC_RCBR,
+ KC_TAB, KC_B, KC_Y, KC_O, KC_U, KC_QUOT, KC_AT, KC_HASH, KC_DQUO, KC_L, KC_D, KC_W, KC_V, KC_Z,
+ KC_CAPS, KC_C, KC_I, KC_E, KC_A, KC_COMM, KC_DOT, KC_H, KC_T, KC_S, KC_N, KC_Q,
+ KC_PSFT, KC_G, KC_X, KC_J, KC_K, KC_MINS, KC_SLSH, KC_PSCR, KC_QUES, KC_R, KC_M, KC_F, KC_P, KC_PSFT,
+ KC_HLM1, KC_FUNC, KC_MEDI, KC_LALT, KC_HLM2, KC_RGUI, KC_RALT, KC_MEDI, KC_FUNC,KC_HLM1,
+ KC_INS, KC_HOME, KC_END, KC_DEL,
+ KC_PGUP, KC_PGDN,
+ KC_ENT, KC_ESC, KC_LSFT, KC_RSFT, KC_BSPC, KC_SPC
+ ),
+ [_ENGRAM_SHIFT] = LAYOUT_ergodox_pretty(
+ KC_LBRC, KC_PIPE, KC_EQL, KC_TILD, KC_PLUS, KC_LT, CG_SWAP, KC_STRN, KC_GT, KC_CIRC, KC_AMPR, KC_PERC, KC_ASTR, KC_RBRC,
+ KC_STRN, RSFT(KC_B), RSFT(KC_Y), RSFT(KC_O), RSFT(KC_U), KC_LPRN, KC_GRV, KC_DLR, KC_RPRN, RSFT(KC_L), RSFT(KC_D), RSFT(KC_W), RSFT(KC_V), RSFT(KC_Z),
+ KC_STRN, RSFT(KC_C), RSFT(KC_I), RSFT(KC_E), RSFT(KC_A), KC_SCLN, KC_COLN, RSFT(KC_H), RSFT(KC_T), RSFT(KC_S), RSFT(KC_N), RSFT(KC_Q),
+ KC_TRNS, RSFT(KC_G), RSFT(KC_X), RSFT(KC_J), RSFT(KC_K), KC_UNDS, KC_BSLS, KC_STRN, KC_EXLM, RSFT(KC_R), RSFT(KC_M), RSFT(KC_F), RSFT(KC_P), KC_TRNS,
+ KC_SHM1, KC_STRN, KC_STRN, KC_STRN, KC_SHM2, KC_STRN, KC_STRN, KC_STRN, KC_STRN, KC_SHM1,
+ KC_STRN, KC_STRN, KC_HYPR, KC_STRN,
+ KC_STRN, KC_STRN,
+ KC_SHM1, KC_STRN, KC_STRN, KC_SHM2, KC_STRN, KC_STRN
+ ),
+ [_QWERTY] = LAYOUT_ergodox_pretty(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ KC_TRNS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_EQL, KC_TRNS, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [_FUNCTION] = LAYOUT_ergodox_pretty(
+ KC_PSCR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_BRID, KC_BRIU, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PWR,
+ KC_APP, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, TG(1), TG(1), KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_SLEP,
+ KC_SCRL, KC_F21, KC_F22, KC_F23, KC_F24, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WAKE,
+ KC_PAUS, KC_UNDO, KC_CUT, KC_COPY, KC_PSTE, KC_NO, CG_SWAP, CG_NORM, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ RGB_SAD, RGB_HUD, RGB_HUI, RGB_SAI,
+ RGB_RMOD, RGB_MOD,
+ RGB_SPD, RGB_VAD, KC_TRNS, KC_TRNS, RGB_VAI, RGB_SPI
+ ),
+ [_MEDIA] = LAYOUT_ergodox_pretty(
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WREF, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_WREF, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_PGDN, KC_MSEL, KC_NO,
+ KC_NO, KC_NO, KC_WSTP, KC_MYCM, KC_WSCH, KC_FIND, KC_WHOM, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO,
+ KC_LSFT, KC_NO, KC_NO, KC_CALC, KC_NO, KC_WFAV, KC_NO, KC_NO, KC_NO, KC_HOME, KC_MAIL, KC_END, KC_NO, KC_NO,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_MUTE, KC_EJCT, KC_MSTP, KC_MPLY,
+ KC_MPRV, KC_MNXT,
+ KC_MRWD, KC_VOLD, KC_TRNS, KC_TRNS, KC_VOLU, KC_MFFD
+ )
+};
+
+char* get_layer_name(uint8_t layer, bool capitalized) {
+ char *layer_name = "Unknown ";
+
+ switch (layer) {
+ case _ENGRAM:
+ case _ENGRAM_SHIFT:
+ if (capitalized) {
+ layer_name = "ENGRAM ";
+ } else {
+ layer_name = "engram ";
+ }
+ break;
+ case _QWERTY:
+ if (capitalized) {
+ layer_name = "QWERTY ";
+ } else {
+ layer_name = "qwerty ";
+ }
+ break;
+ case _MEDIA:
+ layer_name = "Media+ ";
+ break;
+ case _FUNCTION:
+ layer_name = "Function";
+ break;
+ }
+ return layer_name;
+}
+
+void render_locks(led_t led_state) {
+ oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
+ oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
+ oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
+}
+
+void render_mods(uint8_t modifiers, uint8_t layer) {
+ oled_write_P(modifiers & MOD_MASK_GUI ? PSTR("Super") : PSTR(" "), false);
+ oled_write_P(PSTR(" "), false);
+ oled_write_P(modifiers & MOD_MASK_ALT ? PSTR("Alt") : PSTR(" "), false);
+ oled_write_P(PSTR(" "), false);
+ oled_write_P(modifiers & MOD_MASK_CTRL ? PSTR("Ctl") : PSTR(" "), false);
+ oled_write_P(PSTR(" "), false);
+
+ if (layer == _ENGRAM_SHIFT) {
+ oled_write_P(PSTR("Pseudo"), false);
+ } else {
+ oled_write_P(modifiers & MOD_MASK_SHIFT ? PSTR("Shift ") : PSTR(" "), false);
+ }
+}
+
+char* get_helm_key(void) {
+ if (keymap_config.swap_lctl_lgui) {
+ return "Super";
+ } else {
+ return "Control";
+ }
+}
+
+bool oled_task_user(void) {
+ uint8_t layer = get_highest_layer(layer_state);
+ uint8_t modifiers = get_mods()|get_oneshot_mods();
+ led_t led_state = host_keyboard_led_state();
+
+ bool real_shifted = modifiers & MOD_MASK_SHIFT;
+ bool pseudo_shifted = layer == _ENGRAM_SHIFT;
+ bool shifted = real_shifted || pseudo_shifted;
+ bool caps = led_state.caps_lock;
+ bool capitalized = (caps && !shifted) || (!caps && shifted);
+
+ oled_write_P(PSTR("Layer: "), false);
+ oled_write(get_layer_name(layer, capitalized), false);
+ oled_write_P(PSTR("\n"), false);
+
+ // Only the master knows if we've swapped the gui and ctl key
+ if (is_keyboard_master()) {
+ oled_write_P(PSTR(" Helm: "), false);
+ oled_write(get_helm_key(), false);
+ }
+
+ oled_write_P(PSTR("\n"), false);
+
+ render_mods(modifiers, layer);
+ oled_write_P(PSTR("\n"), false);
+
+ render_locks(led_state);
+
+ return false;
+}
diff --git a/keyboards/hotdox76v2/keymaps/dancxjo/rules.mk b/keyboards/hotdox76v2/keymaps/dancxjo/rules.mk
new file mode 100644
index 0000000000..bc20eb20b7
--- /dev/null
+++ b/keyboards/hotdox76v2/keymaps/dancxjo/rules.mk
@@ -0,0 +1,4 @@
+COMMAND_ENABLE = yes
+VIA_ENABLE = yes
+EXTRAKEY_ENABLE = no
+MOUSEKEY_ENABLE = no
--
cgit v1.2.3
From 5687fc76468803db27dd9f04a72766f80141c6cd Mon Sep 17 00:00:00 2001
From: Moritz Plattner
Date: Sun, 2 Apr 2023 20:02:20 +0200
Subject: Add support for Geistmaschine Macropod (#20116)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
---
keyboards/geistmaschine/macropod/config.h | 21 ++++++
keyboards/geistmaschine/macropod/info.json | 41 ++++++++++
.../macropod/keymaps/default/keymap.c | 35 +++++++++
.../macropod/keymaps/default/rules.mk | 1 +
.../geistmaschine/macropod/keymaps/via/keymap.c | 35 +++++++++
.../geistmaschine/macropod/keymaps/via/rules.mk | 2 +
keyboards/geistmaschine/macropod/macropod.c | 21 ++++++
keyboards/geistmaschine/macropod/matrix.c | 87 ++++++++++++++++++++++
keyboards/geistmaschine/macropod/readme.md | 25 +++++++
keyboards/geistmaschine/macropod/rules.mk | 5 ++
10 files changed, 273 insertions(+)
create mode 100644 keyboards/geistmaschine/macropod/config.h
create mode 100644 keyboards/geistmaschine/macropod/info.json
create mode 100644 keyboards/geistmaschine/macropod/keymaps/default/keymap.c
create mode 100644 keyboards/geistmaschine/macropod/keymaps/default/rules.mk
create mode 100644 keyboards/geistmaschine/macropod/keymaps/via/keymap.c
create mode 100644 keyboards/geistmaschine/macropod/keymaps/via/rules.mk
create mode 100644 keyboards/geistmaschine/macropod/macropod.c
create mode 100644 keyboards/geistmaschine/macropod/matrix.c
create mode 100644 keyboards/geistmaschine/macropod/readme.md
create mode 100644 keyboards/geistmaschine/macropod/rules.mk
diff --git a/keyboards/geistmaschine/macropod/config.h b/keyboards/geistmaschine/macropod/config.h
new file mode 100644
index 0000000000..f6dad6ebe0
--- /dev/null
+++ b/keyboards/geistmaschine/macropod/config.h
@@ -0,0 +1,21 @@
+/*
+ * 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
+
+/* key matrix size, only 1x4 are used in current state.
+ IO expander setup would allow up to 1x16 + 1 from the MCU */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 17
diff --git a/keyboards/geistmaschine/macropod/info.json b/keyboards/geistmaschine/macropod/info.json
new file mode 100644
index 0000000000..c2a77905b1
--- /dev/null
+++ b/keyboards/geistmaschine/macropod/info.json
@@ -0,0 +1,41 @@
+{
+ "manufacturer": "Geistmaschine",
+ "keyboard_name": "Macropod",
+ "maintainer": "ebastler",
+ "bootloader": "atmel-dfu",
+ "processor": "atmega32u4",
+ "url": "https://geistmaschine.io/",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0004",
+ "vid": "0x676D"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "encoder": true
+ },
+ "encoder": {
+ "rotary": [
+ {
+ "pin_a": "D3",
+ "pin_b": "D5",
+ "resolution": 2
+ }
+ ]
+ },
+ "layouts": {
+ "LAYOUT_fourkey": {
+ "layout": [
+ {"x":0, "y":0, "matrix":[0,0] },
+ {"x":0, "y":1.25, "matrix":[0,1] },
+ {"x":0, "y":2.25, "matrix":[0,2] },
+ {"x":0, "y":3.25, "matrix":[0,3] }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/geistmaschine/macropod/keymaps/default/keymap.c b/keyboards/geistmaschine/macropod/keymaps/default/keymap.c
new file mode 100644
index 0000000000..fb2d971202
--- /dev/null
+++ b/keyboards/geistmaschine/macropod/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2023 Moritz Plattner
+ *
+ * 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_fourkey (
+ LT(1, KC_MUTE), KC_MPRV, KC_MPLY, KC_MNXT
+ ),
+
+ [1] = LAYOUT_fourkey (
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [1] = { ENCODER_CCW_CW(KC_MRWD, KC_MFFD) },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/geistmaschine/macropod/keymaps/default/rules.mk b/keyboards/geistmaschine/macropod/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/geistmaschine/macropod/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/geistmaschine/macropod/keymaps/via/keymap.c b/keyboards/geistmaschine/macropod/keymaps/via/keymap.c
new file mode 100644
index 0000000000..fb2d971202
--- /dev/null
+++ b/keyboards/geistmaschine/macropod/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2023 Moritz Plattner
+ *
+ * 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_fourkey (
+ LT(1, KC_MUTE), KC_MPRV, KC_MPLY, KC_MNXT
+ ),
+
+ [1] = LAYOUT_fourkey (
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [1] = { ENCODER_CCW_CW(KC_MRWD, KC_MFFD) },
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/geistmaschine/macropod/keymaps/via/rules.mk b/keyboards/geistmaschine/macropod/keymaps/via/rules.mk
new file mode 100644
index 0000000000..6ccd6d9194
--- /dev/null
+++ b/keyboards/geistmaschine/macropod/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/geistmaschine/macropod/macropod.c b/keyboards/geistmaschine/macropod/macropod.c
new file mode 100644
index 0000000000..2f6825e2ee
--- /dev/null
+++ b/keyboards/geistmaschine/macropod/macropod.c
@@ -0,0 +1,21 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+// This will be overridden by encoder map in all default keymaps, but serves as a catch-all for user keymaps that may omit the map.
+#if defined (ENCODER_ENABLE) && !defined (ENCODER_MAP_ENABLE)
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+ if (!encoder_update_user(index, clockwise)) {
+ return false; /* Don't process further events if user function exists and returns false */
+ }
+ if (index == 0) { /* First encoder */
+ if (clockwise) {
+ tap_code_delay(KC_VOLU, 10);
+ } else {
+ tap_code_delay(KC_VOLD, 10);
+ }
+ }
+ return true;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/geistmaschine/macropod/matrix.c b/keyboards/geistmaschine/macropod/matrix.c
new file mode 100644
index 0000000000..60b1dafe63
--- /dev/null
+++ b/keyboards/geistmaschine/macropod/matrix.c
@@ -0,0 +1,87 @@
+/* Copyright 2023 ebastler and elpekenin
+ *
+ * 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 "pca9555.h"
+#include "quantum.h"
+
+// PCA9555 i2c address, 0x20: A0 = 0, A1 = 0, A2 = 0
+#define IC1 0x20
+
+// Define how long to wait to reach the IO expander after connection loss again
+// Since this board is modular, it should not spam unnecessary i2c requests if used without a module
+#define RETRY_TIMESPAN 2000
+
+typedef enum {
+ PLUGGED,
+ DOUBTFUL,
+ UNPLUGGED
+} expander_status_t;
+
+void pca9555_setup(void) {
+ // Initialize the expander, no need to set ports to inputs as that is the default behavior
+ pca9555_init(IC1);
+}
+
+void matrix_init_custom(void) {
+ // Encoder pushbutton on the MCU is connected to PD2
+ setPinInputHigh(D2);
+ pca9555_setup();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+ static expander_status_t status = DOUBTFUL;
+ static uint32_t retry_timer = 0;
+
+ // initialize one byte filled with 1
+ uint8_t pin_states = 0xFF;
+
+
+ if (status != UNPLUGGED || timer_elapsed32(retry_timer) > RETRY_TIMESPAN) {
+ // If the chip was unplugged before, it needs to be re-initialized
+ if(status==UNPLUGGED) {
+ pca9555_setup();
+ }
+ // Read the entire port into this byte, 1 = not pressed, 0 = pressed
+ bool ret = pca9555_readPins(IC1, PCA9555_PORT0, &pin_states);
+
+ // Update state
+ if (ret) {
+ status = PLUGGED;
+ } else {
+ switch (status) {
+ case PLUGGED:
+ status = DOUBTFUL;
+ break;
+
+ case DOUBTFUL:
+ status = UNPLUGGED;
+ break;
+
+ // If we've diagnosed as unplugged, update timer to not read I2C
+ case UNPLUGGED:
+ retry_timer = timer_read32();
+ }
+ }
+ }
+
+ // Shift pin states by 1 to make room for the switch connected to the MCU, then OR them together and invert (as QMK uses inverted logic compared to the electrical levels)
+ matrix_row_t data = ~(pin_states << 1 | readPin(D2));
+
+ bool changed = current_matrix[0] != data;
+ current_matrix[0] = data;
+
+ return changed;
+}
\ No newline at end of file
diff --git a/keyboards/geistmaschine/macropod/readme.md b/keyboards/geistmaschine/macropod/readme.md
new file mode 100644
index 0000000000..5d074437cb
--- /dev/null
+++ b/keyboards/geistmaschine/macropod/readme.md
@@ -0,0 +1,25 @@
+# Geistmaschine Macropod
+
+![macropod](https://i.imgur.com/lAsCslA.png)
+
+Macropod is a modular macropad, designed around a central big encoder with a magnetic connector for modularity. The default module uses three MX style keys.
+* Keyboard Maintainer: [ebastler](https://github.com/ebastler)
+* Hardware Supported: Macropod rev1
+* Hardware Availability: [geistmaschine.io](https://geistmaschine.io/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ qmk compile -kb geistmaschine/macropod -km default
+
+Flashing example for this keyboard:
+
+ qmk flash -kb geistmaschine/macropod -km default
+
+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 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the knob on the main module) and plug in the keyboard
+* **Physical reset button**: Briefly tap the button marked "RST" on the back of the main module PCB
diff --git a/keyboards/geistmaschine/macropod/rules.mk b/keyboards/geistmaschine/macropod/rules.mk
new file mode 100644
index 0000000000..cf2b38601e
--- /dev/null
+++ b/keyboards/geistmaschine/macropod/rules.mk
@@ -0,0 +1,5 @@
+CUSTOM_MATRIX = lite
+
+VPATH += drivers/gpio
+SRC += pca9555.c matrix.c
+QUANTUM_LIB_SRC += i2c_master.c
\ No newline at end of file
--
cgit v1.2.3
From 27e6e27d3a2ff9d91bcf0f189cdc39509bef0335 Mon Sep 17 00:00:00 2001
From: Jay Greco
Date: Sun, 2 Apr 2023 12:12:06 -0700
Subject: [Keyboard] Add nullbits SNAP keyboard (#18916)
Co-authored-by: Ryan
---
keyboards/nullbitsco/snap/config.h | 87 +++++
keyboards/nullbitsco/snap/info.json | 24 ++
.../nullbitsco/snap/keymaps/bongo_reactive/bongo.h | 121 +++++++
.../snap/keymaps/bongo_reactive/bongo_graphics.h | 262 ++++++++++++++++
.../snap/keymaps/bongo_reactive/config.h | 35 +++
.../snap/keymaps/bongo_reactive/keymap.c | 133 ++++++++
.../snap/keymaps/bongo_reactive/rules.mk | 4 +
.../keymaps/bongo_reactive_single_oled/bongo.h | 121 +++++++
.../bongo_reactive_single_oled/bongo_graphics.h | 262 ++++++++++++++++
.../keymaps/bongo_reactive_single_oled/config.h | 29 ++
.../keymaps/bongo_reactive_single_oled/keymap.c | 87 +++++
.../keymaps/bongo_reactive_single_oled/rules.mk | 5 +
keyboards/nullbitsco/snap/keymaps/default/keymap.c | 105 +++++++
keyboards/nullbitsco/snap/keymaps/iso/keymap.c | 104 ++++++
keyboards/nullbitsco/snap/keymaps/oled/config.h | 27 ++
keyboards/nullbitsco/snap/keymaps/oled/keymap.c | 163 ++++++++++
.../nullbitsco/snap/keymaps/oled/oled_graphics.h | 82 +++++
keyboards/nullbitsco/snap/keymaps/oled/rules.mk | 5 +
keyboards/nullbitsco/snap/keymaps/typehud/config.h | 46 +++
keyboards/nullbitsco/snap/keymaps/typehud/keymap.c | 157 +++++++++
.../nullbitsco/snap/keymaps/typehud/readme.md | 51 +++