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

* info.json: apply friendly formatting

* add matrix_diagram.md

* move matrix data to info.json

* add LAYOUT_60_ansi_split_bs_rshift

* add LAYOUT_60_tsangan_hhkb

* add LAYOUT_60_hhkb

data/mappings/keyboard_aliases.hjson

@@ -149,6 +149,15 @@
     "durgod/k320": {
         "target": "durgod/k3x0/k320"
     },
+    "durgod/hades": {
+        "target": "durgod/dgk6x/hades_ansi"
+    },
+    "durgod/hades_ansi": {
+        "target": "durgod/dgk6x/hades_ansi"
+    },
+    "durgod/hades_iso": {
+        "target": "durgod/dgk6x/hades_iso"
+    },
     "dztech/dz60rgb": {
         "target": "dztech/dz60rgb/v1"
     },

keyboards/40percentclub/gherkin/kb2040/readme.md

@@ -0,0 +1,22 @@
+# Gherkin
+
+![Gherkin](https://i.imgur.com/XrqqtTq.jpg)
+![KB2040](https://cdn-shop.adafruit.com/640x480/5302-12.jpg)
+
+===
+
+A 30 key keyboard with Adafruit's KB2040 as microcontroller.
+
+* [The original TMK firmware](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/gherkin)
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: Gherkin PCB  & Adafruit KB2040
+Hardware Availability: [Gherkin project on 40% Keyboards](http://www.40percent.club/2016/11/gherkin.html) and [Adafruit KB2040](https://www.adafruit.com/product/5302)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 40percentclub/gherkin/kb2040: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).
+
+Use the KB2040 microcontroller as a drop-in replacement for the Pro Micro in this cute 30% keyboard.

keyboards/40percentclub/gherkin/kb2040/rules.mk

@@ -0,0 +1 @@
+CONVERT_TO = kb2040

keyboards/40percentclub/gherkin/readme.md

@@ -1,6 +1,6 @@
 # Gherkin
 
-![Gherkin](https://4.bp.blogspot.com/-sQ18-lNZXOc/WCzlTde-4PI/AAAAAAAB_JQ/qQrehAMG6DMKf3i4oj4mkmLGOfTUvb3KgCLcB/s640/IMG_20161116_122926.jpg)
+![Gherkin](https://i.imgur.com/XrqqtTq.jpg)
 ===
 
 A 30 key keyboard.

keyboards/4pplet/eagle_viper_rep/rev_a/info.json

@@ -27,71 +27,287 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                { "label": "!", "x": 1, "y": 0 },
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
-                { "label": "@", "x": 2, "y": 0 },
+                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
-                { "label": "#", "x": 3, "y": 0 },
+                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
-                { "label": "$", "x": 4, "y": 0 },
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
-                { "label": "%", "x": 5, "y": 0 },
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
-                { "label": "^", "x": 6, "y": 0 },
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
-                { "label": "&", "x": 7, "y": 0 },
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
-                { "label": "*", "x": 8, "y": 0 },
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
-                { "label": "(", "x": 9, "y": 0 },
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
-                { "label": ")", "x": 10, "y": 0 },
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
-                { "label": "_", "x": 11, "y": 0 },
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
-                { "label": "+", "x": 12, "y": 0 },
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
-                { "label": "|", "x": 13, "y": 0 },
+                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
-                { "label": "~", "x": 14, "y": 0 },
+                {"label": "~", "matrix": [3, 6], "x": 14, "y": 0},
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
+
-                { "label": "Q", "x": 1.5, "y": 1 },
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                { "label": "W", "x": 2.5, "y": 1 },
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
-                { "label": "E", "x": 3.5, "y": 1 },
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
-                { "label": "R", "x": 4.5, "y": 1 },
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
-                { "label": "T", "x": 5.5, "y": 1 },
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
-                { "label": "Y", "x": 6.5, "y": 1 },
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
-                { "label": "U", "x": 7.5, "y": 1 },
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
-                { "label": "I", "x": 8.5, "y": 1 },
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
-                { "label": "O", "x": 9.5, "y": 1 },
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
-                { "label": "P", "x": 10.5, "y": 1 },
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
-                { "label": "{", "x": 11.5, "y": 1 },
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
-                { "label": "}", "x": 12.5, "y": 1 },
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
-                { "label": "Backsp.", "x": 13.5, "y": 1, "w": 1.5 },
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
+                {"label": "Backsp.", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
-                { "label": "A", "x": 1.75, "y": 2 },
+
-                { "label": "S", "x": 2.75, "y": 2 },
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                { "label": "D", "x": 3.75, "y": 2 },
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
-                { "label": "F", "x": 4.75, "y": 2 },
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
-                { "label": "G", "x": 5.75, "y": 2 },
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
-                { "label": "H", "x": 6.75, "y": 2 },
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
-                { "label": "J", "x": 7.75, "y": 2 },
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
-                { "label": "K", "x": 8.75, "y": 2 },
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
-                { "label": "L", "x": 9.75, "y": 2 },
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
-                { "label": ":", "x": 10.75, "y": 2 },
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
-                { "label": "\"", "x": 11.75, "y": 2 },
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
-                { "label": "~", "x": 12.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
-                { "label": "Enter", "x": 13.75, "y": 2, "w": 1.25 },
+                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
+                {"label": "~", "matrix": [4, 6], "x": 12.75, "y": 2},
-                { "label": "|", "x": 1.25, "y": 3 },
+                {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 2, "w": 1.25},
-                { "label": "Z", "x": 2.25, "y": 3 },
+
-                { "label": "X", "x": 3.25, "y": 3 },
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                { "label": "C", "x": 4.25, "y": 3 },
+                {"label": "|", "matrix": [7, 0], "x": 1.25, "y": 3},
-                { "label": "V", "x": 5.25, "y": 3 },
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
-                { "label": "B", "x": 6.25, "y": 3 },
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
-                { "label": "N", "x": 7.25, "y": 3 },
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
-                { "label": "M", "x": 8.25, "y": 3 },
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
-                { "label": "<", "x": 9.25, "y": 3 },
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
-                { "label": ">", "x": 10.25, "y": 3 },
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
-                { "label": "?", "x": 11.25, "y": 3 },
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
-                { "label": "Fn", "x": 14, "y": 3 },
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
-                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
-                { "label": "Space", "x": 3.75, "y": 4, "w": 6.25 },
+
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                { "label": "Menu", "x": 11.25, "y": 4, "w": 1.25 },
+                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                { "label": "Win", "x": 12.5, "y": 4, "w": 1.25 },
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
-                { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 }
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "~", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "Backsp.", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [9, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "~", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "Backsp.", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Win", "matrix": [9, 5], "x": 12.5, "y": 4},
+                {"label": "Ctrl", "matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "#", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "%", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "&", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "(", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "~", "matrix": [3, 6], "x": 14, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "Backsp.", "matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 3},
+
+                {"label": "Alt", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "GUI", "matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "GUI", "matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [9, 5], "x": 12.5, "y": 4}
             ]
         }
     }

keyboards/4pplet/eagle_viper_rep/rev_a/matrix_diagram.md

@@ -0,0 +1,24 @@
+# Matrix Diagram for 4pplet Eagle Viper REP Rev A
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │36?    │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │16 │36 │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      ┌─────┐
+│20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │56   │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤   ┌──┴┐76  │ ISO Enter
+│40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │76      │   │46 │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   └───┴────┘
+│60  │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66    │96 │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+│80  │90  │91  │93                      │94  │85  │95  │86  │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌────────┐                                       ┌──────────┐
+│60      │ 2.25u LShift             2.75u RShift │66        │
+└────────┘                                       └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│80   │90 │91   │93                         │85   │95 │86   │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```

keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.h

@@ -19,23 +19,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 
 void setLayerLed(layer_state_t state);
-
-#define LAYOUT_all( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k36, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k56,\
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k76,\
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k96,\
-    k80, k90, k91, k93, k94, k85, k95, k86  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06}, \
-    {k10, k11, k12, k13, k14, k15, k16}, \
-    {k20, k21, k22, k23, k24, k25, k26}, \
-    {k30, k31, k32, k33, k34, k35, k36}, \
-    {k40, k41, k42, k43, k44, k45, k46}, \
-    {k50, k51, k52, k53, k54, k55, k56}, \
-    {k60, k61, k62, k63, k64, k65, k66}, \
-    {k70, k71, k72, k73, k74, k75, k76}, \
-    {k80, KC_NO, KC_NO, KC_NO, KC_NO, k85, k86}, \
-    {k90, k91, KC_NO, k93, k94, k95, k96}  \
-}

keyboards/durgod/dgk6x/hades_ansi/readme.md

@@ -12,11 +12,11 @@ This is a standard off-the-shelf Durgod Hades 65% ANSI layout keyboard with RGB
 
 Make command example for this keyboard (after setting up your build environment):
 
-    make durgod/hades:default
+    make durgod/dgk6x/hades_ansi:default
 
 Flashing example for this keyboard:
 
-    make durgod/hades:default:flash
+    make durgod/dgk6x/hades_ansi: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).
 

keyboards/durgod/dgk6x/hades_iso/config.h

@@ -0,0 +1,22 @@
+/* Copyright 2021 Jessica Sullivan and Don Kjer
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#define DRIVER_1_LED_TOTAL 59
+#define DRIVER_2_LED_TOTAL 10   
+
+#define CAPS_LED 29

keyboards/durgod/dgk6x/hades_iso/hades_iso.c

@@ -0,0 +1,105 @@
+/* Copyright 2021 Jessica Sullivan and Don Kjer 
+ *
+ * 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+
+   {0, C_1,   B_1,   A_1},  // Esc
+   {0, C_2,   B_2,   A_2},  // 1
+   {0, C_3,   B_3,   A_3},  // 2
+   {0, C_4,   B_4,   A_4},  // 3
+   {0, C_5,   B_5,   A_5},  // 4
+   {0, C_6,   B_6,   A_6},  // 5
+   {0, C_7,   B_7,   A_7},  // 6
+   {0, C_8,   B_8,   A_8},  // 7
+   {0, C_9,   B_9,   A_9},  // 8
+   {0, C_10,  B_10,  A_10}, // 9
+   {0, C_11,  B_11,  A_11}, // 0
+   {0, C_12,  B_12,  A_12}, // -
+   {0, C_13,  B_13,  A_13}, // =
+   {0, C_14,  B_14,  A_14}, // Bksp
+   {0, C_15,  B_15,  A_15}, // Del
+
+   {0, F_1,   E_1,   D_1},  // Tab
+   {0, F_2,   E_2,   D_2},  // Q
+   {0, F_3,   E_3,   D_3},  // W
+   {0, F_4,   E_4,   D_4},  // E
+   {0, F_5,   E_5,   D_5},  // R
+   {0, F_6,   E_6,   D_6},  // T
+   {0, F_7,   E_7,   D_7},  // Y
+   {0, F_8,   E_8,   D_8},  // U
+   {0, F_9,   E_9,   D_9},  // I
+   {0, F_10,  E_10,  D_10}, // O
+   {0, F_11,  E_11,  D_11}, // P
+   {0, F_12,  E_12,  D_12}, // [
+   {0, F_13,  E_13,  D_13}, // ]
+   {0, F_15,  E_15,  D_15}, // Home
+
+   {0, I_1,   H_1,   G_1},  // Caps
+   {0, I_2,   H_2,   G_2},  // A
+   {0, I_3,   H_3,   G_3},  // S
+   {0, I_4,   H_4,   G_4},  // D
+   {0, I_5,   H_5,   G_5},  // F
+   {0, I_6,   H_6,   G_6},  // G
+   {0, I_7,   H_7,   G_7},  // H
+   {0, I_8,   H_8,   G_8},  // J
+   {0, I_9,   H_9,   G_9},  // K
+   {0, I_10,  H_10,  G_10}, // L
+   {0, I_11,  H_11,  G_11}, // :
+   {0, I_12,  H_12,  G_12}, // '
+   {0, I_13,  H_13,  G_13}, // NUHS
+   {0, I_14,  H_14,  G_14}, // Enter
+   {0, I_15,  H_15,  G_15}, // PgUp
+
+   {0, L_1,   K_1,   J_1},  // LShift
+   {0, L_2,   K_2,   J_2},  // NUBS
+   {0, L_3,   K_3,   J_3},  // Z
+   {0, L_4,   K_4,   J_4},  // X
+   {0, L_5,   K_5,   J_5},  // C
+   {0, L_6,   K_6,   J_6},  // V
+   {0, L_7,   K_7,   J_7},  // B
+   {0, L_8,   K_8,   J_8},  // N
+   {0, L_9,   K_9,   J_9},  // M
+   {0, L_10,  K_10,  J_10}, // <
+   {0, L_11,  K_11,  J_11}, // >
+   {0, L_12,  K_12,  J_12}, // ?
+   {0, L_13,  K_13,  J_13}, // RShift
+   {0, L_14,  K_14,  J_14}, // Up
+   {0, L_15,  K_15,  J_15}, // PgOn
+
+   {1, C_1,   B_1,   A_1},  // LCtrl
+   {1, C_2,   B_2,   A_2},  // LAlt
+   {1, C_3,   B_3,   A_3},  // Windows
+   {1, C_6,   B_6,   A_6},  // Space
+   {1, C_10,  B_10,  A_10}, // Fn1/RAlt hades/venus
+   {1, C_11,  B_11,  A_11}, // Fn2/Fn1
+   {1, C_12,  B_12,  A_12}, // RCtrl/Fn2
+   {1, C_13,  B_13,  A_13}, // LEFT/RCtrl
+   {1, C_14,  B_14,  A_14}, // DOWN
+   {1, C_15,  B_15,  A_15}  // RIGHT
+};
+
+#endif /* RGB_MATRIX_ENABLE */

keyboards/durgod/dgk6x/hades_iso/info.json

@@ -0,0 +1,173 @@
+{
+    "manufacturer": "Hoksi Technology",
+    "keyboard_name": "DURGOD Hades (QMK)",
+    "maintainer": "ebastler",
+    "url": "https://www.amazon.com/gp/product/B08562392T",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x4AD4",
+        "vid": "0xD60D"
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "C10", "C11"],
+        "rows": ["A0", "A1", "A2", "A3", "A4"]
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 216, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 240, "y": 0, "flags": 4},
+
+            {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4},
+            {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 56, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 72, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 88, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 104, "y": 16, "flags": 4},
+            {"matrix": [1, 7], "x": 120, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 136, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 152, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 168, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 184, "y": 16, "flags": 4},
+            {"matrix": [1, 12], "x": 200, "y": 16, "flags": 4},
+            {"matrix": [1, 14], "x": 240, "y": 16, "flags": 4},
+
+            {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4},
+            {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 60, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 76, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 92, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 124, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 140, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 156, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 188, "y": 32, "flags": 4},
+            {"matrix": [2, 12], "x": 204, "y": 32, "flags": 4},
+            {"matrix": [2, 13], "x": 220, "y": 24, "flags": 1},
+            {"matrix": [2, 14], "x": 240, "y": 32, "flags": 4},
+
+            {"matrix": [3, 0], "x": 2, "y": 48, "flags": 1},
+            {"matrix": [3, 1], "x": 19, "y": 48, "flags": 4},
+            {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
+            {"matrix": [3, 4], "x": 68, "y": 48, "flags": 4},
+            {"matrix": [3, 5], "x": 84, "y": 48, "flags": 4},
+            {"matrix": [3, 6], "x": 100, "y": 48, "flags": 4},
+            {"matrix": [3, 7], "x": 116, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 132, "y": 48, "flags": 4},
+            {"matrix": [3, 9], "x": 148, "y": 48, "flags": 4},
+            {"matrix": [3, 10], "x": 164, "y": 48, "flags": 4},
+            {"matrix": [3, 11], "x": 180, "y": 48, "flags": 4},
+            {"matrix": [3, 12], "x": 202, "y": 48, "flags": 1},
+            {"matrix": [3, 13], "x": 224, "y": 48, "flags": 4},
+            {"matrix": [3, 14], "x": 240, "y": 48, "flags": 4},
+
+            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [4, 1], "x": 22, "y": 64, "flags": 1},
+            {"matrix": [4, 2], "x": 42, "y": 64, "flags": 1},
+            {"matrix": [4, 5], "x": 101, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 160, "y": 64, "flags": 1},
+            {"matrix": [4, 10], "x": 176, "y": 64, "flags": 1},
+            {"matrix": [4, 11], "x": 192, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 208, "y": 64, "flags": 4},
+            {"matrix": [4, 13], "x": 224, "y": 64, "flags": 4},
+            {"matrix": [4, 14], "x": 240, "y": 64, "flags": 4}
+        ]
+    },
+    "diode_direction": "ROW2COL",
+    "community_layouts": ["65_iso"],
+    "layouts": {
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"label": "Esc",        "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": "$",          "matrix": [0,  4], "x": 4, "y": 0},
+                {"label": "%",          "matrix": [0,  5], "x": 5, "y": 0},
+                {"label": "^",          "matrix": [0,  6], "x": 6, "y": 0},
+                {"label": "&",          "matrix": [0,  7], "x": 7, "y": 0},
+                {"label": "*",          "matrix": [0,  8], "x": 8, "y": 0},
+                {"label": "(",          "matrix": [0,  9], "x": 9, "y": 0},
+                {"label": ")",          "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_",          "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+",          "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace",  "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Delete",     "matrix": [0, 14], "x": 15, "y": 0},
+
+                {"label": "Tab",        "matrix": [1,  0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q",          "matrix": [1,  1], "x": 1.5, "y": 1},
+                {"label": "W",          "matrix": [1,  2], "x": 2.5, "y": 1},
+                {"label": "E",          "matrix": [1,  3], "x": 3.5, "y": 1},
+                {"label": "R",          "matrix": [1,  4], "x": 4.5, "y": 1},
+                {"label": "T",          "matrix": [1,  5], "x": 5.5, "y": 1},
+                {"label": "Y",          "matrix": [1,  6], "x": 6.5, "y": 1},
+                {"label": "U",          "matrix": [1,  7], "x": 7.5, "y": 1},
+                {"label": "I",          "matrix": [1,  8], "x": 8.5, "y": 1},
+                {"label": "O",          "matrix": [1,  9], "x": 9.5, "y": 1},
+                {"label": "P",          "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{",          "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}",          "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Home",       "matrix": [1, 14], "x": 15, "y": 1},
+
+                {"label": "CapsLock",   "matrix": [2,  0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A",          "matrix": [2,  1], "x": 1.75, "y": 2},
+                {"label": "S",          "matrix": [2,  2], "x": 2.75, "y": 2},
+                {"label": "D",          "matrix": [2,  3], "x": 3.75, "y": 2},
+                {"label": "F",          "matrix": [2,  4], "x": 4.75, "y": 2},
+                {"label": "G",          "matrix": [2,  5], "x": 5.75, "y": 2},
+                {"label": "H",          "matrix": [2,  6], "x": 6.75, "y": 2},
+                {"label": "J",          "matrix": [2,  7], "x": 7.75, "y": 2},
+                {"label": "K",          "matrix": [2,  8], "x": 8.75, "y": 2},
+                {"label": "L",          "matrix": [2,  9], "x": 9.75, "y": 2},
+                {"label": ":",          "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"",         "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "#",          "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "Enter",      "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "PgUp",       "matrix": [2, 14], "x": 15, "y": 2},
+
+                {"label": "Shift",      "matrix": [3,  0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\",         "matrix": [3,  1], "x": 1.25, "y": 3},
+                {"label": "Z",          "matrix": [3,  2], "x": 2.25, "y": 3},
+                {"label": "X",          "matrix": [3,  3], "x": 3.25, "y": 3},
+                {"label": "C",          "matrix": [3,  4], "x": 4.25, "y": 3},
+                {"label": "V",          "matrix": [3,  5], "x": 5.25, "y": 3},
+                {"label": "B",          "matrix": [3,  6], "x": 6.25, "y": 3},
+                {"label": "N",          "matrix": [3,  7], "x": 7.25, "y": 3},
+                {"label": "M",          "matrix": [3,  8], "x": 8.25, "y": 3},
+                {"label": "<",          "matrix": [3,  9], "x": 9.25, "y": 3},
+                {"label": ">",          "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?",          "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift",      "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up",         "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn",       "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl",       "matrix": [4,  0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win",        "matrix": [4,  1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt",        "matrix": [4,  2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K45",        "matrix": [4,  5], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn1",        "matrix": [4,  9], "x": 10, "y": 4},
+                {"label": "Fn2",        "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "Ctrl",       "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "Left",       "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down",       "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right",      "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    }
+}

keyboards/durgod/dgk6x/hades_iso/keymaps/default/keymap.json

@@ -0,0 +1,38 @@
+{
+  "keyboard": "durgod/dgk6x/hades_iso",
+  "keymap": "default",
+  "layout": "LAYOUT_65_iso",
+  "layers": [
+    [
+      "QK_GESC",  "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_BSPC", "KC_DEL", 
+      "KC_TAB",   "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC",            "KC_HOME",
+      "KC_CAPS",  "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT",  "KC_PGUP", 
+      "KC_LSFT",  "KC_NUBS", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH", "KC_RSFT", "KC_UP",   "KC_PGDN", 
+      "KC_LCTL",  "KC_LGUI", "KC_LALT",                                  "KC_SPC",                        "MO(1)",   "MO(2)",   "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RIGHT"
+    ],
+    [
+      "KC_GRV",  "KC_F1",   "KC_F2",   "KC_F3",    "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",  "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_UP",   "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS",            "KC_TRNS",
+      "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS",  "KC_END",  "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "GUI_TOG", "KC_TRNS",                                   "KC_TRNS",                       "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_APP",  "KC_TRNS", "KC_TRNS"
+    ],
+    [
+      "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_VAI", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS",                                  "KC_TRNS",                       "MO(3)",   "KC_TRNS", "KC_TRNS", "RGB_SPD", "RGB_VAD", "RGB_SPI"
+    ],
+    [
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_SAI", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS",                                  "KC_TRNS",                       "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_HUD", "RGB_SAD", "RGB_HUI"
+    ]
+  ],
+  "author":"ebastler",
+  "notes":"derived from ANSI keymap by J-Sully",
+  "version":1
+}

keyboards/durgod/dgk6x/hades_iso/keymaps/default/readme.md

@@ -0,0 +1,12 @@
+![Durgod Hades Layout Image](https://i.imgur.com/vsi6sdKh.png)
+
+# The default keymap for Durgod Hades.
+
+This keymap is intended to closely follow the stock Durgod Hades layout. RGB Hue and Saturation can be changed Fn1 + Fn2 + arrow keys. 
+
+## Windows key lock
+
+You can hold down Fn1 + Windows key to disable the Windows key while in locked mode.
+The 'Lock' LED indicates if the Windows key is locked.
+
+This is similar to the stock Hades Windows key lock functionality.

keyboards/durgod/dgk6x/hades_iso/keymaps/via/keymap.json

@@ -0,0 +1,38 @@
+{
+  "keyboard": "durgod/dgk6x/hades_iso",
+  "keymap": "via",
+  "layout": "LAYOUT_65_iso",
+  "layers": [
+    [
+      "QK_GESC",  "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_BSPC", "KC_DEL", 
+      "KC_TAB",   "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC",            "KC_HOME",
+      "KC_CAPS",  "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT",  "KC_PGUP", 
+      "KC_LSFT",  "KC_NUBS", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH", "KC_RSFT", "KC_UP",   "KC_PGDN", 
+      "KC_LCTL",  "KC_LGUI", "KC_LALT",                                  "KC_SPC",                        "MO(1)",   "MO(2)",   "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RIGHT"
+    ],
+    [
+      "KC_GRV",  "KC_F1",   "KC_F2",   "KC_F3",    "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",  "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_UP",   "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS",            "KC_TRNS",
+      "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS",  "KC_END",  "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "GUI_TOG", "KC_TRNS",                                   "KC_TRNS",                       "KC_TRNS", "MO(3)",   "KC_TRNS", "KC_APP",  "KC_TRNS", "KC_TRNS"
+    ],
+    [
+      "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_VAI", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS",                                  "KC_TRNS",                       "MO(3)",   "KC_TRNS", "KC_TRNS", "RGB_SPD", "RGB_VAD", "RGB_SPI"
+    ],
+    [
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_SAI", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS",                                  "KC_TRNS",                       "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_HUD", "RGB_SAD", "RGB_HUI"
+    ]
+  ],
+  "author":"ebastler",
+  "notes":"derived from ANSI keymap by J-Sully",
+  "version":1
+}

keyboards/durgod/dgk6x/hades_iso/keymaps/via/readme.md

@@ -0,0 +1,12 @@
+![Durgod Hades Layout Image](https://i.imgur.com/vsi6sdK.png)
+
+# The via keymap for Durgod Hades.
+
+This keymap is intended to closely follow the stock Durgod Hades layout. RGB Hue and Saturation can be changed Fn1 + Fn2 + arrow keys. 
+
+## Windows key lock
+
+You can hold down Fn1 + Windows key to disable the Windows key while in locked mode.
+The 'Lock' LED indicates if the Windows key is locked.
+
+This is similar to the stock Hades Windows key lock functionality.

keyboards/durgod/dgk6x/hades_iso/keymaps/via/rules.mk

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

keyboards/durgod/dgk6x/hades_iso/readme.md

@@ -0,0 +1,26 @@
+# Hades
+
+This is a standard off-the-shelf Durgod Hades 65% ISO layout keyboard with RGB matrix.
+
+* Keyboard Maintainer: [ebastler](https://github.com/ebastler), based on the work of [J-Sully](https://github.com/J-Sully) and [dkjer](https://github.com/dkjer)
+* Hardware Supported: Durgod Hades ISO board with STM32F070RBT6
+* Hardware Availability: https://www.amazon.de/-/en/Durgod-Hades-Mechanical-Gaming-Keyboard/dp/B08H11BFXF
+
+## Instructions
+
+### Build
+
+Make command example for this keyboard (after setting up your build environment):
+
+    make durgod/dgk6x/hades_iso:default
+
+Flashing example for this keyboard:
+
+    make durgod/dgk6x/hades_iso: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).
+
+### Initial Flash
+
+Instructions for Flashing from initial Stock Firmware:
+* [Initial Flashing](../readme.md#initial-flash)

keyboards/durgod/dgk6x/hades_iso/rules.mk

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

keyboards/durgod/dgk6x/readme.md

@@ -12,7 +12,8 @@ This DGK6X code is shared between the ANSI variants of Venus, Hades and Galaxy k
 
 Instructions for building the Venus, Hades and Galaxy firmware can be found here: 
 * [Venus](venus/readme.md)
-* [Hades](hades/readme.md)
+* [Hades ANSI](hades_ansi/readme.md)
+* [Hades ISO](hades_iso/readme.md)
 * [Galaxy](galaxy/readme.md)
 
 ### Initial Flash

keyboards/durgod/dgk6x/rules.mk

@@ -17,4 +17,4 @@ LTO_ENABLE = yes
 
 RGB_MATRIX_ENABLE = yes
 
-DEFAULT_FOLDER=durgod/dgk6x/hades
+DEFAULT_FOLDER=durgod/dgk6x/hades_ansi

keyboards/durgod/hades/readme.md

@@ -1,3 +1,3 @@
 # Hades 
 
-See: [Hades](../dgk6x/hades/readme.md)
+See: [Hades ANSI](../dgk6x/hades_ansi/readme.md) and [Hades ISO](../dgk6x/hades_iso/readme.md)

keyboards/durgod/hades/rules.mk

@@ -1 +0,0 @@
-DEFAULT_FOLDER=durgod/dgk6x/hades

keyboards/evyd13/atom47/keymaps/phsc138/config.h

@@ -0,0 +1,17 @@
+/* Copyright 2022 PHSC138
+ *
+ * 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/>.
+ */
+#pragma once
+#define TAPPING_TERM 150 // Tap dance time limit

keyboards/evyd13/atom47/keymaps/phsc138/keymap.c

@@ -0,0 +1,390 @@
+/* Copyright 2022 PHSC138
+ *
+ * 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
+
+// These are all aliases for the function layers.
+enum custom_layers {
+    _BASE,
+    _PROG,
+    _GAME,
+    _FN,
+    _FN1,
+    _NUM
+};
+
+
+// Tap Dance
+typedef struct {
+    char is_press_action;
+    int state;
+} tap;
+
+enum {
+    SINGLE_TAP = 1,
+    SINGLE_HOLD = 2,
+    DOUBLE_TAP = 3,
+    DOUBLE_HOLD = 4,
+    DOUBLE_SINGLE_TAP = 5, // Send two single taps
+    TRIPLE_TAP = 6,
+    TRIPLE_HOLD = 7
+};
+
+// Tap dance enums
+enum {
+    PN_SWAP = 0,
+    LAPO = 1,
+    LCPO = 2,
+    RAPC = 3,
+    RCPC = 4,
+    D20 = 5
+};
+
+enum custom_keycodes {
+    PROF_MAC = QK_USER
+};
+
+
+uint8_t cur_dance (tap_dance_state_t *state);
+void pn_finished (tap_dance_state_t *state, void *user_data);
+void pn_reset (tap_dance_state_t *state, void *user_data);
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// TREE: 'pn' to enter custom layers:
+    // _BASE
+        // _FN
+        // _FN1
+        // _NUM
+        // _PROG
+    // _PROG
+        // _FN
+        // _FN1
+        // _NUM
+        // _GAME
+    // _GAME
+    // _BASE
+
+// Tap pn for toggle to _PROG, or hold for numpad
+[_BASE] = LAYOUT_split_space(
+    QK_GESC,  KC_Q,     KC_W,     KC_E,        KC_R,        KC_T,       KC_Y,    KC_U,      KC_I,    KC_O,       KC_P,     KC_DEL,   KC_BSPC,
+    KC_TAB,   KC_A,     KC_S,     KC_D,        KC_F,        KC_G,       KC_H,    KC_J,      KC_K,    KC_L,       KC_SCLN,            KC_ENT,
+    KC_LSFT,  KC_Z,     KC_X,     KC_C,        KC_V,        KC_B,       KC_N,    KC_M,      KC_COMM, KC_DOT,     KC_RSFT,            MO(_FN1),
+    KC_LCTL,  KC_LGUI,  KC_LALT,  TD(PN_SWAP),              KC_SPC,              KC_SPC,             MO(_FN),    KC_RALT,  KC_APP,   KC_RCTL),
+
+
+// LEFT AND RIGHT SHIFT: '(' and ')' when tapped, shift when held
+// LEFT AND RIGHT CTRL: '{' and '}' when tapped, ctrl when held
+// LEFT AND RIGHT ALT: '[' and ']' when tapped, ctrl when held
+[_PROG] = LAYOUT_split_space(
+    _______,  _______,  _______,  _______,     _______,     _______,    _______, _______,   _______, _______,    _______,   _______, _______,
+    _______,  _______,  _______,  _______,     _______,     _______,    _______, _______,   _______, _______,    _______,            _______,
+    SC_LSPO,  _______,  _______,  _______,     _______,     _______,    _______, _______,   _______, _______,    SC_RSPC,            _______,
+    TD(LCPO), _______,  TD(LAPO), TO(_GAME),                _______,             _______,            _______,    TD(RAPC),  _______, TD(RCPC)),
+
+
+// Macro for right space is bhop
+// Maco for 'fn' is move forward
+// Macro for 'fn1' is spin constantly
+// Macro for right shift is D20
+[_GAME] = LAYOUT_split_space(
+    _______,  _______,  _______,  _______,     _______,     _______,    _______, _______,   _______, _______,    _______,   _______, _______,
+    _______,  _______,  _______,  _______,     _______,     _______,    _______, _______,   _______, _______,    _______,            _______,
+    _______,  _______,  _______,  _______,     _______,     _______,    _______, _______,   _______, _______,    TD(D20),            XXXXXXX,
+    _______,  _______,  _______,  TO(_BASE),                _______,             XXXXXXX,            XXXXXXX,    _______,   XXXXXXX, _______),
+
+
+[_FN] = LAYOUT_split_space(
+    _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,     QK_RBT,      _______,    KC_CALC, KC_PGUP,   _______, KC_PGDN,    KC_PSCR,   KC_SCRL,  KC_PAUS,
+    KC_CAPS,  KC_MPRV,  KC_MPLY,  KC_MNXT,     _______,     _______,    KC_LEFT, KC_DOWN,   KC_UP,   KC_RIGHT,   KC_INS,              _______,
+    _______,  _______,  _______,  _______,     _______,     KC_HOME,    KC_END,  BL_TOGG,   BL_DOWN,  BL_UP,     _______,             _______,
+    _______,  _______,  _______,  _______,                  _______,             _______,            _______,    _______,   _______,  _______),
+
+
+[_FN1] = LAYOUT_split_space(
+    KC_GRV,   KC_F1,    KC_F2,    KC_F3,       KC_F4,       KC_F5,      KC_F6,   KC_F7,     KC_F8,   KC_F9,      KC_F10,    KC_F11,   KC_F12,
+    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_QUOT,    KC_SLSH, KC_LBRC,   KC_RBRC, KC_BSLS,    KC_RSFT,             _______,
+    _______,  _______,  _______,  _______,     _______,     _______,             _______,            _______,    _______,             _______),
+
+
+[_NUM] = LAYOUT_split_space(
+    _______,  _______,  _______,  _______,     _______,     _______,    KC_7,    KC_8,      KC_9,    _______,    PROF_MAC,  _______,  _______,
+    _______,  _______,  _______,  _______,     _______,     _______,    KC_4,    KC_5,      KC_6,    _______,    _______,             _______,
+    _______,  _______,  _______,  _______,     _______,     KC_1,       KC_2,    KC_3,      KC_DOT,  _______,    _______,             _______,
+    _______,  _______,  _______,  _______,     _______,     KC_0,                 _______,           _______,    DB_TOGG,             QK_BOOT),
+};
+
+
+/*--- Profile Macro ---*/
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case PROF_MAC:
+      if (record->event.pressed) {
+        // When keycode PROF_MAC is pressed
+        SEND_STRING("if [ $shell = 'zsh' ]; then echo \"echo \"Lock your computer -PHSC138\"\" >> ~/.zshrc\nclear; else echo \"echo \"Lock your computer -PHSC138\"\" >> ~/.profile\nclear; fi\n");
+      } else {
+        // When keycode QMKBEST is released
+      }
+      break;
+  }
+  return true;
+};
+/*--- End Profile Macro ---*/
+
+/* Return an integer that corresponds to what kind of tap dance should be executed.
+ *
+ * How to figure out tap dance state: interrupted and pressed.
+ *
+ * Interrupted: If the state of a dance dance is "interrupted", that means that another key has been hit
+ *  under the tapping term. This is typically indicitive that you are trying to "tap" the key.
+ *
+ * Pressed: Whether or not the key is still being pressed. If this value is true, that means the tapping term
+ *  has ended, but the key is still being pressed down. This generally means the key is being "held".
+ *
+ * One thing that is currenlty not possible with qmk software in regards to tap dance is to mimic the "permissive hold"
+ *  feature. In general, advanced tap dances do not work well if they are used with commonly typed letters.
+ *  For example "A". Tap dances are best used on non-letter keys that are not hit while typing letters.
+ *
+ * Good places to put an advanced tap dance:
+ *  z,q,x,j,k,v,b, any function key, home/end, comma, semi-colon
+ *
+ * Criteria for "good placement" of a tap dance key:
+ *  Not a key that is hit frequently in a sentence
+ *  Not a key that is used frequently to double tap, for example 'tab' is often double tapped in a terminal, or
+ *    in a web form. So 'tab' would be a poor choice for a tap dance.
+ *  Letters used in common words as a double. For example 'p' in 'pepper'. If a tap dance function existed on the
+ *    letter 'p', the word 'pepper' would be quite frustating to type.
+ *
+ * For the third point, there does exist the 'DOUBLE_SINGLE_TAP', however this is not fully tested
+ *
+ */
+uint8_t cur_dance(tap_dance_state_t *state) {
+    if(state->count == 1) {
+        if(state->interrupted || !state->pressed) return SINGLE_TAP;
+        //key has not been interrupted, but they key is still held. Means you want to send a 'HOLD'.
+        else return SINGLE_HOLD;
+    } else if(state->count == 2) {
+        /*
+         * DOUBLE_SINGLE_TAP is to distinguish between typing "pepper", and actually wanting a double tap
+         * action when hitting 'pp'. Suggested use case for this return value is when you want to send two
+         * keystrokes of the key, and not the 'double tap' action/macro.
+        */
+        if(state->interrupted) return DOUBLE_SINGLE_TAP;
+        else if(state->pressed) return DOUBLE_HOLD;
+        else return DOUBLE_TAP;
+    }
+    //Assumes no one is trying to type the same letter three times (at least not quickly).
+    //If your tap dance key is 'KC_W', and you want to type "www." quickly - then you will need to add
+    //an exception here to return a 'TRIPLE_SINGLE_TAP', and define that enum just like 'DOUBLE_SINGLE_TAP'
+    if(state->count == 3) {
+        if(state->interrupted || !state->pressed) return TRIPLE_TAP;
+        else return TRIPLE_HOLD;
+    }
+    else return 8; //magic number. At some point this method will expand to work for more presses
+}
+
+//instanalize an instance of 'tap' for the 'pn' tap dance.
+static tap pn_tap_state = {
+    .is_press_action = 1,
+    .state = 0
+};
+
+void pn_finished(tap_dance_state_t *state, void *user_data) {
+    pn_tap_state.state = cur_dance(state);
+    switch(pn_tap_state.state) {
+        case SINGLE_TAP: layer_on(_PROG); break;
+        case SINGLE_HOLD: layer_on(_NUM); break;
+        //case DOUBLE_TAP: register_code(KC_ESC); break;
+        //case DOUBLE_HOLD: register_code(KC_LALT); break;
+        //case DOUBLE_SINGLE_TAP: register_code(KC_X); unregister_code(KC_X); register_code(KC_X);
+        //Last case is for fast typing. Assuming your key is `f`:
+        //For example, when typing the word `buffer`, and you want to make sure that you send `ff` and not `Esc`.
+        //In order to type `ff` when typing fast, the next character will have to be hit within the `TAPPING_TERM`, which by default is 200ms.
+    }
+}
+
+void pn_reset(tap_dance_state_t *state, void *user_data) {
+    switch(pn_tap_state.state) {
+        //case SINGLE_TAP: unregister_code(KC_X); break;
+        case SINGLE_HOLD: layer_off(_NUM); break;
+        //case DOUBLE_TAP: unregister_code(KC_ESC); break;
+        //case DOUBLE_HOLD: unregister_code(KC_LALT);
+        //case DOUBLE_SINGLE_TAP: unregister_code(KC_X);
+    }
+    pn_tap_state.state = 0;
+}
+
+static tap lalt_tap_state = {
+    .is_press_action = 1,
+    .state = 0
+};
+
+void lalt_finished(tap_dance_state_t *state, void *user_data) {
+    lalt_tap_state.state = cur_dance(state);
+    switch(lalt_tap_state.state) {
+        case SINGLE_TAP: register_code(KC_LBRC); break;
+        case SINGLE_HOLD: register_code(KC_LALT); break;
+    }
+}
+
+void lalt_reset(tap_dance_state_t *state, void *user_data) {
+    switch(lalt_tap_state.state) {
+        case SINGLE_TAP: unregister_code(KC_LBRC); break;
+        case SINGLE_HOLD: unregister_code(KC_LALT); break;
+    }
+    lalt_tap_state.state = 0;
+}
+
+static tap ralt_tap_state = {
+    .is_press_action = 1,
+    .state = 0
+};
+
+void ralt_finished(tap_dance_state_t *state, void *user_data) {
+    ralt_tap_state.state = cur_dance(state);
+    switch(ralt_tap_state.state) {
+        case SINGLE_TAP: register_code(KC_RBRC); break;
+        case SINGLE_HOLD: register_code(KC_RALT); break;
+    }
+}
+
+void ralt_reset(tap_dance_state_t *state, void *user_data) {
+    switch(ralt_tap_state.state) {
+        case SINGLE_TAP: unregister_code(KC_RBRC); break;
+        case SINGLE_HOLD: unregister_code(KC_RALT); break;
+    }
+    ralt_tap_state.state = 0;
+}
+
+static tap rctl_tap_state = {
+    .is_press_action = 1,
+    .state = 0
+};
+
+void rctl_finished(tap_dance_state_t *state, void *user_data) {
+    rctl_tap_state.state = cur_dance(state);
+    switch(rctl_tap_state.state) {
+        case SINGLE_TAP: register_code(KC_RSFT); register_code(KC_RBRC); break;
+        case SINGLE_HOLD: register_code(KC_RCTL); break;
+    }
+}
+
+void rctl_reset(tap_dance_state_t *state, void *user_data) {
+    switch(rctl_tap_state.state) {
+        case SINGLE_TAP: unregister_code(KC_RSFT); unregister_code(KC_RBRC); break;
+        case SINGLE_HOLD: unregister_code(KC_RCTL); break;
+    }
+    rctl_tap_state.state = 0;
+}
+
+static tap lctl_tap_state = {
+    .is_press_action = 1,
+    .state = 0
+};
+
+void lctl_finished(tap_dance_state_t *state, void *user_data) {
+    lctl_tap_state.state = cur_dance(state);
+    switch(lctl_tap_state.state) {
+        case SINGLE_TAP: register_code(KC_LSFT); register_code(KC_LBRC); break;
+        case SINGLE_HOLD: register_code(KC_LCTL); break;
+    }
+}
+
+void lctl_reset(tap_dance_state_t *state, void *user_data) {
+    switch(lctl_tap_state.state) {
+        case SINGLE_TAP: unregister_code(KC_LSFT); unregister_code(KC_LBRC); break;
+        case SINGLE_HOLD: unregister_code(KC_LCTL); break;
+    }
+    lctl_tap_state.state = 0;
+}
+
+static tap d20_tap_state = {
+    .is_press_action = 1,
+    .state = 0,
+};
+
+int d20_srand = 0;
+uint32_t timer_seed;
+
+void d20_finished(tap_dance_state_t *state, void *user_data) {
+    d20_tap_state.state = cur_dance(state);
+    switch(d20_tap_state.state) {
+        case SINGLE_HOLD: {
+            if(d20_srand == 0){
+                timer_seed = timer_read32();
+                srand((unsigned int)timer_seed);
+                d20_srand = 1;
+            }
+
+            SEND_STRING("Seed: ");
+            // uint32_t has max size of 4294967296
+            char SEED_STR_SIZE = 16;
+            // Initialize seed_str
+            char seed_str[SEED_STR_SIZE];
+            for (int iter=0;iter < SEED_STR_SIZE;iter++) seed_str[iter] = 0;
+
+            int i = SEED_STR_SIZE - 2; // Leave null byte on end of string
+            while (timer_seed && i >= 0) {
+                seed_str[i] = timer_seed % 10 + '0';
+                timer_seed /= 10;
+                i -= 1;
+            }
+            i++;
+
+            // Move all characters over i spaces
+            char move = i;
+            while (i < SEED_STR_SIZE -1) {
+                seed_str[i-move] = seed_str[i];
+                seed_str[i] = 0;
+                i += 1;
+            }
+
+            send_string(seed_str);
+            break;
+            // Else allow fall through
+        }
+        case SINGLE_TAP: {
+            if(d20_srand == 0){
+                timer_seed = timer_read();
+                srand((unsigned int)timer_seed);
+                d20_srand = 1;
+            }
+
+            unsigned char roll = rand() % 20 + 1;
+            char res[3];
+            res[0] = (char)((char)(roll / 10) + '0');
+            res[1] = (char)(roll % 10 + '0');
+
+            send_string(res);
+
+            break;
+                         }
+    }
+}
+
+void d20_reset(tap_dance_state_t *state, void *user_data) {
+    d20_tap_state.state = 0;
+}
+
+tap_dance_action_t tap_dance_actions[] = {
+    [PN_SWAP]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, pn_finished, pn_reset),
+    [LAPO]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lalt_finished, lalt_reset),
+    [RAPC]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ralt_finished, ralt_reset),
+    [LCPO]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lctl_finished, lctl_reset),
+    [RCPC]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rctl_finished, rctl_reset),
+    [D20]      = ACTION_TAP_DANCE_FN_ADVANCED(NULL, d20_finished, d20_reset),
+};

keyboards/evyd13/atom47/keymaps/phsc138/readme.md

@@ -0,0 +1,18 @@
+# PHSC138's Layout for the atom47
+## Base layer
+The base layer is a standard vortex core layout
+
+## Layer 1 (PROG)
+This layer contains space cadet bindings to make programming easier. Ex: tapping left shift will input an open parenthesis
+
+## Layer 2 (GAME)
+This layer contains game specific macros, currently only a D20 has been implemented
+
+## Layer 3 (FN)
+This can be activated by pressing the `fn` key. This layer contains mostly the same bindings as the base vortex core except vim keybinds have replaced the arrow keys.
+
+## Layer 4 (FN1)
+This can be activated by pressing the `fn1` key. This is the default vortex core layer.
+
+## Layer 5 (NUM)
+This is a numpad that can be activated by holding the PN key. This also has some useful keys, such as `QC_BOOT`.

keyboards/evyd13/atom47/keymaps/phsc138/rules.mk

@@ -0,0 +1,3 @@
+MOUSEKEY_ENABLE = no
+NKRO_ENABLE = yes
+TAP_DANCE_ENABLE = yes

keyboards/hineybush/h87_g2/info.json

@@ -21,7 +21,7 @@
     "usb": {
         "device_version": "1.0.0",
         "pid": "0x0001",
-        "vid": "0x4048"
+        "vid": "0x4069"
     },
     "layouts": {
         "LAYOUT": {

keyboards/lily58/keymaps/oldfieldtc/config.h

@@ -0,0 +1,23 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2022 Tommy Oldfield <@oldfieldtc>
+
+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/>.
+*/
+
+#pragma once
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 100

keyboards/lily58/keymaps/oldfieldtc/keymap.c

@@ -0,0 +1,191 @@
+// Copyright 2022 Tommy Oldfield (@oldfieldtc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_number {
+  _QWERTY = 0,
+  _LOWER,
+  _RAISE,
+  _ADJUST,
+};
+
+void render_logo(void);
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* QWERTY
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |BackSP|
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |LCTRL |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |LAlt/⌥|LGUI/⌘|LOWER| /Space /       \Enter \  |RAISE | Play |RGUI/⌘ |
+ *                   |      |      |      |/       /        \      \ |      |      |        |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+ [_QWERTY] = LAYOUT(
+      KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5,                         KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, 
+      KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,                         KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
+      KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,                        KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+      KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,    KC_LBRC, KC_RBRC,   KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+      KC_LALT, KC_LGUI, MO(1), KC_SPC,                              KC_ENT, MO(2), KC_MPLY, KC_RGUI
+),
+
+/* LOWER
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * | Mute |Vol - |Vol + | Play |  Rwd |  Fwd |                    |      |      |      |      |      |  DEL |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   `  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   ~  |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * | Caps |      |      |      |      |      |-------|    |-------|      |   _  |   +  |   {  |   }  |  |\  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |      |      |LOWER | /       /       \      \  |RAISE |      |      |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+[_LOWER] = LAYOUT(
+  KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MRWD, KC_MFFD,           KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL,
+  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,                       KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+  KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,               KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_NONUS_HASH,
+  KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO, KC_NO,   KC_NO, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_NONUS_BACKSLASH,
+  KC_NO, KC_NO, KC_TRNS, KC_NO,                                   KC_NO, KC_TRNS, KC_NO, KC_NO
+),
+
+/* RAISE
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |-------.    ,-------|      | Left | Down |  Up  |Right |      |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |  F7  |  F8  |  F9  | F10  | F11  | F12  |-------|    |-------|   +  |   -  |   =  |   [  |   ]  |  #   |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |      |      |LOWER | /       /       \      \  |RAISE |      |      |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+[_RAISE] = LAYOUT(
+  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                       KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+  KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5,                           KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO,
+  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,                       KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO,
+  KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,    KC_NO, KC_NO,   KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_NO, KC_NO, KC_TRNS, KC_NO,                                   KC_NO, KC_TRNS, KC_NO, KC_NO
+  ),
+
+/* ADJUST
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------.    ,-------|      |      |RGB ON| HUE+ | SAT+ | VAL+ |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |      | MODE | HUE- | SAT- | VAL- |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |      |      |LOWER | /       /       \      \  |RAISE |      |      |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+  [_ADJUST] = LAYOUT(
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                     KC_NO, KC_NO, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
+    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO, KC_NO,   KC_NO, KC_NO, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
+    KC_NO, KC_NO, KC_TRNS, KC_NO,                                 KC_NO, KC_TRNS, KC_NO, KC_NO)
+
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
+#ifdef OLED_ENABLE
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  if (!is_keyboard_master())
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+  return rotation;
+}
+
+// When you add source files to SRC in rules.mk, you can use functions.
+const char *read_layer_state(void);
+const char *read_logo(void);
+void set_keylog(uint16_t keycode, keyrecord_t *record);
+const char *read_keylog(void);
+const char *read_keylogs(void);
+
+bool oled_task_user(void) {
+  if (is_keyboard_master()) {
+    // If you want to change the display of OLED, you need to change here
+    oled_write_ln(read_layer_state(), false);
+    oled_write_ln(read_keylog(), false);
+    oled_write_ln(read_keylogs(), false);
+
+    oled_write_P(PSTR("WPM: "), false);
+    oled_write_ln(get_u8_str(get_current_wpm(), '0'), false);
+  } else {
+    render_logo();
+  }
+  return false;
+}
+#endif // OLED_ENABLE
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+#ifdef OLED_ENABLE
+    set_keylog(keycode, record);
+#endif
+
+  }
+  return true;
+}
+
+void render_logo(void) {
+	static const char PROGMEM my_logo[] = {
+		// 'punpun 2', 128x32px
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x80, 0xe0, 0x70, 0x38, 0x1c, 0x0c, 0x06, 0x06, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+0x02, 0x02, 0x02, 0x06, 0x06, 0x06, 0x04, 0x04, 0x0c, 0x0c, 0x08, 0x08, 0x18, 0x18, 0x18, 0x10, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x3f, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x0c, 0x1c, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x18, 0x10, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x70, 0x38, 0x1c, 0x06, 0x03, 
+0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x02, 0x06, 0x04, 0x04, 0x0c, 0x08, 0x18, 0x18
+	};
+	oled_write_raw_P(my_logo, sizeof(my_logo));
+}

keyboards/lily58/keymaps/oldfieldtc/readme.md

@@ -0,0 +1,22 @@
+# Lily58 keyboard keymap
+
+## Default layer
+![Default keymap layer](https://i.imgur.com/c5kbMww.jpg)
+
+[Default layer - Keyboard layout editor](http://www.keyboard-layout-editor.com/#/gists/8ff6160c16e9b9ee7e104538bfad4a59)
+
+## Lower layer
+![Lower keymap layer](https://i.imgur.com/GcLR3Uw.jpg)
+
+[Lower layer - Keyboard layout editor](http://www.keyboard-layout-editor.com/#/gists/7d77cd87c53d5eded50530242b852c20)
+
+## Raise layer
+![Raise keymap layer](https://i.imgur.com/aNVwlKJ.jpg)
+
+[Raise layer - Keyboard layout editor](http://www.keyboard-layout-editor.com/#/gists/c7a63881a13e339f1b5b847637677e5f)
+
+## Adjust layer
+![Adjust keymap layer](https://i.imgur.com/0l4c1Df.jpg)
+
+[Adjust layer - Keyboard layout editor](http://www.keyboard-layout-editor.com/#/gists/15a25bc84fa69a1b9f228574674728d3)
+

keyboards/lily58/keymaps/oldfieldtc/rules.mk

@@ -0,0 +1,11 @@
+EXTRAKEY_ENABLE = yes
+WPM_ENABLE = yes
+
+# If you want to change the display of OLED, you need to change here
+SRC +=  ./lib/rgb_state_reader.c \
+        ./lib/layer_state_reader.c \
+        ./lib/logo_reader.c \
+        ./lib/keylogger.c \
+        ./lib/timelogger.c \
+        # ./lib/mode_icon_reader.c \
+        # ./lib/host_led_state_reader.c \

keyboards/lily58/keymaps/paulomp90/config.h

@@ -0,0 +1,22 @@
+/* Copyright 2023 Paulo Pereira
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+
+#define QUICK_TAP_TERM 0
+#define TAPPING_TERM 150
+#define TAP_CODE_DELAY 10

keyboards/lily58/keymaps/paulomp90/features/custom_shift_keys.c

@@ -0,0 +1,67 @@
+/* Copyright 2023 Paulo Pereira
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "custom_shift_keys.h"
+
+bool process_custom_shift_keys(uint16_t keycode, keyrecord_t *record) {
+  static uint16_t registered_keycode = KC_NO;
+
+  // If a custom shift key is registered, then this event is either
+  // releasing it or manipulating another key at the same time. Either way,
+  // we release the currently registered key.
+  if (registered_keycode != KC_NO) {
+    unregister_code16(registered_keycode);
+    registered_keycode = KC_NO;
+  }
+
+  if (record->event.pressed) {  // Press event.
+    const uint8_t mods = get_mods();
+#ifndef NO_ACTION_ONESHOT
+    if ((mods | get_weak_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) {
+#else
+    if ((mods | get_weak_mods()) & MOD_MASK_SHIFT) {  // Shift is held.
+#endif  // NO_ACTION_ONESHOT
+      // Continue default handling if this is a tap-hold key being held.
+      if ((IS_QK_MOD_TAP(keycode) || IS_QK_LAYER_TAP(keycode)) &&
+          record->tap.count == 0) {
+        return true;
+      }
+
+      // Search for a custom shift key whose keycode is `keycode`.
+      for (int i = 0; i < NUM_CUSTOM_SHIFT_KEYS; ++i) {
+        if (keycode == custom_shift_keys[i].keycode) {
+          registered_keycode = custom_shift_keys[i].shifted_keycode;
+          if (IS_QK_MODS(registered_keycode) &&  // Should key be shifted?
+              (QK_MODS_GET_MODS(registered_keycode) & MOD_LSFT) != 0) {
+            register_code16(registered_keycode);  // If so, press directly.
+          } else {
+            // If not, cancel shift mods, press the key, and restore mods.
+            del_weak_mods(MOD_MASK_SHIFT);
+#ifndef NO_ACTION_ONESHOT
+            del_oneshot_mods(MOD_MASK_SHIFT);
+#endif  // NO_ACTION_ONESHOT
+            unregister_mods(MOD_MASK_SHIFT);
+            register_code16(registered_keycode);
+            set_mods(mods);
+          }
+          return false;
+        }
+      }
+    }
+  }
+
+  return true;  // Continue with default handling.
+}

keyboards/lily58/keymaps/paulomp90/features/custom_shift_keys.h

@@ -0,0 +1,29 @@
+/* Copyright 2023 Paulo Pereira
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+
+#pragma once
+#include QMK_KEYBOARD_H
+
+typedef struct {
+  uint16_t keycode;
+  uint16_t shifted_keycode;
+} custom_shift_key_t;
+
+extern const custom_shift_key_t custom_shift_keys[];
+extern uint8_t NUM_CUSTOM_SHIFT_KEYS;
+
+bool process_custom_shift_keys(uint16_t keycode, keyrecord_t *record);

keyboards/lily58/keymaps/paulomp90/keymap.c

@@ -0,0 +1,264 @@
+/* Copyright 2023 Paulo Pereira
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keymap_portuguese.h"
+#include "features/custom_shift_keys.h"
+
+enum layer_number {
+    _QWERTY = 0,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+/* tap dance shifts */
+typedef struct {
+    bool is_press_action;
+    int  state;
+} tap;
+
+typedef enum {
+    TD_NONE,
+    TD_UNKNOWN,
+    TD_SINGLE_TAP,
+    TD_SINGLE_HOLD,
+    TD_DOUBLE_TAP
+} td_state_t;
+
+enum { LEFT_SHIFT = 0, RIGHT_SHIFT = 1 };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* QWERTY
+    * ,-----------------------------------------.                    ,-----------------------------------------.
+    * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  '?  |
+    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+    * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  +*  |
+    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+    * |LShift|   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   Ç  | BACK |
+    * |------+------+------+------+------+------|  <>   |    |  ´`   |------+------+------+------+------+------|
+    * |LCTRL |   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |  ,;  |   .: |  _-  |Shift|
+    * `-----------------------------------------/       /     \      \-----------------------------------------'
+    *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE | RGUI | RAlt |
+    *                   |      |      |      |/       /         \      \ |      |      |      |
+    *                   `-------------------''-------'           '------''--------------------'
+    */
+    [_QWERTY] = 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_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,
+        TD(LEFT_SHIFT),  KC_A,   KC_S,    KC_D,    KC_F,    KC_G,              KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_BSPC,
+        KC_LCTL,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_GRV,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  TD(RIGHT_SHIFT),
+                            KC_LALT, KC_LGUI, TL_LOWR, KC_SPC,   KC_ENT,   TL_UPPR,  KC_RGUI, KC_RALT
+    ),
+
+    /* LOWER
+    * ,-----------------------------------------.                    ,-----------------------------------------.
+    * |      |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  |  F11 |      |
+    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+    * |  F1  |      |      |      |      |      |                    | PgUp | HOME |  Up  | END  |  ºª  | F12  |
+    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+    * |      |      |      |      |      |      |-------.    ,-------| PgDn | Left | Down |Right |  ~^  | DEL  |
+    * |------+------+------+------+------+------|  <>   |    |  ´`   |------+------+------+------+------+------|
+    * |      |      |      |  <<  |  >|| |  >>  |-------|    |-------|      | Vol+ | Vol- | Mute |  \|  |      |
+    * `-----------------------------------------/       /     \      \-----------------------------------------'
+    *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE | RGUI | RAlt |
+    *                   |      |      |      |/       /         \      \ |      |      |      |
+    *                   `-------------------''-------'           '------''--------------------'
+    */
+    [_LOWER] = LAYOUT(
+        _______,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                 KC_F7,     KC_F8, KC_F9,  KC_F10,  KC_F11, _______,  
+          KC_F1, _______, _______, _______, _______, _______,                 KC_PGUP, KC_HOME, KC_UP,  KC_END, KC_LBRC,  KC_F12,
+        _______, _______, _______, _______, _______, _______,                 KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_QUOT, KC_DEL,
+        _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT,   _______, _______, _______, KC_VOLU,  KC_VOLD, KC_MUTE, KC_BSLS, _______,
+                                    _______, _______, _______,  _______, _______,  _______, _______, _______
+    ),
+
+    /* RAISE
+    * ,-----------------------------------------.                    ,-----------------------------------------.
+    * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+    * |      |   1  |   2  |  3   |  4   |  5   |                    | PgUp | HOME |  Up  | END  |  ºª  |      |
+    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+    * |      |   6  |   7  |  8   |  9   |  0   |-------.    ,-------| PgDn | Left | Down |Right |  ~^  |      |
+    * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+    * |      |      |      |  <<  |  >|| |  >>  |-------|    |-------|      | Vol+ | Vol- | Mute |  \|  |      |
+    * `-----------------------------------------/       /     \      \-----------------------------------------'
+    *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE | RGUI | RAlt |
+    *                   |      |      |      |/       /         \      \ |      |      |      |
+    *                   `-------------------''-------'           '------''--------------------'
+    */
+    [_RAISE] = LAYOUT(
+        _______, _______, _______, _______, _______, _______,                   _______, _______, _______,_______, _______, _______,
+        _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                   KC_PGUP, KC_HOME, KC_UP,  KC_END, KC_LBRC, _______,
+        _______,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_QUOT, _______,
+        _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_VOLU,  KC_VOLD, KC_MUTE, KC_BSLS, _______,
+                                    _______, _______, _______, _______, _______,  _______, _______, _______
+    ),   
+
+    /* ADJUST
+    * ,-----------------------------------------.                    ,-----------------------------------------.
+    * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+    * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+    * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+    * |RGB ON| HUE+ | SAT+ | VAL+ |      | BRG+ |-------.    ,-------|      |      |      |      |      |      |
+    * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+    * | MODE | HUE- | SAT- | VAL- |      | BRG- |-------|    |-------|      |      |      |      |      |      |
+    * `-----------------------------------------/       /     \      \-----------------------------------------'
+    *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE | RGUI | RAlt | 
+    *                   |      |      |      |/       /         \      \ |      |      |      |
+    *                   `----------------------------'           '------''--------------------'
+    */
+
+    [_ADJUST] = LAYOUT(
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_BRIU,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_BRID, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                                    _______, _______, _______, _______, _______,  _______, _______, _______
+    )
+};
+
+// SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
+#ifdef OLED_ENABLE
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    if (!is_keyboard_master()) return OLED_ROTATION_180; // flips the display 180 degrees if offhand
+    return rotation;
+}
+
+// When you add source files to SRC in rules.mk, you can use functions.
+const char *read_layer_state(void);
+const char *read_logo(void);
+void        set_keylog(uint16_t keycode, keyrecord_t *record);
+const char *read_keylog(void);
+const char *read_keylogs(void);
+
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        oled_write_ln(read_layer_state(), false);
+        oled_write_ln(read_keylog(), false);
+        oled_write_ln(read_keylogs(), false);
+    } else {
+        oled_write(read_logo(), false);
+    }
+    return false;
+}
+#endif // OLED_ENABLE
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+    #ifdef OLED_ENABLE
+        set_keylog(keycode, record);
+    #endif
+    }
+
+    return true;
+}
+
+/* Tap dance shifts */
+td_state_t cur_dance(tap_dance_state_t *state) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) {
+            return TD_SINGLE_TAP;
+        } else {
+            return TD_SINGLE_HOLD;
+        }
+    } else if (state->count == 2) {
+        return TD_DOUBLE_TAP;
+    }
+
+    return TD_UNKNOWN;
+}
+
+static tap lshifttap_state = {.is_press_action = true, .state = TD_NONE};
+
+static tap rshifttap_state = {.is_press_action = true, .state = TD_NONE};
+
+void lshift_finished(tap_dance_state_t *state, void *user_data) {
+    lshifttap_state.state = cur_dance(state);
+
+    switch (lshifttap_state.state) {
+        case TD_SINGLE_TAP:
+            register_code16(LALT(KC_LEFT));
+            break;
+        case TD_SINGLE_HOLD:
+            register_code(KC_LSFT);
+            break;
+        case TD_DOUBLE_TAP:
+            tap_code16(LALT(KC_LEFT));
+            register_code16(LALT(KC_LEFT));
+            break;
+        default:
+            break;
+    }
+}
+
+void lshift_reset(tap_dance_state_t *state, void *user_data) {
+    switch (lshifttap_state.state) {
+        case TD_SINGLE_TAP:
+            unregister_code16(LALT(KC_LEFT));
+            break;
+        case TD_SINGLE_HOLD:
+            unregister_code(KC_LSFT);
+            break;
+        case TD_DOUBLE_TAP:
+            unregister_code16(LALT(KC_LEFT));
+            break;
+    }
+    lshifttap_state.state = TD_NONE;
+}
+
+void rshift_finished(tap_dance_state_t *state, void *user_data) {
+    rshifttap_state.state = cur_dance(state);
+
+    switch (rshifttap_state.state) {
+        case TD_SINGLE_TAP:
+            register_code16(LALT(KC_RGHT));
+            break;
+        case TD_SINGLE_HOLD:
+            register_code(KC_RSFT);
+            break;
+        case TD_DOUBLE_TAP:
+            tap_code16(LALT(KC_RGHT));
+            register_code16(LALT(KC_RGHT));
+            break;
+        default:
+            break;
+    }
+}
+
+void rshift_reset(tap_dance_state_t *state, void *user_data) {
+    switch (rshifttap_state.state) {
+        case TD_SINGLE_TAP:
+            unregister_code16(LALT(KC_RGHT));
+            break;
+        case TD_SINGLE_HOLD:
+            unregister_code(KC_RSFT);
+            break;
+        case TD_DOUBLE_TAP:
+            unregister_code16(LALT(KC_RGHT));
+            break;
+    }
+    rshifttap_state.state = TD_NONE;
+}
+
+tap_dance_action_t tap_dance_actions[] = {
+    [LEFT_SHIFT]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lshift_finished, lshift_reset),
+    [RIGHT_SHIFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rshift_finished, rshift_reset),
+};

