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

keyboards/5keys/keyboard.json

@@ -0,0 +1,34 @@
+{
+    "manufacturer": "mikiya418",
+    "keyboard_name": "5keys",
+    "maintainer": "mikiya418",
+    "development_board": "promicro",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "direct": [
+            ["F4","F5","F6","F7","B1"]
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x4D4B"
+    },
+    "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}
+            ]
+        }
+    }
+}

keyboards/5keys/keymaps/default/keymap.c

@@ -0,0 +1,21 @@
+/* Copylight 2024 mikiya418. 
+ *
+ * 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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_WBAK,   KC_WFWD,   LSG_T(KC_S),   G(KC_L),  MO(1) 
+    )
+};

keyboards/5keys/readme.md

@@ -0,0 +1,27 @@
+# 5keys
+
+![5keys](https://imgur.com/yOkI4HT)
+
+This keyboard is a macro keyboard with five keys.
+
+* Keyboard Maintainer: [mikiya418](https://github.com/mikiya418)
+* Hardware Supported: 5keys PCBs, Pro Micro
+* Hardware Availability: [Thingiverse](https://www.thingiverse.com/thing:6834908)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 5keys:default
+
+Flashing example for this keyboard:
+
+    make 5keys: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

layouts/default/fullsize_extended_jis/info.json

@@ -48,8 +48,8 @@
                 {"x": 19.5, "y": 1.25},
                 {"x": 20.5, "y": 1.25},
                 {"x": 21.5, "y": 1.25},
-                {"x": 0, "y": 2.25, "w": 1.5},
 
+                {"x": 0, "y": 2.25, "w": 1.5},
                 {"x": 1.5, "y": 2.25},
                 {"x": 2.5, "y": 2.25},
                 {"x": 3.5, "y": 2.25},
@@ -62,7 +62,7 @@
                 {"x": 10.5, "y": 2.25},
                 {"x": 11.5, "y": 2.25},
                 {"x": 12.5, "y": 2.25},
-                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
                 {"x": 15.25, "y": 2.25},
                 {"x": 16.25, "y": 2.25},
                 {"x": 17.25, "y": 2.25},
@@ -84,6 +84,7 @@
                 {"x": 10.75, "y": 3.25},
                 {"x": 11.75, "y": 3.25},
                 {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
                 {"x": 18.5, "y": 3.25},
                 {"x": 19.5, "y": 3.25},
                 {"x": 20.5, "y": 3.25},
@@ -106,7 +107,7 @@
                 {"x": 19.5, "y": 4.25},
                 {"x": 20.5, "y": 4.25},
                 {"x": 21.5, "y": 4.25, "h": 2},
-                
+
                 {"x": 0, "y": 5.25, "w": 1.25},
                 {"x": 1.25, "y": 5.25, "w": 1.25},
                 {"x": 2.5, "y": 5.25, "w": 1.25},

layouts/default/fullsize_jis/info.json

@@ -44,8 +44,8 @@
                 {"x": 19.5, "y": 1.25},
                 {"x": 20.5, "y": 1.25},
                 {"x": 21.5, "y": 1.25},
-                {"x": 0, "y": 2.25, "w": 1.5},
 
+                {"x": 0, "y": 2.25, "w": 1.5},
                 {"x": 1.5, "y": 2.25},
                 {"x": 2.5, "y": 2.25},
                 {"x": 3.5, "y": 2.25},
@@ -58,7 +58,6 @@
                 {"x": 10.5, "y": 2.25},
                 {"x": 11.5, "y": 2.25},
                 {"x": 12.5, "y": 2.25},
-                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
                 {"x": 15.25, "y": 2.25},
                 {"x": 16.25, "y": 2.25},
                 {"x": 17.25, "y": 2.25},
@@ -80,6 +79,7 @@
                 {"x": 10.75, "y": 3.25},
                 {"x": 11.75, "y": 3.25},
                 {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
                 {"x": 18.5, "y": 3.25},
                 {"x": 19.5, "y": 3.25},
                 {"x": 20.5, "y": 3.25},
@@ -102,7 +102,7 @@
                 {"x": 19.5, "y": 4.25},
                 {"x": 20.5, "y": 4.25},
                 {"x": 21.5, "y": 4.25, "h": 2},
-                
+
                 {"x": 0, "y": 5.25, "w": 1.25},
                 {"x": 1.25, "y": 5.25, "w": 1.25},
                 {"x": 2.5, "y": 5.25, "w": 1.25},