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

2024-07-15 05:30:07 +00:00 · 2024-07-15 05:30:07 +00:00 · 65143b08a3
commit 65143b08a3
parent fd44e96110 c70c99367a
6 changed files with 111 additions and 2 deletions
--- a/keyboards/matchstickworks/southpad/info.json
+++ b/keyboards/matchstickworks/southpad/info.json
@ -1,4 +1,4 @@
 {
    "manufacturer": "MatchstickWorks",
-    "maintainer": "MatchstickWorks",
-}
+    "maintainer": "MatchstickWorks"
+}
--- a/keyboards/matchstickworks/normiepad/keyboard.json
+++ b/keyboards/matchstickworks/normiepad/keyboard.json
@ -0,0 +1,51 @@
+{
+    "keyboard_name": "NormiePad",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP4", "GP11", "GP12"],
+        "rows": ["GP13", "GP29", "GP28", "GP20", "GP19", "GP18"]
+    },
+    "processor": "RP2040",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0003",
+        "vid": "0x4D57"
+    },
+    "community_layouts": ["numpad_6x4"],
+    "layouts": {
+        "LAYOUT_numpad_6x4": {
+            "layout": [
+                {"label": "Bksp", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "=", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "(", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": ")", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "/", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "*", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "-", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "7", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "8", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "9", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "4", "matrix": [3, 0], "x": 1, "y": 3},
+                {"label": "5", "matrix": [3, 1], "x": 2, "y": 3},
+                {"label": "6", "matrix": [3, 2], "x": 3, "y": 3},
+                {"label": "+", "matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+                {"label": "1", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "2", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "3", "matrix": [4, 2], "x": 2, "y": 4},
+                {"label": "0", "matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"label": ".", "matrix": [5, 2], "x": 2, "y": 5},
+                {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4, "h": 2}
+            ]
+        }
+    }
+}
--- a/keyboards/matchstickworks/normiepad/keymaps/default/keymap.c
+++ b/keyboards/matchstickworks/normiepad/keymaps/default/keymap.c
@ -0,0 +1,17 @@
+/* Copyright 2024 Logan Butler*/
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_numpad_6x4(
+        KC_BSPC, KC_EQL,  LSFT(KC_9),LSFT(KC_0),
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_P7,   KC_P8,   KC_P9,
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,   KC_P2,   KC_P3,
+        KC_P0,            KC_PDOT, KC_PENT
+    ),
+
+};
--- a/keyboards/matchstickworks/normiepad/keymaps/via/keymap.c
+++ b/keyboards/matchstickworks/normiepad/keymaps/via/keymap.c
@ -0,0 +1,17 @@
+/* Copyright 2024 Logan Butler*/
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_numpad_6x4(
+        KC_BSPC, KC_EQL,  LSFT(KC_9),LSFT(KC_0),
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_P7,   KC_P8,   KC_P9,
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,   KC_P2,   KC_P3,
+        KC_P0,            KC_PDOT, KC_PENT
+    ),
+
+};
--- a/keyboards/matchstickworks/normiepad/keymaps/via/rules.mk
+++ b/keyboards/matchstickworks/normiepad/keymaps/via/rules.mk
@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/matchstickworks/normiepad/readme.md
+++ b/keyboards/matchstickworks/normiepad/readme.md
@ -0,0 +1,23 @@
+# NormiePad
+
+![NormiePad](https://i.imgur.com/Fr8o5Ijm.png)
+
+This is a standard layout numberpad with USB-C connection and Kailh hotswap sockets, built on the RP2040 MCU.
+
+## Default layout
+
+![NormiePad Layout](https://i.imgur.com/IZxBA1f.png)
+
+* Keyboard Maintainer: [Logan Butler](https://github.com/MatchstickWorks)
+* Hardware Supported: NormiePad PCB
+* Hardware Availability: Either via [my storefront](https://matchstick.works), [my Etsy Store](https://www.etsy.com/shop/MatchstickWorksShop), or by messaging directly
+
+Getting the board into bootloader mode:
+
+In order to flash the firmware to this board, simply press both the RESET and BOOT buttons on the back of the PCB. You will hear a reconnect sound on your computer and a file explorer window should open where you can drag and drop the compiled UF2 into.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make matchstickworks/normiepad: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).