keyboards/lily58/keymaps/paulomp90/readme.md

@@ -0,0 +1,10 @@
+# Paulo Lily58
+
+Lily58 is 6×4 column-staggered split keyboard.
+
+![Keymap first layer](https://i.postimg.cc/HWcgcxb8/lily58.png "Keymap first layer")
+
+- Add portuguese include
+- Add custom shift behaviour, when tap move by 1 word left <> right, when held act as shift.
+idea taken from [here](https://getreuer.info/posts/keyboards/custom-shift-keys/index.html).
+

keyboards/lily58/keymaps/paulomp90/rules.mk

@@ -0,0 +1,14 @@
+EXTRAKEY_ENABLE = yes        # Audio control and System control
+OLED_ENABLE= yes     # OLED display
+TAP_DANCE_ENABLE = yes
+TRI_LAYER_ENABLE = yes
+
+# If you want to change the display of OLED, you need to change here
+SRC +=  ./lib/rgb_state_reader.c \
+        ./lib/layer_state_reader.c \
+        ./lib/logo_reader.c \
+        ./lib/keylogger.c \
+        features/custom_shift_keys.c \
+        # ./lib/mode_icon_reader.c \
+        # ./lib/host_led_state_reader.c \
+        # ./lib/timelogger.c \

keyboards/ymdk/id75/board.h

@@ -0,0 +1,22 @@
+/* Copyright 2022 JasonRen(biu)
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000

keyboards/ymdk/id75/config.h

@@ -0,0 +1,31 @@
+/* Copyright 2021 MT
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#define RGB_DI_PIN B9
+#define RGB_MATRIX_LED_COUNT 89
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define WS2812_PWM_DRIVER PWMD4
+#define WS2812_PWM_CHANNEL 4
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_DMA_CHANNEL 7

keyboards/ymdk/id75/halconf.h

@@ -0,0 +1,21 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>

keyboards/ymdk/id75/id75.c

@@ -0,0 +1,30 @@
+/* Copyright 2021 MT
+ *
+ * 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+
+    if (host_keyboard_led_state().caps_lock) { // Capslock = RED
+        rgb_matrix_set_color(44, 200, 0, 0);
+    }
+    return true;
+}
+#endif

keyboards/ymdk/id75/info.json

@@ -0,0 +1,250 @@
+{
+    "manufacturer": "YMDK",
+    "keyboard_name": "Idobao x YMDK ID75",
+    "maintainer": "qmk",
+    "bootloader": "uf2boot",
+    "board": "STM32_F103_STM32DUINO",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "A5", "A6", "A4", "A3", "A2", "A1", "A0", "A15"],
+        "rows": ["B2", "B1", "B0", "A7", "B10"]
+    },
+    "processor": "STM32F103",
+    "ws2812": {
+        "driver": "pwm"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 4, "matrix": [4, 14], "x": 224, "y": 64 },
+            { "flags": 4, "matrix": [4, 13], "x": 208, "y": 64 },
+            { "flags": 4, "matrix": [4, 12], "x": 192, "y": 64 },
+            { "flags": 4, "matrix": [4, 11], "x": 176, "y": 64 },
+            { "flags": 4, "matrix": [4, 10], "x": 160, "y": 64 },
+            { "flags": 4, "matrix": [4, 9], "x": 144, "y": 64 },
+            { "flags": 4, "matrix": [4, 8], "x": 128, "y": 64 },
+            { "flags": 4, "matrix": [4, 7], "x": 112, "y": 64 },
+            { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64 },
+            { "flags": 4, "matrix": [4, 5], "x": 80, "y": 64 },
+            { "flags": 4, "matrix": [4, 4], "x": 64, "y": 64 },
+            { "flags": 4, "matrix": [4, 3], "x": 48, "y": 64 },
+            { "flags": 4, "matrix": [4, 2], "x": 32, "y": 64 },
+            { "flags": 4, "matrix": [4, 1], "x": 16, "y": 64 },
+            { "flags": 4, "matrix": [4, 0], "x": 0, "y": 64 },
+            { "flags": 4, "matrix": [3, 14], "x": 224, "y": 48 },
+            { "flags": 4, "matrix": [3, 13], "x": 208, "y": 48 },
+            { "flags": 4, "matrix": [3, 12], "x": 192, "y": 48 },
+            { "flags": 4, "matrix": [3, 11], "x": 176, "y": 48 },
+            { "flags": 4, "matrix": [3, 10], "x": 160, "y": 48 },
+            { "flags": 4, "matrix": [3, 9], "x": 144, "y": 48 },
+            { "flags": 4, "matrix": [3, 8], "x": 128, "y": 48 },
+            { "flags": 4, "matrix": [3, 7], "x": 112, "y": 48 },
+            { "flags": 4, "matrix": [3, 6], "x": 96, "y": 48 },
+            { "flags": 4, "matrix": [3, 5], "x": 80, "y": 48 },
+            { "flags": 4, "matrix": [3, 4], "x": 64, "y": 48 },
+            { "flags": 4, "matrix": [3, 3], "x": 48, "y": 48 },
+            { "flags": 4, "matrix": [3, 2], "x": 32, "y": 48 },
+            { "flags": 4, "matrix": [3, 1], "x": 16, "y": 48 },
+            { "flags": 4, "matrix": [3, 0], "x": 0, "y": 48 },
+            { "flags": 4, "matrix": [2, 14], "x": 224, "y": 32 },
+            { "flags": 4, "matrix": [2, 13], "x": 208, "y": 32 },
+            { "flags": 4, "matrix": [2, 12], "x": 192, "y": 32 },
+            { "flags": 4, "matrix": [2, 11], "x": 176, "y": 32 },
+            { "flags": 4, "matrix": [2, 10], "x": 160, "y": 32 },
+            { "flags": 4, "matrix": [2, 9], "x": 144, "y": 32 },
+            { "flags": 4, "matrix": [2, 8], "x": 128, "y": 32 },
+            { "flags": 4, "matrix": [2, 7], "x": 112, "y": 32 },
+            { "flags": 4, "matrix": [2, 6], "x": 96, "y": 32 },
+            { "flags": 4, "matrix": [2, 5], "x": 80, "y": 32 },
+            { "flags": 4, "matrix": [2, 4], "x": 64, "y": 32 },
+            { "flags": 4, "matrix": [2, 3], "x": 48, "y": 32 },
+            { "flags": 4, "matrix": [2, 2], "x": 32, "y": 32 },
+            { "flags": 4, "matrix": [2, 1], "x": 16, "y": 32 },
+            { "flags": 4, "matrix": [2, 0], "x": 0, "y": 32 },
+            { "flags": 4, "matrix": [1, 14], "x": 224, "y": 16 },
+            { "flags": 4, "matrix": [1, 13], "x": 208, "y": 16 },
+            { "flags": 4, "matrix": [1, 12], "x": 192, "y": 16 },
+            { "flags": 4, "matrix": [1, 11], "x": 176, "y": 16 },
+            { "flags": 4, "matrix": [1, 10], "x": 160, "y": 16 },
+            { "flags": 4, "matrix": [1, 9], "x": 144, "y": 16 },
+            { "flags": 4, "matrix": [1, 8], "x": 128, "y": 16 },
+            { "flags": 4, "matrix": [1, 7], "x": 112, "y": 16 },
+            { "flags": 4, "matrix": [1, 6], "x": 96, "y": 16 },
+            { "flags": 4, "matrix": [1, 5], "x": 80, "y": 16 },
+            { "flags": 4, "matrix": [1, 4], "x": 64, "y": 16 },
+            { "flags": 4, "matrix": [1, 3], "x": 48, "y": 16 },
+            { "flags": 4, "matrix": [1, 2], "x": 32, "y": 16 },
+            { "flags": 4, "matrix": [1, 1], "x": 16, "y": 16 },
+            { "flags": 4, "matrix": [1, 0], "x": 0, "y": 16 },
+            { "flags": 4, "matrix": [0, 14], "x": 224, "y": 0 },
+            { "flags": 4, "matrix": [0, 13], "x": 208, "y": 0 },
+            { "flags": 4, "matrix": [0, 12], "x": 192, "y": 0 },
+            { "flags": 4, "matrix": [0, 11], "x": 176, "y": 0 },
+            { "flags": 4, "matrix": [0, 10], "x": 160, "y": 0 },
+            { "flags": 4, "matrix": [0, 9], "x": 144, "y": 0 },
+            { "flags": 4, "matrix": [0, 8], "x": 128, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 112, "y": 0 },
+            { "flags": 4, "matrix": [0, 6], "x": 96, "y": 0 },
+            { "flags": 4, "matrix": [0, 5], "x": 80, "y": 0 },
+            { "flags": 4, "matrix": [0, 4], "x": 64, "y": 0 },
+            { "flags": 4, "matrix": [0, 3], "x": 48, "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 32, "y": 0 },
+            { "flags": 4, "matrix": [0, 1], "x": 16, "y": 0 },
+            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 },
+            { "flags": 2, "x": 0, "y": 64 },
+            { "flags": 2, "x": 38, "y": 64 },
+            { "flags": 2, "x": 76, "y": 64 },
+            { "flags": 2, "x": 114, "y": 64 },
+            { "flags": 2, "x": 152, "y": 64 },
+            { "flags": 2, "x": 190, "y": 64 },
+            { "flags": 2, "x": 224, "y": 64 },
+            { "flags": 2, "x": 0, "y": 0 },
+            { "flags": 2, "x": 38, "y": 0 },
+            { "flags": 2, "x": 76, "y": 0 },
+            { "flags": 2, "x": 114, "y": 0 },
+            { "flags": 2, "x": 152, "y": 0 },
+            { "flags": 2, "x": 190, "y": 0 },
+            { "flags": 2, "x": 224, "y": 0 }
+        ],
+        "max_brightness": 128
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0075",
+        "vid": "0x594D"
+    },
+    "community_layouts": [ "ortho_5x15" ],
+    "layouts": {
+        "LAYOUT_ortho_5x15": {
+            "layout": [
+                { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+                { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+                { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+                { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+                { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
+                { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
+                { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
+                { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
+                { "label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
+                { "label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
+                { "label": "k0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
+                { "label": "k0B", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
+                { "label": "k0C", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
+                { "label": "k0D", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
+                { "label": "k0E", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 },
+                { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 },
+                { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 },
+                { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
+                { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 },
+                { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 },
+                { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5, "y": 1 },
+                { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6, "y": 1 },
+                { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7, "y": 1 },
+                { "label": "k18", "matrix": [1, 8], "w": 1, "x": 8, "y": 1 },
+                { "label": "k19", "matrix": [1, 9], "w": 1, "x": 9, "y": 1 },
+                { "label": "k1A", "matrix": [1, 10], "w": 1, "x": 10, "y": 1 },
+                { "label": "k1B", "matrix": [1, 11], "w": 1, "x": 11, "y": 1 },
+                { "label": "k1C", "matrix": [1, 12], "w": 1, "x": 12, "y": 1 },
+                { "label": "k1D", "matrix": [1, 13], "w": 1, "x": 13, "y": 1 },
+                { "label": "k1E", "matrix": [1, 14], "w": 1, "x": 14, "y": 1 },
+                { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
+                { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
+                { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
+                { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 },
+                { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 },
+                { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 },
+                { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 },
+                { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 },
+                { "label": "k28", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 },
+                { "label": "k29", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 },
+                { "label": "k2A", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 },
+                { "label": "k2B", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 },
+                { "label": "k2C", "matrix": [2, 12], "w": 1, "x": 12, "y": 2 },
+                { "label": "k2D", "matrix": [2, 13], "w": 1, "x": 13, "y": 2 },
+                { "label": "k2E", "matrix": [2, 14], "w": 1, "x": 14, "y": 2 },
+                { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 },
+                { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 },
+                { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 },
+                { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 },
+                { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 },
+                { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5, "y": 3 },
+                { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6, "y": 3 },
+                { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7, "y": 3 },
+                { "label": "k38", "matrix": [3, 8], "w": 1, "x": 8, "y": 3 },
+                { "label": "k39", "matrix": [3, 9], "w": 1, "x": 9, "y": 3 },
+                { "label": "k3A", "matrix": [3, 10], "w": 1, "x": 10, "y": 3 },
+                { "label": "k3B", "matrix": [3, 11], "w": 1, "x": 11, "y": 3 },
+                { "label": "k3C", "matrix": [3, 12], "w": 1, "x": 12, "y": 3 },
+                { "label": "k3D", "matrix": [3, 13], "w": 1, "x": 13, "y": 3 },
+                { "label": "k3E", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 },
+                { "label": "k40", "matrix": [4, 0], "w": 1, "x": 0, "y": 4 },
+                { "label": "k41", "matrix": [4, 1], "w": 1, "x": 1, "y": 4 },
+                { "label": "k42", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 },
+                { "label": "k43", "matrix": [4, 3], "w": 1, "x": 3, "y": 4 },
+                { "label": "k44", "matrix": [4, 4], "w": 1, "x": 4, "y": 4 },
+                { "label": "k45", "matrix": [4, 5], "w": 1, "x": 5, "y": 4 },
+                { "label": "k46", "matrix": [4, 6], "w": 1, "x": 6, "y": 4 },
+                { "label": "k47", "matrix": [4, 7], "w": 1, "x": 7, "y": 4 },
+                { "label": "k48", "matrix": [4, 8], "w": 1, "x": 8, "y": 4 },
+                { "label": "k49", "matrix": [4, 9], "w": 1, "x": 9, "y": 4 },
+                { "label": "k4A", "matrix": [4, 10], "w": 1, "x": 10, "y": 4 },
+                { "label": "k4B", "matrix": [4, 11], "w": 1, "x": 11, "y": 4 },
+                { "label": "k4C", "matrix": [4, 12], "w": 1, "x": 12, "y": 4 },
+                { "label": "k4D", "matrix": [4, 13], "w": 1, "x": 13, "y": 4 },
+                { "label": "k4E", "matrix": [4, 14], "w": 1, "x": 14, "y": 4 }
+            ]
+        }
+    }
+}

keyboards/ymdk/id75/keymaps/default/keymap.json

@@ -0,0 +1,24 @@
+{
+    "version": 1,
+    "author": "qmk",
+    "notes": "",
+    "keyboard": "ymdk/id75",
+    "keymap": "default",
+    "layout": "LAYOUT_ortho_5x15",
+    "layers": [
+        [
+            "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_BSLS", "KC_GRV",
+            "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSPC", "KC_DEL",
+            "KC_CAPS", "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT", "KC_ENT",  "KC_ENT",  "KC_PGUP",
+            "KC_LSFT", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH", "KC_RSFT", "MO(1)",   "KC_UP",   "KC_PGDN",
+            "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC",  "KC_SPC",  "KC_SPC",  "KC_SPC",  "KC_SPC",  "KC_SPC",  "KC_RALT", "KC_RCTL", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"
+        ],
+        [
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "RGB_MOD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "QK_BOOT"
+        ]
+    ]
+}

keyboards/ymdk/id75/keymaps/via/keymap.json

@@ -0,0 +1,43 @@
+{
+    "version": 1,
+    "author": "qmk",
+    "notes": "",
+    "config": {
+        "features": {
+            "via": true
+        }
+    },
+    "keyboard": "ymdk/id75",
+    "keymap": "via",
+    "layout": "LAYOUT_ortho_5x15",
+    "layers": [
+        [
+            "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_BSLS", "KC_GRV",
+            "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSPC", "KC_DEL",
+            "KC_CAPS", "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT", "KC_ENT",  "KC_ENT",  "KC_PGUP",
+            "KC_LSFT", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH", "KC_RSFT", "MO(1)",   "KC_UP",   "KC_PGDN",
+            "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC",  "KC_SPC",  "KC_SPC",  "KC_SPC",  "KC_SPC",  "KC_SPC",  "KC_RALT", "KC_RCTL", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"
+        ],
+        [
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "RGB_MOD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "QK_BOOT"
+        ],
+        [
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
+        ],
+        [
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
+        ]
+    ]
+}

keyboards/ymdk/id75/mcuconf.h

@@ -0,0 +1,25 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
+
+#undef STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2

keyboards/ymdk/id75/readme.md

@@ -0,0 +1,30 @@
+# Idobao x YMDK ID75
+
+![Idobao x YMDK ID75](https://i.imgur.com/bhVfzrzh.jpg)
+
+A 75-key, 5-row ortholinear keyboard with per-key and underglow RGB LEDs.
+
+* Keyboard Maintainer: [The QMK Community](https://github.com/qmk)
+* Hardware Supported: [Idobao x YMDK ID75 PCB (APM32F103CBT6)](https://www.aliexpress.com/item/3256804537842097.html)
+  *  This PCB uses an ARM Cortex-M3 MCU with 128kb flash. **It is not the same as `idobao/id75` or `ymdk/ymd75`.**
+* Hardware Availability: [YMDK](https://ymdkey.com/products/id75-75-keys-ortholinear-layout-qmk-anodized-aluminum-case-plate-hot-swappable-hot-swap-type-c-pcb-mechanical-keyboard-kit), [AliExpress (YMDK Store)](https://www.aliexpress.com/item/2255800125183974.html), [Amazon](https://www.amazon.com/Ortholinear-Anodized-Aluminum-hot-swappable-Mechanical/dp/B07ZQ8CD88)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ymdk/id75:default
+
+Flashing example for this keyboard:
+
+    make ymdk/id75: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 top left key and plug in the keyboard. This will also clear the emulated EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset button**: Press the button on the back of the PCB twice in quick succession.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT`. In the pre-supplied keymaps it is on the second layer, in the bottom-right corner.
+
+After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device named `MT.KEY`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded.

keyboards/ymdk/id75/rules.mk

@@ -0,0 +1,9 @@
+# Configure for 128K flash
+#MCU_LDSCRIPT = STM32F103xB
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+WS2812_DRIVER = pwm
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE