Browse Source

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

QMK Bot 8 months ago
parent
commit
dcdcd360a1

+ 16 - 1
docs/reference_info_json.md

@@ -327,6 +327,21 @@ Configures the [LED Indicators](features/led_indicators) feature.
     * `scroll_lock` <Badge type="info">Pin</Badge>
         * The GPIO pin connected to the Scroll Lock LED.
 
+## (Custom) Keycodes {#keycodes}
+
+Defines [custom keycodes](custom_quantum_functions#definining-a-new-keycode) for use within keymaps.
+
+* `keycodes` <Badge type="info">Array: Object</Badge>
+    * A list of keycode objects.
+        * `key` <Badge type="info">String</Badge> <Badge>Required</Badge>
+            * The enum name of the custom keycode. 
+            * Example: `LAYER_CHANGE_BEEP_ON`
+        * `label` <Badge type="info">String</Badge>
+            * A short description of the custom keycode.
+        * `aliases` <Badge type="info">Array: String</Badge>
+            * A list of shortened names for the custom keycode.
+            * Example: `["LCBON", "LCB_ON"]`
+
 ## Layouts {#layouts}
 
 The `layouts` portion of the dictionary contains several nested dictionaries. The outer layer consists of QMK layout names, for example `LAYOUT_60_ansi` or `LAYOUT_60_iso`.
@@ -513,7 +528,7 @@ Configures the [LED Matrix](features/led_matrix) feature.
         * The amount of time to wait between row/col selection and col/row pin reading, in microseconds.
         * Default: `30` (30 µs)
     * `masked` <Badge type="info">Boolean</Badge>
-        * Whether configured intersections should be ignored.
+        * Whether unconfigured intersections should be ignored.
         * Default: `false`
     * `rows` <Badge type="info">Array: Pin</Badge>
         * A list of GPIO pins connected to the matrix rows.

+ 4 - 4
keyboards/miuni32/keyboard.json

@@ -3,8 +3,8 @@
     "manufacturer": "Bigtuna.io",
     "maintainer": "qmk",
     "usb": {
-        "vid": "0xFEED",
-        "pid": "0x6060",
+        "vid": "0x41FA",
+        "pid": "0xAAEF",
         "device_version": "0.0.1"
     },
     "rgblight": {
@@ -80,8 +80,8 @@
                 {"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, "w": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2, "w": 2},
                 {"matrix": [2, 6], "x": 6, "y": 2},
                 {"matrix": [2, 7], "x": 7, "y": 2},
                 {"matrix": [2, 8], "x": 8, "y": 2},

+ 15 - 0
keyboards/miuni32/keymaps/default/keymap.c

@@ -1,3 +1,18 @@
+/* Copyright 2025 BigTuna.io
+ *
+ * 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] = {