Merge 1c8b6dec9b into 85a7627641

Co-authored-by: Joel Challis <git@zvecr.com>

keyboards/nibell/mpad16/config.h

@@ -0,0 +1,20 @@
+// Copyright 2023 nibell (@Linus Nibell)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT

keyboards/nibell/mpad16/info.json

@@ -0,0 +1,46 @@
+{
+    "manufacturer": "nibell",
+    "keyboard_name": "nibell/mpad16",
+    "maintainer": "Linus Nibell",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP2", "GP3", "GP4", "GP5"],
+        "rows": ["GP10", "GP11", "GP12", "GP13"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "vid": "0x4C4E",
+        "pid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x4": {
+            "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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
+            ]
+        }
+    }
+}

keyboards/nibell/mpad16/keymaps/default/keymap.c

@@ -0,0 +1,24 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───────┬─────┬────────┬───────┐
+     * │  F1   │ F2  │   F3   │  F4   │
+     * ├───────┼─────┼────────┼───────┤
+     * │  F5   │ F6  │   F7   │  F8   │
+     * ├───────┼─────┼────────┼───────┤
+     * │   1   │  2  │   3    │   4   │
+     * ├───────┼─────┼────────┼───────┤
+     * │ PRTSC │ INS │ RSHIFT │ RCTRL │
+     * └───────┴─────┴────────┴───────┘
+     */
+    [0] = LAYOUT_ortho_4x4(
+        KC_F1,              KC_F2,      KC_F3,          KC_F4,
+        KC_F5,              KC_F6,      KC_F7,          KC_F8,
+        KC_1,               KC_2,       KC_3,           KC_4,
+        KC_PRINT_SCREEN,    KC_INSERT,  KC_RIGHT_SHIFT, KC_RIGHT_CTRL
+    )
+};

keyboards/nibell/mpad16/keymaps/via/keymap.c

@@ -0,0 +1,24 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───────┬─────┬────────┬───────┐
+     * │  F1   │ F2  │   F3   │  F4   │
+     * ├───────┼─────┼────────┼───────┤
+     * │  F5   │ F6  │   F7   │  F8   │
+     * ├───────┼─────┼────────┼───────┤
+     * │   1   │  2  │   3    │   4   │
+     * ├───────┼─────┼────────┼───────┤
+     * │ PRTSC │ INS │ RSHIFT │ RCTRL │
+     * └───────┴─────┴────────┴───────┘
+     */
+    [0] = LAYOUT_ortho_4x4(
+        KC_F1,              KC_F2,      KC_F3,          KC_F4,
+        KC_F5,              KC_F6,      KC_F7,          KC_F8,
+        KC_1,               KC_2,       KC_3,           KC_4,
+        KC_PRINT_SCREEN,    KC_INSERT,  KC_RIGHT_SHIFT, KC_RIGHT_CTRL
+    )
+};

keyboards/nibell/mpad16/keymaps/via/rules.mk

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

keyboards/nibell/mpad16/readme.md

@@ -0,0 +1,27 @@
+# nibell/mpad16
+
+![nibell/mpad16](imgur.com image replace me!)
+
+*A short description of the keyboard/project*
+
+* Keyboard Maintainer: [nibell](https://github.com/Linus Nibell)
+* Hardware Supported: *The PCBs, controllers supported*
+* Hardware Availability: *Links to where you can find this hardware*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nibell/mpad16:default
+
+Flashing example for this keyboard:
+
+    make nibell/mpad16: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

keyboards/nibell/mpad16/rules.mk

@@ -0,0 +1 @@
+# This file intentionally left blank

tmk_core/protocol/usb_descriptor.c

@@ -281,7 +281,7 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
             HID_RI_LOGICAL_MAXIMUM(16, 0x7FFF),
             HID_RI_REPORT_COUNT(8, 0x02),
             HID_RI_REPORT_SIZE(8, 0x10),
-            HID_RI_UNIT(8, 0x33),          // Inch, English Linear
+            HID_RI_UNIT(8, 0x13),          // Inch, English Linear
             HID_RI_UNIT_EXPONENT(8, 0x0E), // -2
             HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
         HID_RI_END_COLLECTION(0),

tmk_core/protocol/vusb/vusb.c

@@ -659,7 +659,7 @@ const PROGMEM uchar shared_hid_report[] = {
     0x26, 0xFF, 0x7F, //     Logical Maximum (32767)
     0x95, 0x02,       //     Report Count (2)
     0x75, 0x10,       //     Report Size (16)
-    0x65, 0x33,       //     Unit (Inch, English Linear)
+    0x65, 0x13,       //     Unit (Inch, English Linear)
     0x55, 0x0E,       //     Unit Exponent (-2)
     0x81, 0x02,       //     Input (Data, Variable, Absolute)
     0xC0,             //   End Collection