Merge 85fcac4647 into 9bea332a21

deleted keyboards/reviung/reviung46/keymaps/via/keymap.c
deleted keyboards/reviung/reviung46/keymaps/via/rules.mk

keyboards/reviung/reviung46/keyboard.json

@@ -0,0 +1,463 @@
+{
+    "keyboard_name": "reviung46",
+    "manufacturer": "gtips",
+    "url": "https://github.com/gtips/reviung/tree/master/reviung46/",
+    "maintainer": "gtips",
+    "usb": {
+        "vid": "0x4E95",
+        "pid": "0x4E19",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "hue_steps": 16,
+        "saturation_steps": 16,
+        "brightness_steps": 16,
+        "led_count": 10,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "matrix_pins": {
+        "cols": ["B5", "C6", "D4", "D0", "D1", "D2"],
+        "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"]
+    },
+    "diode_direction": "COL2ROW",
+    "development_board": "promicro",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 2, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "y": 0},
+                {"matrix": [4, 2], "x": 10.5, "y": 0},
+                {"matrix": [4, 3], "x": 11.5, "y": 0},
+                {"matrix": [4, 4], "x": 12.5, "y": 0},
+                {"matrix": [4, 5], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 2, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+                {"matrix": [5, 0], "x": 8.75, "y": 1},
+                {"matrix": [5, 1], "x": 9.75, "y": 1},
+                {"matrix": [5, 2], "x": 10.75, "y": 1},
+                {"matrix": [5, 3], "x": 11.75, "y": 1},
+                {"matrix": [5, 4], "x": 12.75, "y": 1},
+                {"matrix": [5, 5], "x": 13.75, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 1, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2, "w": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [6, 0], "x": 8.25, "y": 2},
+                {"matrix": [6, 1], "x": 9.25, "y": 2},
+                {"matrix": [6, 2], "x": 10.25, "y": 2},
+                {"matrix": [6, 3], "x": 11.25, "y": 2},
+                {"matrix": [6, 4], "x": 12.25, "y": 2},
+                {"matrix": [6, 5], "x": 13.25, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 6, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 8.25, "y": 3, "w": 2.75},
+                {"matrix": [7, 1], "x": 11, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 13.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_225u_enter": {
+            "layout": [
+                {"matrix": [0, 0], "x": 2, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "y": 0},
+                {"matrix": [4, 2], "x": 10.5, "y": 0},
+                {"matrix": [4, 3], "x": 11.5, "y": 0},
+                {"matrix": [4, 4], "x": 12.5, "y": 0},
+                {"matrix": [4, 5], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 2, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+                {"matrix": [5, 0], "x": 8.75, "y": 1},
+                {"matrix": [5, 1], "x": 9.75, "y": 1},
+                {"matrix": [5, 2], "x": 10.75, "y": 1},
+                {"matrix": [5, 3], "x": 11.75, "y": 1},
+                {"matrix": [5, 5], "x": 12.75, "y": 1, "w": 2.25},
+
+                {"matrix": [2, 0], "x": 1, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2, "w": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [6, 0], "x": 8.25, "y": 2},
+                {"matrix": [6, 1], "x": 9.25, "y": 2},
+                {"matrix": [6, 2], "x": 10.25, "y": 2},
+                {"matrix": [6, 3], "x": 11.25, "y": 2},
+                {"matrix": [6, 4], "x": 12.25, "y": 2},
+                {"matrix": [6, 5], "x": 13.25, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 6, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 8.25, "y": 3, "w": 2.75},
+                {"matrix": [7, 1], "x": 11, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 13.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_275u_r_shift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 2, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "y": 0},
+                {"matrix": [4, 2], "x": 10.5, "y": 0},
+                {"matrix": [4, 3], "x": 11.5, "y": 0},
+                {"matrix": [4, 4], "x": 12.5, "y": 0},
+                {"matrix": [4, 5], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 2, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+                {"matrix": [5, 0], "x": 8.75, "y": 1},
+                {"matrix": [5, 1], "x": 9.75, "y": 1},
+                {"matrix": [5, 2], "x": 10.75, "y": 1},
+                {"matrix": [5, 3], "x": 11.75, "y": 1},
+                {"matrix": [5, 4], "x": 12.75, "y": 1},
+                {"matrix": [5, 5], "x": 13.75, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 1, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2, "w": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [6, 0], "x": 8.25, "y": 2},
+                {"matrix": [6, 1], "x": 9.25, "y": 2},
+                {"matrix": [6, 2], "x": 10.25, "y": 2},
+                {"matrix": [6, 3], "x": 11.25, "y": 2},
+                {"matrix": [6, 5], "x": 12.25, "y": 2, "w": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 6, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 8.25, "y": 3, "w": 2.75},
+                {"matrix": [7, 1], "x": 11, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 13.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_625u_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 2, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "y": 0},
+                {"matrix": [4, 2], "x": 10.5, "y": 0},
+                {"matrix": [4, 3], "x": 11.5, "y": 0},
+                {"matrix": [4, 4], "x": 12.5, "y": 0},
+                {"matrix": [4, 5], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 2, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+                {"matrix": [5, 0], "x": 8.75, "y": 1},
+                {"matrix": [5, 1], "x": 9.75, "y": 1},
+                {"matrix": [5, 2], "x": 10.75, "y": 1},
+                {"matrix": [5, 3], "x": 11.75, "y": 1},
+                {"matrix": [5, 4], "x": 12.75, "y": 1},
+                {"matrix": [5, 5], "x": 13.75, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 1, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2, "w": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [6, 0], "x": 8.25, "y": 2},
+                {"matrix": [6, 1], "x": 9.25, "y": 2},
+                {"matrix": [6, 2], "x": 10.25, "y": 2},
+                {"matrix": [6, 3], "x": 11.25, "y": 2},
+                {"matrix": [6, 4], "x": 12.25, "y": 2},
+                {"matrix": [6, 5], "x": 13.25, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 6.25},
+                {"matrix": [7, 1], "x": 11, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 13.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_225u_enter_275u_r_shift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 2, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "y": 0},
+                {"matrix": [4, 2], "x": 10.5, "y": 0},
+                {"matrix": [4, 3], "x": 11.5, "y": 0},
+                {"matrix": [4, 4], "x": 12.5, "y": 0},
+                {"matrix": [4, 5], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 2, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+                {"matrix": [5, 0], "x": 8.75, "y": 1},
+                {"matrix": [5, 1], "x": 9.75, "y": 1},
+                {"matrix": [5, 2], "x": 10.75, "y": 1},
+                {"matrix": [5, 3], "x": 11.75, "y": 1},
+                {"matrix": [5, 5], "x": 12.75, "y": 1, "w": 2.25},
+
+                {"matrix": [2, 0], "x": 1, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2, "w": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [6, 0], "x": 8.25, "y": 2},
+                {"matrix": [6, 1], "x": 9.25, "y": 2},
+                {"matrix": [6, 2], "x": 10.25, "y": 2},
+                {"matrix": [6, 3], "x": 11.25, "y": 2},
+                {"matrix": [6, 5], "x": 12.25, "y": 2, "w": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 6, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 8.25, "y": 3, "w": 2.75},
+                {"matrix": [7, 1], "x": 11, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 13.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_225u_enter_625u_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 2, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "y": 0},
+                {"matrix": [4, 2], "x": 10.5, "y": 0},
+                {"matrix": [4, 3], "x": 11.5, "y": 0},
+                {"matrix": [4, 4], "x": 12.5, "y": 0},
+                {"matrix": [4, 5], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 2, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+                {"matrix": [5, 0], "x": 8.75, "y": 1},
+                {"matrix": [5, 1], "x": 9.75, "y": 1},
+                {"matrix": [5, 2], "x": 10.75, "y": 1},
+                {"matrix": [5, 3], "x": 11.75, "y": 1},
+                {"matrix": [5, 5], "x": 12.75, "y": 1, "w": 2.25},
+
+                {"matrix": [2, 0], "x": 1, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2, "w": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [6, 0], "x": 8.25, "y": 2},
+                {"matrix": [6, 1], "x": 9.25, "y": 2},
+                {"matrix": [6, 2], "x": 10.25, "y": 2},
+                {"matrix": [6, 3], "x": 11.25, "y": 2},
+                {"matrix": [6, 4], "x": 12.25, "y": 2},
+                {"matrix": [6, 5], "x": 13.25, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 6.25},
+                {"matrix": [7, 1], "x": 11, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 13.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_275u_r_shift_625u_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 2, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "y": 0},
+                {"matrix": [4, 2], "x": 10.5, "y": 0},
+                {"matrix": [4, 3], "x": 11.5, "y": 0},
+                {"matrix": [4, 4], "x": 12.5, "y": 0},
+                {"matrix": [4, 5], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 2, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+                {"matrix": [5, 0], "x": 8.75, "y": 1},
+                {"matrix": [5, 1], "x": 9.75, "y": 1},
+                {"matrix": [5, 2], "x": 10.75, "y": 1},
+                {"matrix": [5, 3], "x": 11.75, "y": 1},
+                {"matrix": [5, 4], "x": 12.75, "y": 1},
+                {"matrix": [5, 5], "x": 13.75, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 1, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2, "w": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [6, 0], "x": 8.25, "y": 2},
+                {"matrix": [6, 1], "x": 9.25, "y": 2},
+                {"matrix": [6, 2], "x": 10.25, "y": 2},
+                {"matrix": [6, 3], "x": 11.25, "y": 2},
+                {"matrix": [6, 5], "x": 12.25, "y": 2, "w": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 6.25},
+                {"matrix": [7, 1], "x": 11, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 13.5, "y": 3, "w": 1.5}
+            ]
+        },
+        "LAYOUT_225u_enter_275u_r_shift_625u_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 2, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "y": 0},
+                {"matrix": [4, 2], "x": 10.5, "y": 0},
+                {"matrix": [4, 3], "x": 11.5, "y": 0},
+                {"matrix": [4, 4], "x": 12.5, "y": 0},
+                {"matrix": [4, 5], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 2, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 3.75, "y": 1},
+                {"matrix": [1, 2], "x": 4.75, "y": 1},
+                {"matrix": [1, 3], "x": 5.75, "y": 1},
+                {"matrix": [1, 4], "x": 6.75, "y": 1},
+                {"matrix": [1, 5], "x": 7.75, "y": 1},
+                {"matrix": [5, 0], "x": 8.75, "y": 1},
+                {"matrix": [5, 1], "x": 9.75, "y": 1},
+                {"matrix": [5, 2], "x": 10.75, "y": 1},
+                {"matrix": [5, 3], "x": 11.75, "y": 1},
+                {"matrix": [5, 5], "x": 12.75, "y": 1, "w": 2.25},
+
+                {"matrix": [2, 0], "x": 1, "y": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 2, "w": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+                {"matrix": [6, 0], "x": 8.25, "y": 2},
+                {"matrix": [6, 1], "x": 9.25, "y": 2},
+                {"matrix": [6, 2], "x": 10.25, "y": 2},
+                {"matrix": [6, 3], "x": 11.25, "y": 2},
+                {"matrix": [6, 5], "x": 12.25, "y": 2, "w": 2.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 6.25},
+                {"matrix": [7, 1], "x": 11, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 12.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 13.5, "y": 3, "w": 1.5}
+            ]
+        }
+    }
+}

keyboards/reviung/reviung46/keymaps/default/keymap.c

@@ -0,0 +1,47 @@
+// Copyright 2024 gtips (@gtips)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+#define SF_SS RSFT_T(KC_SLSH)
+#define SP_LO LT(_LOWER, KC_SPC)
+#define SP_RA LT(_RAISE, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+                          KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSPC,
+                          KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_ENT,
+              KC_UP,      KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,             SF_SS,
+    KC_LEFT,  KC_DOWN,  KC_RGHT,    KC_LCTL,  KC_LALT,               SP_LO,                   SP_RA,                KC_LALT,  KC_RGUI,  KC_RCTL
+    ),
+    [_LOWER] = LAYOUT(
+                          KC_TILD,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,   KC_DEL,
+                          _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  XXXXXXX,  KC_QUOT,
+              _______,    _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    XXXXXXX,  XXXXXXX,  XXXXXXX,            KC_SLSH,
+    _______,  _______,  _______,    _______,  _______,               _______,                 _______,              _______,  _______,  _______
+    ),
+    [_RAISE] = 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_LBRC,  KC_RBRC,  KC_BSLS,  KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  XXXXXXX,  KC_DQUO,
+              _______,    _______,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   XXXXXXX,  XXXXXXX,  XXXXXXX,            KC_QUES,
+    _______,  _______,  _______,    _______,  _______,               _______,                 _______,              _______,  _______,  _______
+    ),
+    [_ADJUST] = LAYOUT(
+                          UG_VALU,   UG_SATU, UG_HUEU,  UG_NEXT,  XXXXXXX,  UG_TOGG,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+                          UG_VALD,   UG_SATD, UG_HUED,  UG_PREV,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+              KC_VOLU,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  QK_BOOT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            XXXXXXX,
+    KC_MUTE,  KC_VOLD,  KC_MPLY,    XXXXXXX,  XXXXXXX,               _______,                 _______,              XXXXXXX,  XXXXXXX,  XXXXXXX
+    ),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}

keyboards/reviung/reviung46/readme.md

@@ -0,0 +1,27 @@
+# reviung46
+
+![reviung46](https://github.com/gtips/reviung/blob/master/reviung46/image/reviung46_01.jpg) 
+
+The REVIUNG46 is 42-46 key keyboard.
+
+* Keyboard Maintainer: [gtips](https://github.com/gtips)
+* Hardware Supported: REVIUNG46 PCB. 
+* Hardware Availability: [PCB & Case Data](https://github.com/gtips/reviung/tree/master/reviung46) 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make reviung46:default
+
+Flashing example for this keyboard:
+
+    make reviung46: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

lib/python/qmk/cli/new/keymap.py

@@ -1,5 +1,6 @@
 """This script automates the copying of the default keymap into your own keymap.
 """
+import re
 import shutil
 
 from milc import cli
@@ -13,6 +14,13 @@ from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.userspace import UserspaceDefs
 
 
+def validate_keymap_name(name):
+    """Returns True if the given keymap name contains only a-z, 0-9 and underscore characters.
+    """
+    regex = re.compile(r'^[a-zA-Z0-9][a-zA-Z0-9_]+$')
+    return bool(regex.match(name))
+
+
 def prompt_keyboard():
     prompt = """{fg_yellow}Select Keyboard{style_reset_all}
 If you`re unsure you can view a full list of supported keyboards with {fg_yellow}qmk list-keyboards{style_reset_all}.
@@ -60,6 +68,10 @@ def new_keymap(cli):
         cli.log.error(f'Default keymap {{fg_cyan}}{keymap_path_default}{{fg_reset}} does not exist!')
         return False
 
+    if not validate_keymap_name(user_name):
+        cli.log.error('Keymap names must contain only {fg_cyan}a-z{fg_reset}, {fg_cyan}0-9{fg_reset} and {fg_cyan}_{fg_reset}! Please choose a different name.')
+        return False
+
     if keymap_path_new.exists():
         cli.log.error(f'Keymap {{fg_cyan}}{user_name}{{fg_reset}} already exists! Please choose a different name.')
         return False

lib/python/qmk/cli/via2json.py

@@ -29,6 +29,7 @@ def _convert_macros(via_macros):
     if len(via_macros) == 0:
         return list()
     split_regex = re.compile(r'(}\,)|(\,{)')
+    macro_group_regex = re.compile(r'({.+?})')
     macros = list()
     for via_macro in via_macros:
         # Split VIA macro to its elements
@@ -38,13 +39,28 @@ def _convert_macros(via_macros):
         macro_data = list()
         for m in macro:
             if '{' in m or '}' in m:
-                # Found keycode(s)
+                # Split macro groups
-                keycodes = m.split(',')
+                macro_groups = macro_group_regex.findall(m)
-                # Remove whitespaces and curly braces from around keycodes
+                for macro_group in macro_groups:
-                keycodes = list(map(lambda s: s.strip(' {}'), keycodes))
+                    # Remove whitespaces and curly braces from around group
-                # Remove the KC prefix
+                    macro_group = macro_group.strip(' {}')
-                keycodes = list(map(lambda s: s.replace('KC_', ''), keycodes))
+
-                macro_data.append({"action": "tap", "keycodes": keycodes})
+                    macro_action = 'tap'
+                    macro_keycodes = []
+
+                    if macro_group[0] == '+':
+                        macro_action = 'down'
+                        macro_keycodes.append(macro_group[1:])
+                    elif macro_group[0] == '-':
+                        macro_action = 'up'
+                        macro_keycodes.append(macro_group[1:])
+                    else:
+                        macro_keycodes.extend(macro_group.split(',') if ',' in macro_group else [macro_group])
+
+                    # Remove the KC prefixes
+                    macro_keycodes = list(map(lambda s: s.replace('KC_', ''), macro_keycodes))
+
+                    macro_data.append({"action": macro_action, "keycodes": macro_keycodes})
             else:
                 # Found text
                 macro_data.append(m)
@@ -54,13 +70,13 @@ def _convert_macros(via_macros):
 
 
 def _fix_macro_keys(keymap_data):
-    macro_no = re.compile(r'MACRO0?([0-9]{1,2})')
+    macro_no = re.compile(r'MACRO0?\(([0-9]{1,2})\)')
     for i in range(0, len(keymap_data)):
         for j in range(0, len(keymap_data[i])):
             kc = keymap_data[i][j]
             m = macro_no.match(kc)
             if m:
-                keymap_data[i][j] = f'MACRO_{m.group(1)}'
+                keymap_data[i][j] = f'MC_{m.group(1)}'
     return keymap_data