diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index de08442c1ca..81da72046c8 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -35,7 +35,7 @@ jobs:
- name: Get changed files
id: file_changes
- uses: tj-actions/changed-files@v41
+ uses: tj-actions/changed-files@v42
- name: Run qmk formatters
shell: 'bash {0}'
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 08a131c786f..67823103f1b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -27,7 +27,7 @@ jobs:
- name: Get changed files
id: file_changes
- uses: tj-actions/changed-files@v41
+ uses: tj-actions/changed-files@v42
- name: Print info
run: |
diff --git a/docs/feature_combo.md b/docs/feature_combo.md
index 2e802446b6b..61f8b2ee197 100644
--- a/docs/feature_combo.md
+++ b/docs/feature_combo.md
@@ -333,27 +333,26 @@ will give the _NAV layer as a reference to it's self. All other layers
will have the default for their combo reference layer. If the default
is not set, all other layers will reference themselves.
- ```c
- #define COMBO_REF_DEFAULT _MY_COMBO_LAYER
- ...
+```c
+#define COMBO_REF_DEFAULT _MY_COMBO_LAYER
- uint8_t combo_ref_from_layer(uint8_t layer){
- switch (get_highest_layer(layer_state)){
- case _DVORAK: return _QWERTY;
- case _NAV: return _NAV;
- default: return _MY_COMBO_LAYER;
- }
- return layer; // important if default is not in case.
+uint8_t combo_ref_from_layer(uint8_t layer){
+ switch (get_highest_layer(layer_state)){
+ case _DVORAK: return _QWERTY;
+ case _NAV: return _NAV;
+ default: return _MY_COMBO_LAYER;
}
- ```
+ return layer; // important if default is not in case.
+}
+```
The equivalent definition using the combo macros is this:
- ```c
- COMBO_REF_LAYER(_DVORAK, _QWERTY)
- COMBO_REF_LAYER(_NAV, _NAV)
- DEFAULT_REF_LAYER(_MY_COMBO_LAYER).
- ```
+```c
+COMBO_REF_LAYER(_DVORAK, _QWERTY)
+COMBO_REF_LAYER(_NAV, _NAV)
+DEFAULT_REF_LAYER(_MY_COMBO_LAYER).
+```
## User callbacks
diff --git a/docs/feature_encoders.md b/docs/feature_encoders.md
index 891baeefa1d..4eeb388e577 100644
--- a/docs/feature_encoders.md
+++ b/docs/feature_encoders.md
@@ -82,10 +82,10 @@ Your `keymap.c` will then need an encoder mapping defined (for four layers and t
```c
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [_BASE] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
- [_LOWER] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
- [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
- [_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
+ [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
+ [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
+ [3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
};
#endif
```
diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json
index 5259316d9d5..83ca4d9b8aa 100644
--- a/keyboards/alfredslab/swift65/solder/info.json
+++ b/keyboards/alfredslab/swift65/solder/info.json
@@ -349,6 +349,322 @@
{"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
{"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_iso_625u_space": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [1, 13], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_iso_625u_space_split_bs": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 15], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [1, 13], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_iso_7u_space": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [1, 13], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_iso_7u_space_split_bs": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 15], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [1, 13], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
{"matrix": [4, 12], "x": 13, "y": 4},
{"matrix": [4, 13], "x": 14, "y": 4},
{"matrix": [4, 14], "x": 15, "y": 4}
diff --git a/keyboards/artifact/lvl/rev_hs01/config.h b/keyboards/artifact/lvl/rev_hs01/config.h
new file mode 100755
index 00000000000..674fb1110c8
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2024 Yiancar-Designs
+
+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 .
+*/
+
+#pragma once
+
+/* RGB Light */
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_DMA_CHANNEL 5
+
+#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/artifact/lvl/rev_hs01/halconf.h b/keyboards/artifact/lvl/rev_hs01/halconf.h
new file mode 100644
index 00000000000..c7f5bab5c85
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next
diff --git a/keyboards/artifact/lvl/rev_hs01/info.json b/keyboards/artifact/lvl/rev_hs01/info.json
new file mode 100755
index 00000000000..1b587501550
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/info.json
@@ -0,0 +1,232 @@
+{
+ "manufacturer": "Yiancar-Designs",
+ "keyboard_name": "LvL Type-01/80",
+ "maintainer": "Yiancar-Designs",
+ "bootloader": "stm32-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "indicators": {
+ "caps_lock": "B6",
+ "on_state": 0
+ },
+ "matrix_pins": {
+ "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
+ "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
+ },
+ "processor": "STM32F072",
+ "rgblight": {
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ },
+ "default": {
+ "sat": 0
+ },
+ "led_count": 1
+ },
+ "url": "https://yiancar-designs.com",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x4C56",
+ "vid": "0x8968"
+ },
+ "ws2812": {
+ "driver": "pwm",
+ "pin": "A9"
+ },
+ "community_layouts": ["tkl_ansi_tsangan"],
+ "layouts": {
+ "LAYOUT_tkl_ansi_tsangan": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+ {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_ansi_wkl": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/artifact/lvl/rev_hs01/keymaps/default/keymap.c b/keyboards/artifact/lvl/rev_hs01/keymaps/default/keymap.c
new file mode 100644
index 00000000000..0cca681ba67
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_tkl_ansi_tsangan( /* Base */
+ KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS,
+
+ KC_GRV, 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_INS, KC_HOME, KC_PGUP,
+ 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_BSLS, KC_DEL, KC_END, KC_PGDN,
+ 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_LSFT, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/keyboards/artifact/lvl/rev_hs01/keymaps/via/keymap.c b/keyboards/artifact/lvl/rev_hs01/keymaps/via/keymap.c
new file mode 100644
index 00000000000..0cca681ba67
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/keymaps/via/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_tkl_ansi_tsangan( /* Base */
+ KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS,
+
+ KC_GRV, 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_INS, KC_HOME, KC_PGUP,
+ 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_BSLS, KC_DEL, KC_END, KC_PGDN,
+ 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_LSFT, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/keyboards/artifact/lvl/rev_hs01/keymaps/via/rules.mk b/keyboards/artifact/lvl/rev_hs01/keymaps/via/rules.mk
new file mode 100755
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/artifact/lvl/rev_hs01/mcuconf.h b/keyboards/artifact/lvl/rev_hs01/mcuconf.h
new file mode 100644
index 00000000000..73c8c7d3f4f
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#include_next
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
diff --git a/keyboards/artifact/lvl/rev_hs01/readme.md b/keyboards/artifact/lvl/rev_hs01/readme.md
new file mode 100755
index 00000000000..af724bd85cf
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/readme.md
@@ -0,0 +1,32 @@
+# LvL Type-01/80
+
+This is a standard TKL layout PCB. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A TKL keyboard with STM32F072CB
+* Hardware Availability: https://artifact-industries.com
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+ make artifact/lvl/rev_hs01: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).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or CLI (`make artifact/lvl/rev_hs01::flash`)
diff --git a/keyboards/artifact/lvl/rev_hs01/rev_hs01.c b/keyboards/artifact/lvl/rev_hs01/rev_hs01.c
new file mode 100755
index 00000000000..6266ef69ad5
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/rev_hs01.c
@@ -0,0 +1,21 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * 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 .
+ */
+#include "quantum.h"
+
+void led_init_ports(void) {
+ // Set our LED pins as open drain outputs
+ setPinOutputOpenDrain(LED_CAPS_LOCK_PIN);
+}
diff --git a/keyboards/artifact/lvl/rev_hs01/rules.mk b/keyboards/artifact/lvl/rev_hs01/rules.mk
new file mode 100755
index 00000000000..0ab54aaaf71
--- /dev/null
+++ b/keyboards/artifact/lvl/rev_hs01/rules.mk
@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/atreus62/info.json b/keyboards/atreus62/info.json
index a745eb5e272..d27f97ce974 100644
--- a/keyboards/atreus62/info.json
+++ b/keyboards/atreus62/info.json
@@ -4,7 +4,7 @@
"url": "",
"maintainer": "qmk",
"usb": {
- "vid": "0xFEED",
+ "vid": "0x5072",
"pid": "0x6062",
"device_version": "0.0.1"
},
diff --git a/keyboards/atreus62/keymaps/via/keymap.c b/keyboards/atreus62/keymaps/via/keymap.c
new file mode 100644
index 00000000000..408886f82c1
--- /dev/null
+++ b/keyboards/atreus62/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2024 Tommi Pääkkö (@Glenf)
+ *
+ * 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+ _DEFAULT,
+ _NAV,
+ _RESET,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_DEFAULT] = LAYOUT( /* qwerty */
+ 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_BSLS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRC ,
+ KC_TAB, 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LBRC ,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_GRV, MO(_NAV),KC_BSPC, KC_DEL, KC_ENT, KC_SPC, KC_EQL, KC_MINS, KC_QUOT, KC_ENT, KC_RGUI
+ ),
+
+ [_NAV] = LAYOUT(
+ TO(_DEFAULT), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11 ,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS ,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS ,
+ TO(_RESET), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+
+ [_RESET] = LAYOUT(
+ TO(_DEFAULT), 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 , 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 , QK_BOOT
+ )
+
+};
diff --git a/keyboards/atreus62/keymaps/via/rules.mk b/keyboards/atreus62/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/atreus62/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/binepad/bnk9/config.h b/keyboards/binepad/bnk9/config.h
new file mode 100644
index 00000000000..c774a0f2b09
--- /dev/null
+++ b/keyboards/binepad/bnk9/config.h
@@ -0,0 +1,12 @@
+// Copyright 2023 binepad (@binepad)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define ENCODER_DEFAULT_POS 0x3 // enable 1:1 resolution
+
+// Default PIO0 cases flickering in this board. Setting to PIO1 resolves this issue.
+#define WS2812_PIO_USE_PIO1
+
+// Timing for SK6812
+#define WS2812_T1H 650
diff --git a/keyboards/binepad/bnk9/info.json b/keyboards/binepad/bnk9/info.json
new file mode 100644
index 00000000000..1f3b7cb7b0f
--- /dev/null
+++ b/keyboards/binepad/bnk9/info.json
@@ -0,0 +1,86 @@
+{
+ "manufacturer": "binepad",
+ "keyboard_name": "BNK9",
+ "maintainer": "binepad",
+ "board": "GENERIC_RP_RP2040",
+ "bootloader": "rp2040",
+ "bootloader_instructions": "Hold down the key at (0x0) in the matrix (the 'knob' / rotary encoder) and plug in the keyboard.",
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "GP13", "pin_b": "GP14"}
+ ]
+ },
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["GP1", "GP2", "GP3"],
+ "rows": ["GP12", "GP4", "GP5", "GP6"]
+ },
+ "processor": "RP2040",
+ "rgb_matrix": {
+ "animations": {
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_pinwheel": true,
+ "cycle_up_down": true,
+ "jellybean_raindrops": true,
+ "riverflow": true,
+ "solid_reactive": true,
+ "solid_reactive_simple": true,
+ "solid_splash": true,
+ "splash": true,
+ "starlight": true,
+ "starlight_dual_hue": true,
+ "starlight_dual_sat": true
+ },
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [1, 0], "x": 80, "y": 0, "flags": 4},
+ {"matrix": [1, 1], "x": 112, "y": 0, "flags": 4},
+ {"matrix": [1, 2], "x": 144, "y": 0, "flags": 4},
+ {"matrix": [2, 2], "x": 144, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 112, "y": 32, "flags": 4},
+ {"matrix": [2, 0], "x": 80, "y": 32, "flags": 4},
+ {"matrix": [3, 0], "x": 80, "y": 64, "flags": 4},
+ {"matrix": [3, 1], "x": 112, "y": 64, "flags": 4},
+ {"matrix": [3, 2], "x": 144, "y": 64, "flags": 4}
+ ],
+ "led_process_limit": 9,
+ "max_brightness": 180,
+ "sleep": true
+ },
+ "url": "https://www.binepad.com/product-page/bnk9",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x4E39",
+ "vid": "0x4249"
+ },
+ "ws2812": {
+ "driver": "vendor",
+ "pin": "GP11"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "Knob", "matrix": [0, 0], "x": 0, "y": 0, "w": 3, "h": 3, "encoder": 0},
+ {"label": "1", "matrix": [1, 0], "x": 3.25, "y": 0},
+ {"label": "2", "matrix": [1, 1], "x": 4.25, "y": 0},
+ {"label": "3", "matrix": [1, 2], "x": 5.25, "y": 0},
+ {"label": "4", "matrix": [2, 0], "x": 3.25, "y": 1},
+ {"label": "5", "matrix": [2, 1], "x": 4.25, "y": 1},
+ {"label": "6", "matrix": [2, 2], "x": 5.25, "y": 1},
+ {"label": "7", "matrix": [3, 0], "x": 3.25, "y": 2},
+ {"label": "8", "matrix": [3, 1], "x": 4.25, "y": 2},
+ {"label": "9", "matrix": [3, 2], "x": 5.25, "y": 2}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/binepad/bnk9/keymaps/default/keymap.c b/keyboards/binepad/bnk9/keymaps/default/keymap.c
new file mode 100644
index 00000000000..9ae1e4541f6
--- /dev/null
+++ b/keyboards/binepad/bnk9/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2023 Binepad (@binpad)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_MUTE,
+ KC_P1, KC_P2, KC_P3,
+ KC_P4, KC_P5, KC_P6,
+ KC_P7, KC_P8, LT(1, KC_P9)
+ ),
+ [1] = LAYOUT(
+ RGB_TOG,
+ RGB_HUI, RGB_SAI, RGB_SPI,
+ RGB_HUD, RGB_SAD, RGB_SPD,
+ RGB_RMOD, RGB_MOD, _______
+ )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+
+#endif
diff --git a/keyboards/binepad/bnk9/keymaps/default/rules.mk b/keyboards/binepad/bnk9/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/binepad/bnk9/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/binepad/bnk9/keymaps/via/keymap.c b/keyboards/binepad/bnk9/keymaps/via/keymap.c
new file mode 100644
index 00000000000..9ae1e4541f6
--- /dev/null
+++ b/keyboards/binepad/bnk9/keymaps/via/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2023 Binepad (@binpad)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_MUTE,
+ KC_P1, KC_P2, KC_P3,
+ KC_P4, KC_P5, KC_P6,
+ KC_P7, KC_P8, LT(1, KC_P9)
+ ),
+ [1] = LAYOUT(
+ RGB_TOG,
+ RGB_HUI, RGB_SAI, RGB_SPI,
+ RGB_HUD, RGB_SAD, RGB_SPD,
+ RGB_RMOD, RGB_MOD, _______
+ )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
+};
+
+#endif
diff --git a/keyboards/binepad/bnk9/keymaps/via/rules.mk b/keyboards/binepad/bnk9/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/binepad/bnk9/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/binepad/bnk9/readme.md b/keyboards/binepad/bnk9/readme.md
new file mode 100644
index 00000000000..f8e6633b143
--- /dev/null
+++ b/keyboards/binepad/bnk9/readme.md
@@ -0,0 +1,27 @@
+# BINEPAD BNK9
+
+
+
+A 3x3 macropad with a large rotary encoder.
+
+* Keyboard Maintainer: [binepad](https://github.com/binepad)
+* Hardware Supported: BINPAD BNK9
+* Hardware Availability: [binepad.com](https://www.binepad.com/product-page/bnk9)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make binepad/bnk9:default
+
+Flashing example for this keyboard:
+
+ make binepad/bnk9:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0x0) in the matrix (the 'knob' / rotary encoder) and plug in the keyboard.
+* **Physical reset button**: Briefly press the PCB button located on the back of the PCB.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` *(or* `RESET` *in VIA)* if it is available.
diff --git a/keyboards/binepad/bnk9/rules.mk b/keyboards/binepad/bnk9/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/binepad/bnk9/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/buildakb/mw60/info.json b/keyboards/buildakb/mw60/info.json
new file mode 100644
index 00000000000..9a8b7955a85
--- /dev/null
+++ b/keyboards/buildakb/mw60/info.json
@@ -0,0 +1,945 @@
+{
+ "manufacturer": "Maelkworks",
+ "keyboard_name": "mw60",
+ "maintainer": "Maelkk",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F0", "C7", "C6", "B6", "B5", "F5", "B4", "D7", "D6", "D4", "D5", "D3", "F6", "D2"],
+ "rows": ["E6", "D1", "F7", "F4", "F1"]
+ },
+ "processor": "atmega32u4",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0004",
+ "vid": "0x4A56"
+ },
+ "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"],
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+ {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_tsangan": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+ {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+ {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_ansi_wkl": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+ {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_hhkb": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4}
+ ]
+ },
+ "LAYOUT_60_iso": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+ {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_iso_split_bs_rshift": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_iso_tsangan": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+ {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+ {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+ {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_iso_wkl": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+ {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_iso_wkl_split_bs_rshift": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+ {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+ {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+ {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "k405", "matrix": [4, 5], "x": 4, "y": 4, "w": 2.75},
+ {"label": "k407", "matrix": [4, 7], "x": 6.75, "y": 4, "w": 1.5},
+ {"label": "k409", "matrix": [4, 9], "x": 8.25, "y": 4, "w": 2.75},
+ {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/buildakb/mw60/keymaps/default/keymap.c b/keyboards/buildakb/mw60/keymaps/default/keymap.c
new file mode 100644
index 00000000000..efd37afe26d
--- /dev/null
+++ b/keyboards/buildakb/mw60/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2023 Maelkk
+ *
+ * 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ 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_BSPC,
+ 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_BSLS,
+ 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_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, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL),
+ [1] = LAYOUT_all(
+ KC_TRNS, 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_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)
+};
diff --git a/keyboards/buildakb/mw60/keymaps/via/keymap.c b/keyboards/buildakb/mw60/keymaps/via/keymap.c
new file mode 100644
index 00000000000..3a04af81134
--- /dev/null
+++ b/keyboards/buildakb/mw60/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2023 Maelkk
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ 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_BSPC,
+ 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_BSLS,
+ 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_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, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL),
+ [1] = LAYOUT_all(
+ KC_TRNS, 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_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),
+};
diff --git a/keyboards/buildakb/mw60/keymaps/via/rules.mk b/keyboards/buildakb/mw60/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/buildakb/mw60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/buildakb/mw60/readme.md b/keyboards/buildakb/mw60/readme.md
new file mode 100644
index 00000000000..f5e0119eeb4
--- /dev/null
+++ b/keyboards/buildakb/mw60/readme.md
@@ -0,0 +1,24 @@
+# MW60 PCB
+
+
+
+A simple standard 60% PCB available in hotswap and solderable variants
+
+- Keyboard Maintainer: [Maelkk](https://github.com/Aeonstrife)
+- Hardware Supported: MW60 PCB
+- Hardware Availability: [sandkeys.me](https://sandkeys.me/product/petals-60-addon-pcbs/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make buildakb/mw60:default
+
+Flashing example for this keyboard:
+
+ make buildakb/mw60:default:flash
+
+To reset into bootloader mode:
+
+While plugged in, press the RESET switch located on the back of the pcb.
+The keyboard should now be in bootloader mode.
+
+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).
\ No newline at end of file
diff --git a/keyboards/buildakb/mw60/rules.mk b/keyboards/buildakb/mw60/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/buildakb/mw60/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/chlx/ppr_merro60/config.h b/keyboards/chlx/ppr_merro60/config.h
new file mode 100644
index 00000000000..bdeed0c824e
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2024 Alexander Lee
+
+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 .
+*/
+
+#pragma once
+
+/* VIA related config */
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json
new file mode 100644
index 00000000000..f8f45232a1a
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/info.json
@@ -0,0 +1,957 @@
+{
+ "manufacturer": "chlx bsmt",
+ "keyboard_name": "ppr.merro60",
+ "maintainer": "gaclee3b",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "ROW2COL",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "indicators": {
+ "caps_lock": "C7",
+ "on_state": 0,
+ "scroll_lock": "F0"
+ },
+ "matrix_pins": {
+ "rows": ["F6", "F4", "F5", "F1", "B1", "B0", "C6", "B6", "D2", "D4"],
+ "cols": ["F7", "B2", "B3", "B7", "D7", "B4", "B5"]
+ },
+ "processor": "atmega32u4",
+ "url": "www.github.com/gaclee3b",
+ "usb": {
+ "device_version": "1.0.1",
+ "pid": "0x0603",
+ "vid": "0x4358"
+ },
+ "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"],
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [9, 6], "x": 14, "y": 0},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [7, 6], "x": 14, "y": 3},
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_tsangan": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [8, 0], "x": 1.5, "y": 4},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+ {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [9, 5], "x": 12.5, "y": 4},
+ {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_ansi_wkl": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+ {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [9, 6], "x": 14, "y": 0},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [7, 6], "x": 14, "y": 3},
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+ {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_hhkb": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [9, 6], "x": 14, "y": 0},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [7, 6], "x": 14, "y": 3},
+ {"matrix": [8, 0], "x": 1.5, "y": 4},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+ {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [9, 5], "x": 12.5, "y": 4}
+ ]
+ },
+ "LAYOUT_60_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [4, 6], "x": 12.75, "y": 2},
+ {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 3},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_iso_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [9, 6], "x": 14, "y": 0},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [4, 6], "x": 12.75, "y": 2},
+ {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 3},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [7, 6], "x": 14, "y": 3},
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_iso_tsangan": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [4, 6], "x": 12.75, "y": 2},
+ {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 3},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [8, 0], "x": 1.5, "y": 4},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+ {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [9, 5], "x": 12.5, "y": 4},
+ {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [9, 6], "x": 14, "y": 0},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [4, 6], "x": 12.75, "y": 2},
+ {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 3},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [7, 6], "x": 14, "y": 3},
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [8, 0], "x": 1.5, "y": 4},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+ {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [9, 5], "x": 12.5, "y": 4},
+ {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_iso_wkl": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [4, 6], "x": 12.75, "y": 2},
+ {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 3},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+ {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_iso_wkl_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [9, 6], "x": 14, "y": 0},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [4, 6], "x": 12.75, "y": 2},
+ {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 3},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [7, 6], "x": 14, "y": 3},
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+ {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [9, 6], "x": 14, "y": 0},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [7, 6], "x": 14, "y": 3},
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [8, 0], "x": 1.5, "y": 4},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+ {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [9, 5], "x": 12.5, "y": 4},
+ {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [9, 6], "x": 14, "y": 0},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [4, 6], "x": 12.75, "y": 2},
+ {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 3},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [7, 6], "x": 14, "y": 3},
+ {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 3.75, "y": 4, "w": 2.75},
+ {"matrix": [8, 3], "x": 6.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 7.75, "y": 4, "w": 2.25},
+ {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c
new file mode 100644
index 00000000000..4012c4a2dac
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 Alexander Lee
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_ansi(
+ 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_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_BSLS,
+ 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL),
+
+[1] = LAYOUT_60_ansi(
+ 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_DEL,
+ KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT,
+ _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
+ _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..ebb2ced9f7a
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 Alexander Lee
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_ansi_split_bs_rshift(
+ 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_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_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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL),
+
+[1] = LAYOUT_60_ansi_split_bs_rshift(
+ 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_DEL, _______,
+ KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT,
+ _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
+ _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c
new file mode 100644
index 00000000000..a51098d586b
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 Alexander Lee
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_ansi_tsangan(
+ 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_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_BSLS,
+ 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),
+
+[1] = LAYOUT_60_ansi_tsangan(
+ 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_DEL,
+ KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT,
+ _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
+ _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______,
+ _______, _______, _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c
new file mode 100644
index 00000000000..ca3686c071b
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 Alexander Lee
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_ansi_wkl(
+ 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_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_BSLS,
+ 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL),
+
+[1] = LAYOUT_60_ansi_wkl(
+ 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_DEL,
+ KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT,
+ _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
+ _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______,
+ _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..1f6ff266d8d
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 Alexander Lee
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_ansi_wkl_split_bs_rshift(
+ 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_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_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_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_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL),
+
+[1] = LAYOUT_60_ansi_wkl_split_bs_rshift(
+ 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_DEL, _______,
+ KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT,
+ _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
+ _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______,
+ _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c
new file mode 100644
index 00000000000..070f6f022b8
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 Alexander Lee
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_all(
+ 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_UP, KC_ENT,
+ KC_LSFT, KC_LEFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RGHT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL),
+
+[1] = LAYOUT_all(
+ 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_DEL,
+ KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT,
+ _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+ _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c
new file mode 100644
index 00000000000..8614ad28487
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 Alexander Lee
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_hhkb(
+ 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_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_LCTL, 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_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_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT),
+
+[1] = LAYOUT_60_hhkb(
+ 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_INS, KC_DEL,
+ KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT,
+ _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
+ _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______,
+ _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c
new file mode 100644
index 00000000000..ffdc49a2fb0
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 Alexander Lee
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_iso(
+ 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_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_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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL),
+
+[1] = LAYOUT_60_iso(
+ 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, QK_BOOT,
+ KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______,
+ _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+ _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c
new file mode 100644
index 00000000000..73282416ab8
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 Alexander Lee
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_tsangan_hhkb(
+ 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_BSPC,
+ 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_BSLS,
+ 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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),
+
+[1] = LAYOUT_60_tsangan_hhkb(
+ 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_DEL, _______,
+ KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT,
+ _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
+ _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c
new file mode 100644
index 00000000000..6d668def020
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 Alexander Lee
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_all(
+ 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_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_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_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_RGHT,
+ KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_LSCR, KC_RALT, KC_RGUI, MO(1), KC_RCTL),
+
+[1] = LAYOUT_all(
+ 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_DEL,
+ KC_CAPS, _______, KC_HOME, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP, _______, QK_BOOT,
+ _______, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+ _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk b/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk
new file mode 100644
index 00000000000..36b7ba9cbc9
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/chlx/ppr_merro60/readme.md b/keyboards/chlx/ppr_merro60/readme.md
new file mode 100644
index 00000000000..14674ff9ab3
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/readme.md
@@ -0,0 +1,28 @@
+# ppr.merro60
+
+
+
+- Standard 60% format keyboard PCB with USB-C and unified daughterboard compatibility.
+- Modified cutouts to allow usage of certain tray mount cases into gummy gasket o-ring mount.
+- Additional center flex cut.
+- Meant to be manufactured in 1.2mm thickness.
+
+* Keyboard Maintainer: [Alexander Lee](https://github.com/gaclee3b)
+* Hardware Supported: chlx PCB ppr.merro60.x.x.x
+
+Make example for this keyboard (after setting up your build environment):
+
+ make chlx/ppr_merro60:default
+
+Flashing example for this keyboard:
+
+ make chlx/ppr_merro60: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 bootloader mode by any of the following options -
+- When unplugged, holding the top-left key (typically ESC) while plugging in the keyboard
+- When plugged in, pressing and releasing the reset button on the pcb bottom behind the CAPSLOCK / A-key region
+- When plugged in, shorting out the two reset metal contacts near the 'z' key (accessible through the switch LED slot)
diff --git a/keyboards/chlx/ppr_merro60/rules.mk b/keyboards/chlx/ppr_merro60/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/compensator/info.json b/keyboards/compensator/info.json
new file mode 100644
index 00000000000..ceaa1763338
--- /dev/null
+++ b/keyboards/compensator/info.json
@@ -0,0 +1,163 @@
+{
+ "keyboard_name": "Compensator",
+ "manufacturer": "Highleap",
+ "url": "https://lrfoster03.github.io/",
+ "maintainer": "Lrfoster03",
+ "usb": {
+ "vid": "0x564B",
+ "pid": "0x0001",
+ "device_version": "1.0.0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "matrix_pins": {
+ "rows": ["B2", "F5", "F7", "F1", "B3", "F4", "F6", "F0"],
+ "cols": ["B0", "D4", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B1", "D5", "D3", "D2", "D1", "D0"]
+ },
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": false
+ },
+ "bootmagic": {
+ "matrix": [0, 5]
+ },
+ "dynamic_keymap": {
+ "layer_count": 3
+ },
+ "indicators": {
+ "caps_lock": "E6",
+ "on_state": 0
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [4, 0], "x": 2.25, "y": 0},
+ {"matrix": [4, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+ {"matrix": [0, 3], "x": 5.25, "y": 0},
+ {"matrix": [4, 2], "x": 6.5, "y": 0},
+ {"matrix": [4, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [0, 5], "x": 9.75, "y": 0, "w": 1.5},
+ {"matrix": [4, 4], "x": 11.25, "y": 0},
+ {"matrix": [4, 5], "x": 12.25, "y": 0},
+ {"matrix": [0, 6], "x": 13.25, "y": 0},
+ {"matrix": [0, 7], "x": 14.25, "y": 0},
+ {"matrix": [4, 6], "x": 15.25, "y": 0},
+ {"matrix": [4, 7], "x": 16.25, "y": 0},
+ {"matrix": [0, 8], "x": 17.25, "y": 0},
+ {"matrix": [0, 9], "x": 18.25, "y": 0},
+ {"matrix": [4, 8], "x": 19.25, "y": 0},
+ {"matrix": [4, 9], "x": 20.25, "y": 0},
+ {"matrix": [0, 10], "x": 21.25, "y": 0},
+ {"matrix": [0, 11], "x": 22.25, "y": 0},
+ {"matrix": [4, 10], "x": 23.25, "y": 0, "w": 1.5},
+ {"matrix": [4, 11], "x": 25, "y": 0},
+ {"matrix": [0, 12], "x": 26, "y": 0},
+ {"matrix": [0, 13], "x": 27, "y": 0},
+ {"matrix": [4, 12], "x": 28.25, "y": 0},
+ {"matrix": [4, 13], "x": 29.25, "y": 0},
+ {"matrix": [0, 14], "x": 30.25, "y": 0},
+ {"matrix": [0, 15], "x": 31.25, "y": 0},
+ {"matrix": [4, 14], "x": 32.5, "y": 0},
+ {"matrix": [4, 15], "x": 33.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [5, 0], "x": 2.25, "y": 1},
+ {"matrix": [5, 1], "x": 3.25, "y": 1},
+ {"matrix": [1, 2], "x": 4.25, "y": 1},
+ {"matrix": [1, 3], "x": 5.25, "y": 1},
+ {"matrix": [5, 2], "x": 6.5, "y": 1},
+ {"matrix": [5, 3], "x": 7.5, "y": 1},
+ {"matrix": [1, 4], "x": 8.5, "y": 1},
+ {"matrix": [1, 5], "x": 9.75, "y": 1, "w": 1.25},
+ {"matrix": [5, 4], "x": 11.5, "y": 1},
+ {"matrix": [5, 5], "x": 12.5, "y": 1},
+ {"matrix": [1, 6], "x": 13.5, "y": 1},
+ {"matrix": [1, 7], "x": 14.5, "y": 1},
+ {"matrix": [5, 6], "x": 15.5, "y": 1},
+ {"matrix": [5, 7], "x": 16.5, "y": 1},
+ {"matrix": [1, 8], "x": 17.5, "y": 1},
+ {"matrix": [1, 9], "x": 18.5, "y": 1},
+ {"matrix": [5, 8], "x": 19.5, "y": 1},
+ {"matrix": [5, 9], "x": 20.5, "y": 1},
+ {"matrix": [1, 10], "x": 21.5, "y": 1},
+ {"matrix": [1, 11], "x": 22.5, "y": 1, "w": 2.25},
+ {"matrix": [5, 11], "x": 25, "y": 1},
+ {"matrix": [1, 12], "x": 26, "y": 1},
+ {"matrix": [1, 13], "x": 27, "y": 1},
+ {"matrix": [5, 12], "x": 28.25, "y": 1},
+ {"matrix": [5, 13], "x": 29.25, "y": 1},
+ {"matrix": [1, 14], "x": 30.25, "y": 1},
+ {"matrix": [1, 15], "x": 31.25, "y": 1},
+ {"matrix": [5, 14], "x": 32.5, "y": 1},
+ {"matrix": [5, 15], "x": 33.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [6, 0], "x": 2.25, "y": 2},
+ {"matrix": [6, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [6, 2], "x": 6.5, "y": 2},
+ {"matrix": [6, 3], "x": 7.5, "y": 2},
+ {"matrix": [2, 4], "x": 8.5, "y": 2},
+ {"matrix": [2, 5], "x": 9.75, "y": 2, "w": 1.25},
+ {"matrix": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 5], "x": 12, "y": 2},
+ {"matrix": [2, 6], "x": 13, "y": 2},
+ {"matrix": [2, 7], "x": 14, "y": 2},
+ {"matrix": [6, 6], "x": 15, "y": 2},
+ {"matrix": [6, 7], "x": 16, "y": 2},
+ {"matrix": [2, 8], "x": 17, "y": 2},
+ {"matrix": [2, 9], "x": 18, "y": 2},
+ {"matrix": [6, 8], "x": 19, "y": 2},
+ {"matrix": [6, 9], "x": 20, "y": 2},
+ {"matrix": [2, 10], "x": 21, "y": 2},
+ {"matrix": [2, 11], "x": 22, "y": 2, "w": 1.75},
+ {"matrix": [6, 10], "x": 23.75, "y": 2},
+ {"matrix": [6, 11], "x": 25, "y": 2},
+ {"matrix": [2, 12], "x": 26, "y": 2},
+ {"matrix": [2, 13], "x": 27, "y": 2},
+ {"matrix": [6, 12], "x": 28.25, "y": 2},
+ {"matrix": [6, 13], "x": 29.25, "y": 2},
+ {"matrix": [2, 14], "x": 30.25, "y": 2},
+ {"matrix": [2, 15], "x": 31.25, "y": 2},
+ {"matrix": [6, 14], "x": 32.5, "y": 2},
+ {"matrix": [6, 15], "x": 33.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [7, 0], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [3, 2], "x": 4.25, "y": 3},
+ {"matrix": [3, 3], "x": 5.25, "y": 3},
+ {"matrix": [7, 2], "x": 6.5, "y": 3},
+ {"matrix": [7, 3], "x": 7.5, "y": 3},
+ {"matrix": [3, 4], "x": 8.5, "y": 3},
+ {"matrix": [3, 5], "x": 9.75, "y": 3, "w": 1.5},
+ {"matrix": [3, 6], "x": 12.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 7], "x": 13.75, "y": 3, "w": 2.75},
+ {"matrix": [3, 8], "x": 16.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 9], "x": 18, "y": 3, "w": 2.75},
+ {"matrix": [3, 10], "x": 20.75, "y": 3, "w": 1.5},
+ {"matrix": [7, 10], "x": 23.25, "y": 3, "w": 1.5},
+ {"matrix": [7, 11], "x": 25, "y": 3},
+ {"matrix": [3, 12], "x": 26, "y": 3},
+ {"matrix": [3, 13], "x": 27, "y": 3},
+ {"matrix": [7, 12], "x": 28.25, "y": 3},
+ {"matrix": [7, 13], "x": 29.25, "y": 3},
+ {"matrix": [3, 14], "x": 30.25, "y": 3},
+ {"matrix": [3, 15], "x": 31.25, "y": 3},
+ {"matrix": [7, 14], "x": 32.5, "y": 3},
+ {"matrix": [7, 15], "x": 33.5, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/compensator/keymaps/default/keymap.c b/keyboards/compensator/keymaps/default/keymap.c
new file mode 100644
index 00000000000..5e39c20e72f
--- /dev/null
+++ b/keyboards/compensator/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2024 Lrfoster03
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+ KC_P00 = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/
+ KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, 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_BSLS, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2,
+ KC_F3, KC_F4, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN, 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_DEL, KC_END, KC_PGDN, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_F3, KC_F4,
+ KC_F5, KC_F6, KC_PENT, KC_P1, KC_P2, KC_P3, KC_NO, KC_UP, KC_NO, KC_LSFT, KC_BSLS, 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_NO, KC_UP, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_F5, KC_F6,
+ KC_F7, KC_F8, KC_PMNS, KC_PDOT, KC_P0, KC_P00, KC_LEFT, KC_DOWN, KC_RIGHT, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P00, KC_P0, KC_PDOT, KC_PMNS, KC_F7, KC_F8
+ ),
+
+ [1] = LAYOUT( /* MO(1) */
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_NUM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ if (record->event.pressed) {
+ switch(keycode) {
+ case KC_P00:
+ tap_code(KC_P0);
+ tap_code(KC_P0);
+ return false;
+ }
+ }
+ return true;
+}
diff --git a/keyboards/compensator/keymaps/via/keymap.c b/keyboards/compensator/keymaps/via/keymap.c
new file mode 100644
index 00000000000..d9124a96aff
--- /dev/null
+++ b/keyboards/compensator/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2024 Lrfoster03
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+ KC_P00 = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/
+ KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, 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_BSLS, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2,
+ KC_F3, KC_F4, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN, 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_DEL, KC_END, KC_PGDN, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_F3, KC_F4,
+ KC_F5, KC_F6, KC_PENT, KC_P1, KC_P2, KC_P3, KC_NO, KC_UP, KC_NO, KC_LSFT, KC_BSLS, 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_NO, KC_UP, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_F5, KC_F6,
+ KC_F7, KC_F8, KC_PMNS, KC_PDOT, KC_P0, KC_P00, KC_LEFT, KC_DOWN, KC_RIGHT, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P00, KC_P0, KC_PDOT, KC_PMNS, KC_F7, KC_F8
+ ),
+
+ [1] = LAYOUT( /* MO(1) */
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_NUM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ if (record->event.pressed) {
+ switch(keycode) {
+ case KC_P00:
+ tap_code(KC_P0);
+ tap_code(KC_P0);
+ return false;
+ }
+ }
+ return true;
+}
diff --git a/keyboards/compensator/keymaps/via/rules.mk b/keyboards/compensator/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/compensator/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/compensator/matrix_diagram.md b/keyboards/compensator/matrix_diagram.md
new file mode 100644
index 00000000000..39eeec7b509
--- /dev/null
+++ b/keyboards/compensator/matrix_diagram.md
@@ -0,0 +1,25 @@
+# Matrix Diagram for Compensator
+
+```
+┌───────┐┌───────────────┐┌───────────┐┌───────────────────────────────────────────────────────────┐┌───────────┐┌───────────────┐┌───────┐
+│00 │01 ││02 │03 │04 │05 ││06 │07 │08 ││09 │0A │0B │0C │0D │0E │0F │0G │0H │0I │0J │0K │0L │0M ││0N │0O │0P ││0Q │0R │0S │0T ││0U │0V │
+├───┼───┤├───┼───┼───┼───┤├───┼───┼───│├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┼───┼───│├───┼───┼───┼───┤├───┼───┤
+│10 │11 ││12 │13 │14 │15 ││16 │17 │18 ││19 │1A │1B │1C │1D │1E │1F │1G │1H │1I │1J │1K │1L ││1M │1N │1O ││1P │1Q │1R │1S ││1T │1U │
+├───┼───┤├───┼───┼───┼───┤└───┼───┼───┘├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤└───┼───┼───┘├───┼───┼───┼───┤├───┼───┤
+│20 │21 ││22 │23 │24 │25 │ │26 │ │27 │28 │29 │2A │2B │2C │2D │2E │2F │2G │2H │2I │2J │2K │ │1L │ │2M │2N │2O │2P ││2Q │2R │
+├───┼───┤├───┼───┼───┼───┤┌───┼───┼───┐├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐├───┼───┼───┼───┤├───┼───┤
+│31 │32 ││33 │34 │35 │36 ││37 │38 │39 ││3A │ │3B │3C │3D │ │3E ││3F │3G │3H ││3I │3J │3K │3L ││30 │31 │
+└───┴───┘└───┴───┴───┴───┘└───┴───┴───┘└─────┘ └─────┴───────────────────────────┴─────┘ └─────┘└───┴───┴───┘└───┴───┴───┴───┘└───┴───┘
+ ┌───────┐ ┌────────┐ ┌──────────┐ ┌───────┐
+ 2u Numpad Zero │36 │ │27 │ 2.25u LShift 2.75u RShift │2J │ │3I │ 2u Numpad Zero
+ └───────┘ └────────┘ └──────────┘ └───────┘
+ ┌───┐ ┌───────────────────────────────────────┐ ┌───┐
+ │ │ 2u │3C │ 10u Space │ │ 2u
+ │02 │ Numpad └───────────────────────────────────────┘ │0T │ Numpad
+ │ │ Plus │ │ Plus
+ ├───┤ ┌─────────┐┌─────┐┌─────────┐ 2.75 + 1.5 + ├───┤
+ │ │ 2u |3C ||3C ||3C | 2.75 Split │ │ 2u
+ │33 │ Numpad └─────────┘└─────┘└─────────┘ Spacebar │3L │ Numpad
+ │ │ Enter │ │ Enter
+ └───┘ └───┘
+```
diff --git a/keyboards/compensator/readme.md b/keyboards/compensator/readme.md
new file mode 100644
index 00000000000..13502ecad2d
--- /dev/null
+++ b/keyboards/compensator/readme.md
@@ -0,0 +1,24 @@
+# The Compensator
+
+[Compensator](https://i.imgur.com/fAB2SSTh.png)
+
+A 40% monstrosity with 10U spacebar support and a required 2 keycap sets to fill. It supports VIA. [Geekhack Post](https://geekhack.org/index.php?topic=122493.0)
+
+* Keyboard Maintainer: [Lrfoster03](https://lrfoster03.github.io/) and on [GitHub](https://github.com/Lrfoster03)
+* Hardware Supported: A 40% with 2 numpads, 2 nav clusters, and 2 XT columns with an ATMEGU32U4
+* Hardware Availability: Contact @victusss on discord. [vk.works Discord](https://discord.gg/7weV2kyqFB)
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+ make compensator: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).
+
+### Flash
+- Ensure PCB is plugged in and recognized by the computer
+- Hold Physical reset button on back of the PCB to enter bootloader mode
+- Flash using QMK Toolbox or CLI (`make compensator::flash`)
diff --git a/keyboards/compensator/rules.mk b/keyboards/compensator/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/compensator/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/dnworks/numpad/config.h b/keyboards/dnworks/numpad/config.h
new file mode 100644
index 00000000000..77970ce4d34
--- /dev/null
+++ b/keyboards/dnworks/numpad/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2023 zeix (@itsme-zeix)
+
+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 .
+*/
+
+#pragma once
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
diff --git a/keyboards/dnworks/numpad/info.json b/keyboards/dnworks/numpad/info.json
new file mode 100644
index 00000000000..26fbcbf146e
--- /dev/null
+++ b/keyboards/dnworks/numpad/info.json
@@ -0,0 +1,73 @@
+{
+ "manufacturer": "dnworks",
+ "keyboard_name": "DN Numpad Rev1",
+ "maintainer": "itsme-zeix",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["GP5", "GP6", "GP7", "GP25"],
+ "rows": ["GP11", "GP4", "GP3", "GP2", "GP1", "GP0", "GP24"]
+ },
+ "processor": "RP2040",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x2937",
+ "vid": "0x4C23"
+ },
+ "community_layouts": ["numpad_6x4", "ortho_6x4"],
+ "layouts": {
+ "LAYOUT_numpad_6x4": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [6, 3], "x": 3, "y": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+ {"matrix": [4, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+ {"matrix": [4, 2], "x": 2, "y": 4.25},
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5.25},
+ {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
+ ]
+ },
+ "LAYOUT_ortho_6x4": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [6, 3], "x": 3, "y": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2.25},
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+ {"matrix": [4, 2], "x": 2, "y": 4.25},
+ {"matrix": [4, 3], "x": 3, "y": 4.25},
+ {"matrix": [5, 0], "x": 0, "y": 5.25},
+ {"matrix": [5, 1], "x": 1, "y": 5.25},
+ {"matrix": [5, 2], "x": 2, "y": 5.25},
+ {"matrix": [5, 3], "x": 3, "y": 5.25}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/dnworks/numpad/keymaps/default/keymap.c b/keyboards/dnworks/numpad/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ad8c5887044
--- /dev/null
+++ b/keyboards/dnworks/numpad/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/*
+Copyright 2023 zeix (@itsme-zeix)
+
+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 .
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_ortho_6x4(
+ KC_ESC, KC_APP, KC_TAB, KC_BSPC,
+
+ KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_P7, KC_P8, KC_P9, KC_PPLS,
+ KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_P1, KC_P2, KC_P3, KC_PENT,
+ KC_P0, KC_P0, KC_PDOT, KC_PENT
+ ),
+};
diff --git a/keyboards/dnworks/numpad/keymaps/via/keymap.c b/keyboards/dnworks/numpad/keymaps/via/keymap.c
new file mode 100644
index 00000000000..ad8c5887044
--- /dev/null
+++ b/keyboards/dnworks/numpad/keymaps/via/keymap.c
@@ -0,0 +1,29 @@
+/*
+Copyright 2023 zeix (@itsme-zeix)
+
+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 .
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_ortho_6x4(
+ KC_ESC, KC_APP, KC_TAB, KC_BSPC,
+
+ KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_P7, KC_P8, KC_P9, KC_PPLS,
+ KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_P1, KC_P2, KC_P3, KC_PENT,
+ KC_P0, KC_P0, KC_PDOT, KC_PENT
+ ),
+};
diff --git a/keyboards/dnworks/numpad/keymaps/via/rules.mk b/keyboards/dnworks/numpad/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/dnworks/numpad/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/dnworks/numpad/matrix_diagram.md b/keyboards/dnworks/numpad/matrix_diagram.md
new file mode 100644
index 00000000000..9bd195650db
--- /dev/null
+++ b/keyboards/dnworks/numpad/matrix_diagram.md
@@ -0,0 +1,25 @@
+# Matrix Diagram for dnworks numpad rev1
+
+```
+Top Left 2u
+┌───────┐┌───────┐
+│00 ││02 │ Top Right 2u
+└───────┘└───────┘
+┌───┬───┬───┬───┐
+│00 │01 │02 │03 │
+└───┴───┴───┴───┘
+┌───┬───┬───┬───┐
+│10 │11 │12 │63 │
+├───┼───┼───┼───┤ ┌───┐
+│20 │21 │22 │ │ │23 │
+├───┼───┼───┤33 │ ├───┤ Split Plus
+│30 │31 │32 │ │ │33 │
+├───┼───┼───┼───┤ └───┘ ┌───┐
+│40 │41 │42 │ │ │43 │
+├───┴───┼───┤53 │ ├───┤ Split Enter
+│50 │52 │ │ │53 │
+└───────┴───┴───┘ └───┘
+┌───┬───┐
+│50 │51 │ Split Zero
+└───┴───┘
+```
diff --git a/keyboards/dnworks/numpad/readme.md b/keyboards/dnworks/numpad/readme.md
new file mode 100644
index 00000000000..080ced6f77d
--- /dev/null
+++ b/keyboards/dnworks/numpad/readme.md
@@ -0,0 +1,27 @@
+# DN Numpad Rev1
+
+
+
+PCB that supports the numpad designed by dnworks.
+
+* Keyboard Maintainer: [Zeix](https://github.com/itsme-zeix)
+* Hardware Supported: DN Numpad Rev1
+* Hardware Availability: dnworks.co
+
+Make example for this keyboard (after setting up your build environment):
+
+ make dnworks/numpad:default
+
+Flashing example for this keyboard:
+
+ make dnworks/numpad: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
+* **Physical reset button**: Briefly press the `RESET` button twice or short the `USB_BOOT` and `GND` pads and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/dnworks/numpad/rules.mk b/keyboards/dnworks/numpad/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/dnworks/numpad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/doio/kb04/info.json b/keyboards/doio/kb04/info.json
new file mode 100644
index 00000000000..2455f82e03c
--- /dev/null
+++ b/keyboards/doio/kb04/info.json
@@ -0,0 +1,111 @@
+{
+ "manufacturer": "DOIO",
+ "keyboard_name": "KB04-01",
+ "maintainer": "filmstarr",
+ "bootloader": "stm32duino",
+ "build": {
+ "lto": true
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B5", "pin_b": "B6"}
+ ]
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["B14", "B13", "B12", "B0", "A7"],
+ "rows": ["B3"]
+ },
+ "processor": "STM32F103",
+ "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,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "rainbow_moving_chevron": 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_fractal": true,
+ "pixel_flow": true,
+ "pixel_rain": 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": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 75, "y": 0, "flags": 1},
+ {"matrix": [0, 2], "x": 149, "y": 0, "flags": 1},
+ {"matrix": [0, 3], "x": 224, "y": 0, "flags": 1},
+
+ {"x": 112, "y": 64, "flags": 1},
+ {"x": 112, "y": 64, "flags": 1},
+ {"x": 112, "y": 64, "flags": 1},
+ {"x": 112, "y": 64, "flags": 1}
+ ],
+ "max_brightness": 200,
+ "sleep": true
+ },
+ "url": "https://www.keebmonkey.com/products/megalodon-macro-pad-with-a-knob",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x0401",
+ "vid": "0xD010"
+ },
+ "ws2812": {
+ "pin": "A10"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "1!", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "2@", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "3#", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "4$", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "Encoder", "matrix": [0, 4], "x": 1.5, "y": 1}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/doio/kb04/keymaps/default/keymap.c b/keyboards/doio/kb04/keymaps/default/keymap.c
new file mode 100644
index 00000000000..7df80397fd3
--- /dev/null
+++ b/keyboards/doio/kb04/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 filmstarr
+ *
+ * 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 .
+ */
+
+ #include QMK_KEYBOARD_H
+
+enum layer_names {
+ _LAY0,
+ _LAY1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+ L0:
+ ┌───┬───┬───┬───┐ ┌───┐
+ │MO1│Prv│Ply│Nxt│ │Mut│
+ └───┴───┴───┴───┘ └───┘
+ L1:
+ ┌───┬───┬───┬───┐ ┌───┐
+ │ │Hud│Tog│Mod│ │ │
+ └───┴───┴───┴───┘ └───┘
+*/
+ [_LAY0] = LAYOUT(
+ MO(_LAY1), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE
+ ),
+ [_LAY1] = LAYOUT(
+ KC_TRNS, RGB_HUD, RGB_TOG, RGB_MOD, KC_TRNS
+ )
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [_LAY0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [_LAY1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
diff --git a/keyboards/doio/kb04/keymaps/default/rules.mk b/keyboards/doio/kb04/keymaps/default/rules.mk
new file mode 100644
index 00000000000..a40474b4d5c
--- /dev/null
+++ b/keyboards/doio/kb04/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/doio/kb04/keymaps/via/keymap.c b/keyboards/doio/kb04/keymaps/via/keymap.c
new file mode 100644
index 00000000000..7df80397fd3
--- /dev/null
+++ b/keyboards/doio/kb04/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 filmstarr
+ *
+ * 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 .
+ */
+
+ #include QMK_KEYBOARD_H
+
+enum layer_names {
+ _LAY0,
+ _LAY1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+ L0:
+ ┌───┬───┬───┬───┐ ┌───┐
+ │MO1│Prv│Ply│Nxt│ │Mut│
+ └───┴───┴───┴───┘ └───┘
+ L1:
+ ┌───┬───┬───┬───┐ ┌───┐
+ │ │Hud│Tog│Mod│ │ │
+ └───┴───┴───┴───┘ └───┘
+*/
+ [_LAY0] = LAYOUT(
+ MO(_LAY1), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE
+ ),
+ [_LAY1] = LAYOUT(
+ KC_TRNS, RGB_HUD, RGB_TOG, RGB_MOD, KC_TRNS
+ )
+};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [_LAY0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [_LAY1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
diff --git a/keyboards/doio/kb04/keymaps/via/rules.mk b/keyboards/doio/kb04/keymaps/via/rules.mk
new file mode 100644
index 00000000000..4253f570f0b
--- /dev/null
+++ b/keyboards/doio/kb04/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/doio/kb04/readme.md b/keyboards/doio/kb04/readme.md
new file mode 100644
index 00000000000..8277164bf38
--- /dev/null
+++ b/keyboards/doio/kb04/readme.md
@@ -0,0 +1,27 @@
+# doio/kb04
+
+
+
+A macropad that have 4-key keyboard made by DOIO, which controlled by an APM32F103CBT6 chipset. The keyboard features per-key RGB and 1 encoder.
+
+* Keyboard Maintainer: [filmstarr](https://github.com/filmstarr)
+* Hardware Supported: DOIO Knob Board - KB04
+* Hardware Availability: [keebmonkey.com](https://www.keebmonkey.com/products/megalodon-macro-pad-with-a-knob)
+
+Make example for this keyboard (after setting up your build environment):
+
+ qmk compile -kb doio/kb04 -km default
+
+Flashing example for this keyboard:
+
+ qmk flash -kb doio/kb04 -km 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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (1! key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/doio/kb04/rules.mk b/keyboards/doio/kb04/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/doio/kb04/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json
index 7905a1233a0..6ed958463e2 100644
--- a/keyboards/elcantorhs/info.json
+++ b/keyboards/elcantorhs/info.json
@@ -20,7 +20,7 @@
["B1", "B10", "A8", "B15", "B14", "B13"],
["B9", "B8", "B5", "B4", "B3", "A15"],
["A3", "A4", "A5", "A6", "A7", "B0"],
- ["B12","A2", "A1", "A0", null, null]
+ ["A2", "A1", "A0", "B12", null, null]
]
},
"split": {
@@ -34,7 +34,7 @@
["B13", "B14", "B15", "A8", "B10", "B1"],
["A15", "B3", "B4", "B5", "B8", "B9"],
["B0", "A7", "A6", "A5", "A4", "A3"],
- ["A0", "A1", "A2", "B12", null, null]
+ ["B12", "A0", "A1", "A2", null, null]
]
}
}
diff --git a/keyboards/gkeyboard/greatpad/config.h b/keyboards/gkeyboard/greatpad/config.h
new file mode 100644
index 00000000000..4c745779b4a
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/config.h
@@ -0,0 +1,11 @@
+// Copyright 2023 gkeyboard (@gkeyboard)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define OLED_DISPLAY_128X64
+#define I2C1_SCL_PIN GP21
+#define I2C1_SDA_PIN GP20
+#define I2C_DRIVER I2CD0
+#define OLED_BRIGHTNESS 128
+#define OLED_FONT_H "lib/glcdfont.c"
diff --git a/keyboards/gkeyboard/greatpad/greatpad.c b/keyboards/gkeyboard/greatpad/greatpad.c
new file mode 100644
index 00000000000..54a6f173e86
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/greatpad.c
@@ -0,0 +1,577 @@
+/* Copyright 2023 gkeyboard (@gkeyboard)
+ *
+ * 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 .
+ */
+
+#include "quantum.h"
+
+#ifdef OLED_ENABLE
+uint16_t startup_timer;
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+ return OLED_ROTATION_180;
+}
+
+static void render_logo(void) {
+ static const char PROGMEM raw_logo[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x02, 0x82, 0xc2,
+ 0xe2, 0xe2, 0xe2, 0xc2, 0x82, 0x02, 0x02, 0x02, 0x02, 0x02, 0xe2, 0xe2, 0xe2, 0xe2, 0xe2, 0xe2,
+ 0xe2, 0xe2, 0xe2, 0xe2, 0xe2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x82, 0xc2, 0xe2, 0xe2, 0xe2, 0xc2,
+ 0x82, 0x02, 0x02, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 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, 0x00, 0x00, 0x03, 0x07,
+ 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+ 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x07,
+ 0x03, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 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, 0x00, 0x00, 0x00, 0x3e,
+ 0x3e, 0x3e, 0x3e, 0x3e, 0x00, 0x00, 0x3e, 0x3e, 0x3e, 0x3e, 0x3e, 0x00, 0x00, 0x3e, 0x3e, 0x3e,
+ 0x3e, 0x3e, 0x00, 0x00, 0x3e, 0x3e, 0x3e, 0x3e, 0x3e, 0x00, 0x00, 0x3e, 0x3e, 0x3e, 0x3e, 0x3e,
+ 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 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, 0x00, 0x00, 0x00, 0x9f,
+ 0x9f, 0x9f, 0x9f, 0x9f, 0x00, 0x00, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x00, 0x00, 0x9f, 0x9f, 0x9f,
+ 0x9f, 0x9f, 0x00, 0x00, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x00, 0x00, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f,
+ 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 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, 0x00, 0x00, 0x00, 0xcf,
+ 0xcf, 0xcf, 0xcf, 0xcf, 0x00, 0x00, 0xcf, 0xcf, 0xcf, 0xcf, 0xcf, 0x00, 0x00, 0xcf, 0xcf, 0xcf,
+ 0xcf, 0xcf, 0x00, 0x00, 0xcf, 0xcf, 0xcf, 0xcf, 0xcf, 0x00, 0x00, 0xcf, 0xcf, 0xcf, 0xcf, 0xcf,
+ 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x40, 0x40, 0x40, 0x47,
+ 0x47, 0x47, 0x47, 0x47, 0x40, 0x40, 0x47, 0x47, 0x47, 0x47, 0x47, 0x40, 0x40, 0x47, 0x47, 0x47,
+ 0x47, 0x47, 0x40, 0x40, 0x47, 0x47, 0x47, 0x47, 0x47, 0x40, 0x40, 0x47, 0x47, 0x47, 0x47, 0x47,
+ 0x40, 0x40, 0x40, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ oled_write_raw_P(raw_logo, sizeof(raw_logo));
+}
+
+static void render_LAYER_0(void) {
+ static const char PROGMEM raw_LAYER_0[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ oled_write_raw_P(raw_LAYER_0, sizeof(raw_LAYER_0));
+}
+
+static void render_LAYER_1(void) {
+ static const char PROGMEM raw_LAYER_1[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0,
+ 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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,
+ 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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,
+ 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
+ 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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,
+ 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ oled_write_raw_P(raw_LAYER_1, sizeof(raw_LAYER_1));
+}
+
+static void render_LAYER_2(void) {
+ static const char PROGMEM raw_LAYER_2[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xfe, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+ 0x0e, 0x0e, 0x0e, 0x0e, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8,
+ 0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ oled_write_raw_P(raw_LAYER_2, sizeof(raw_LAYER_2));
+}
+
+static void render_LAYER_3(void) {
+ static const char PROGMEM raw_LAYER_3[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+ 0x0e, 0x0e, 0x0e, 0x0e, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ oled_write_raw_P(raw_LAYER_3, sizeof(raw_LAYER_3));
+}
+
+static void render_LAYER_4(void) {
+ static const char PROGMEM raw_LAYER_4[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+ 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+ 0x0e, 0x0e, 0x0e, 0x0e, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ oled_write_raw_P(raw_LAYER_4, sizeof(raw_LAYER_4));
+}
+
+static void render_LAYER_5(void) {
+ static const char PROGMEM raw_LAYER_5[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+ 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+ 0x0e, 0x0e, 0x0e, 0x0e, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ oled_write_raw_P(raw_LAYER_5, sizeof(raw_LAYER_5));
+}
+
+static void render_LAYER_6(void) {
+ static const char PROGMEM raw_LAYER_6[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+ 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, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d,
+ 0x6d, 0x6d, 0x6d, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+ 0x0e, 0x0e, 0x0e, 0x0e, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ oled_write_raw_P(raw_LAYER_6, sizeof(raw_LAYER_6));
+}
+
+static void render_LAYER_7(void) {
+ static const char PROGMEM raw_LAYER_7[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0, 0xb0,
+ 0xb0, 0xb0, 0xb0, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d,
+ 0x6d, 0x6d, 0x6d, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ oled_write_raw_P(raw_LAYER_7, sizeof(raw_LAYER_7));
+}
+
+static void render_LAYER_8(void) {
+ static const char PROGMEM raw_LAYER_8[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6,
+ 0xb6, 0xb6, 0xb6, 0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d,
+ 0x6d, 0x6d, 0x6d, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+ 0x0e, 0x0e, 0x0e, 0x0e, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ oled_write_raw_P(raw_LAYER_8, sizeof(raw_LAYER_8));
+}
+
+static void render_LAYER_9(void) {
+ static const char PROGMEM raw_LAYER_9[] = {
+ 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
+ 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6, 0xb6,
+ 0xb6, 0xb6, 0xb6, 0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d,
+ 0x6d, 0x6d, 0x6d, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e,
+ 0x0e, 0x0e, 0x0e, 0x0e, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb,
+ 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ oled_write_raw_P(raw_LAYER_9, sizeof(raw_LAYER_9));
+}
+
+static void render_LAYER_UNDEF(void) {
+ static const char PROGMEM raw_LAYER_UNDEF[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 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, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+ 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+ oled_write_raw_P(raw_LAYER_UNDEF, sizeof(raw_LAYER_UNDEF));
+}
+
+/* Shows the name of the current layer and locks for the host (Cap etc.) */
+static void render_info(void) {
+ oled_write_P(PSTR(" GreatPad\n"), false);
+ oled_write_P(PSTR("\n"), false);
+ led_t led_state = host_keyboard_led_state();
+ oled_write_P(led_state.caps_lock ? PSTR("Cap(x) ") : PSTR("Cap( ) "), false);
+ oled_write_P(led_state.num_lock ? PSTR("Num(x) ") : PSTR("Num( ) "), false);
+ oled_write_P(led_state.scroll_lock ? PSTR("Scrl(x)") : PSTR("Scrl( )"), false);
+ oled_write_P(PSTR("\n"), false);
+
+ switch (get_highest_layer(layer_state)) {
+ case 0:
+ render_LAYER_0();
+ break;
+ case 1:
+ render_LAYER_1();
+ break;
+ case 2:
+ render_LAYER_2();
+ break;
+ case 3:
+ render_LAYER_3();
+ break;
+ case 4:
+ render_LAYER_4();
+ break;
+ case 5:
+ render_LAYER_5();
+ break;
+ case 6:
+ render_LAYER_6();
+ break;
+ case 7:
+ render_LAYER_7();
+ break;
+ case 8:
+ render_LAYER_8();
+ break;
+ case 9:
+ render_LAYER_9();
+ break;
+ default:
+ render_LAYER_UNDEF();
+ }
+}
+
+#define SHOW_LOGO 5000
+bool oled_task_kb(void) {
+ if (!oled_task_user()) {
+ return false;
+ }
+ static bool finished_timer = false;
+ if (!finished_timer && (timer_elapsed(startup_timer) < SHOW_LOGO)) {
+ render_logo();
+ } else {
+ if (!finished_timer) {
+ oled_clear();
+ finished_timer = true;
+ }
+ render_info();
+ }
+ return false;
+}
+#endif
diff --git a/keyboards/gkeyboard/greatpad/halconf.h b/keyboards/gkeyboard/greatpad/halconf.h
new file mode 100644
index 00000000000..f4403a0ff0f
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/halconf.h
@@ -0,0 +1,7 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next
diff --git a/keyboards/gkeyboard/greatpad/info.json b/keyboards/gkeyboard/greatpad/info.json
new file mode 100644
index 00000000000..6f55141333c
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/info.json
@@ -0,0 +1,151 @@
+{
+ "manufacturer": "gkeyboard",
+ "keyboard_name": "GreatPad",
+ "maintainer": "gkeyboard",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "dynamic_keymap": {
+ "layer_count": 10
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "GP25", "pin_b": "GP26"},
+ {"pin_a": "GP0", "pin_b": "GP1"}
+ ]
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["GP24", "GP23", "GP16", "GP11", "GP10"],
+ "rows": ["GP6", "GP5", "GP4", "GP3", "GP2"]
+ },
+ "processor": "RP2040",
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_sat": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "band_val": true,
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "cycle_up_down": true,
+ "digital_rain": true,
+ "dual_beacon": true,
+ "gradient_left_right": true,
+ "gradient_up_down": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "jellybean_raindrops": true,
+ "multisplash": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "pixel_rain": true,
+ "rainbow_beacon": true,
+ "rainbow_moving_chevron": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "solid_color": true,
+ "solid_multisplash": true,
+ "solid_reactive": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_multinexus": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_simple": true,
+ "solid_reactive_wide": true,
+ "solid_splash": true,
+ "splash": true,
+ "typing_heatmap": true
+ },
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [1, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [1, 1], "x": 56, "y": 0, "flags": 4},
+ {"matrix": [1, 2], "x": 112, "y": 0, "flags": 4},
+ {"matrix": [1, 3], "x": 168, "y": 0, "flags": 4},
+ {"matrix": [1, 4], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 21, "flags": 4},
+ {"matrix": [2, 1], "x": 56, "y": 21, "flags": 4},
+ {"matrix": [2, 2], "x": 112, "y": 21, "flags": 4},
+ {"matrix": [2, 3], "x": 168, "y": 21, "flags": 4},
+ {"matrix": [2, 4], "x": 224, "y": 21, "flags": 4},
+ {"matrix": [3, 0], "x": 0, "y": 43, "flags": 4},
+ {"matrix": [3, 1], "x": 56, "y": 43, "flags": 4},
+ {"matrix": [3, 2], "x": 112, "y": 43, "flags": 4},
+ {"matrix": [3, 3], "x": 168, "y": 43, "flags": 4},
+ {"matrix": [3, 4], "x": 224, "y": 43, "flags": 4},
+ {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
+ {"matrix": [4, 1], "x": 56, "y": 64, "flags": 4},
+ {"matrix": [4, 2], "x": 112, "y": 64, "flags": 4},
+ {"matrix": [4, 3], "x": 168, "y": 64, "flags": 4},
+ {"matrix": [4, 4], "x": 224, "y": 64, "flags": 4},
+ {"x": 196, "y": 53, "flags": 2},
+ {"x": 196, "y": 10, "flags": 2},
+ {"x": 140, "y": 10, "flags": 2},
+ {"x": 84, "y": 10, "flags": 2},
+ {"x": 28, "y": 10, "flags": 2},
+ {"x": 28, "y": 53, "flags": 2},
+ {"x": 84, "y": 53, "flags": 2},
+ {"x": 140, "y": 53, "flags": 2}
+ ],
+ "max_brightness": 170,
+ "sleep": true
+ },
+ "url": "https://github.com/gkeyboard/GreatPad",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x4203",
+ "vid": "0x474B"
+ },
+ "ws2812": {
+ "driver": "vendor",
+ "pin": "GP22"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2.5},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1, "y": 3.5},
+ {"matrix": [3, 2], "x": 2, "y": 3.5},
+ {"matrix": [3, 3], "x": 3, "y": 3.5},
+ {"matrix": [3, 4], "x": 4, "y": 3.5},
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+ {"matrix": [4, 1], "x": 1, "y": 4.5},
+ {"matrix": [4, 2], "x": 2, "y": 4.5},
+ {"matrix": [4, 3], "x": 3, "y": 4.5},
+ {"matrix": [4, 4], "x": 4, "y": 4.5}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/gkeyboard/greatpad/keymaps/default/keymap.c b/keyboards/gkeyboard/greatpad/keymaps/default/keymap.c
new file mode 100644
index 00000000000..1fd0edc5ca3
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/keymaps/default/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT(
+ KC_MUTE, RGB_TOG,
+ KC_P7, KC_P8, KC_P9, KC_PSLS, KC_NUM,
+ KC_P4, KC_P5, KC_P6, KC_PAST, KC_PGUP,
+ KC_P1, KC_P2, KC_P3, KC_PMNS, KC_PGDN,
+ KC_P0, KC_PDOT, KC_PENT, KC_PPLS, _______
+ )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+};
+#endif
diff --git a/keyboards/gkeyboard/greatpad/keymaps/default/rules.mk b/keyboards/gkeyboard/greatpad/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/gkeyboard/greatpad/keymaps/via/keymap.c b/keyboards/gkeyboard/greatpad/keymaps/via/keymap.c
new file mode 100644
index 00000000000..1fd0edc5ca3
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/keymaps/via/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT(
+ KC_MUTE, RGB_TOG,
+ KC_P7, KC_P8, KC_P9, KC_PSLS, KC_NUM,
+ KC_P4, KC_P5, KC_P6, KC_PAST, KC_PGUP,
+ KC_P1, KC_P2, KC_P3, KC_PMNS, KC_PGDN,
+ KC_P0, KC_PDOT, KC_PENT, KC_PPLS, _______
+ )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+};
+#endif
diff --git a/keyboards/gkeyboard/greatpad/keymaps/via/rules.mk b/keyboards/gkeyboard/greatpad/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/gkeyboard/greatpad/lib/glcdfont.c b/keyboards/gkeyboard/greatpad/lib/glcdfont.c
new file mode 100644
index 00000000000..10ced2bb2b9
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/lib/glcdfont.c
@@ -0,0 +1,236 @@
+// Copyright 2023 gkeyboard (@gkeyboard)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
+// See gfxfont.h for newer custom bitmap font info.
+
+#pragma once
+
+#include "progmem.h"
+
+static const unsigned char PROGMEM font[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
+ 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
+ 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
+ 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
+ 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
+ 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
+ 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
+ 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
+ 0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
+ 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
+ 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
+ 0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
+ 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
+ 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
+ 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
+ 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
+ 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
+ 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
+ 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
+ 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
+ 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
+ 0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+ 0x94, 0xB6, 0xFF, 0xB6, 0x94, 0x00,
+ 0x08, 0x0C, 0x7E, 0x0C, 0x08, 0x00,
+ 0x10, 0x30, 0x7E, 0x30, 0x10, 0x00,
+ 0x08, 0x08, 0x3E, 0x1C, 0x08, 0x00,
+ 0x08, 0x1C, 0x3E, 0x08, 0x08, 0x00,
+ 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
+ 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
+ 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
+ 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
+ 0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
+ 0x14, 0x3E, 0x14, 0x3E, 0x14, 0x00,
+ 0x2E, 0x2A, 0x7F, 0x2A, 0x3A, 0x00,
+ 0x20, 0x12, 0x08, 0x24, 0x02, 0x00,
+ 0x37, 0x49, 0x49, 0x37, 0x50, 0x00,
+ 0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
+ 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
+ 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
+ 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
+ 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
+ 0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
+ 0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+ 0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
+ 0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
+ 0x7F, 0x51, 0x49, 0x45, 0x7F, 0x00,
+ 0x08, 0x04, 0x02, 0x7F, 0x00, 0x00,
+ 0x71, 0x49, 0x49, 0x49, 0x4F, 0x00,
+ 0x41, 0x41, 0x49, 0x49, 0x77, 0x00,
+ 0x0F, 0x10, 0x10, 0x10, 0x7F, 0x00,
+ 0x4F, 0x49, 0x49, 0x49, 0x71, 0x00,
+ 0x7E, 0x49, 0x49, 0x49, 0x70, 0x00,
+ 0x01, 0x01, 0x71, 0x09, 0x07, 0x00,
+ 0x77, 0x49, 0x49, 0x49, 0x77, 0x00,
+ 0x07, 0x49, 0x49, 0x49, 0x3F, 0x00,
+ 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+ 0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
+ 0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
+ 0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
+ 0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
+ 0x01, 0x01, 0x59, 0x09, 0x0F, 0x00,
+ 0x7F, 0x41, 0x5D, 0x59, 0x4F, 0x00,
+ 0x7F, 0x09, 0x09, 0x09, 0x7F, 0x00,
+ 0x7F, 0x49, 0x49, 0x49, 0x76, 0x00,
+ 0x7F, 0x41, 0x41, 0x41, 0x41, 0x00,
+ 0x7F, 0x41, 0x41, 0x41, 0x7E, 0x00,
+ 0x7F, 0x49, 0x49, 0x49, 0x49, 0x00,
+ 0x7F, 0x09, 0x09, 0x09, 0x09, 0x00,
+ 0x7F, 0x41, 0x41, 0x49, 0x7B, 0x00,
+ 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
+ 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00,
+ 0x70, 0x40, 0x40, 0x40, 0x7F, 0x00,
+ 0x7F, 0x08, 0x08, 0x08, 0x77, 0x00,
+ 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
+ 0x7F, 0x01, 0x1F, 0x01, 0x7F, 0x00,
+ 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
+ 0x7F, 0x41, 0x41, 0x41, 0x7F, 0x00,
+ 0x7F, 0x09, 0x09, 0x09, 0x0F, 0x00,
+ 0x7F, 0x41, 0x71, 0x41, 0x7F, 0x00,
+ 0x7F, 0x09, 0x09, 0x19, 0x6F, 0x00,
+ 0x47, 0x49, 0x49, 0x49, 0x79, 0x00,
+ 0x01, 0x01, 0x7F, 0x01, 0x01, 0x00,
+ 0x7F, 0x40, 0x40, 0x40, 0x7F, 0x00,
+ 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
+ 0x7F, 0x40, 0x7F, 0x40, 0x7F, 0x00,
+ 0x77, 0x08, 0x08, 0x08, 0x77, 0x00,
+ 0x4F, 0x48, 0x48, 0x48, 0x7F, 0x00,
+ 0x61, 0x51, 0x49, 0x45, 0x43, 0x00,
+ 0x00, 0x7F, 0x41, 0x41, 0x00, 0x00,
+ 0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
+ 0x00, 0x41, 0x41, 0x7F, 0x00, 0x00,
+ 0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
+ 0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
+ 0x00, 0x00, 0x07, 0x08, 0x00, 0x00,
+ 0x60, 0x54, 0x54, 0x54, 0x7C, 0x00,
+ 0x7F, 0x44, 0x44, 0x44, 0x78, 0x00,
+ 0x7C, 0x44, 0x44, 0x44, 0x44, 0x00,
+ 0x78, 0x44, 0x44, 0x44, 0x7F, 0x00,
+ 0x7C, 0x54, 0x54, 0x54, 0x5C, 0x00,
+ 0x08, 0x7F, 0x09, 0x09, 0x09, 0x00,
+ 0x38, 0xA4, 0xA4, 0xA4, 0xFC, 0x00,
+ 0x7F, 0x04, 0x04, 0x04, 0x78, 0x00,
+ 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00,
+ 0x70, 0x40, 0x40, 0x7D, 0x00, 0x00,
+ 0x7F, 0x08, 0x08, 0x08, 0x76, 0x00,
+ 0x00, 0x00, 0x7F, 0x40, 0x00, 0x00,
+ 0x7C, 0x04, 0x7C, 0x04, 0x7C, 0x00,
+ 0x7C, 0x04, 0x04, 0x04, 0x78, 0x00,
+ 0x7C, 0x44, 0x44, 0x44, 0x7C, 0x00,
+ 0xFC, 0x24, 0x24, 0x24, 0x38, 0x00,
+ 0x38, 0x24, 0x24, 0x24, 0xFC, 0x00,
+ 0x7C, 0x04, 0x04, 0x04, 0x04, 0x00,
+ 0x5C, 0x54, 0x54, 0x54, 0x74, 0x00,
+ 0x04, 0x04, 0x7F, 0x04, 0x04, 0x00,
+ 0x7C, 0x40, 0x40, 0x40, 0x7C, 0x00,
+ 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
+ 0x7C, 0x40, 0x7C, 0x40, 0x7C, 0x00,
+ 0x6C, 0x10, 0x10, 0x10, 0x6C, 0x00,
+ 0xBC, 0xA0, 0xA0, 0xA0, 0xFC, 0x00,
+ 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
+ 0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
+ 0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+ 0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
+ 0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
+ 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
+ 0x00, 0x00, 0xE0, 0xF0, 0xF0, 0xF0,
+ 0xF0, 0xFE, 0xFF, 0x9F, 0x0F, 0x0F,
+ 0x9F, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F,
+ 0x0F, 0x0F, 0x9F, 0xFF, 0xFE, 0xF0,
+ 0xF0, 0xF0, 0xF0, 0xE0, 0x00, 0x00,
+ 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xC0, 0x30, 0x0C, 0x03, 0x00,
+ 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xE0, 0x10, 0x08, 0x04, 0x02, 0x02,
+ 0x02, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x02, 0x02, 0x02, 0x04, 0x08,
+ 0x10, 0xE0, 0x00, 0x00, 0x00, 0x00,
+ 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0xFF,
+ 0x7F, 0x51, 0x55, 0x55, 0x45, 0x7F,
+ 0x41, 0x5F, 0x5F, 0x5F, 0x7F, 0x00,
+ 0x7F, 0x41, 0x7B, 0x77, 0x41, 0x7F,
+ 0x41, 0x5F, 0x5F, 0x5F, 0x7F, 0x00,
+ 0x7F, 0x41, 0x5D, 0x5D, 0x5D, 0x7F,
+ 0x41, 0x5F, 0x5F, 0x5F, 0x7F, 0x00,
+ 0xC0, 0xE0, 0xF0, 0xF0, 0xF0, 0xE0,
+ 0xE6, 0xF7, 0xF3, 0xF0, 0x60, 0x00,
+ 0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x00,
+ 0x7C, 0x7C, 0x7C, 0x7C, 0x7C, 0x00,
+ 0xF8, 0x1C, 0xDE, 0x1F, 0xFF, 0xFF,
+ 0xFF, 0x1F, 0xDE, 0x1C, 0xF8, 0x00,
+ 0xC0, 0xE2, 0xB4, 0xF8, 0xF8, 0xF8,
+ 0xF8, 0xF8, 0xB4, 0xE2, 0xC0, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x07, 0x0F, 0x0F, 0x0F,
+ 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F,
+ 0x87, 0xE1, 0xF9, 0xF9, 0xE1, 0x87,
+ 0x9F, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F,
+ 0x0F, 0x0F, 0x0F, 0x07, 0x00, 0x00,
+ 0xFF, 0x00, 0x00, 0xC0, 0x30, 0x0C,
+ 0x33, 0xC0, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F,
+ 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xC0, 0x3F, 0x00, 0x00, 0x00,
+ 0xFF, 0x08, 0x08, 0x08, 0x08, 0x08,
+ 0x08, 0x38, 0xC8, 0x08, 0x08, 0x0F,
+ 0x7E, 0x00, 0x00, 0x7F, 0x00, 0x00,
+ 0x78, 0x00, 0x00, 0x7E, 0x00, 0x00,
+ 0x24, 0x24, 0x12, 0x12, 0x24, 0x24,
+ 0x48, 0x48, 0x24, 0x24, 0x12, 0x12,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x3F,
+ 0x3F, 0x7F, 0x7F, 0x38, 0x10, 0x00,
+ 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x00,
+ 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x00,
+ 0x0F, 0x14, 0x21, 0x40, 0x45, 0x41,
+ 0x45, 0x40, 0x21, 0x14, 0x0F, 0x00,
+ 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D,
+ 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+ 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, 0x0C, 0x03, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x03, 0x0C, 0x30, 0x00,
+ 0x00, 0x00, 0x00, 0x3F, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x01, 0x02, 0x04, 0x08, 0x10, 0x10,
+ 0x10, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x10, 0x10, 0x10, 0x08, 0x04,
+ 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
+ 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x03, 0x0C, 0x30,
+ 0x40, 0x00, 0x00, 0x40, 0x00, 0x00,
+ 0x40, 0x00, 0x00, 0x40, 0x00, 0x00,
+ 0x1C, 0x3E, 0x3E, 0x3E, 0x1C, 0x00,
+ 0x3E, 0x1C, 0x1C, 0x08, 0x08, 0x00,
+ 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
diff --git a/keyboards/gkeyboard/greatpad/mcuconf.h b/keyboards/gkeyboard/greatpad/mcuconf.h
new file mode 100644
index 00000000000..443e9e0f448
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/mcuconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next
+
+#undef RP_I2C_USE_I2C0
+#define RP_I2C_USE_I2C0 TRUE
diff --git a/keyboards/gkeyboard/greatpad/readme.md b/keyboards/gkeyboard/greatpad/readme.md
new file mode 100644
index 00000000000..d8a0443d2b1
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/readme.md
@@ -0,0 +1,25 @@
+# GreatPad
+
+20 Keys Custom Macro Pad, 2 Encoders, OLED 128x64, with USB Type-C, RGB underglow, RGB Per Key Lighting.
+
+* Keyboard Maintainer: [gkeyboard](https://github.com/gkeyboard)
+* Hardware Supported: GreatPad PCB
+* Hardware Availability: http://www.mltelectronic.com
+
+Make example for this keyboard (after setting up your build environment):
+
+ make gkeyboard/greatpad:default
+
+Flashing example for this keyboard:
+
+ make gkeyboard/greatpad:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical boot button**: Hold down the boot button on RP2040 and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/gkeyboard/greatpad/rules.mk b/keyboards/gkeyboard/greatpad/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/gkeyboard/greatpad/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/battleship_gamepad/config.h b/keyboards/handwired/battleship_gamepad/config.h
index f2eee84a577..9853f7f39d7 100644
--- a/keyboards/handwired/battleship_gamepad/config.h
+++ b/keyboards/handwired/battleship_gamepad/config.h
@@ -18,7 +18,6 @@
/* joystick configuration */
#define JOYSTICK_BUTTON_COUNT 25
-#define JOYSTICK_AXIS_COUNT 2
#define JOYSTICK_AXIS_RESOLUTION 10
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/handwired/onekey/keymaps/joystick/config.h b/keyboards/handwired/onekey/keymaps/joystick/config.h
index 8a4e461b277..589e4dbf3d6 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/config.h
+++ b/keyboards/handwired/onekey/keymaps/joystick/config.h
@@ -1,4 +1,3 @@
#pragma once
-#define JOYSTICK_AXIS_COUNT 2
#define JOYSTICK_BUTTON_COUNT 1
diff --git a/keyboards/handwired/scottokeebs/scottodeck/info.json b/keyboards/handwired/scottokeebs/scottodeck/info.json
new file mode 100644
index 00000000000..0607918cae3
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottodeck/info.json
@@ -0,0 +1,52 @@
+{
+ "manufacturer": "ScottoKeebs",
+ "keyboard_name": "ScottoDeck",
+ "maintainer": "joe-scotto",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "GP2", "pin_b": "GP3"},
+ {"pin_a": "GP27", "pin_b": "GP28"}
+ ]
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "direct": [
+ ["GP9", null, null, "GP21"],
+ ["GP7", "GP8", "GP20", "GP23"],
+ ["GP5", "GP6", "GP26", "GP22"]
+ ]
+ },
+ "processor": "RP2040",
+ "url": "https://scottokeebs.com",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0024",
+ "vid": "0xFEED"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c
new file mode 100644
index 00000000000..181c1e309df
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottodeck/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2024 Joe Scotto
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = { ENCODER_CCW_CW(HYPR(KC_RIGHT), HYPR(KC_LEFT)), ENCODER_CCW_CW(HYPR(KC_UP), HYPR(KC_DOWN)) }
+ // Encoder 1 Encoder 2
+};
+#endif
+
+// Keymap
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ HYPR(KC_9), HYPR(KC_0),
+ HYPR(KC_5), HYPR(KC_6), HYPR(KC_7), HYPR(KC_8),
+ HYPR(KC_1), HYPR(KC_2), HYPR(KC_3), HYPR(KC_4)
+ )
+};
diff --git a/keyboards/handwired/scottokeebs/scottodeck/readme.md b/keyboards/handwired/scottokeebs/scottodeck/readme.md
new file mode 100644
index 00000000000..86224acb3c9
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottodeck/readme.md
@@ -0,0 +1,27 @@
+# ScottoDeck
+
+
+
+An 8-key macropad with two EC11 encoders designed for live streaming. Case files available [here](https://github.com/joe-scotto/scottokeebs).
+
+* Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+* Hardware Supported: ATmega32U4
+* Hardware Availability: [Amazon](https://amazon.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make handwired/scottokeebs/scottodeck:default
+
+Flashing example for this keyboard:
+
+ make handwired/scottokeebs/scottodeck:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottodeck/rules.mk b/keyboards/handwired/scottokeebs/scottodeck/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottodeck/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/wwa/mercury/info.json b/keyboards/handwired/wwa/mercury/info.json
new file mode 100644
index 00000000000..bb89858da27
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/info.json
@@ -0,0 +1,40 @@
+{
+ "manufacturer": "spacehangover",
+ "keyboard_name": "Mercury",
+ "maintainer": "spacehangover",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["GP0", "GP1", "GP2", "GP3"],
+ "rows": ["GP4", "GP5"]
+ },
+ "processor": "RP2040",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0003",
+ "vid": "0x5757"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/mercury/keymaps/default/keymap.c b/keyboards/handwired/wwa/mercury/keymaps/default/keymap.c
new file mode 100644
index 00000000000..eb2187e59a3
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/keymaps/default/keymap.c
@@ -0,0 +1,11 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_F13, KC_F14, KC_F15, KC_F16,
+ KC_F17, KC_F18, KC_F19, KC_F20
+ )
+};
diff --git a/keyboards/handwired/wwa/mercury/keymaps/via/keymap.c b/keyboards/handwired/wwa/mercury/keymaps/via/keymap.c
new file mode 100644
index 00000000000..eb2187e59a3
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/keymaps/via/keymap.c
@@ -0,0 +1,11 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_F13, KC_F14, KC_F15, KC_F16,
+ KC_F17, KC_F18, KC_F19, KC_F20
+ )
+};
diff --git a/keyboards/handwired/wwa/mercury/keymaps/via/rules.mk b/keyboards/handwired/wwa/mercury/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/mercury/readme.md b/keyboards/handwired/wwa/mercury/readme.md
new file mode 100644
index 00000000000..32d346dbe9d
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/readme.md
@@ -0,0 +1,27 @@
+# mercury
+
+
+
+8 Key VIA Compatible Macropad
+
+* Keyboard Maintainer: [spacehangover](https://github.com/spacehangover)
+* Hardware Supported: RP2040 Handwired
+* Hardware Availability: RP2040
+
+Make example for this keyboard (after setting up your build environment):
+
+ make handwired/wwa/mercury:default
+
+Flashing example for this keyboard:
+
+ make handwired/wwa/mercury:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/mercury/rules.mk b/keyboards/handwired/wwa/mercury/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/handwired/wwa/mercury/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/wwa/soyuz/info.json b/keyboards/handwired/wwa/soyuz/info.json
new file mode 100644
index 00000000000..9670f312a6a
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuz/info.json
@@ -0,0 +1,55 @@
+{
+ "manufacturer": "spacehangover",
+ "keyboard_name": "Soyuz",
+ "maintainer": "spacehangover",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6"],
+ "rows": ["GP7", "GP8", "GP9"]
+ },
+ "processor": "RP2040",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0004",
+ "vid": "0x5757"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuz/keymaps/default/keymap.c b/keyboards/handwired/wwa/soyuz/keymaps/default/keymap.c
new file mode 100644
index 00000000000..af0eb592dc7
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuz/keymaps/default/keymap.c
@@ -0,0 +1,13 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17,
+ KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24
+ )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuz/keymaps/via/keymap.c b/keyboards/handwired/wwa/soyuz/keymaps/via/keymap.c
new file mode 100644
index 00000000000..41c76826a9b
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuz/keymaps/via/keymap.c
@@ -0,0 +1,12 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17,
+ KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24
+ )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuz/keymaps/via/rules.mk b/keyboards/handwired/wwa/soyuz/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuz/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuz/readme.md b/keyboards/handwired/wwa/soyuz/readme.md
new file mode 100644
index 00000000000..69f8ef9d760
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuz/readme.md
@@ -0,0 +1,27 @@
+# soyuz
+
+
+
+21 Key and 3 MIDI Potentiometers Macro Keyboard
+
+* Keyboard Maintainer: [spacehangover](https://github.com/spacehangover)
+* Hardware Supported: RP2040 Handwired
+* Hardware Availability: RP2040 Pico
+
+Make example for this keyboard (after setting up your build environment):
+
+ make handwired/wwa/soyuz:default
+
+Flashing example for this keyboard:
+
+ make handwired/wwa/soyuz:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/wwa/soyuz/rules.mk b/keyboards/handwired/wwa/soyuz/rules.mk
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/keyboards/handwired/wwa/soyuzxl/info.json b/keyboards/handwired/wwa/soyuzxl/info.json
new file mode 100644
index 00000000000..9180344176c
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuzxl/info.json
@@ -0,0 +1,55 @@
+{
+ "manufacturer": "spacehangover",
+ "keyboard_name": "SoyuzXL",
+ "maintainer": "spacehangover",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"],
+ "rows": ["B5", "B2", "B3"]
+ },
+ "processor": "atmega32u4",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0005",
+ "vid": "0x5757"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuzxl/keymaps/default/keymap.c b/keyboards/handwired/wwa/soyuzxl/keymaps/default/keymap.c
new file mode 100644
index 00000000000..af0eb592dc7
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuzxl/keymaps/default/keymap.c
@@ -0,0 +1,13 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17,
+ KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24
+ )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuzxl/keymaps/via/keymap.c b/keyboards/handwired/wwa/soyuzxl/keymaps/via/keymap.c
new file mode 100644
index 00000000000..af0eb592dc7
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuzxl/keymaps/via/keymap.c
@@ -0,0 +1,13 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17,
+ KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24
+ )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuzxl/keymaps/via/rules.mk b/keyboards/handwired/wwa/soyuzxl/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuzxl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuzxl/readme.md b/keyboards/handwired/wwa/soyuzxl/readme.md
new file mode 100644
index 00000000000..329acb36b6b
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuzxl/readme.md
@@ -0,0 +1,27 @@
+# soyuzxl
+
+
+
+21 Keys, 4 Potentiometers and 1 Fader MIDI Macro Keyboard
+
+* Keyboard Maintainer: [spacehangover](https://github.com/spacehangover)
+* Hardware Supported: Arduino Pro Micro, B103K Slide Pot, 10k Pots Handwired
+* Hardware Availability: Arduino Pro Micro
+
+Make example for this keyboard (after setting up your build environment):
+
+ make handwired/wwa/soyuzxl:default
+
+Flashing example for this keyboard:
+
+ make handwired/wwa/soyuzxl:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/wwa/soyuzxl/rules.mk b/keyboards/handwired/wwa/soyuzxl/rules.mk
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/keyboards/hineybush/h101/matrix_diagram.md b/keyboards/hineybush/h101/matrix_diagram.md
new file mode 100644
index 00000000000..48281f12eed
--- /dev/null
+++ b/keyboards/hineybush/h101/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Hineybush H101
+
+```
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0B │0C │0D ││0E │ │0F │0G │0H │ │0I │0J │0K │0L │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘ └───┴───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │1F │1G │1H │ │1I │1J │1K │1L │ │1E │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ ├───┼───┼───┼───┤ └───────┘ ┌───┐
+│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │ │2F │2G │2H │ │2I │2J │2K │2L │ │ │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┼───┤ │2L │ Numpad "+"
+│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │ │3I │3J │3K │3L │ │ │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ ├───┼───┼───┼───┤ ├───┤
+│40 │42 │43 │44 │45 │46 │47 │48 │49 │3A │3B │4C │4D │ │4G │ │4I │4J │4K │4L │ │ │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ ├───┼───┼───┼───┤ ┌───────┐ │4L │ Numpad Enter
+│50 │51 │52 │57 │5A │5B │5C │5D │ │5F │5G │5H │ │5I │5J │5K │5L │ Numpad 0 │5J │ │ │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───┴───┴───┴───┘ └───────┘ └───┘
+ ┌──────────┐
+ 2.75u RShift │4C │
+ └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│50 │51 │52 │57 │5B │5C │5D │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+```
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/info.json b/keyboards/inett_studio/sq80/hotswap_layout_i/info.json
new file mode 100644
index 00000000000..3d18b0fc942
--- /dev/null
+++ b/keyboards/inett_studio/sq80/hotswap_layout_i/info.json
@@ -0,0 +1,131 @@
+{
+ "keyboard_name": "SQUARE 80 % Hotswap Layout I",
+ "manufacturer": "iNETT Studio",
+ "url": "https://geekhack.org/index.php?topic=100769.0",
+ "maintainer": "Wraul",
+ "usb": {
+ "vid": "0x694E",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "matrix_pins": {
+ "cols": [ "C7", "C6", "B6", "B3", "B4", "D7", "D6", "E6", "F0", "F1", "F4", "F5", "F7", "D5", "D3" ],
+ "rows": ["B0", "B1", "B2", "F6", "B5", "D4"]
+ },
+ "diode_direction": "COL2ROW",
+ "indicators": {
+ "caps_lock": "D0",
+ "scroll_lock": "D1",
+ "num_lock": "D2",
+ "on_state": 0
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "community_layouts": ["tkl_ansi"],
+ "layouts": {
+ "LAYOUT_tkl_ansi": {
+ "layout": [
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 2, "y": 0 },
+ { "matrix": [0, 2], "x": 3, "y": 0 },
+ { "matrix": [0, 3], "x": 4, "y": 0 },
+ { "matrix": [0, 4], "x": 5, "y": 0 },
+ { "matrix": [0, 5], "x": 6.5, "y": 0 },
+ { "matrix": [0, 6], "x": 7.5, "y": 0 },
+ { "matrix": [0, 7], "x": 8.5, "y": 0 },
+ { "matrix": [0, 8], "x": 9.5, "y": 0 },
+ { "matrix": [0, 9], "x": 11, "y": 0 },
+ { "matrix": [0, 10], "x": 12, "y": 0 },
+ { "matrix": [0, 11], "x": 13, "y": 0 },
+ { "matrix": [0, 12], "x": 14, "y": 0 },
+ { "matrix": [0, 13], "x": 15.25, "y": 0 },
+ { "matrix": [0, 14], "x": 16.25, "y": 0 },
+ { "matrix": [3, 14], "x": 17.25, "y": 0 },
+
+ { "matrix": [5, 0], "x": 0, "y": 1.5 },
+ { "matrix": [1, 0], "x": 1, "y": 1.5 },
+ { "matrix": [1, 1], "x": 2, "y": 1.5 },
+ { "matrix": [1, 2], "x": 3, "y": 1.5 },
+ { "matrix": [1, 3], "x": 4, "y": 1.5 },
+ { "matrix": [1, 4], "x": 5, "y": 1.5 },
+ { "matrix": [1, 5], "x": 6, "y": 1.5 },
+ { "matrix": [1, 6], "x": 7, "y": 1.5 },
+ { "matrix": [1, 7], "x": 8, "y": 1.5 },
+ { "matrix": [1, 8], "x": 9, "y": 1.5 },
+ { "matrix": [1, 9], "x": 10, "y": 1.5 },
+ { "matrix": [1, 10], "x": 11, "y": 1.5 },
+ { "matrix": [1, 11], "x": 12, "y": 1.5 },
+ { "matrix": [1, 12], "w": 2, "x": 13, "y": 1.5 },
+ { "matrix": [1, 13], "x": 15.25, "y": 1.5 },
+ { "matrix": [1, 14], "x": 16.25, "y": 1.5 },
+ { "matrix": [3, 13], "x": 17.25, "y": 1.5 },
+
+ { "matrix": [5, 1], "w": 1.5, "x": 0, "y": 2.5 },
+ { "matrix": [2, 0], "x": 1.5, "y": 2.5 },
+ { "matrix": [2, 1], "x": 2.5, "y": 2.5 },
+ { "matrix": [2, 2], "x": 3.5, "y": 2.5 },
+ { "matrix": [2, 3], "x": 4.5, "y": 2.5 },
+ { "matrix": [2, 4], "x": 5.5, "y": 2.5 },
+ { "matrix": [2, 5], "x": 6.5, "y": 2.5 },
+ { "matrix": [2, 6], "x": 7.5, "y": 2.5 },
+ { "matrix": [2, 7], "x": 8.5, "y": 2.5 },
+ { "matrix": [2, 8], "x": 9.5, "y": 2.5 },
+ { "matrix": [2, 9], "x": 10.5, "y": 2.5 },
+ { "matrix": [2, 10], "x": 11.5, "y": 2.5 },
+ { "matrix": [2, 11], "x": 12.5, "y": 2.5 },
+ { "matrix": [2, 12], "w": 1.5, "x": 13.5, "y": 2.5 },
+ { "matrix": [2, 13], "x": 15.25, "y": 2.5 },
+ { "matrix": [2, 14], "x": 16.25, "y": 2.5 },
+ { "matrix": [4, 14], "x": 17.25, "y": 2.5 },
+
+ { "matrix": [5, 2], "w": 1.75, "x": 0, "y": 3.5 },
+ { "matrix": [3, 0], "x": 1.75, "y": 3.5 },
+ { "matrix": [3, 1], "x": 2.75, "y": 3.5 },
+ { "matrix": [3, 2], "x": 3.75, "y": 3.5 },
+ { "matrix": [3, 3], "x": 4.75, "y": 3.5 },
+ { "matrix": [3, 4], "x": 5.75, "y": 3.5 },
+ { "matrix": [3, 5], "x": 6.75, "y": 3.5 },
+ { "matrix": [3, 6], "x": 7.75, "y": 3.5 },
+ { "matrix": [3, 7], "x": 8.75, "y": 3.5 },
+ { "matrix": [3, 8], "x": 9.75, "y": 3.5 },
+ { "matrix": [3, 9], "x": 10.75, "y": 3.5 },
+ { "matrix": [3, 10], "x": 11.75, "y": 3.5 },
+ { "matrix": [3, 11], "w": 2.25, "x": 12.75, "y": 3.5 },
+
+ { "matrix": [5, 3], "w": 2.25, "x": 0, "y": 4.5 },
+ { "matrix": [4, 0], "x": 2.25, "y": 4.5 },
+ { "matrix": [4, 1], "x": 3.25, "y": 4.5 },
+ { "matrix": [4, 2], "x": 4.25, "y": 4.5 },
+ { "matrix": [4, 3], "x": 5.25, "y": 4.5 },
+ { "matrix": [4, 4], "x": 6.25, "y": 4.5 },
+ { "matrix": [4, 5], "x": 7.25, "y": 4.5 },
+ { "matrix": [4, 6], "x": 8.25, "y": 4.5 },
+ { "matrix": [4, 7], "x": 9.25, "y": 4.5 },
+ { "matrix": [4, 8], "x": 10.25, "y": 4.5 },
+ { "matrix": [4, 9], "x": 11.25, "y": 4.5 },
+ { "matrix": [4, 10], "w": 2.75, "x": 12.25, "y": 4.5 },
+ { "matrix": [4, 13], "x": 16.25, "y": 4.5 },
+
+ { "matrix": [5, 4], "w": 1.25, "x": 0, "y": 5.5 },
+ { "matrix": [5, 5], "w": 1.25, "x": 1.25, "y": 5.5 },
+ { "matrix": [5, 6], "w": 1.25, "x": 2.5, "y": 5.5 },
+ { "matrix": [5, 7], "w": 6.25, "x": 3.75, "y": 5.5 },
+ { "matrix": [5, 8], "w": 1.25, "x": 10, "y": 5.5 },
+ { "matrix": [5, 9], "w": 1.25, "x": 11.25, "y": 5.5 },
+ { "matrix": [5, 10], "w": 1.25, "x": 12.5, "y": 5.5 },
+ { "matrix": [5, 11], "w": 1.25, "x": 13.75, "y": 5.5 },
+ { "matrix": [5, 12], "x": 15.25, "y": 5.5 },
+ { "matrix": [5, 13], "x": 16.25, "y": 5.5 },
+ { "matrix": [5, 14], "x": 17.25, "y": 5.5 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/default/keymap.json b/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/default/keymap.json
new file mode 100644
index 00000000000..3b3555d62c4
--- /dev/null
+++ b/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/default/keymap.json
@@ -0,0 +1,18 @@
+{
+ "keyboard": "inett_studio/sq80/hotswap_layout_i",
+ "keymap": "default",
+ "layout": "LAYOUT_tkl_ansi",
+ "layers": [
+ [
+ "KC_ESC", "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_PSCR", "KC_SCRL", "KC_PAUS",
+ "KC_GRV", "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_INS" , "KC_HOME", "KC_PGUP",
+ "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_BSLS", "KC_DEL" , "KC_END", "KC_PGDN",
+ "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_LSFT", "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_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_APP", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"
+ ]
+ ],
+ "author": "Wraul",
+ "notes": "",
+ "version": 1
+}
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/via/keymap.json b/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/via/keymap.json
new file mode 100644
index 00000000000..d3d432ab1b6
--- /dev/null
+++ b/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/via/keymap.json
@@ -0,0 +1,24 @@
+{
+ "keyboard": "inett_studio/sq80/hotswap_layout_i",
+ "keymap": "via",
+ "layout": "LAYOUT_tkl_ansi",
+ "config": {
+ "features": {
+ "via": true,
+ "lto": true
+ }
+ },
+ "layers": [
+ [
+ "KC_ESC", "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_PSCR", "KC_SCRL", "KC_PAUS",
+ "KC_GRV", "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_INS" , "KC_HOME", "KC_PGUP",
+ "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_BSLS", "KC_DEL" , "KC_END", "KC_PGDN",
+ "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_LSFT", "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_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_APP", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"
+ ]
+ ],
+ "author": "Wraul",
+ "notes": "",
+ "version": 1
+}
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk b/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/inett_studio/sq80/readme.md b/keyboards/inett_studio/sq80/readme.md
new file mode 100644
index 00000000000..5e10ace9043
--- /dev/null
+++ b/keyboards/inett_studio/sq80/readme.md
@@ -0,0 +1,34 @@
+# FOX × iNETT Studio SQUARE 80%
+
+
+
+_A TKL keyboard from the iNETT Studio's SQUARE series._
+
+- Keyboard Maintainer: [Wraul](https://github.com/Wraul)
+- Hardware Supported: The QMK compatible hot swappable PCB offered during the GB
+- Hardware Availability: [Geekhack Group Buy](https://geekhack.org/index.php?topic=100769.0)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make inett_studio/sq80:default
+
+Flashing example for this keyboard:
+
+ make inett_studio/sq80: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
+
+The PCB is delivered with a forked version of QMK.
+At this moment it is not apparent if the stock firmware comes with a keybinding for entering the bootloader.
+
+Enter the bootloader with the stock firmware:
+
+- **Physical reset button**: Briefly press the button on the back of the PCB
+
+After flashing it is possible to enter the bootloader in 3 ways:
+
+- **Bootmagic reset**: Hold down the escape key and plug in the keyboard
+- **Physical reset button**: Briefly press the button on the back of the PCB
+- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/inett_studio/sq80/rules.mk b/keyboards/inett_studio/sq80/rules.mk
new file mode 100644
index 00000000000..d4f8260d939
--- /dev/null
+++ b/keyboards/inett_studio/sq80/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = inett_studio/sq80/hotswap_layout_i
diff --git a/keyboards/keebio/iris_ce/info.json b/keyboards/keebio/iris_ce/info.json
new file mode 100644
index 00000000000..64fa5a05caf
--- /dev/null
+++ b/keyboards/keebio/iris_ce/info.json
@@ -0,0 +1,8 @@
+{
+ "manufacturer": "Keebio",
+ "maintainer": "Keebio",
+ "url": "https://keeb.io",
+ "usb": {
+ "vid": "0xCB10"
+ }
+}
diff --git a/keyboards/keebio/iris_ce/keymaps/default/keymap.c b/keyboards/keebio/iris_ce/keymaps/default/keymap.c
new file mode 100644
index 00000000000..d5021d647d4
--- /dev/null
+++ b/keyboards/keebio/iris_ce/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+// Copyright 2023 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+ _QWERTY,
+ _LOWER,
+ _RAISE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_QWERTY] = LAYOUT(
+ //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
+ QK_GESC, 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_DEL,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ 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_HOME, KC_END, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+ KC_LGUI, TL_LOWR, KC_ENT, KC_SPC, TL_UPPR, KC_RALT
+ // └────────┴────────┴────────┘ └────────┴────────┴────────┘
+ ),
+
+ [_LOWER] = LAYOUT(
+ //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
+ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PGUP,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ KC_GRV, _______, KC_UP, _______, QK_BOOT, _______, _______, KC_P7, KC_P8, KC_P9, KC_P0, KC_PGDN,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_PIPE,
+ //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+ RGB_MOD, EE_CLR, _______, _______, _______, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_MINS, _______,
+ //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+ _______, _______, KC_DEL, KC_DEL, _______, KC_P0
+ // └────────┴────────┴────────┘ └────────┴────────┴────────┘
+ ),
+
+ [_RAISE] = LAYOUT(
+ //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
+ KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ RGB_TOG, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, QK_BOOT,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS, KC_EQL, KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS,
+ //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+ KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN, _______, KC_PLUS, KC_END, RGB_HUD, RGB_SAD, RGB_VAD, EE_CLR,
+ //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+ _______, _______, _______, _______, _______, _______
+ // └────────┴────────┴────────┘ └────────┴────────┴────────┘
+ )
+};
diff --git a/keyboards/keebio/iris_ce/keymaps/default/rules.mk b/keyboards/keebio/iris_ce/keymaps/default/rules.mk
new file mode 100644
index 00000000000..7c9bf212a6f
--- /dev/null
+++ b/keyboards/keebio/iris_ce/keymaps/default/rules.mk
@@ -0,0 +1 @@
+TRI_LAYER_ENABLE = yes
diff --git a/keyboards/keebio/iris_ce/keymaps/via/keymap.c b/keyboards/keebio/iris_ce/keymaps/via/keymap.c
new file mode 100644
index 00000000000..7d2a182ad6a
--- /dev/null
+++ b/keyboards/keebio/iris_ce/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+// Copyright 2023 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layer {
+ _MAIN,
+ _FN1,
+ _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_MAIN] = LAYOUT(
+ //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
+ QK_GESC, 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_DEL,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ 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_HOME, KC_END, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+ KC_LGUI, TL_LOWR, KC_ENT, KC_SPC, TL_UPPR, KC_RALT
+ // └────────┴────────┴────────┘ └────────┴────────┴────────┘
+ ),
+
+ [_FN1] = LAYOUT(
+ //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
+ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PGUP,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ KC_GRV, _______, KC_UP, _______, QK_BOOT, _______, _______, KC_P7, KC_P8, KC_P9, KC_P0, KC_PGDN,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_PIPE,
+ //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+ RGB_MOD, EE_CLR, _______, _______, _______, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_MINS, _______,
+ //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+ _______, _______, KC_DEL, KC_DEL, _______, KC_P0
+ // └────────┴────────┴────────┘ └────────┴────────┴────────┘
+ ),
+
+ [_FN2] = LAYOUT(
+ //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
+ KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ RGB_TOG, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, QK_BOOT,
+ //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
+ RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS, KC_EQL, KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS,
+ //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+ KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN, _______, KC_PLUS, KC_END, RGB_HUD, RGB_SAD, RGB_VAD, EE_CLR,
+ //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+ _______, _______, _______, _______, _______, _______
+ // └────────┴────────┴────────┘ └────────┴────────┴────────┘
+ )
+};
diff --git a/keyboards/keebio/iris_ce/keymaps/via/rules.mk b/keyboards/keebio/iris_ce/keymaps/via/rules.mk
new file mode 100644
index 00000000000..e2a844ab40f
--- /dev/null
+++ b/keyboards/keebio/iris_ce/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+CONSOLE_ENABLE = no
diff --git a/keyboards/keebio/iris_ce/readme.md b/keyboards/keebio/iris_ce/readme.md
new file mode 100644
index 00000000000..7b3ea32dd1f
--- /dev/null
+++ b/keyboards/keebio/iris_ce/readme.md
@@ -0,0 +1,25 @@
+# Iris CE (Compact Edition)
+
+A split ergo 4x6 keyboard with 4 thumb keys made and sold by Keebio. [More info at Keebio](https://keeb.io).
+
+* Keyboard Maintainer: [Bakingpy/nooges](https://github.com/nooges)
+* Hardware Supported: Iris CE PCBs w/RP2040 microcontroller
+* Hardware Availability: [Keebio](https://keeb.io)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make keebio/iris_ce/rev1:default
+
+Example of flashing this keyboard:
+
+ make keebio/iris_ce/rev1:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at the top left and plug in the keyboard
+* **Physical reset button**: Press and hold the button on the back of the PCB for at least 1 second and let go
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/keebio/iris_ce/rev1/config.h b/keyboards/keebio/iris_ce/rev1/config.h
new file mode 100644
index 00000000000..e5f43f001e2
--- /dev/null
+++ b/keyboards/keebio/iris_ce/rev1/config.h
@@ -0,0 +1,16 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define SPLIT_HAND_PIN GP4
+#define USB_VBUS_PIN GP0
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP12
+#define SERIAL_USART_RX_PIN GP13
+#define SERIAL_USART_PIN_SWAP
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+#define I2C_DRIVER I2CD2
+#define I2C1_SDA_PIN GP10
+#define I2C1_SCL_PIN GP11
diff --git a/keyboards/keebio/iris_ce/rev1/info.json b/keyboards/keebio/iris_ce/rev1/info.json
new file mode 100644
index 00000000000..c9fc160001a
--- /dev/null
+++ b/keyboards/keebio/iris_ce/rev1/info.json
@@ -0,0 +1,218 @@
+{
+ "keyboard_name": "Iris CE Rev. 1",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "extrakey": true,
+ "mousekey": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["GP29", "GP28", "GP27", "GP2", "GP3", "GP14"],
+ "rows": ["GP18", "GP19", "GP20", "GP7", "GP26"]
+ },
+ "processor": "RP2040",
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_sat": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "band_val": true,
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "cycle_up_down": true,
+ "digital_rain": true,
+ "dual_beacon": true,
+ "gradient_left_right": true,
+ "gradient_up_down": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "jellybean_raindrops": true,
+ "multisplash": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "pixel_rain": true,
+ "rainbow_beacon": true,
+ "rainbow_moving_chevron": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "solid_multisplash": true,
+ "solid_reactive": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_multinexus": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_simple": true,
+ "solid_reactive_wide": true,
+ "solid_splash": true,
+ "splash": true,
+ "typing_heatmap": true
+ },
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 5, "flags": 4},
+ {"x": 8, "y": 5, "flags": 2},
+ {"matrix": [0, 1], "x": 16, "y": 5, "flags": 4},
+ {"matrix": [0, 2], "x": 32, "y": 2, "flags": 4},
+ {"x": 40, "y": 1, "flags": 2},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 5, "flags": 4},
+ {"x": 72, "y": 3, "flags": 2},
+ {"matrix": [0, 5], "x": 80, "y": 3, "flags": 4},
+ {"matrix": [1, 5], "x": 80, "y": 17, "flags": 4},
+ {"matrix": [1, 4], "x": 64, "y": 15, "flags": 4},
+ {"matrix": [1, 3], "x": 48, "y": 13, "flags": 4},
+ {"matrix": [1, 2], "x": 32, "y": 15, "flags": 4},
+ {"matrix": [1, 1], "x": 16, "y": 18, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 18, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 32, "y": 28, "flags": 4},
+ {"matrix": [2, 3], "x": 48, "y": 27, "flags": 4},
+ {"matrix": [2, 4], "x": 64, "y": 28, "flags": 4},
+ {"matrix": [2, 5], "x": 80, "y": 30, "flags": 4},
+ {"matrix": [3, 5], "x": 80, "y": 43, "flags": 4},
+ {"matrix": [3, 4], "x": 64, "y": 42, "flags": 4},
+ {"matrix": [3, 3], "x": 48, "y": 40, "flags": 4},
+ {"matrix": [3, 2], "x": 32, "y": 42, "flags": 4},
+ {"matrix": [3, 1], "x": 16, "y": 45, "flags": 4},
+ {"matrix": [3, 0], "x": 0, "y": 45, "flags": 4},
+ {"x": 8, "y": 43, "flags": 2},
+ {"x": 40, "y": 50, "flags": 2},
+ {"matrix": [4, 2], "x": 56, "y": 47, "flags": 4},
+ {"matrix": [4, 3], "x": 72, "y": 58, "flags": 4},
+ {"x": 80, "y": 58, "flags": 2},
+ {"matrix": [4, 4], "x": 90, "y": 64, "flags": 4},
+ {"matrix": [4, 5], "x": 98, "y": 52, "flags": 4},
+ {"matrix": [5, 0], "x": 224, "y": 5, "flags": 4},
+ {"x": 216, "y": 5, "flags": 2},
+ {"matrix": [5, 1], "x": 208, "y": 5, "flags": 4},
+ {"matrix": [5, 2], "x": 192, "y": 2, "flags": 4},
+ {"x": 184, "y": 1, "flags": 2},
+ {"matrix": [5, 3], "x": 176, "y": 0, "flags": 4},
+ {"matrix": [5, 4], "x": 160, "y": 5, "flags": 4},
+ {"x": 152, "y": 3, "flags": 2},
+ {"matrix": [5, 5], "x": 144, "y": 3, "flags": 4},
+ {"matrix": [6, 5], "x": 144, "y": 17, "flags": 4},
+ {"matrix": [6, 4], "x": 160, "y": 15, "flags": 4},
+ {"matrix": [6, 3], "x": 176, "y": 13, "flags": 4},
+ {"matrix": [6, 2], "x": 192, "y": 15, "flags": 4},
+ {"matrix": [6, 1], "x": 208, "y": 18, "flags": 4},
+ {"matrix": [6, 0], "x": 224, "y": 18, "flags": 4},
+ {"matrix": [7, 0], "x": 224, "y": 32, "flags": 4},
+ {"matrix": [7, 1], "x": 208, "y": 32, "flags": 4},
+ {"matrix": [7, 2], "x": 192, "y": 28, "flags": 4},
+ {"matrix": [7, 3], "x": 176, "y": 27, "flags": 4},
+ {"matrix": [7, 4], "x": 160, "y": 28, "flags": 4},
+ {"matrix": [7, 5], "x": 144, "y": 30, "flags": 4},
+ {"matrix": [8, 5], "x": 144, "y": 43, "flags": 4},
+ {"matrix": [8, 4], "x": 160, "y": 42, "flags": 4},
+ {"matrix": [8, 3], "x": 176, "y": 40, "flags": 4},
+ {"x": 184, "y": 50, "flags": 2},
+ {"matrix": [8, 2], "x": 192, "y": 42, "flags": 4},
+ {"matrix": [8, 1], "x": 208, "y": 45, "flags": 4},
+ {"x": 216, "y": 43, "flags": 2},
+ {"matrix": [8, 0], "x": 224, "y": 45, "flags": 4},
+ {"matrix": [9, 2], "x": 168, "y": 47, "flags": 4},
+ {"matrix": [9, 3], "x": 152, "y": 58, "flags": 4},
+ {"x": 144, "y": 58, "flags": 2},
+ {"matrix": [9, 4], "x": 134, "y": 64, "flags": 4},
+ {"matrix": [9, 5], "x": 126, "y": 52, "flags": 4}
+ ],
+ "max_brightness": 120,
+ "split_count": [34, 34],
+ "sleep": true
+ },
+ "split": {
+ "enabled": true,
+ "matrix_pins": {
+ "right": {
+ "cols": ["GP29", "GP28", "GP2", "GP27", "GP18", "GP7"],
+ "rows": ["GP26", "GP24", "GP23", "GP21", "GP3"]
+ }
+ },
+ "transport": {
+ "sync_matrix_state": true
+ }
+ },
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x1556"
+ },
+ "ws2812": {
+ "driver": "vendor",
+ "pin": "GP25"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [5, 5], "x": 9, "y": 0.25},
+ {"matrix": [5, 4], "x": 10, "y": 0.125},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0.125},
+ {"matrix": [5, 1], "x": 13, "y": 0.375},
+ {"matrix": [5, 0], "x": 14, "y": 0.375},
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [6, 5], "x": 9, "y": 1.25},
+ {"matrix": [6, 4], "x": 10, "y": 1.125},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1.125},
+ {"matrix": [6, 1], "x": 13, "y": 1.375},
+ {"matrix": [6, 0], "x": 14, "y": 1.375},
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [7, 5], "x": 9, "y": 2.25},
+ {"matrix": [7, 4], "x": 10, "y": 2.125},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2.125},
+ {"matrix": [7, 1], "x": 13, "y": 2.375},
+ {"matrix": [7, 0], "x": 14, "y": 2.375},
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [4, 5], "x": 6.15, "y": 3.75},
+ {"matrix": [9, 5], "x": 7.85, "y": 3.75},
+ {"matrix": [8, 5], "x": 9, "y": 3.25},
+ {"matrix": [8, 4], "x": 10, "y": 3.125},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3.125},
+ {"matrix": [8, 1], "x": 13, "y": 3.375},
+ {"matrix": [8, 0], "x": 14, "y": 3.375},
+ {"matrix": [4, 2], "x": 3.5, "y": 4.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4.375},
+ {"matrix": [4, 4], "x": 5.6, "y": 4.75},
+ {"matrix": [9, 4], "x": 8.4, "y": 4.75},
+ {"matrix": [9, 3], "x": 9.5, "y": 4.375},
+ {"matrix": [9, 2], "x": 10.5, "y": 4.25}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/keebio/iris_ce/rev1/rules.mk b/keyboards/keebio/iris_ce/rev1/rules.mk
new file mode 100644
index 00000000000..161ec22b16e
--- /dev/null
+++ b/keyboards/keebio/iris_ce/rev1/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/glcdfont.c b/keyboards/keycapsss/kimiko/glcdfont.c
similarity index 100%
rename from keyboards/keycapsss/kimiko/keymaps/oriaj3/glcdfont.c
rename to keyboards/keycapsss/kimiko/glcdfont.c
diff --git a/keyboards/keycapsss/kimiko/info.json b/keyboards/keycapsss/kimiko/info.json
new file mode 100644
index 00000000000..a962104c56a
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/info.json
@@ -0,0 +1,9 @@
+{
+ "features": {
+ "mousekey": true,
+ "extrakey": true
+ },
+ "split": {
+ "enabled": true
+ }
+}
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h b/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
deleted file mode 100644
index 2fd384b9865..00000000000
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/config.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2019 MechMerlin
- * Copyright 2020 @ben_roe (keycapsss.com)
- * Copyright 2022 @oriaj3
- *
- * 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 .
- */
-
-#pragma once
-
-/* Select hand configuration */
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define OLED_FONT_H "keyboards/keycapsss/kimiko/keymaps/rgb_matrix/glcdfont.c"
-// #define OLED_FONT_WIDTH 5
-// #define OLED_FONT_HEIGHT 7
-
-
-#ifdef RGB_MATRIX_ENABLE
-
-// The pin connected to the data pin of the LEDs
-#define WS2812_DI_PIN D3
-// The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 60
-#define RGBLED_NUM 60
-#define RGB_MATRIX_SPLIT {30,30}
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_TRANSPORT_MIRROR
-
-
-# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
-// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 80 // limits maximum brightness of LEDs to 80 out of 255. Higher may cause the controller to crash.
-# define RGB_MATRIX_HUE_STEP 8
-# define RGB_MATRIX_SAT_STEP 8
-# define RGB_MATRIX_VAL_STEP 8
-# define RGB_MATRIX_SPD_STEP 10
-
-
-
-// ENABLES EFFECTS. See alls the effects -> https://github.com/samhocevar-forks/qmk-firmware/blob/master/docs/feature_rgb_matrix.md#rgb-matrix-effects
-# define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
-# define ENABLE_RGB_MATRIX_BAND_SPLIT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-//# define ENABLE_RGB_MATRIX_MULTISPLASH
-//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SPLASH
-#endif
-
-// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
-// #define SPLIT_USB_DETECT
-// #define NO_USB_STARTUP_CHECK
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c b/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c
deleted file mode 100644
index 243a7d013d4..00000000000
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/keymap.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/* Copyright 2019 Leo Batyuk
- * Copyright 2020 Drashna Jaelre <@drashna>
- * Copyright 2020 @ben_roe (keycapsss.com)
- * Copyright 2022 @oriaj3
- *
- * 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 .
- */
-
-#include QMK_KEYBOARD_H
-
-enum layers {
- _QWERTY,
- _LOWER,
- _RAISE,
- _ADJUST,
-};
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-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 | ; | ' |
- * |---------+------+------+------+------+------| [ | | ] |------+------+------+------+------+-----------|
- * | LCTRL | Z | X | C | V | B |-------| |-------| N | M | , | . | / |RShift/Enter|
- * `-------------------------------------------| / \ \-----------------------------------------------'
- * | LCTRL| LGUI | LALT |LOWER| Space / \Enter \ |RAISE |BackSP| 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_GRV,
- 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_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT),
- KC_LCTL, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_ENT, RAISE, KC_BSPC, KC_RGUI, KC_RALT
-),
-/* LOWER
- * ,-------------------------------------------. ,-----------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | F12 |
- * |--------+------+------+------+------+------| |------+------+------+------+------+------|
- * | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | ~ |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+------|
- * | | | | | | |-------| |-------| | _ | + | { | } | \ |
- * `-------------------------------------------| / \ \-----------------------------------------------'
- * | LCTRL| LGUI | LALT |LOWER| Space / \Enter \ |RAISE |BackSP| RGUI | RALT |
- * `----------------------------------' '------------------------------------'
- */
-
-[_LOWER] = LAYOUT(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_TILD,
- _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_BSLS,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-/* 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 |-------| |-------| + | - | = | [ | ] | \ |
- * `-----------------------------------------/ / \ \-----------------------------------------'
- * | LCTRL| LGUI | LALT |LOWER| Space / \Enter \ |RAISE |BackSP| RGUI | RALT |
- * `----------------------------------' '------------------------------------'
- */
-
-[_RAISE] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX,
- KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-/* ADJUST (Press LOWER and RAISE together)
- * ,-----------------------------------------. ,-----------------------------------------.
- * |QK_BOOT | | | | | | | | | | | | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * |RGB ON| HUE+ | SAT+ | VAL+ | | | | PREV | PLAY | NEXT | | | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | MODE | HUE- | SAT- | VAL- | | |-------. ,-------| VOL+ | MUTE | VOL- | | | |
- * |------+------+------+------+------+------| | | |------+------+------+------+------+------|
- * | | | | | | |-------| |-------| | | | | | |
- * `-----------------------------------------/ / \ \-----------------------------------------'
- * |LCTRL| LGUI | LALT |LOWER| Space / \Enter \ |RAISE |BackSP| RGUI | RALT |
- * `----------------------------------' '------------------------------------'
- */
-
-[_ADJUST] = LAYOUT(
- QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX,
- RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- )
-};
-
-
-layer_state_t layer_state_set_user(layer_state_t state) {
- state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
- return state;
-}
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
- if (is_keyboard_master()) {
- return OLED_ROTATION_270;
- } else {
- return OLED_ROTATION_270;
- }
-}
-
-void render_space(void) {
- oled_write_P(PSTR(" "), false);
-}
-
-void render_mod_status_gui_alt(uint8_t modifiers) {
- static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
- static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
- static const char PROGMEM gui_on_1[] = {0x8d, 0x8e, 0};
- static const char PROGMEM gui_on_2[] = {0xad, 0xae, 0};
-
- static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
- static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
- static const char PROGMEM alt_on_1[] = {0x8f, 0x90, 0};
- static const char PROGMEM alt_on_2[] = {0xaf, 0xb0, 0};
-
- // fillers between the modifier icons bleed into the icon frames
- static const char PROGMEM off_off_1[] = {0xc5, 0};
- static const char PROGMEM off_off_2[] = {0xc6, 0};
- static const char PROGMEM on_off_1[] = {0xc7, 0};
- static const char PROGMEM on_off_2[] = {0xc8, 0};
- static const char PROGMEM off_on_1[] = {0xc9, 0};
- static const char PROGMEM off_on_2[] = {0xca, 0};
- static const char PROGMEM on_on_1[] = {0xcb, 0};
- static const char PROGMEM on_on_2[] = {0xcc, 0};
-
- if(modifiers & MOD_MASK_GUI) {
- oled_write_P(gui_on_1, false);
- } else {
- oled_write_P(gui_off_1, false);
- }
-
- if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
- oled_write_P(on_on_1, false);
- } else if(modifiers & MOD_MASK_GUI) {
- oled_write_P(on_off_1, false);
- } else if(modifiers & MOD_MASK_ALT) {
- oled_write_P(off_on_1, false);
- } else {
- oled_write_P(off_off_1, false);
- }
-
- if(modifiers & MOD_MASK_ALT) {
- oled_write_P(alt_on_1, false);
- } else {
- oled_write_P(alt_off_1, false);
- }
-
- if(modifiers & MOD_MASK_GUI) {
- oled_write_P(gui_on_2, false);
- } else {
- oled_write_P(gui_off_2, false);
- }
-
- if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
- oled_write_P(on_on_2, false);
- } else if(modifiers & MOD_MASK_GUI) {
- oled_write_P(on_off_2, false);
- } else if(modifiers & MOD_MASK_ALT) {
- oled_write_P(off_on_2, false);
- } else {
- oled_write_P(off_off_2, false);
- }
-
- if(modifiers & MOD_MASK_ALT) {
- oled_write_P(alt_on_2, false);
- } else {
- oled_write_P(alt_off_2, false);
- }
-}
-
-void render_mod_status_ctrl_shift(uint8_t modifiers) {
- static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0};
- static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0};
- static const char PROGMEM ctrl_on_1[] = {0x91, 0x92, 0};
- static const char PROGMEM ctrl_on_2[] = {0xb1, 0xb2, 0};
-
- static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
- static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
- static const char PROGMEM shift_on_1[] = {0xcd, 0xce, 0};
- static const char PROGMEM shift_on_2[] = {0xcf, 0xd0, 0};
-
- // fillers between the modifier icons bleed into the icon frames
- static const char PROGMEM off_off_1[] = {0xc5, 0};
- static const char PROGMEM off_off_2[] = {0xc6, 0};
- static const char PROGMEM on_off_1[] = {0xc7, 0};
- static const char PROGMEM on_off_2[] = {0xc8, 0};
- static const char PROGMEM off_on_1[] = {0xc9, 0};
- static const char PROGMEM off_on_2[] = {0xca, 0};
- static const char PROGMEM on_on_1[] = {0xcb, 0};
- static const char PROGMEM on_on_2[] = {0xcc, 0};
-
- if(modifiers & MOD_MASK_CTRL) {
- oled_write_P(ctrl_on_1, false);
- } else {
- oled_write_P(ctrl_off_1, false);
- }
-
- if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
- oled_write_P(on_on_1, false);
- } else if(modifiers & MOD_MASK_CTRL) {
- oled_write_P(on_off_1, false);
- } else if(modifiers & MOD_MASK_SHIFT) {
- oled_write_P(off_on_1, false);
- } else {
- oled_write_P(off_off_1, false);
- }
-
- if(modifiers & MOD_MASK_SHIFT) {
- oled_write_P(shift_on_1, false);
- } else {
- oled_write_P(shift_off_1, false);
- }
-
- if(modifiers & MOD_MASK_CTRL) {
- oled_write_P(ctrl_on_2, false);
- } else {
- oled_write_P(ctrl_off_2, false);
- }
-
- if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
- oled_write_P(on_on_2, false);
- } else if(modifiers & MOD_MASK_CTRL) {
- oled_write_P(on_off_2, false);
- } else if(modifiers & MOD_MASK_SHIFT) {
- oled_write_P(off_on_2, false);
- } else {
- oled_write_P(off_off_2, false);
- }
-
- if(modifiers & MOD_MASK_SHIFT) {
- oled_write_P(shift_on_2, false);
- } else {
- oled_write_P(shift_off_2, false);
- }
-}
-
-void render_logo(void) {
- static const char PROGMEM corne_logo[] = {
- 0xA0, 0xA1, 0xA2, 0xA3, 0xA4,
- 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0};
- oled_write_P(corne_logo, false);
- // oled_write_P(PSTR("Kimiko"), false);
-}
-
-void render_layer_state(void) {
- static const char PROGMEM default_layer[] = {
- 0x20, 0x94, 0x95, 0x96, 0x20,
- 0x20, 0xb4, 0xb5, 0xb6, 0x20,
- 0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
- static const char PROGMEM raise_layer[] = {
- 0x20, 0x97, 0x98, 0x99, 0x20,
- 0x20, 0xb7, 0xb8, 0xb9, 0x20,
- 0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
- static const char PROGMEM lower_layer[] = {
- 0x20, 0x9a, 0x9b, 0x9c, 0x20,
- 0x20, 0xba, 0xbb, 0xbc, 0x20,
- 0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
- static const char PROGMEM adjust_layer[] = {
- 0x20, 0x9d, 0x9e, 0x9f, 0x20,
- 0x20, 0xbd, 0xbe, 0xbf, 0x20,
- 0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
- if(layer_state_is(_ADJUST)) {
- oled_write_P(adjust_layer, false);
- } else if(layer_state_is(_LOWER)) {
- oled_write_P(lower_layer, false);
- } else if(layer_state_is(_RAISE)) {
- oled_write_P(raise_layer, false);
- } else {
- oled_write_P(default_layer, false);
- }
-}
-
-void render_status_main(void) {
- render_space();
- render_space();
- render_logo();
- render_space();
- render_layer_state();
- render_space();
- render_mod_status_gui_alt(get_mods()|get_oneshot_mods());
- render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods());
-}
-
-void render_status_secondary(void) {
- render_space();
- render_space();
- render_logo();
- render_space();
-}
-
-bool oled_task_user(void) {
- if (is_keyboard_master()) {
- render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
- } else {
- render_status_secondary();
- }
- return false;
-}
-
-#endif
-
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
- // Encoder on master side
- if (index == 0) {
- switch (get_highest_layer(layer_state)) {
- // If the Default (QWERTY) layer is active
- case _QWERTY:
- // Arrow Up/Down
- if (clockwise) {
- tap_code(KC_DOWN);
- } else {
- tap_code(KC_UP);
- }
- break;
-
- // If the RAISE layer is active
- case _RAISE:
- // Switch browser tabs
- if (clockwise) {
- tap_code16(LCTL(KC_TAB));
- } else {
- tap_code16(RCS(KC_TAB));
- }
- break;
- // If the ADJUST layer is active
- case _ADJUST:
- // RGB brightness up/down
- if (clockwise) {
- rgblight_decrease_val(); // tap_code(RGB_VAD);
- } else {
- rgblight_increase_val(); // tap_code(RGB_VAI);
- }
- break;
- }
- }
- // Encoder on slave side
- else if (index == 1) {
- switch (get_highest_layer(layer_state)) {
- // If the Default (QWERTY) layer is active
- case _QWERTY:
- // Scroll by Word
- if (clockwise) {
- tap_code16(LCTL(KC_RGHT));
- } else {
- tap_code16(LCTL(KC_LEFT));
- }
- break;
-
- // If the LOWER layer is active
- case _LOWER:
- // Volume up/down
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- break;
-
- // If the ADJUST layer is active
- case _ADJUST:
- // RGB hue up/down
- if (clockwise) {
- // tap_code(RGB_HUI);
- rgblight_increase_hue();
- } else {
- // tap_code(RGB_HUD);
- rgblight_decrease_hue();
- }
- break;
- }
- }
- return false;
-}
-#endif // ENCODER_ENABLE
-
-
-
diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk b/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
deleted file mode 100644
index 46cb8d8a947..00000000000
--- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes # ENables the use of one or more encoders
-RGBLIGHT_ENABLE = no # Disable keyboard RGB underglow
-
-# LTO: Link Time Optimizations.
-# Reduce compiled size, but will automatically disable the legacy TMK Macros and Functions features.
-# This does not affect QMK Macros and Layers
-LTO_ENABLE = yes
-
-#ENABLE RGB MATRIX WITH DRIVER WS2812
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = ws2812
-
-#DEFINE SPLIT KEYBOARD AND SPLIT TRANSPORT MIRROR
-SPLIT_KEYBOARD = yes
-
-#DEACTIVATED FOR MEMORY SAVING
-MOUSEKEY_ENABLE = no
-CONSOLE_ENABLE = no
diff --git a/keyboards/keycapsss/kimiko/kimiko.c b/keyboards/keycapsss/kimiko/kimiko.c
index 041387ad535..c99a966603a 100644
--- a/keyboards/keycapsss/kimiko/kimiko.c
+++ b/keyboards/keycapsss/kimiko/kimiko.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 @ben_roe (keycapsss.com)
+/* Copyright 2023 @BenRoe (keycapsss.com)
*
* 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
@@ -13,8 +13,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#include "quantum.h"
+ #include "quantum.h"
+
+#ifdef KEYBOARD_keycapsss_kimiko_rev1
#ifdef RGB_MATRIX_ENABLE
//Thanks to Ben (keycapsss) for helpipng me to create g_led_config
@@ -75,4 +77,7 @@ led_config_t g_led_config = { {
4, 4, 1, 1, 1, 1
} };
-#endif // RGB_MATRIX_ENABLE
\ No newline at end of file
+#endif // RGB_MATRIX_ENABLE
+#endif // KEYBOARD_keycapsss_kimiko_rev1
+
+
diff --git a/keyboards/keycapsss/kimiko/post_config.h b/keyboards/keycapsss/kimiko/post_config.h
new file mode 100644
index 00000000000..31be5898cfd
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/post_config.h
@@ -0,0 +1,25 @@
+/* Copyright 2019 MechMerlin
+ * Copyright 2023 @Ex3c4Def
+ * Copyright 2023 @BenRoe (keycapsss.com)
+ *
+ * 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 .
+ */
+
+#pragma once
+
+// OLED definitions
+#ifndef OLED_FONT_H
+# define OLED_FONT_H "keyboards/keycapsss/kimiko/glcdfont.c"
+#endif
+
diff --git a/keyboards/keycapsss/kimiko/readme.md b/keyboards/keycapsss/kimiko/readme.md
index 0e2604079d7..32c64010126 100644
--- a/keyboards/keycapsss/kimiko/readme.md
+++ b/keyboards/keycapsss/kimiko/readme.md
@@ -1,23 +1,59 @@
# Kimiko
-
+## Rev2
+
+A split keyboard with 4x6 vertically staggered keys and a Kyria style thumb thumb cluster.
+
+
+
+- Keyboard Maintainer: [BenRoe](https://github.com/BenRoe/) [@keycapsss](https://twitter.com/keycapsss)
+- Hardware Supported: Pro Micro 5V/16Mhz and compatible
+- Hardware Availability: [Keycapsss.com](https://keycapsss.com)
+
+### Features (Rev2)
+
+- 62 Per key RGB led's (SK6812 Mini-E)
+ - RGB Matrix is enabled as default in rules.mk
+ - The effects can be configured in config.h
+- Support for 1 rotary encoder per side (two possible positions)
+- Support for 1 OLED display per side
+ - 128x32 (SSD1306) or Nice!View are supported
+ - With 1 OLED on each side, they have to be the same
+ - Default configuration for 128x32 OLED
+
+
+Make firmware .hex for this keyboard (after setting up your build environment):
+
+```bash
+qmk compile -kb keycapsss/kimiko/rev2 -km default
+```
+
+Use [QMK Toolbox](https://github.com/qmk/qmk_toolbox) to flash the firmware hex file to the keyboard controller.
+
+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).
+
+## Rev1
A split keyboard with 4x6 vertically staggered keys and thumb keys.
+
+
+- Keyboard Maintainer: [BenRoe](https://github.com/BenRoe/) [@keycapsss](https://twitter.com/keycapsss)
+- Hardware Supported: Pro Micro 5V/16Mhz and compatible
+- Hardware Availability: [Keycapsss.com](https://keycapsss.com)
+
+### Features (Rev1)
+
- Per key RGB led's (SK6812 Mini-E)
- 6 underglow RGB led's per side (SK6812 Mini)
- Support for 1 rotary encoder per side (two possible positions)
-* Keyboard Maintainer: [BenRoe](https://github.com/BenRoe/) [@keycapsss](https://twitter.com/keycapsss)
-* Hardware Supported: Pro Micro 5V/16Mhz and compatible
-* Hardware Availability: [keycapsss.com](https://keycapsss.com)
-
Make firmware .hex for this keyboard (after setting up your build environment):
- make keycapsss/kimiko:default
+```bash
+qmk compile -kb keycapsss/kimiko/rev1 -km default
+```
-Example of flashing this keyboard (or use [QMK Toolbox](https://github.com/qmk/qmk_toolbox)):
-
- make keycapsss/kimiko:default:flash
+Use [QMK Toolbox](https://github.com/qmk/qmk_toolbox) to flash the firmware hex file to the keyboard controller.
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).
diff --git a/keyboards/keycapsss/kimiko/rev2/info.json b/keyboards/keycapsss/kimiko/rev2/info.json
new file mode 100644
index 00000000000..f595bd9cc42
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/rev2/info.json
@@ -0,0 +1,199 @@
+{
+ "manufacturer": "Keycapsss",
+ "keyboard_name": "Kimiko Rev2",
+ "maintainer": "BenRoe",
+ "build": {
+ "lto": true
+ },
+ "development_board": "promicro",
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "F5", "pin_b": "F4"}
+ ]
+ },
+ "features": {
+ "encoder": true,
+ "nkro": true,
+ "oled": true
+ },
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "rgb_matrix": {
+ "driver": "ws2812",
+ "layout": [
+ { "matrix": [0, 5], "x": 66, "y": 5, "flags": 4 },
+ { "matrix": [0, 4], "x": 53, "y": 4, "flags": 4 },
+ { "matrix": [0, 3], "x": 40, "y": 0, "flags": 4 },
+ { "matrix": [0, 2], "x": 26, "y": 4, "flags": 4 },
+ { "matrix": [0, 1], "x": 13, "y": 11, "flags": 4 },
+ { "matrix": [0, 0], "x": 0, "y": 11, "flags": 4 },
+ { "matrix": [1, 0], "x": 0, "y": 23, "flags": 4 },
+ { "matrix": [1, 1], "x": 13, "y": 23, "flags": 4 },
+ { "matrix": [1, 2], "x": 26, "y": 15, "flags": 4 },
+ { "matrix": [1, 3], "x": 40, "y": 12, "flags": 4 },
+ { "matrix": [1, 4], "x": 53, "y": 15, "flags": 4 },
+ { "matrix": [1, 5], "x": 66, "y": 17, "flags": 4 },
+ { "matrix": [2, 5], "x": 66, "y": 29, "flags": 4 },
+ { "matrix": [2, 4], "x": 53, "y": 27, "flags": 4 },
+ { "matrix": [2, 3], "x": 40, "y": 24, "flags": 4 },
+ { "matrix": [2, 2], "x": 26, "y": 27, "flags": 4 },
+ { "matrix": [2, 1], "x": 13, "y": 35, "flags": 4 },
+ { "matrix": [2, 0], "x": 0, "y": 35, "flags": 1 },
+ { "matrix": [3, 0], "x": 0, "y": 47, "flags": 1 },
+ { "matrix": [3, 1], "x": 13, "y": 47, "flags": 4 },
+ { "matrix": [3, 2], "x": 26, "y": 39, "flags": 4 },
+ { "matrix": [3, 3], "x": 40, "y": 36, "flags": 4 },
+ { "matrix": [3, 4], "x": 53, "y": 39, "flags": 4 },
+ { "matrix": [3, 5], "x": 66, "y": 41, "flags": 4 },
+ { "matrix": [5, 5], "x": 80, "y": 48, "flags": 4 },
+ { "matrix": [4, 5], "x": 94, "y": 52, "flags": 4 },
+ { "matrix": [4, 4], "x": 87, "y": 64, "flags": 4 },
+ { "matrix": [4, 3], "x": 73, "y": 60, "flags": 1 },
+ { "matrix": [4, 2], "x": 53, "y": 51, "flags": 1 },
+ { "matrix": [4, 1], "x": 40, "y": 47, "flags": 1 },
+ { "matrix": [4, 0], "x": 26, "y": 51, "flags": 1 },
+ { "matrix": [6, 5], "x": 158, "y": 5, "flags": 4 },
+ { "matrix": [6, 4], "x": 171, "y": 4, "flags": 4 },
+ { "matrix": [6, 3], "x": 184, "y": 0, "flags": 4 },
+ { "matrix": [6, 2], "x": 198, "y": 4, "flags": 4 },
+ { "matrix": [6, 1], "x": 211, "y": 11, "flags": 4 },
+ { "matrix": [6, 0], "x": 224, "y": 11, "flags": 4 },
+ { "matrix": [7, 0], "x": 224, "y": 23, "flags": 4 },
+ { "matrix": [7, 1], "x": 211, "y": 23, "flags": 4 },
+ { "matrix": [7, 2], "x": 198, "y": 15, "flags": 4 },
+ { "matrix": [7, 3], "x": 184, "y": 12, "flags": 4 },
+ { "matrix": [7, 4], "x": 171, "y": 15, "flags": 4 },
+ { "matrix": [7, 5], "x": 158, "y": 17, "flags": 4 },
+ { "matrix": [8, 5], "x": 158, "y": 29, "flags": 4 },
+ { "matrix": [8, 4], "x": 171, "y": 27, "flags": 4 },
+ { "matrix": [8, 3], "x": 184, "y": 24, "flags": 4 },
+ { "matrix": [8, 2], "x": 198, "y": 27, "flags": 4 },
+ { "matrix": [8, 1], "x": 211, "y": 35, "flags": 4 },
+ { "matrix": [8, 0], "x": 224, "y": 35, "flags": 4 },
+ { "matrix": [9, 0], "x": 224, "y": 47, "flags": 1 },
+ { "matrix": [9, 1], "x": 211, "y": 47, "flags": 4 },
+ { "matrix": [9, 2], "x": 198, "y": 39, "flags": 4 },
+ { "matrix": [9, 3], "x": 184, "y": 36, "flags": 4 },
+ { "matrix": [9, 4], "x": 171, "y": 39, "flags": 4 },
+ { "matrix": [9, 5], "x": 158, "y": 41, "flags": 4 },
+ { "matrix": [11, 5], "x": 144, "y": 48, "flags": 4 },
+ { "matrix": [10, 5], "x": 130, "y": 52, "flags": 4 },
+ { "matrix": [10, 4], "x": 137, "y": 64, "flags": 4 },
+ { "matrix": [10, 3], "x": 151, "y": 60, "flags": 1 },
+ { "matrix": [10, 2], "x": 171, "y": 51, "flags": 4 },
+ { "matrix": [10, 1], "x": 184, "y": 47, "flags": 1 },
+ { "matrix": [10, 0], "x": 198, "y": 51, "flags": 1 }
+ ],
+ "led_count": 62,
+ "max_brightness": 80,
+ "split_count": [31, 31]
+ },
+ "rgblight": {
+ "led_count": 62,
+ "max_brightness": 80,
+ "split": true,
+ "split_count": [31, 31]
+ },
+ "split": {
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "F5", "pin_b": "F4"}
+ ]
+ }
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+ }
+ },
+ "soft_serial_pin": "D2"
+ },
+ "url": "https://keycapsss.com",
+ "usb": {
+ "device_version": "2.0.0",
+ "pid": "0x4B69",
+ "vid": "0x7983"
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0.96},
+ {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.96},
+ {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0.31},
+ {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.31},
+ {"label": "L05", "matrix": [0, 5], "x": 5, "y": 0.46},
+ {"label": "R00", "matrix": [6, 5], "x": 12, "y": 0.45},
+ {"label": "R01", "matrix": [6, 4], "x": 13, "y": 0.31},
+ {"label": "R02", "matrix": [6, 3], "x": 14, "y": 0},
+ {"label": "R03", "matrix": [6, 2], "x": 15, "y": 0.31},
+ {"label": "R04", "matrix": [6, 1], "x": 16, "y": 0.96},
+ {"label": "R05", "matrix": [6, 0], "x": 17, "y": 0.96},
+ {"label": "L10", "matrix": [1, 0], "x": 0, "y": 1.96},
+ {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.96},
+ {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1.31},
+ {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.31},
+ {"label": "L15", "matrix": [1, 5], "x": 5, "y": 1.46},
+ {"label": "R10", "matrix": [7, 5], "x": 12, "y": 1.46},
+ {"label": "R11", "matrix": [7, 4], "x": 13, "y": 1.31},
+ {"label": "R12", "matrix": [7, 3], "x": 14, "y": 1},
+ {"label": "R13", "matrix": [7, 2], "x": 15, "y": 1.31},
+ {"label": "R14", "matrix": [7, 1], "x": 16, "y": 1.96},
+ {"label": "R15", "matrix": [7, 0], "x": 17, "y": 1.96},
+ {"label": "L20", "matrix": [2, 0], "x": 0, "y": 2.96},
+ {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.96},
+ {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2.31},
+ {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2},
+ {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.31},
+ {"label": "L25", "matrix": [2, 5], "x": 5, "y": 2.46},
+ {"label": "R20", "matrix": [8, 5], "x": 12, "y": 2.46},
+ {"label": "R21", "matrix": [8, 4], "x": 13, "y": 2.31},
+ {"label": "R22", "matrix": [8, 3], "x": 14, "y": 2},
+ {"label": "R23", "matrix": [8, 2], "x": 15, "y": 2.31},
+ {"label": "R24", "matrix": [8, 1], "x": 16, "y": 2.96},
+ {"label": "R25", "matrix": [8, 0], "x": 17, "y": 2.96},
+ {"label": "L30", "matrix": [3, 0], "x": 0, "y": 3.96},
+ {"label": "L31", "matrix": [3, 1], "x": 1, "y": 4},
+ {"label": "L32", "matrix": [3, 2], "x": 2, "y": 3.31},
+ {"label": "L33", "matrix": [3, 3], "x": 3, "y": 3},
+ {"label": "L34", "matrix": [3, 4], "x": 4, "y": 3.31},
+ {"label": "L35", "matrix": [3, 5], "x": 5, "y": 3.46},
+ {"label": "L50", "matrix": [5, 5], "x": 5.75, "y": 4.51},
+ {"label": "L40", "matrix": [4, 5], "x": 6.75, "y": 5},
+ {"label": "R40", "matrix": [10, 5], "x": 10.25, "y": 5},
+ {"label": "R50", "matrix": [11, 5], "x": 11.25, "y": 4.5},
+ {"label": "R30", "matrix": [9, 5], "x": 12, "y": 3.46},
+ {"label": "R31", "matrix": [9, 4], "x": 13, "y": 3.31},
+ {"label": "R32", "matrix": [9, 3], "x": 14, "y": 3},
+ {"label": "R33", "matrix": [9, 2], "x": 15, "y": 3.31},
+ {"label": "R34", "matrix": [9, 1], "x": 16, "y": 3.96},
+ {"label": "R35", "matrix": [9, 0], "x": 17, "y": 3.96},
+ {"label": "L41", "matrix": [4, 0], "x": 2.5, "y": 4.5},
+ {"label": "L42", "matrix": [4, 1], "x": 3.5, "y": 4.5},
+ {"label": "L43", "matrix": [4, 2], "x": 4.5, "y": 4.95},
+ {"label": "L44", "matrix": [4, 3], "x": 5.5, "y": 5.5},
+ {"label": "L45", "matrix": [4, 4], "x": 6.5, "y": 6},
+ {"label": "R41", "matrix": [10, 4], "x": 10.5, "y": 6},
+ {"label": "R42", "matrix": [10, 3], "x": 11.5, "y": 5.5},
+ {"label": "R43", "matrix": [10, 2], "x": 12.5, "y": 4.75},
+ {"label": "R44", "matrix": [10, 1], "x": 13.5, "y": 4.5},
+ {"label": "R45", "matrix": [10, 0], "x": 14.5, "y": 4.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/default/config.h b/keyboards/keycapsss/kimiko/rev2/keymaps/default/config.h
new file mode 100644
index 00000000000..34c2708e865
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/rev2/keymaps/default/config.h
@@ -0,0 +1,37 @@
+/* Copyright 2019 MechMerlin
+ * Copyright 2020 @ben_roe (keycapsss.com)
+ * Copyright 2023 @Ex3c4Def
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#define MASTER_RIGHT
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard
+
+// These modes also require the RGB_MATRIX_FRAMEBUFFER_EFFECTS define to be available.
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM!
+
+#define RGB_MATRIX_VAL_STEP 4
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_DEFAULT_HUE 0 // Sets the default hue value, if none has been set
+#define RGB_MATRIX_DEFAULT_SAT 255 // Sets the default saturation value, if none has been set
+#define RGB_MATRIX_DEFAULT_VAL 60 // RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
+#define RGB_MATRIX_DEFAULT_SPD 60 // Sets the default animation speed, if none has been set
+
+#if defined(POINTING_DEVICE_DRIVER_pimoroni_trackball)
+# define POINTING_DEVICE_ROTATION_180 // may be used for trackball in 2nd position
+#endif
diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c b/keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..f7e434c8816
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c
@@ -0,0 +1,122 @@
+/* Copyright 2019 Leo Batyuk
+ * Copyright 2020 Drashna Jaelre <@drashna>
+ * Copyright 2020 @ben_roe (keycapsss.com)
+ * Copyright 2023 @Ex3c4Def
+ *
+ * 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+ _QWERTY,
+ _LOWER,
+ _RAISE,
+ _ADJUST,
+};
+
+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 | ; | ' |
+ * |---------+------+------+------+------+------| ( | [ | | ] | ) |------+------+------+------+------+-----------|
+ * | LCTRL | Z | X | C | V | B |------|--------| |-------|-------| N | M | , | . | / |RShift/Enter|
+ * `--------------------------------------------| / \ |----------------------------------------------'
+ * | LCTRL| LGUI |LALT |LOWER | Space / \Enter| RAISE |BackSP| 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_GRV,
+ 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_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LPRN, KC_LBRC, KC_RBRC, KC_RPRN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT),
+ KC_LCTL, KC_LGUI, KC_LALT, TL_LOWR, KC_SPC, KC_ENT, TL_UPPR, KC_BSPC, KC_RGUI, KC_RALT
+),
+/* LOWER
+* QWERTY
+ * ,--------------------------------------------. ,----------------------------------------------.
+ * | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
+ * |---------+------+------+------+------+------| |------+------+------+------+------+-----------|
+ * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | F12 |
+ * |---------+------+------+------+------+------| |------+------+------+------+------+-----------|
+ * | ` | ! | @ | # | $ | % |---------------. ,---------------| ^ | & | * | ( | ) | ~ |
+ * |---------+------+------+------+------+------| | | | | |------+------+------+------+------+-----------|
+ * | | | | | | |------|--------| |-------|-------| | _ | + | { | } | \ |
+ * `--------------------------------------------| / \ |----------------------------------------------'
+ * | LCTRL| LGUI |LALT |LOWER | Space / \Enter| RAISE |BackSP| RGUI | RALT |
+ * `----------------------------------' '---------------------------------'
+ */
+[_LOWER] = LAYOUT(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_TILD,
+ _______, _______, _______, _______, _______, _______, _______,_______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_BSLS,
+ _______, _______, _______, _______,_______, _______, _______, _______, _______, _______
+),
+/* 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 |------|--------| |-------|-------| + | - | = | [ | ] | \ |
+ * `--------------------------------------------| / \ |----------------------------------------------'
+ * | LCTRL| LGUI |LALT |LOWER | Space / \Enter| RAISE |BackSP| RGUI | RALT |
+ * `----------------------------------' '---------------------------------'
+ */
+ [_RAISE] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX,
+ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+/* ADJUST (Press LOWER and RAISE together)
+ * ,--------------------------------------------. ,----------------------------------------------.
+ * | QK_BOOT | | | | | | | | | | | | |
+ * |---------+------+------+------+------+------| |------+------+------+------+------+-----------|
+ * | RGB ON | HUE+ | SAT+ | VAL+ | | | | PREV | PLAY | NEXT | | | |
+ * |---------+------+------+------+------+------| |------+------+------+------+------+-----------|
+ * | MODE | HUE- | SAT- | VAL- | | |---------------. ,---------------| VOL+ | MUTE | VOL- | | | |
+ * |---------+------+------+------+------+------| | | | | |------+------+------+------+------+-----------|
+ * | | | | | | |------|--------| |-------|-------| | | | | | |
+ * `--------------------------------------------| / \ |----------------------------------------------'
+ * | LCTRL| LGUI |LALT |LOWER | Space / \Enter| RAISE |BackSP| RGUI | RALT |
+ * `----------------------------------' '---------------------------------'
+ */
+[_ADJUST] = LAYOUT(
+ QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX,
+ RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+)
+};
+
+
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [_QWERTY] = { ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
+ [_LOWER] = { ENCODER_CCW_CW(RGB_HUI, KC_TAB), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
+ [_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keycapsss/kimiko/rev2/keymaps/default/rules.mk b/keyboards/keycapsss/kimiko/rev2/keymaps/default/rules.mk
new file mode 100644
index 00000000000..420f29d8f7a
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/rev2/keymaps/default/rules.mk
@@ -0,0 +1,8 @@
+TRI_LAYER_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+RGBLIGHT_ENABLE = no # Enable keyboard 'old' RGB lightning
+RGB_MATRIX_ENABLE = yes # Enable keyboard RGB Matrix lightning
+
+# POINTING_DEVICE_ENABLE = yes
+# POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c
diff --git a/keyboards/keycapsss/kimiko/rev2/rev2.c b/keyboards/keycapsss/kimiko/rev2/rev2.c
new file mode 100644
index 00000000000..c5765812c06
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/rev2/rev2.c
@@ -0,0 +1,209 @@
+/* Copyright 2023 @BenRoe (keycapsss.com)
+ *
+ * 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 .
+ */
+
+#include "quantum.h"
+
+enum layers { _QWERTY, _LOWER, _RAISE, _ADJUST };
+
+# ifdef OLED_ENABLE
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+ return OLED_ROTATION_270;
+}
+
+// NOTE: Most of the OLED code was originally written by Soundmonster for the Corne,
+// and has been copied directly from `crkbd/soundmonster/keymap.c`
+
+void render_mod_status_gui_alt(uint8_t modifiers) {
+ static const char PROGMEM gui_off_1[] = {0x85, 0x86, 0};
+ static const char PROGMEM gui_off_2[] = {0xa5, 0xa6, 0};
+ static const char PROGMEM gui_on_1[] = {0x8d, 0x8e, 0};
+ static const char PROGMEM gui_on_2[] = {0xad, 0xae, 0};
+
+ static const char PROGMEM alt_off_1[] = {0x87, 0x88, 0};
+ static const char PROGMEM alt_off_2[] = {0xa7, 0xa8, 0};
+ static const char PROGMEM alt_on_1[] = {0x8f, 0x90, 0};
+ static const char PROGMEM alt_on_2[] = {0xaf, 0xb0, 0};
+
+ // fillers between the modifier icons bleed into the icon frames
+ static const char PROGMEM off_off_1[] = {0xc5, 0};
+ static const char PROGMEM off_off_2[] = {0xc6, 0};
+ static const char PROGMEM on_off_1[] = {0xc7, 0};
+ static const char PROGMEM on_off_2[] = {0xc8, 0};
+ static const char PROGMEM off_on_1[] = {0xc9, 0};
+ static const char PROGMEM off_on_2[] = {0xca, 0};
+ static const char PROGMEM on_on_1[] = {0xcb, 0};
+ static const char PROGMEM on_on_2[] = {0xcc, 0};
+
+ if (modifiers & MOD_MASK_GUI) {
+ oled_write_P(gui_on_1, false);
+ } else {
+ oled_write_P(gui_off_1, false);
+ }
+
+ if ((modifiers & MOD_MASK_GUI) && (modifiers & MOD_MASK_ALT)) {
+ oled_write_P(on_on_1, false);
+ } else if (modifiers & MOD_MASK_GUI) {
+ oled_write_P(on_off_1, false);
+ } else if (modifiers & MOD_MASK_ALT) {
+ oled_write_P(off_on_1, false);
+ } else {
+ oled_write_P(off_off_1, false);
+ }
+
+ if (modifiers & MOD_MASK_ALT) {
+ oled_write_P(alt_on_1, false);
+ } else {
+ oled_write_P(alt_off_1, false);
+ }
+
+ if (modifiers & MOD_MASK_GUI) {
+ oled_write_P(gui_on_2, false);
+ } else {
+ oled_write_P(gui_off_2, false);
+ }
+
+ if (modifiers & MOD_MASK_GUI & MOD_MASK_ALT) {
+ oled_write_P(on_on_2, false);
+ } else if (modifiers & MOD_MASK_GUI) {
+ oled_write_P(on_off_2, false);
+ } else if (modifiers & MOD_MASK_ALT) {
+ oled_write_P(off_on_2, false);
+ } else {
+ oled_write_P(off_off_2, false);
+ }
+
+ if (modifiers & MOD_MASK_ALT) {
+ oled_write_P(alt_on_2, false);
+ } else {
+ oled_write_P(alt_off_2, false);
+ }
+}
+
+void render_mod_status_ctrl_shift(uint8_t modifiers) {
+ static const char PROGMEM ctrl_off_1[] = {0x89, 0x8a, 0};
+ static const char PROGMEM ctrl_off_2[] = {0xa9, 0xaa, 0};
+ static const char PROGMEM ctrl_on_1[] = {0x91, 0x92, 0};
+ static const char PROGMEM ctrl_on_2[] = {0xb1, 0xb2, 0};
+
+ static const char PROGMEM shift_off_1[] = {0x8b, 0x8c, 0};
+ static const char PROGMEM shift_off_2[] = {0xab, 0xac, 0};
+ static const char PROGMEM shift_on_1[] = {0xcd, 0xce, 0};
+ static const char PROGMEM shift_on_2[] = {0xcf, 0xd0, 0};
+
+ // fillers between the modifier icons bleed into the icon frames
+ static const char PROGMEM off_off_1[] = {0xc5, 0};
+ static const char PROGMEM off_off_2[] = {0xc6, 0};
+ static const char PROGMEM on_off_1[] = {0xc7, 0};
+ static const char PROGMEM on_off_2[] = {0xc8, 0};
+ static const char PROGMEM off_on_1[] = {0xc9, 0};
+ static const char PROGMEM off_on_2[] = {0xca, 0};
+ static const char PROGMEM on_on_1[] = {0xcb, 0};
+ static const char PROGMEM on_on_2[] = {0xcc, 0};
+
+ if (modifiers & MOD_MASK_CTRL) {
+ oled_write_P(ctrl_on_1, false);
+ } else {
+ oled_write_P(ctrl_off_1, false);
+ }
+
+ if ((modifiers & MOD_MASK_CTRL) && (modifiers & MOD_MASK_SHIFT)) {
+ oled_write_P(on_on_1, false);
+ } else if (modifiers & MOD_MASK_CTRL) {
+ oled_write_P(on_off_1, false);
+ } else if (modifiers & MOD_MASK_SHIFT) {
+ oled_write_P(off_on_1, false);
+ } else {
+ oled_write_P(off_off_1, false);
+ }
+
+ if (modifiers & MOD_MASK_SHIFT) {
+ oled_write_P(shift_on_1, false);
+ } else {
+ oled_write_P(shift_off_1, false);
+ }
+
+ if (modifiers & MOD_MASK_CTRL) {
+ oled_write_P(ctrl_on_2, false);
+ } else {
+ oled_write_P(ctrl_off_2, false);
+ }
+
+ if (modifiers & MOD_MASK_CTRL & MOD_MASK_SHIFT) {
+ oled_write_P(on_on_2, false);
+ } else if (modifiers & MOD_MASK_CTRL) {
+ oled_write_P(on_off_2, false);
+ } else if (modifiers & MOD_MASK_SHIFT) {
+ oled_write_P(off_on_2, false);
+ } else {
+ oled_write_P(off_off_2, false);
+ }
+
+ if (modifiers & MOD_MASK_SHIFT) {
+ oled_write_P(shift_on_2, false);
+ } else {
+ oled_write_P(shift_off_2, false);
+ }
+}
+
+void render_logo(void) {
+ static const char PROGMEM kimiko_logo[] = {0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0};
+ oled_advance_page(false);
+ oled_advance_page(false);
+ oled_write_P(kimiko_logo, false);
+ // oled_write_P(PSTR("Kimiko"), false);
+}
+
+void render_layer_state(void) {
+ static const char PROGMEM default_layer[] = {0x20, 0x94, 0x95, 0x96, 0x20, 0x20, 0xb4, 0xb5, 0xb6, 0x20, 0x20, 0xd4, 0xd5, 0xd6, 0x20, 0};
+ static const char PROGMEM raise_layer[] = {0x20, 0x97, 0x98, 0x99, 0x20, 0x20, 0xb7, 0xb8, 0xb9, 0x20, 0x20, 0xd7, 0xd8, 0xd9, 0x20, 0};
+ static const char PROGMEM lower_layer[] = {0x20, 0x9a, 0x9b, 0x9c, 0x20, 0x20, 0xba, 0xbb, 0xbc, 0x20, 0x20, 0xda, 0xdb, 0xdc, 0x20, 0};
+ static const char PROGMEM adjust_layer[] = {0x20, 0x9d, 0x9e, 0x9f, 0x20, 0x20, 0xbd, 0xbe, 0xbf, 0x20, 0x20, 0xdd, 0xde, 0xdf, 0x20, 0};
+
+ if (layer_state_is(_ADJUST)) {
+ oled_write_P(adjust_layer, false);
+ } else if (layer_state_is(_LOWER)) {
+ oled_write_P(lower_layer, false);
+ } else if (layer_state_is(_RAISE)) {
+ oled_write_P(raise_layer, false);
+ } else {
+ oled_write_P(default_layer, false);
+ }
+}
+
+void render_status_main(void) {
+ render_logo();
+ oled_advance_page(false);
+ render_layer_state();
+ oled_advance_page(false);
+ render_mod_status_gui_alt(get_mods() | get_oneshot_mods());
+ render_mod_status_ctrl_shift(get_mods() | get_oneshot_mods());
+}
+
+bool oled_task_kb(void) {
+ if (!oled_task_user()) {
+ return false;
+ }
+
+ if (is_keyboard_master()) {
+ render_status_main(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+ } else {
+ render_logo();
+ }
+
+ return true;
+}
+# endif // OLED_ENABLE
diff --git a/keyboards/keycapsss/kimiko/rev2/rules.mk b/keyboards/keycapsss/kimiko/rev2/rules.mk
new file mode 100644
index 00000000000..7d895c7f4df
--- /dev/null
+++ b/keyboards/keycapsss/kimiko/rev2/rules.mk
@@ -0,0 +1 @@
+# File is left intentionally blank
diff --git a/keyboards/keycapsss/kimiko/rules.mk b/keyboards/keycapsss/kimiko/rules.mk
index 7aeacb46d0b..cb9f69d6bbe 100644
--- a/keyboards/keycapsss/kimiko/rules.mk
+++ b/keyboards/keycapsss/kimiko/rules.mk
@@ -1,15 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-
-DEFAULT_FOLDER = keycapsss/kimiko/rev1
+DEFAULT_FOLDER = keycapsss/kimiko/rev2
diff --git a/keyboards/kk/65/info.json b/keyboards/kk/65/info.json
new file mode 100644
index 00000000000..49c52eec804
--- /dev/null
+++ b/keyboards/kk/65/info.json
@@ -0,0 +1,111 @@
+{
+ "manufacturer": "Kory Hicks",
+ "keyboard_name": "KK65",
+ "maintainer": "apricity-spam",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["D2", "D1", "D0", "D3", "D6", "C6", "B0", "C7", "F7", "E6", "F0", "F1", "F4", "F5", "F6"],
+ "rows": ["D7", "B4", "B5", "B6", "B7"]
+ },
+ "processor": "atmega32u4",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0001",
+ "vid": "0x6B6B"
+ },
+ "community_layouts": ["65_ansi"],
+ "layouts": {
+ "LAYOUT_65_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/kk/65/keymaps/default/config.h b/keyboards/kk/65/keymaps/default/config.h
new file mode 100644
index 00000000000..97fad80ee0d
--- /dev/null
+++ b/keyboards/kk/65/keymaps/default/config.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Kory Hicks (@apricity-spam)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Adjust value for number of taps required to toggle layer change */
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/kk/65/keymaps/default/keymap.c b/keyboards/kk/65/keymaps/default/keymap.c
new file mode 100644
index 00000000000..19f0e5d914d
--- /dev/null
+++ b/keyboards/kk/65/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backsp │Ins│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │Del│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │Hme│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │End│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+ * │Ctrl│GUI │Alt │ │Alt│GUI│TT1│ ← │ ↓ │ → │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+ */
+ [0] = LAYOUT_65_ansi(
+ 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_BSPC, KC_INS,
+ 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_BSLS, 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_HOME,
+ KC_LSFT, 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_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, TT(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_65_ansi(
+ 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_VOLU,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
diff --git a/keyboards/kk/65/keymaps/via/config.h b/keyboards/kk/65/keymaps/via/config.h
new file mode 100644
index 00000000000..97fad80ee0d
--- /dev/null
+++ b/keyboards/kk/65/keymaps/via/config.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Kory Hicks (@apricity-spam)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Adjust value for number of taps required to toggle layer change */
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/kk/65/keymaps/via/keymap.c b/keyboards/kk/65/keymaps/via/keymap.c
new file mode 100644
index 00000000000..19f0e5d914d
--- /dev/null
+++ b/keyboards/kk/65/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backsp │Ins│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │Del│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │Hme│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │End│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+ * │Ctrl│GUI │Alt │ │Alt│GUI│TT1│ ← │ ↓ │ → │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+ */
+ [0] = LAYOUT_65_ansi(
+ 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_BSPC, KC_INS,
+ 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_BSLS, 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_HOME,
+ KC_LSFT, 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_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, TT(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_65_ansi(
+ 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_VOLU,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
diff --git a/keyboards/kk/65/keymaps/via/rules.mk b/keyboards/kk/65/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/kk/65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kk/65/readme.md b/keyboards/kk/65/readme.md
new file mode 100644
index 00000000000..6c8f1ee396f
--- /dev/null
+++ b/keyboards/kk/65/readme.md
@@ -0,0 +1,27 @@
+# KK65
+
+
+
+The KK65 is a hot-swappable 68-key keyboard designed and manufactured in the USA.
+
+* Keyboard Maintainer: [Kory Hicks](https://github.com/apricity-spam)
+* Hardware Supported: KK65 PCB, ATMega32u4
+* Hardware Availability: Coming soon!
+
+Make example for this keyboard (after setting up your build environment):
+
+ make kk/65:default
+
+Flashing example for this keyboard:
+
+ make kk/65:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kk/65/rules.mk b/keyboards/kk/65/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/kk/65/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/kopibeng/tgr_lena/info.json b/keyboards/kopibeng/tgr_lena/info.json
index 91a385be2f8..2460b04a5a1 100644
--- a/keyboards/kopibeng/tgr_lena/info.json
+++ b/keyboards/kopibeng/tgr_lena/info.json
@@ -13,6 +13,11 @@
"nkro": true,
"rgb_matrix": true
},
+ "indicators": {
+ "caps_lock": "A2",
+ "num_lock": "A3",
+ "scroll_lock": "A1"
+ },
"matrix_pins": {
"cols": ["B10", "A8", "A7", "B15", "A6", "B14", "A4", "C15", "B9", "C14", "B8", "C13", "B7", "B6", "B5", "B3", "B4", "A15"],
"rows": ["B12", "B13", "A5", "B0", "B1"]
diff --git a/keyboards/lime/rev1/config.h b/keyboards/lime/rev1/config.h
index ec2c0613722..a87c01b9387 100644
--- a/keyboards/lime/rev1/config.h
+++ b/keyboards/lime/rev1/config.h
@@ -16,11 +16,6 @@
#pragma once
-/* joystick support */
-#ifdef JOYSTICK_ENABLE
-# define JOYSTICK_AXIS_COUNT 2
-# define JOYSTICK_BUTTON_COUNT 1
-# define JOYSTICK_AXIS_RESOLUTION 8
-#endif
+#define JOYSTICK_BUTTON_COUNT 1
#define SPLIT_USB_DETECT
diff --git a/keyboards/mechlovin/zed1800/config.h b/keyboards/mechlovin/zed1800/config.h
new file mode 100644
index 00000000000..9bfc776bcb4
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2022 Mechlovin'
+
+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 .
+*/
+
+#pragma once
+
+#define WEAR_LEVELING_BACKING_SIZE 4096
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
diff --git a/keyboards/mechlovin/zed1800/info.json b/keyboards/mechlovin/zed1800/info.json
new file mode 100644
index 00000000000..a3d862fa8c1
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/info.json
@@ -0,0 +1,39 @@
+{
+ "manufacturer": "Mechlovin Studio",
+ "url": "",
+ "maintainer": "Mechlovin' Studio",
+ "usb": {
+ "vid": "0x4D4C",
+ "device_version": "0.0.1"
+ },
+ "indicators": {
+ "caps_lock": "C14",
+ "num_lock": "C15"
+ },
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "rgblight": true,
+ "audio": false
+ },
+ "rgblight": {
+ "sleep": true,
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ }
+ }
+}
diff --git a/keyboards/mechlovin/zed1800/oreum/config.h b/keyboards/mechlovin/zed1800/oreum/config.h
new file mode 100644
index 00000000000..e9e3ce09ca1
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/oreum/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2022 Mechlovin'
+
+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 .
+*/
+
+#pragma once
+
+#define RGBLIGHT_LAYERS
diff --git a/keyboards/mechlovin/zed1800/oreum/info.json b/keyboards/mechlovin/zed1800/oreum/info.json
new file mode 100644
index 00000000000..4a15f61ce49
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/oreum/info.json
@@ -0,0 +1,368 @@
+{
+ "keyboard_name": "ZED1800-Oreum",
+ "usb": {
+ "pid": "0x1802"
+ },
+ "matrix_pins": {
+ "cols": ["A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"],
+ "rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
+ },
+ "diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 6
+ },
+ "ws2812": {
+ "pin": "A15"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5},
+ {"matrix": [1, 14], "x": 14, "y": 1.5},
+ {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+ {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [3, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+ {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+ {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+ {"matrix": [4, 14], "x": 15.25, "y": 3.5},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+ {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+ {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4.75},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.5},
+ {"matrix": [5, 10], "x": 11, "y": 5.5},
+ {"matrix": [5, 11], "x": 12, "y": 5.5},
+ {"matrix": [5, 15], "x": 16.5, "y": 5.5},
+ {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 19.5, "y": 5.5},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.75},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.75}
+ ]
+ },
+ "LAYOUT_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+ {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+ {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [3, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+ {"matrix": [3, 18], "x": 19.5, "y": 2.5, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [4, 14], "x": 15.25, "y": 3.5},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+ {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4.75},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.5},
+ {"matrix": [5, 10], "x": 11, "y": 5.5},
+ {"matrix": [5, 11], "x": 12, "y": 5.5},
+ {"matrix": [5, 15], "x": 16.5, "y": 5.5, "w": 2},
+ {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.75},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.75}
+ ]
+ },
+ "LAYOUT_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+ {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+ {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+ {"matrix": [3, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+ {"matrix": [3, 18], "x": 19.5, "y": 2.5, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+ {"matrix": [4, 14], "x": 15.25, "y": 3.5},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+ {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4.75},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.5},
+ {"matrix": [5, 10], "x": 11, "y": 5.5},
+ {"matrix": [5, 11], "x": 12, "y": 5.5},
+ {"matrix": [5, 15], "x": 16.5, "y": 5.5, "w": 2},
+ {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.75},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.75}
+ ]
+ }
+ }
+}
diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c
new file mode 100644
index 00000000000..63cb1b7a27c
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2022 Mechlovin'
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+#define LT1_CAP LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_all(
+ KC_ESC, 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_F13, KC_PSCR, KC_F9, KC_F10, KC_F11, KC_F12,
+ KC_GRV, 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_INS, KC_NUM, KC_SLSH, KC_ASTR, 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_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS,
+ LT1_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_SPC, KC_ENT, KC_END, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_SPC, KC_SPC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_P0, KC_P0, KC_PDOT, KC_PENT, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+};
diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c
new file mode 100644
index 00000000000..5a0492241dd
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c
@@ -0,0 +1,29 @@
+/* Copyright 2022 Mechlovin'
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+#define LT1_CAP LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_ESC, 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_F13, KC_PSCR, KC_F9, KC_F10, KC_F11, KC_F12, //19
+ KC_GRV, 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_INS, KC_NUM, KC_SLSH, KC_ASTR, KC_MINS, //20
+ 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_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, //19
+ LT1_CAP, 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_END, KC_P4, KC_P5, KC_P6, KC_PPLS, //19
+ 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_P1, KC_P2, KC_P3, KC_PEQL, //18
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_P0, KC_PDOT, KC_PENT //14
+ ),
+};
diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/via/rules.mk b/keyboards/mechlovin/zed1800/oreum/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/oreum/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed1800/oreum/readme.md b/keyboards/mechlovin/zed1800/oreum/readme.md
new file mode 100644
index 00000000000..3858b9b564a
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/oreum/readme.md
@@ -0,0 +1,27 @@
+# Oreum
+
+
+
+A PCB for Oreum Keyboard, base on ZED1800 PCB
+
+* Keyboard Maintainer: [mechlovin](https://github.com/mechlovin)
+* Hardware Supported: The Oreum Keyboard, APM32F103
+* Hardware Availability: [Reddit GB](https://www.reddit.com/r/MechanicalKeyboards/comments/xjqddx/gb_oreum_cp_gb_has_started/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/zed1800/oreum:default
+
+Flashing example for this keyboard:
+
+ make mechlovin/zed1800/oreum:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/mechlovin/zed1800/oreum/rules.mk b/keyboards/mechlovin/zed1800/oreum/rules.mk
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/keyboards/mechlovin/zed1800/readme.md b/keyboards/mechlovin/zed1800/readme.md
new file mode 100644
index 00000000000..e11c81d6076
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/readme.md
@@ -0,0 +1,26 @@
+# ZED1800
+
+
+A platform design for Mechlovin' 1800-layout PCBs.
+
+* Keyboard Maintainer: [mechlovin](https://github.com/mechlovin)
+* Hardware Supported: APM32F103
+* Hardware Availability: [Mechlovin' Studio](https://mechlovin.studio)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/zed1800:default
+
+Flashing example for this keyboard:
+
+ make mechlovin/zed1800:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/mechlovin/zed1800/rules.mk b/keyboards/mechlovin/zed1800/rules.mk
new file mode 100644
index 00000000000..d007da3fa20
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mechlovin/zed1800/saber
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed1800/saber/config.h b/keyboards/mechlovin/zed1800/saber/config.h
new file mode 100644
index 00000000000..e9e3ce09ca1
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/saber/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2022 Mechlovin'
+
+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 .
+*/
+
+#pragma once
+
+#define RGBLIGHT_LAYERS
diff --git a/keyboards/mechlovin/zed1800/saber/info.json b/keyboards/mechlovin/zed1800/saber/info.json
new file mode 100644
index 00000000000..d921d95a950
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/saber/info.json
@@ -0,0 +1,358 @@
+{
+ "keyboard_name": "ZED1800-Saber1800",
+ "usb": {
+ "pid": "0x1803"
+ },
+ "matrix_pins": {
+ "cols": ["A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"],
+ "rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
+ },
+ "rgblight": {
+ "led_count": 6
+ },
+ "ws2812": {
+ "pin": "B15"
+ },
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+ {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+ {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [3, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+ {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+ {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+ {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2}
+
+ ]
+ },
+ "LAYOUT_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+ {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+ {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+ {"matrix": [3, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+ {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+ {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+ {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5},
+ {"matrix": [1, 14], "x": 14, "y": 1.5},
+ {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+ {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [3, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+ {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+ {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+ {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.5},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+ {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+
+ {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 19.5, "y": 5.5},
+
+ {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.75}
+ ]
+ }
+ }
+}
diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c
new file mode 100644
index 00000000000..5c151e7933b
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/*
+Copyright 2022 Mechlovin'
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+#define LT1_CAP LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_ansi(
+ KC_ESC, 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_PSCR, KC_HOME, KC_END, KC_PGUP, KC_PGDN, //18
+ KC_GRV, 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_PGUP, KC_NUM, KC_SLSH, KC_ASTR, KC_MINS, //19
+ 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_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, //19
+ LT1_CAP, 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_P4, KC_P5, KC_P6, KC_PPLS, //17
+ KC_LSFT, 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_P1, KC_P2, KC_P3, //16
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT //12
+ ),
+
+};
diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c
new file mode 100644
index 00000000000..86b00e31de8
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c
@@ -0,0 +1,30 @@
+/* Copyright 2022 Mechlovin'
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+#define LT1_CAP LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_ansi(
+ KC_ESC, 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_PSCR, KC_HOME, KC_END, KC_PGUP, KC_PGDN, //18
+ KC_GRV, 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_PGUP, KC_NUM, KC_SLSH, KC_ASTR, KC_MINS, //19
+ 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_BSLS, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, //19
+ LT1_CAP, 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_P4, KC_P5, KC_P6, KC_PPLS, //17
+ KC_LSFT, 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_P1, KC_P2, KC_P3, //16
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT //12
+ ),
+
+};
diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/via/rules.mk b/keyboards/mechlovin/zed1800/saber/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/saber/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed1800/saber/readme.md b/keyboards/mechlovin/zed1800/saber/readme.md
new file mode 100644
index 00000000000..739df1a319e
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/saber/readme.md
@@ -0,0 +1,27 @@
+# Saber1800
+
+
+
+A PCB for Saber1800 Keyboard, base on ZED1800 PCB
+
+* Keyboard Maintainer: [mechlovin](https://github.com/mechlovin)
+* Hardware Supported: The Saber1800 Keyboard, APM32F103
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/zed1800/saber:default
+
+Flashing example for this keyboard:
+
+ make mechlovin/zed1800/saber:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/mechlovin/zed1800/saber/rules.mk b/keyboards/mechlovin/zed1800/saber/rules.mk
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/keyboards/mechlovin/zed1800/zed1800.c b/keyboards/mechlovin/zed1800/zed1800.c
new file mode 100644
index 00000000000..e86b4d5a5a8
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zed1800.c
@@ -0,0 +1,39 @@
+/* Copyright 2022 Mechlovin' Studio
+ *
+ * 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 .
+ */
+
+#include "quantum.h"
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN});
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN});
+const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN});
+
+// Now define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] =
+RGBLIGHT_LAYERS_LIST(
+ my_capslock_layer,
+ my_numlock_layer,
+ my_scroll_layer
+ );
+void keyboard_post_init_kb(void) {
+ rgblight_layers = my_rgb_layers;
+}
+// Activate rgb layer for caps when capslock is enabled
+bool led_update_kb(led_t led_state) {
+ rgblight_set_layer_state(0, led_state.caps_lock);
+ rgblight_set_layer_state(1, led_state.num_lock);
+ rgblight_set_layer_state(2, led_state.scroll_lock);
+ return true;
+}
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed1800/zepsody/config.h b/keyboards/mechlovin/zed1800/zepsody/config.h
new file mode 100644
index 00000000000..e9e3ce09ca1
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zepsody/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2022 Mechlovin'
+
+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 .
+*/
+
+#pragma once
+
+#define RGBLIGHT_LAYERS
diff --git a/keyboards/mechlovin/zed1800/zepsody/info.json b/keyboards/mechlovin/zed1800/zepsody/info.json
new file mode 100644
index 00000000000..dab92b26d7e
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zepsody/info.json
@@ -0,0 +1,388 @@
+{
+ "keyboard_name": "ZED1800-Zepsody",
+ "usb": {
+ "pid": "0x1801"
+ },
+ "matrix_pins": {
+ "cols": ["A10", "A9", "A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+ "rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
+ },
+ "diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 6
+ },
+ "ws2812": {
+ "pin": "B15"
+ },
+ "indicators": {
+ "scroll_lock": "C13"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6, "y": 0},
+ {"matrix": [0, 6], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [0, 14], "x": 16, "y": 0},
+ {"matrix": [0, 16], "x": 18, "y": 0},
+ {"matrix": [0, 17], "x": 19, "y": 0},
+ {"matrix": [0, 18], "x": 20, "y": 0},
+ {"matrix": [0, 19], "x": 21, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+ {"matrix": [1, 13], "x": 13.5, "y": 1.5},
+ {"matrix": [1, 14], "x": 14.5, "y": 1.5},
+ {"matrix": [1, 15], "x": 15.5, "y": 1.5},
+ {"matrix": [0, 15], "x": 16.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 18, "y": 1.5},
+ {"matrix": [1, 17], "x": 19, "y": 1.5},
+ {"matrix": [1, 18], "x": 20, "y": 1.5},
+ {"matrix": [1, 19], "x": 21, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 3], "x": 4, "y": 2.5},
+ {"matrix": [2, 4], "x": 5, "y": 2.5},
+ {"matrix": [2, 5], "x": 6, "y": 2.5},
+ {"matrix": [2, 6], "x": 7, "y": 2.5},
+ {"matrix": [2, 7], "x": 8, "y": 2.5},
+ {"matrix": [2, 8], "x": 9, "y": 2.5},
+ {"matrix": [2, 9], "x": 10, "y": 2.5},
+ {"matrix": [2, 10], "x": 11, "y": 2.5},
+ {"matrix": [2, 11], "x": 12, "y": 2.5},
+ {"matrix": [2, 12], "x": 13, "y": 2.5},
+ {"matrix": [2, 13], "x": 14, "y": 2.5},
+ {"matrix": [2, 14], "x": 15, "y": 2.5},
+ {"matrix": [2, 15], "x": 16, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 16], "x": 18, "y": 2.5},
+ {"matrix": [2, 17], "x": 19, "y": 2.5},
+ {"matrix": [2, 18], "x": 20, "y": 2.5},
+ {"matrix": [2, 19], "x": 21, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.5, "w": 1.25},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+ {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+ {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+ {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+ {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+ {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+ {"matrix": [3, 10], "x": 11.25, "y": 3.5},
+ {"matrix": [3, 11], "x": 12.25, "y": 3.5},
+ {"matrix": [3, 12], "x": 13.25, "y": 3.5},
+ {"matrix": [3, 13], "x": 14.25, "y": 3.5},
+ {"matrix": [3, 14], "x": 15.25, "y": 3.5},
+ {"matrix": [3, 15], "x": 16.25, "y": 3.5, "w": 1.25 },
+ {"matrix": [3, 16], "x": 18, "y": 3.5},
+ {"matrix": [3, 17], "x": 19, "y": 3.5},
+ {"matrix": [3, 18], "x": 20, "y": 3.5},
+ {"matrix": [3, 19], "x": 21, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+ {"matrix": [4, 1], "x": 1, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.75, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.75, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.75, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.75, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.75, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.75, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.75, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.75, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.75, "y": 4.5},
+ {"matrix": [4, 13], "x": 13.75, "y": 4.5},
+ {"matrix": [4, 14], "x": 14.75, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 15], "x": 16.75, "y": 4.75},
+ {"matrix": [4, 16], "x": 18, "y": 4.5},
+ {"matrix": [4, 17], "x": 19, "y": 4.5},
+ {"matrix": [4, 18], "x": 20, "y": 4.5},
+ {"matrix": [4, 19], "x": 21, "y": 4.5},
+
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5},
+ {"matrix": [5, 1], "x": 1, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 4], "x": 5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 8], "x": 6.25, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 13], "x": 14, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 14], "x": 15.75, "y": 5.75},
+ {"matrix": [5, 15], "x": 16.75, "y": 5.75},
+ {"matrix": [5, 16], "x": 17.75, "y": 5.75},
+ {"matrix": [5, 17], "x": 19, "y": 5.5},
+ {"matrix": [5, 18], "x": 20, "y": 5.5},
+ {"matrix": [5, 19], "x": 21, "y": 5.5}
+
+ ]
+ },
+ "LAYOUT_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6, "y": 0},
+ {"matrix": [0, 6], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [0, 14], "x": 16, "y": 0},
+ {"matrix": [0, 16], "x": 18, "y": 0},
+ {"matrix": [0, 17], "x": 19, "y": 0},
+ {"matrix": [0, 18], "x": 20, "y": 0},
+ {"matrix": [0, 19], "x": 21, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+ {"matrix": [1, 13], "x": 13.5, "y": 1.5},
+ {"matrix": [1, 14], "x": 14.5, "y": 1.5},
+ {"matrix": [1, 15], "x": 15.5, "y": 1.5, "w": 2},
+ {"matrix": [1, 16], "x": 18, "y": 1.5},
+ {"matrix": [1, 17], "x": 19, "y": 1.5},
+ {"matrix": [1, 18], "x": 20, "y": 1.5},
+ {"matrix": [1, 19], "x": 21, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 3], "x": 4, "y": 2.5},
+ {"matrix": [2, 4], "x": 5, "y": 2.5},
+ {"matrix": [2, 5], "x": 6, "y": 2.5},
+ {"matrix": [2, 6], "x": 7, "y": 2.5},
+ {"matrix": [2, 7], "x": 8, "y": 2.5},
+ {"matrix": [2, 8], "x": 9, "y": 2.5},
+ {"matrix": [2, 9], "x": 10, "y": 2.5},
+ {"matrix": [2, 10], "x": 11, "y": 2.5},
+ {"matrix": [2, 11], "x": 12, "y": 2.5},
+ {"matrix": [2, 12], "x": 13, "y": 2.5},
+ {"matrix": [2, 13], "x": 14, "y": 2.5},
+ {"matrix": [2, 14], "x": 15, "y": 2.5},
+ {"matrix": [2, 15], "x": 16, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 16], "x": 18, "y": 2.5},
+ {"matrix": [2, 17], "x": 19, "y": 2.5},
+ {"matrix": [2, 18], "x": 20, "y": 2.5},
+ {"matrix": [3, 19], "x": 21, "y": 2.5, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.5, "w": 1.25},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+ {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+ {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+ {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+ {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+ {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+ {"matrix": [3, 10], "x": 11.25, "y": 3.5},
+ {"matrix": [3, 11], "x": 12.25, "y": 3.5},
+ {"matrix": [3, 12], "x": 13.25, "y": 3.5},
+ {"matrix": [3, 13], "x": 14.25, "y": 3.5},
+ {"matrix": [3, 15], "x": 15.25, "y": 3.5, "w": 2.25},
+ {"matrix": [3, 16], "x": 18, "y": 3.5},
+ {"matrix": [3, 17], "x": 19, "y": 3.5},
+ {"matrix": [3, 18], "x": 20, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+ {"matrix": [4, 1], "x": 1, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.75, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.75, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.75, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.75, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.75, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.75, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.75, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.75, "y": 4.5},
+ {"matrix": [4, 13], "x": 13.75, "y": 4.5},
+ {"matrix": [4, 14], "x": 14.75, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 15], "x": 16.75, "y": 4.75},
+ {"matrix": [4, 16], "x": 18, "y": 4.5},
+ {"matrix": [4, 17], "x": 19, "y": 4.5},
+ {"matrix": [4, 18], "x": 20, "y": 4.5},
+ {"matrix": [5, 19], "x": 21, "y": 4.5, "h": 2},
+
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5},
+ {"matrix": [5, 1], "x": 1, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 4], "x": 5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 8], "x": 6.25, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 13], "x": 14, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 14], "x": 15.75, "y": 5.75},
+ {"matrix": [5, 15], "x": 16.75, "y": 5.75},
+ {"matrix": [5, 16], "x": 17.75, "y": 5.75},
+ {"matrix": [5, 17], "x": 19, "y": 5.5},
+ {"matrix": [5, 18], "x": 20, "y": 5.5}
+
+ ]
+ },
+ "LAYOUT_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6, "y": 0},
+ {"matrix": [0, 6], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [0, 14], "x": 16, "y": 0},
+ {"matrix": [0, 16], "x": 18, "y": 0},
+ {"matrix": [0, 17], "x": 19, "y": 0},
+ {"matrix": [0, 18], "x": 20, "y": 0},
+ {"matrix": [0, 19], "x": 21, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+ {"matrix": [1, 13], "x": 13.5, "y": 1.5},
+ {"matrix": [1, 14], "x": 14.5, "y": 1.5},
+ {"matrix": [1, 15], "x": 15.5, "y": 1.5, "w": 2},
+ {"matrix": [1, 16], "x": 18, "y": 1.5},
+ {"matrix": [1, 17], "x": 19, "y": 1.5},
+ {"matrix": [1, 18], "x": 20, "y": 1.5},
+ {"matrix": [1, 19], "x": 21, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 3], "x": 4, "y": 2.5},
+ {"matrix": [2, 4], "x": 5, "y": 2.5},
+ {"matrix": [2, 5], "x": 6, "y": 2.5},
+ {"matrix": [2, 6], "x": 7, "y": 2.5},
+ {"matrix": [2, 7], "x": 8, "y": 2.5},
+ {"matrix": [2, 8], "x": 9, "y": 2.5},
+ {"matrix": [2, 9], "x": 10, "y": 2.5},
+ {"matrix": [2, 10], "x": 11, "y": 2.5},
+ {"matrix": [2, 11], "x": 12, "y": 2.5},
+ {"matrix": [2, 12], "x": 13, "y": 2.5},
+ {"matrix": [2, 13], "x": 14, "y": 2.5},
+ {"matrix": [2, 14], "x": 15, "y": 2.5},
+ {"matrix": [3, 15], "x": 16.25, "y": 2.5, "w": 1.25, "h": 2},
+ {"matrix": [2, 16], "x": 18, "y": 2.5},
+ {"matrix": [2, 17], "x": 19, "y": 2.5},
+ {"matrix": [2, 18], "x": 20, "y": 2.5},
+ {"matrix": [3, 19], "x": 21, "y": 2.5, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.5, "w": 1.25},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+ {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+ {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+ {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+ {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+ {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+ {"matrix": [3, 10], "x": 11.25, "y": 3.5},
+ {"matrix": [3, 11], "x": 12.25, "y": 3.5},
+ {"matrix": [3, 12], "x": 13.25, "y": 3.5},
+ {"matrix": [3, 13], "x": 14.25, "y": 3.5},
+ {"matrix": [3, 14], "x": 15.25, "y": 3.5},
+ {"matrix": [3, 16], "x": 18, "y": 3.5},
+ {"matrix": [3, 17], "x": 19, "y": 3.5},
+ {"matrix": [3, 18], "x": 20, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+ {"matrix": [4, 1], "x": 1, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.75, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.75, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.75, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.75, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.75, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.75, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.75, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.75, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.75, "y": 4.5},
+ {"matrix": [4, 13], "x": 13.75, "y": 4.5},
+ {"matrix": [4, 14], "x": 14.75, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 15], "x": 16.75, "y": 4.75},
+ {"matrix": [4, 16], "x": 18, "y": 4.5},
+ {"matrix": [4, 17], "x": 19, "y": 4.5},
+ {"matrix": [4, 18], "x": 20, "y": 4.5},
+ {"matrix": [5, 19], "x": 21, "y": 4.5, "h": 2},
+
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5},
+ {"matrix": [5, 1], "x": 1, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 4], "x": 5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 8], "x": 6.25, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 13], "x": 14, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 14], "x": 15.75, "y": 5.75},
+ {"matrix": [5, 15], "x": 16.75, "y": 5.75},
+ {"matrix": [5, 16], "x": 17.75, "y": 5.75},
+ {"matrix": [5, 17], "x": 19, "y": 5.5},
+ {"matrix": [5, 18], "x": 20, "y": 5.5}
+
+ ]
+ }
+ }
+}
diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c
new file mode 100644
index 00000000000..8d1be55c138
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2022 Mechlovin'
+
+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 .
+*/
+
+#include QMK_KEYBOARD_H
+
+#define LT1_CAP LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_ESC, 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_HOME, KC_END, KC_PGUP, KC_PGDN,
+ KC_TRNS, KC_TRNS, KC_GRV, 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_NUM, KC_PSLS, KC_ASTR, KC_PMNS,
+ KC_TRNS, KC_TRNS, 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_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
+ KC_TRNS, KC_TRNS, LT1_CAP, 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_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_TRNS, KC_TRNS, 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_P1, KC_P2, KC_P3, KC_PENT,
+ KC_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PEQL
+ ),
+
+};
diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c
new file mode 100644
index 00000000000..bb579ec5da6
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c
@@ -0,0 +1,29 @@
+/* Copyright 2022 Mechlovin'
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+#define LT1_CAP LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_ESC, 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_HOME, KC_END, KC_PGUP, KC_PGDN,
+ KC_TRNS, KC_TRNS, KC_GRV, 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_NUM, KC_PSLS, KC_ASTR, KC_PMNS,
+ KC_TRNS, KC_TRNS, 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_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
+ KC_TRNS, KC_TRNS, LT1_CAP, 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_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_TRNS, KC_TRNS, 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_P1, KC_P2, KC_P3, KC_PENT,
+ KC_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PEQL
+ ),
+};
diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/via/rules.mk b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed1800/zepsody/readme.md b/keyboards/mechlovin/zed1800/zepsody/readme.md
new file mode 100644
index 00000000000..261b74abfde
--- /dev/null
+++ b/keyboards/mechlovin/zed1800/zepsody/readme.md
@@ -0,0 +1,27 @@
+# Zepsody
+
+
+
+A PCB for Saber1800 Keyboard, base on ZED1800 PCB
+
+* Keyboard Maintainer: [mechlovin](https://github.com/mechlovin)
+* Hardware Supported: The Zepsody Keyboard, APM32F103
+* Hardware Availability: [GH IC](https://geekhack.org/index.php?topic=118275.0)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/zed1800/zepsody:default
+
+Flashing example for this keyboard:
+
+ make mechlovin/zed1800/zepsody:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/mechlovin/zed1800/zepsody/rules.mk b/keyboards/mechlovin/zed1800/zepsody/rules.mk
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/keyboards/meetlab/rena/config.h b/keyboards/meetlab/rena/config.h
new file mode 100644
index 00000000000..ef8715e3842
--- /dev/null
+++ b/keyboards/meetlab/rena/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#define WS2812_PWM_DRIVER PWMD2
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_DMA_CHANNEL 2
diff --git a/keyboards/meetlab/rena/halconf.h b/keyboards/meetlab/rena/halconf.h
new file mode 100644
index 00000000000..76f44ff900a
--- /dev/null
+++ b/keyboards/meetlab/rena/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next
diff --git a/keyboards/meetlab/rena/info.json b/keyboards/meetlab/rena/info.json
new file mode 100644
index 00000000000..cf28f6d5f03
--- /dev/null
+++ b/keyboards/meetlab/rena/info.json
@@ -0,0 +1,117 @@
+{
+ "manufacturer": "meet_lab",
+ "keyboard_name": "Rena",
+ "maintainer": "yuezp",
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B7", "B13", "B6", "A15"],
+ "rows": ["B5", "B4", "B3", "B14", "A1"]
+ },
+ "rgblight": {
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ },
+ "brightness_steps": 10,
+ "default": {
+ "animation": "rainbow_swirl"
+ },
+ "layers": {
+ "enabled": true,
+ "override_rgb": false
+ },
+ "led_count": 1,
+ "saturation_steps": 8
+ },
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0xAB06",
+ "vid": "0xBA60"
+ },
+ "ws2812": {
+ "driver": "pwm",
+ "pin": "A2"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "!", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "@", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "#", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "$", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "%", "matrix": [0, 5], "x": 5.5, "y": 0},
+ {"label": "^", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "&", "matrix": [0, 7], "x": 7.5, "y": 0},
+ {"label": "*", "matrix": [0, 8], "x": 8.5, "y": 0},
+ {"label": "(", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": ")", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "_", "matrix": [0, 11], "x": 11.75, "y": 0},
+ {"label": "+", "matrix": [0, 12], "x": 12.75, "y": 0},
+ {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 0},
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.25},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.25},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.25},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.25},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.25},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.25},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.25},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.25},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.25},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.25},
+ {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.25},
+ {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.25},
+ {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.25},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.25},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"label": "k90", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2.25, "w": 2.25},
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+ {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3.25},
+ {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3.25},
+ {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3.25},
+ {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3.25},
+ {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3.25},
+ {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3.25},
+ {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3.25},
+ {"label": "<", "matrix": [3, 8], "x": 9.25, "y": 3.25},
+ {"label": ">", "matrix": [3, 9], "x": 10.25, "y": 3.25},
+ {"label": "?", "matrix": [3, 10], "x": 11.25, "y": 3.25},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3.25, "w": 1.75},
+ {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3.25},
+ {"label": "Win", "matrix": [4, 1], "x": 1.625, "y": 4.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.625, "y": 4.25, "w": 1.5},
+ {"label": "Space", "matrix": [4, 6], "x": 4.375, "y": 4.5, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 10.875, "y": 4.25, "w": 1.5},
+ {"label": "Ctrl", "matrix": [4, 12], "x": 12.375, "y": 4.25}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/meetlab/rena/keymaps/default/keymap.c b/keyboards/meetlab/rena/keymaps/default/keymap.c
new file mode 100644
index 00000000000..72339aa130b
--- /dev/null
+++ b/keyboards/meetlab/rena/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS,
+ 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_LCTL, 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_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_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI),
+
+
+[1] = LAYOUT(
+ KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/meetlab/rena/keymaps/via/keymap.c b/keyboards/meetlab/rena/keymaps/via/keymap.c
new file mode 100644
index 00000000000..72339aa130b
--- /dev/null
+++ b/keyboards/meetlab/rena/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS,
+ 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_LCTL, 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_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_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI),
+
+
+[1] = LAYOUT(
+ KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/meetlab/rena/keymaps/via/rules.mk b/keyboards/meetlab/rena/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/meetlab/rena/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/meetlab/rena/matrix_diagram.md b/keyboards/meetlab/rena/matrix_diagram.md
new file mode 100644
index 00000000000..c671421bff0
--- /dev/null
+++ b/keyboards/meetlab/rena/matrix_diagram.md
@@ -0,0 +1,17 @@
+# Matrix Diagram for Rena
+
+```
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐
+│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘
+┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3C │3D │
+└─────┬──┴─┬─┴───┼───┴───┴───┴───┴───┴───┴─┬─┴───┼────┬─┴───┘
+ │41 │42 │┌───────────────────────┐│4A │4C │
+ └────┴─────┘│46 │└─────┴────┘
+ └───────────────────────┘
+```
\ No newline at end of file
diff --git a/keyboards/meetlab/rena/mcuconf.h b/keyboards/meetlab/rena/mcuconf.h
new file mode 100644
index 00000000000..206afe376eb
--- /dev/null
+++ b/keyboards/meetlab/rena/mcuconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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 .
+ */
+
+#pragma once
+#include_next
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
diff --git a/keyboards/meetlab/rena/readme.md b/keyboards/meetlab/rena/readme.md
new file mode 100644
index 00000000000..3941525d74c
--- /dev/null
+++ b/keyboards/meetlab/rena/readme.md
@@ -0,0 +1,27 @@
+# Rena - PCB
+
+
+
+A 59 keys keyboard with rgb.
+This keyboard use 8mhz HSE and STM32F103 as MCU.
+
+* Keyboard Maintainer: https://github.com/LXF-YZP
+* Hardware Supported: Rena PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+ make meetlab/rena:default
+
+Flashing example for this keyboard:
+
+ make meetlab/rena:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/meetlab/rena/rena.c b/keyboards/meetlab/rena/rena.c
new file mode 100644
index 00000000000..b84903d56ff
--- /dev/null
+++ b/keyboards/meetlab/rena/rena.c
@@ -0,0 +1,40 @@
+/* Copyright 2022 LXF-YZP(yuezp)
+ *
+ * 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 .
+ */
+
+#include "quantum.h"
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0, 1, HSV_GREEN}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+ my_capslock_layer
+);
+
+bool led_update_kb(led_t led_state) {
+ if (!led_update_user(led_state)) { return false; }
+ rgblight_set_layer_state(0, led_state.caps_lock);
+ return true;
+}
+
+void keyboard_post_init_kb(void) {
+ rgblight_layers = my_rgb_layers;
+ keyboard_post_init_user();
+}
+
+#endif
diff --git a/keyboards/meetlab/rena/rules.mk b/keyboards/meetlab/rena/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/meetlab/rena/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mntre_v3/info.json b/keyboards/mntre_v3/info.json
new file mode 100644
index 00000000000..eeef7575ff1
--- /dev/null
+++ b/keyboards/mntre_v3/info.json
@@ -0,0 +1,120 @@
+{
+ "keyboard_name": "MNT Reform Keyboard 3.0",
+ "manufacturer": "MNT Research GmbH",
+ "url": "https://shop.mntre.com/products/mnt-reform-keyboard-30",
+ "maintainer": "Habibmuhd",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1302",
+ "device_version": "0.0.2"
+ },
+ "matrix_pins": {
+ "cols": ["D5", "F7", "E6", "C7", "B3", "B2", "B1", "B0", "F0", "F1", "F4", "F5", "F6", "C6"],
+ "rows": ["B6", "B5", "B4", "D7", "D6", "D4"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B7",
+ "max_brightness": 84
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "backlight": true,
+ "oled": true
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4},
+ {"matrix": [4, 5], "x": 5.5, "y": 4},
+ {"matrix": [4, 6], "x": 6.5, "y": 4},
+ {"matrix": [4, 7], "x": 7.5, "y": 4},
+ {"matrix": [4, 8], "x": 8.5, "y": 4},
+ {"matrix": [4, 9], "x": 9.5, "y": 4},
+ {"matrix": [4, 10], "x": 10.5, "y": 4},
+ {"matrix": [4, 11], "x": 11.5, "y": 4},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 2], "x": 3, "y": 5, "w": 1.5},
+ {"matrix": [5, 3], "x": 4.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 4], "x": 6, "y": 5,"w": 2},
+ {"matrix": [5, 5], "x": 7, "y": 5,"w": 1.5},
+ {"matrix": [5, 6], "x": 8, "y": 5},
+ {"matrix": [5, 7], "x": 9.5, "y": 5},
+ {"matrix": [5, 8], "x": 10.5, "y": 5},
+ {"matrix": [5, 9], "x": 11.5, "y": 5},
+ {"matrix": [5, 10], "x": 12.5, "y": 5,"w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/mntre_v3/keymaps/default/keymap.c b/keyboards/mntre_v3/keymaps/default/keymap.c
new file mode 100644
index 00000000000..1f62bae851a
--- /dev/null
+++ b/keyboards/mntre_v3/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+// Copyright 2021 Cedric Vincent (@cdc-mkb)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+ _BASE,
+ _FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Base */
+ [_BASE] = LAYOUT(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(_FN),
+ KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, 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_LBRC, KC_RBRC, KC_BSLS,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOTE, KC_ENTER,
+ KC_LSFT, KC_DEL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_UP, KC_RSFT,
+ KC_RGUI, KC_LGUI, KC_LALT, KC_SPACE, KC_SPACE, KC_SPACE, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+ ),
+
+ [_FN] = LAYOUT(
+ _______, BL_DOWN, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+};
diff --git a/keyboards/mntre_v3/keymaps/default/readme.md b/keyboards/mntre_v3/keymaps/default/readme.md
new file mode 100644
index 00000000000..417feacb38c
--- /dev/null
+++ b/keyboards/mntre_v3/keymaps/default/readme.md
@@ -0,0 +1,21 @@
+# Default layout of MNT Reform USB Keyboard 3.0 (Standalone)
+
+This is exactly the same layout as in the original firmware.
+Backlight level can be decreased and increased using Fn+F1 and Fn+F2
+respectively.
+
+ ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+ ┃ Esc │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │ Fn ┃
+ ┠──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────────┨
+ ┃ `~ │ 1! │ 2@ │ 3# │ 4$ │ 5% │ 6^ │ 7& │ 8* │ 9( │ 0) │ -_ │ =+ │ Backspace┃
+ ┠──────┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──────┨
+ ┃ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [{ │ ]} │ \| ┃
+ ┠──────────┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──────┨
+ ┃ LCtrl │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ;: │ '" │ Enter ┃
+ ┠─────────┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───────┨
+ ┃ LShift │ Del │ Z │ X │ C │ V │ B │ N │ M │ ,< │ .> │ /? │ Up │ RShift┃
+ ┠─────────┼──────┴──┬───┴──────┼──────┴──┬───┴──────┴──┬───┴──────┼──────┼──────┼──────┼──────┼───────┨
+ ┃ RGUI │ LGUI │ ALT │ Space │ Space │ Space │ ALT │ RCtrl │ Left │ Down │ Right┃
+ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+
diff --git a/keyboards/mntre_v3/mntre.c b/keyboards/mntre_v3/mntre.c
new file mode 100644
index 00000000000..80ed074c2f0
--- /dev/null
+++ b/keyboards/mntre_v3/mntre.c
@@ -0,0 +1,19 @@
+// Copyright 2021 Cedric Vincent (@cdc-mkb)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+ if (!oled_task_user()) { return false; }
+
+ static const char PROGMEM qmk_logo[] = {
+ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
+ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
+ 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
+ };
+
+ oled_write_P(qmk_logo, false);
+ return true;
+}
+#endif
diff --git a/keyboards/mntre_v3/readme.md b/keyboards/mntre_v3/readme.md
new file mode 100644
index 00000000000..cd07479991e
--- /dev/null
+++ b/keyboards/mntre_v3/readme.md
@@ -0,0 +1,27 @@
+# MNT Reform USB Keyboard (Standalone)
+
+
+
+A compact and slim mechanical keyboard designed for comfort and portability.
+
+* Keyboard QMK port Maintainer: [cdc-mkb](https://github.com/cdc-mkb)
+* Hardware Supported: MNT Reform USB Keyboard (Standalone)
+* Hardware Availability: https://shop.mntre.com/products/mnt-reform-keyboard-30
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mntre_v3:default
+
+Flashing example for this keyboard:
+
+ make mntre_v3: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 "Esc" key and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (default: "Circle" + "R")
+* **Physical reset button**: Remove the keyboard’s frame and toggle the programming DIP switch SW84 on the keyboard to “ON”. Then press the reset button SW83.
diff --git a/keyboards/mntre_v3/rules.mk b/keyboards/mntre_v3/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/mntre_v3/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/moky/moky88/config.h b/keyboards/moky/moky88/config.h
new file mode 100644
index 00000000000..a673a38069c
--- /dev/null
+++ b/keyboards/moky/moky88/config.h
@@ -0,0 +1,19 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* SPI */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+
+/* Flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+
+/* RGB Driver */
+#define AW20216S_CS_PIN_1 D2
+#define AW20216S_CS_PIN_2 B8
+#define AW20216S_EN_PIN_1 B9
+#define AW20216S_EN_PIN_2 B9
diff --git a/keyboards/moky/moky88/halconf.h b/keyboards/moky/moky88/halconf.h
new file mode 100644
index 00000000000..0a59a1fcb8e
--- /dev/null
+++ b/keyboards/moky/moky88/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next
diff --git a/keyboards/moky/moky88/info.json b/keyboards/moky/moky88/info.json
new file mode 100644
index 00000000000..79d5373ea86
--- /dev/null
+++ b/keyboards/moky/moky88/info.json
@@ -0,0 +1,272 @@
+{
+ "manufacturer": "moky",
+ "keyboard_name": "moky88",
+ "url": "",
+ "processor": "WB32FQ95",
+ "bootloader": "wb32-dfu",
+ "usb": {
+ "device_version": "1.0.0",
+ "vid": "0xBB4F",
+ "pid": "0x0001",
+ "suspend_wakeup_delay": 1000
+ },
+ "diode_direction": "ROW2COL",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "encoder": true
+ },
+ "matrix_pins": {
+ "cols": ["C0", "C1", "C2", "C3", "A6", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "A8", "C4"],
+ "rows": ["A0", "A1", "A2", "A3", "A4", "C13"]
+ },
+ "eeprom": {
+ "wear_leveling": {
+ "backing_size": 4096,
+ "driver": "spi_flash"
+ }
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B6", "pin_b": "B7"}
+ ]
+ },
+ "rgb_matrix": {
+ "driver": "aw20216",
+ "max_brightness": 108,
+ "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,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "rainbow_moving_chevron": 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_fractal": true,
+ "pixel_flow": true,
+ "pixel_rain": 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
+ },
+ "layout": [
+ {"flags": 4, "matrix": [0, 0], "x": 0 , "y": 0},
+ {"flags": 4, "matrix": [0, 1], "x": 14 , "y": 0},
+ {"flags": 4, "matrix": [0, 2], "x": 28 , "y": 0},
+ {"flags": 4, "matrix": [0, 3], "x": 42 , "y": 0},
+ {"flags": 4, "matrix": [0, 4], "x": 56 , "y": 0},
+ {"flags": 4, "matrix": [0, 5], "x": 70 , "y": 0},
+ {"flags": 4, "matrix": [0, 6], "x": 84 , "y": 0},
+ {"flags": 4, "matrix": [0, 7], "x": 98 , "y": 0},
+ {"flags": 4, "matrix": [0, 8], "x": 112, "y": 0},
+ {"flags": 4, "matrix": [0, 9], "x": 126, "y": 0},
+ {"flags": 4, "matrix": [0,10], "x": 140, "y": 0},
+ {"flags": 4, "matrix": [0,11], "x": 154, "y": 0},
+ {"flags": 4, "matrix": [0,12], "x": 168, "y": 0},
+ {"flags": 4, "matrix": [0,13], "x": 182, "y": 0},
+ {"flags": 4, "matrix": [0,14], "x": 196, "y": 0},
+ {"flags": 4, "matrix": [0,15], "x": 210, "y": 0},
+ {"flags": 4, "matrix": [0,16], "x": 224, "y": 0},
+ {"flags": 4, "matrix": [1, 0], "x": 0 , "y": 13},
+ {"flags": 4, "matrix": [1, 1], "x": 14 , "y": 13},
+ {"flags": 4, "matrix": [1, 2], "x": 28 , "y": 13},
+ {"flags": 4, "matrix": [1, 3], "x": 42 , "y": 13},
+ {"flags": 4, "matrix": [1, 4], "x": 56 , "y": 13},
+ {"flags": 4, "matrix": [1, 5], "x": 70 , "y": 13},
+ {"flags": 4, "matrix": [1, 6], "x": 84 , "y": 13},
+ {"flags": 4, "matrix": [1, 7], "x": 98 , "y": 13},
+ {"flags": 4, "matrix": [1, 8], "x": 112, "y": 13},
+ {"flags": 4, "matrix": [1, 9], "x": 126, "y": 13},
+ {"flags": 4, "matrix": [1,10], "x": 140, "y": 13},
+ {"flags": 4, "matrix": [1,11], "x": 154, "y": 13},
+ {"flags": 4, "matrix": [1,12], "x": 168, "y": 13},
+ {"flags": 4, "matrix": [1,13], "x": 182, "y": 13},
+ {"flags": 4, "matrix": [1,14], "x": 196, "y": 13},
+ {"flags": 4, "matrix": [1,15], "x": 210, "y": 13},
+ {"flags": 4, "matrix": [1,16], "x": 224, "y": 13},
+ {"flags": 4, "matrix": [2, 0], "x": 0 , "y": 26},
+ {"flags": 4, "matrix": [2, 1], "x": 14 , "y": 26},
+ {"flags": 4, "matrix": [2, 2], "x": 28 , "y": 26},
+ {"flags": 4, "matrix": [2, 3], "x": 42 , "y": 26},
+ {"flags": 4, "matrix": [2, 4], "x": 56 , "y": 26},
+ {"flags": 4, "matrix": [2, 5], "x": 70 , "y": 26},
+ {"flags": 4, "matrix": [2, 6], "x": 84 , "y": 26},
+ {"flags": 4, "matrix": [2, 7], "x": 98 , "y": 26},
+ {"flags": 4, "matrix": [2, 8], "x": 112, "y": 26},
+ {"flags": 4, "matrix": [2, 9], "x": 126, "y": 26},
+ {"flags": 4, "matrix": [2,10], "x": 140, "y": 26},
+ {"flags": 4, "matrix": [2,11], "x": 154, "y": 26},
+ {"flags": 4, "matrix": [2,12], "x": 168, "y": 26},
+ {"flags": 4, "matrix": [2,13], "x": 182, "y": 26},
+ {"flags": 4, "matrix": [2,14], "x": 196, "y": 26},
+ {"flags": 4, "matrix": [2,15], "x": 210, "y": 26},
+ {"flags": 4, "matrix": [2,16], "x": 224, "y": 26},
+ {"flags": 4, "matrix": [3, 0], "x": 0 , "y": 39},
+ {"flags": 4, "matrix": [3, 1], "x": 14 , "y": 39},
+ {"flags": 4, "matrix": [3, 2], "x": 28 , "y": 39},
+ {"flags": 4, "matrix": [3, 3], "x": 42 , "y": 39},
+ {"flags": 4, "matrix": [3, 4], "x": 56 , "y": 39},
+ {"flags": 4, "matrix": [3, 5], "x": 70 , "y": 39},
+ {"flags": 4, "matrix": [3, 6], "x": 84 , "y": 39},
+ {"flags": 4, "matrix": [3, 7], "x": 98 , "y": 39},
+ {"flags": 4, "matrix": [3, 8], "x": 112, "y": 39},
+ {"flags": 4, "matrix": [3, 9], "x": 126, "y": 39},
+ {"flags": 4, "matrix": [3,10], "x": 140, "y": 39},
+ {"flags": 4, "matrix": [3,11], "x": 154, "y": 39},
+ {"flags": 4, "matrix": [3,13], "x": 182, "y": 39},
+ {"flags": 4, "matrix": [4, 0], "x": 0 , "y": 52},
+ {"flags": 4, "matrix": [4, 2], "x": 28 , "y": 52},
+ {"flags": 4, "matrix": [4, 3], "x": 42 , "y": 52},
+ {"flags": 4, "matrix": [4, 4], "x": 56 , "y": 52},
+ {"flags": 4, "matrix": [4, 5], "x": 70 , "y": 52},
+ {"flags": 4, "matrix": [4, 6], "x": 84 , "y": 52},
+ {"flags": 4, "matrix": [4, 7], "x": 98 , "y": 52},
+ {"flags": 4, "matrix": [4, 8], "x": 112, "y": 52},
+ {"flags": 4, "matrix": [4, 9], "x": 126, "y": 52},
+ {"flags": 4, "matrix": [4,10], "x": 140, "y": 52},
+ {"flags": 4, "matrix": [4,11], "x": 154, "y": 52},
+ {"flags": 4, "matrix": [4,13], "x": 182, "y": 52},
+ {"flags": 4, "matrix": [4,15], "x": 210, "y": 52},
+ {"flags": 4, "matrix": [5, 0], "x": 0 , "y": 64},
+ {"flags": 4, "matrix": [5, 1], "x": 14 , "y": 64},
+ {"flags": 4, "matrix": [5, 2], "x": 28 , "y": 64},
+ {"flags": 4, "matrix": [5, 6], "x": 84 , "y": 64},
+ {"flags": 4, "matrix": [5,10], "x": 140, "y": 64},
+ {"flags": 4, "matrix": [5,11], "x": 154, "y": 64},
+ {"flags": 4, "matrix": [5,12], "x": 168, "y": 64},
+ {"flags": 4, "matrix": [5,13], "x": 182, "y": 64},
+ {"flags": 4, "matrix": [5,14], "x": 196, "y": 64},
+ {"flags": 4, "matrix": [5,15], "x": 210, "y": 64},
+ {"flags": 4, "matrix": [5,16], "x": 224, "y": 64}
+ ],
+ "sleep": true
+ },
+ "community_layouts": ["tkl_f13_ansi"],
+ "layouts": {
+ "LAYOUT_tkl_f13_ansi": {
+ "layout": [
+ {"matrix": [0,0], "x": 0, "y": 0 },
+ {"matrix": [0,1], "x": 1.5, "y": 0 },
+ {"matrix": [0,2], "x": 2.5, "y": 0 },
+ {"matrix": [0,3], "x": 3.5, "y": 0 },
+ {"matrix": [0,4], "x": 4.5, "y": 0 },
+ {"matrix": [0,5], "x": 5.75, "y": 0 },
+ {"matrix": [0,6], "x": 6.75, "y": 0 },
+ {"matrix": [0,7], "x": 7.75, "y": 0 },
+ {"matrix": [0,8], "x": 8.75, "y": 0 },
+ {"matrix": [0,9], "x": 10, "y": 0 },
+ {"matrix": [0,10], "x": 11, "y": 0 },
+ {"matrix": [0,11], "x": 12, "y": 0 },
+ {"matrix": [0,12], "x": 13, "y": 0 },
+ {"matrix": [0,13], "x": 14.25, "y": 0 },
+ {"matrix": [0,14], "x": 15.75, "y": 0 },
+ {"matrix": [0,15], "x": 16.75, "y": 0 },
+ {"matrix": [0,16], "x": 17.75, "y": 0 },
+ {"matrix": [1,0], "x": 0, "y": 1.25 },
+ {"matrix": [1,1], "x": 1, "y": 1.25 },
+ {"matrix": [1,2], "x": 2, "y": 1.25 },
+ {"matrix": [1,3], "x": 3, "y": 1.25 },
+ {"matrix": [1,4], "x": 4, "y": 1.25 },
+ {"matrix": [1,5], "x": 5, "y": 1.25 },
+ {"matrix": [1,6], "x": 6, "y": 1.25 },
+ {"matrix": [1,7], "x": 7, "y": 1.25 },
+ {"matrix": [1,8], "x": 8, "y": 1.25 },
+ {"matrix": [1,9], "x": 9, "y": 1.25 },
+ {"matrix": [1,10], "x": 10, "y": 1.25 },
+ {"matrix": [1,11], "x": 11, "y": 1.25 },
+ {"matrix": [1,12], "x": 12, "y": 1.25 },
+ {"matrix": [1,13], "x": 13, "y": 1.25, "w": 2.25 },
+ {"matrix": [1,14], "x": 15.75, "y": 1.25 },
+ {"matrix": [1,15], "x": 16.75, "y": 1.25 },
+ {"matrix": [1,16], "x": 17.75, "y": 1.25 },
+ {"matrix": [2,0], "x": 0, "y": 2.25, "w": 1.5 },
+ {"matrix": [2,1], "x": 1.5, "y": 2.25 },
+ {"matrix": [2,2], "x": 2.5, "y": 2.25 },
+ {"matrix": [2,3], "x": 3.5, "y": 2.25 },
+ {"matrix": [2,4], "x": 4.5, "y": 2.25 },
+ {"matrix": [2,5], "x": 5.5, "y": 2.25 },
+ {"matrix": [2,6], "x": 6.5, "y": 2.25 },
+ {"matrix": [2,7], "x": 7.5, "y": 2.25 },
+ {"matrix": [2,8], "x": 8.5, "y": 2.25 },
+ {"matrix": [2,9], "x": 9.5, "y": 2.25 },
+ {"matrix": [2,10], "x": 10.5, "y": 2.25 },
+ {"matrix": [2,11], "x": 11.5, "y": 2.25 },
+ {"matrix": [2,12], "x": 12.5, "y": 2.25 },
+ {"matrix": [2,13], "x": 13.5, "y": 2.25, "w": 1.75 },
+ {"matrix": [2,14], "x": 15.75, "y": 2.25 },
+ {"matrix": [2,15], "x": 16.75, "y": 2.25 },
+ {"matrix": [2,16], "x": 17.75, "y": 2.25 },
+ {"matrix": [3,0], "x": 0, "y": 3.25, "w": 1.75 },
+ {"matrix": [3,1], "x": 1.75, "y": 3.25 },
+ {"matrix": [3,2], "x": 2.75, "y": 3.25 },
+ {"matrix": [3,3], "x": 3.75, "y": 3.25 },
+ {"matrix": [3,4], "x": 4.75, "y": 3.25 },
+ {"matrix": [3,5], "x": 5.75, "y": 3.25 },
+ {"matrix": [3,6], "x": 6.75, "y": 3.25 },
+ {"matrix": [3,7], "x": 7.75, "y": 3.25 },
+ {"matrix": [3,8], "x": 8.75, "y": 3.25 },
+ {"matrix": [3,9], "x": 9.75, "y": 3.25 },
+ {"matrix": [3,10], "x": 10.75, "y": 3.25 },
+ {"matrix": [3,11], "x": 11.75, "y": 3.25 },
+ {"matrix": [3,13], "x": 12.75, "y": 3.25, "w": 2.5 },
+ {"matrix": [4,0], "x": 0, "y": 4.25, "w": 2.25 },
+ {"matrix": [4,2], "x": 2.25, "y": 4.25 },
+ {"matrix": [4,3], "x": 3.25, "y": 4.25 },
+ {"matrix": [4,4], "x": 4.25, "y": 4.25 },
+ {"matrix": [4,5], "x": 5.25, "y": 4.25 },
+ {"matrix": [4,6], "x": 6.25, "y": 4.25 },
+ {"matrix": [4,7], "x": 7.25, "y": 4.25 },
+ {"matrix": [4,8], "x": 8.25, "y": 4.25 },
+ {"matrix": [4,9], "x": 9.25, "y": 4.25 },
+ {"matrix": [4,10], "x": 10.25, "y": 4.25 },
+ {"matrix": [4,11], "x": 11.25, "y": 4.25 },
+ {"matrix": [4,13], "x": 12.25, "y": 4.25, "w": 3 },
+ {"matrix": [4,15], "x": 16.75, "y": 4.25 },
+ {"matrix": [5,0], "x": 0, "y": 5.25, "w": 1.25 },
+ {"matrix": [5,1], "x": 1.25, "y": 5.25, "w": 1.25 },
+ {"matrix": [5,2], "x": 2.5, "y": 5.25, "w": 1.25 },
+ {"matrix": [5,6], "x": 3.75, "y": 5.25, "w": 6.5 },
+ {"matrix": [5,10], "x": 10.25, "y": 5.25, "w": 1.25 },
+ {"matrix": [5,11], "x": 11.5, "y": 5.25, "w": 1.25 },
+ {"matrix": [5,12], "x": 12.75, "y": 5.25, "w": 1.25 },
+ {"matrix": [5,13], "x": 14, "y": 5.25, "w": 1.25 },
+ {"matrix": [5,14], "x": 15.75, "y": 5.25 },
+ {"matrix": [5,15], "x": 16.75, "y": 5.25 },
+ {"matrix": [5,16], "x": 17.75, "y": 5.25 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/moky/moky88/keymaps/default/keymap.c b/keyboards/moky/moky88/keymaps/default/keymap.c
new file mode 100644
index 00000000000..5b86c306cfd
--- /dev/null
+++ b/keyboards/moky/moky88/keymaps/default/keymap.c
@@ -0,0 +1,73 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_tkl_f13_ansi( /* Base */
+ KC_ESC, 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+ KC_GRV, 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_INS, KC_HOME, KC_PGUP,
+ 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_BSLS, KC_DEL, KC_END, KC_PGDN,
+ 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_LSFT, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [1] = LAYOUT_tkl_f13_ansi( /* Base */
+ _______, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+ _______, TO(0), TO(2), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,
+ _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+
+ [2] = LAYOUT_tkl_f13_ansi( /* Base */
+ KC_ESC, KC_BRMD, KC_BRMU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+ KC_GRV, 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_INS, KC_HOME, KC_PGUP,
+ 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_BSLS, KC_DEL, KC_END, KC_PGDN,
+ 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_LSFT, 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(3), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [3] = LAYOUT_tkl_f13_ansi( /* FN */
+ _______, 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+ _______, TO(0), TO(2), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,
+ _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+};
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+
+ [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
+ [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},
+ [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+ [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+};
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+ if (get_highest_layer(default_layer_state | layer_state) == 1) {
+ rgb_matrix_set_color(52, RGB_WHITE);
+ } else if (get_highest_layer(default_layer_state | layer_state) == 3) {
+ rgb_matrix_set_color(53, RGB_WHITE);
+ }
+
+ if (host_keyboard_led_state().caps_lock) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(51, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+ }
+ if (host_keyboard_led_state().scroll_lock) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(15, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+ }
+ if (keymap_config.no_gui) {
+ if (get_highest_layer(default_layer_state) == 0) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(80, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+ } else if (get_highest_layer(default_layer_state) == 2) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(81, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+ }
+ }
+
+ return true;
+}
diff --git a/keyboards/moky/moky88/keymaps/default/rules.mk b/keyboards/moky/moky88/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/moky/moky88/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/moky/moky88/keymaps/via/keymap.c b/keyboards/moky/moky88/keymaps/via/keymap.c
new file mode 100644
index 00000000000..c67ded7b65b
--- /dev/null
+++ b/keyboards/moky/moky88/keymaps/via/keymap.c
@@ -0,0 +1,73 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_tkl_f13_ansi( /* Base */
+ KC_ESC, 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+ KC_GRV, 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_INS, KC_HOME, KC_PGUP,
+ 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_BSLS, KC_DEL, KC_END, KC_PGDN,
+ 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_LSFT, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [1] = LAYOUT_tkl_f13_ansi( /* Base */
+ QK_BOOT, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+ _______, TO(0), TO(2), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,
+ _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+
+ [2] = LAYOUT_tkl_f13_ansi( /* Base */
+ KC_ESC, KC_BRMD, KC_BRMU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+ KC_GRV, 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_INS, KC_HOME, KC_PGUP,
+ 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_BSLS, KC_DEL, KC_END, KC_PGDN,
+ 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_LSFT, 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(3), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [3] = LAYOUT_tkl_f13_ansi( /* FN */
+ QK_BOOT, 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+ _______, TO(0), TO(2), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,
+ _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+};
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+
+ [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
+ [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},
+ [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+ [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+};
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+ if (get_highest_layer(default_layer_state | layer_state) == 1) {
+ rgb_matrix_set_color(52, RGB_WHITE);
+ } else if (get_highest_layer(default_layer_state | layer_state) == 3) {
+ rgb_matrix_set_color(53, RGB_WHITE);
+ }
+
+ if (host_keyboard_led_state().caps_lock) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(51, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+ }
+ if (host_keyboard_led_state().scroll_lock) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(15, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+ }
+ if (keymap_config.no_gui) {
+ if (get_highest_layer(default_layer_state) == 0) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(80, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+ } else if (get_highest_layer(default_layer_state) == 2) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(81, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+ }
+ }
+
+ return true;
+}
diff --git a/keyboards/moky/moky88/keymaps/via/rules.mk b/keyboards/moky/moky88/keymaps/via/rules.mk
new file mode 100644
index 00000000000..715838ecc5d
--- /dev/null
+++ b/keyboards/moky/moky88/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/moky/moky88/mcuconf.h b/keyboards/moky/moky88/mcuconf.h
new file mode 100644
index 00000000000..848f55377e5
--- /dev/null
+++ b/keyboards/moky/moky88/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright (C) 2023 Westberry Technology Corp., Ltd
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#include_next
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
diff --git a/keyboards/moky/moky88/moky88.c b/keyboards/moky/moky88/moky88.c
new file mode 100644
index 00000000000..3cbd6e14681
--- /dev/null
+++ b/keyboards/moky/moky88/moky88.c
@@ -0,0 +1,119 @@
+/* Copyright (C) 2023 Westberry Technology Corp., Ltd
+ *
+ * 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ {0, CS18_SW2, CS17_SW2, CS16_SW2 }, // 0 Esc
+ {0, CS18_SW3, CS17_SW3, CS16_SW3 }, // 1 F1
+ {0, CS18_SW4, CS17_SW4, CS16_SW4 }, // 2 F2
+ {0, CS18_SW5, CS17_SW5, CS16_SW5 }, // 3 F3
+ {0, CS18_SW6, CS17_SW6, CS16_SW6 }, // 4 F4
+ {0, CS18_SW7, CS17_SW7, CS16_SW7 }, // 5 F5
+ {0, CS18_SW8, CS17_SW8, CS16_SW8 }, // 6 F6
+ {0, CS18_SW9, CS17_SW9, CS16_SW9 }, // 7 F7
+ {0, CS18_SW10, CS17_SW10, CS16_SW10 }, // 8 F8
+ {0, CS18_SW11, CS17_SW11, CS16_SW11 }, // 9 F9
+ {0, CS18_SW12, CS17_SW12, CS16_SW12 }, // 10 F10
+ {1, CS18_SW1, CS17_SW1, CS16_SW1 }, // 11 F11
+ {1, CS18_SW2, CS17_SW2, CS16_SW2 }, // 12 F12
+ {1, CS18_SW3, CS17_SW3, CS16_SW3 }, // 13 MUTE
+ {1, CS18_SW4, CS17_SW4, CS16_SW4 }, // 14 PSCR
+ {1, CS18_SW5, CS17_SW5, CS16_SW5 }, // 15 SCRL
+ {1, CS18_SW6, CS17_SW6, CS16_SW6 }, // 16 PAUSE
+
+ {0, CS15_SW2, CS14_SW2, CS13_SW2 }, // 17 `~
+ {0, CS15_SW3, CS14_SW3, CS13_SW3 }, // 18 1
+ {0, CS15_SW4, CS14_SW4, CS13_SW4 }, // 19 2
+ {0, CS15_SW5, CS14_SW5, CS13_SW5 }, // 20 3
+ {0, CS15_SW6, CS14_SW6, CS13_SW6 }, // 21 4
+ {0, CS15_SW7, CS14_SW7, CS13_SW7 }, // 22 5
+ {0, CS15_SW8, CS14_SW8, CS13_SW8 }, // 23 6
+ {0, CS15_SW9, CS14_SW9, CS13_SW9 }, // 24 7
+ {0, CS15_SW10, CS14_SW10, CS13_SW10 }, // 25 8
+ {0, CS15_SW11, CS14_SW11, CS13_SW11 }, // 26 9
+ {0, CS15_SW12, CS14_SW12, CS13_SW12 }, // 27 0
+ {1, CS15_SW1, CS14_SW1, CS13_SW1 }, // 28 -_
+ {1, CS15_SW2, CS14_SW2, CS13_SW2 }, // 29 =+
+ {1, CS15_SW3, CS14_SW3, CS13_SW3 }, // 30 BSPC
+ {1, CS15_SW4, CS14_SW4, CS13_SW4 }, // 31 INS
+ {1, CS15_SW5, CS14_SW5, CS13_SW5 }, // 32 HOME
+ {1, CS15_SW6, CS14_SW6, CS13_SW6 }, // 33 PGUP
+
+ {0, CS12_SW2, CS11_SW2, CS10_SW2 }, // 34 Tab
+ {0, CS12_SW3, CS11_SW3, CS10_SW3 }, // 35 Q
+ {0, CS12_SW4, CS11_SW4, CS10_SW4 }, // 36 W
+ {0, CS12_SW5, CS11_SW5, CS10_SW5 }, // 37 E
+ {0, CS12_SW6, CS11_SW6, CS10_SW6 }, // 38 R
+ {0, CS12_SW7, CS11_SW7, CS10_SW7 }, // 39 T
+ {0, CS12_SW8, CS11_SW8, CS10_SW8 }, // 40 Y
+ {0, CS12_SW9, CS11_SW9, CS10_SW9 }, // 41 U
+ {0, CS12_SW10, CS11_SW10, CS10_SW10 }, // 42 I
+ {0, CS12_SW11, CS11_SW11, CS10_SW11 }, // 43 O
+ {0, CS12_SW12, CS11_SW12, CS10_SW12 }, // 44 P
+ {1, CS12_SW1, CS11_SW1, CS10_SW1 }, // 45 [{
+ {1, CS12_SW2, CS11_SW2, CS10_SW2 }, // 48 ]}
+ {1, CS12_SW3, CS11_SW3, CS10_SW3 }, // 47 \|
+ {1, CS12_SW4, CS11_SW4, CS10_SW4 }, // 48 Del
+ {1, CS12_SW5, CS11_SW5, CS10_SW5 }, // 49 End
+ {1, CS12_SW6, CS11_SW6, CS10_SW6 }, // 50 PGDN
+
+ {0, CS1_SW2, CS2_SW2, CS3_SW2 }, // 51 Caps
+ {0, CS1_SW3, CS2_SW3, CS3_SW3 }, // 52 A
+ {0, CS1_SW4, CS2_SW4, CS3_SW4 }, // 33 S
+ {0, CS1_SW5, CS2_SW5, CS3_SW5 }, // 54 D
+ {0, CS1_SW6, CS2_SW6, CS3_SW6 }, // 55 F
+ {0, CS1_SW7, CS2_SW7, CS3_SW7 }, // 56 G
+ {0, CS1_SW8, CS2_SW8, CS3_SW8 }, // 57 H
+ {0, CS1_SW9, CS2_SW9, CS3_SW9 }, // 58 J
+ {0, CS1_SW10, CS2_SW10, CS3_SW10 }, // 59 K
+ {0, CS1_SW11, CS2_SW11, CS3_SW11 }, // 60 L
+ {0, CS1_SW12, CS2_SW12, CS3_SW12 }, // 61 ;:
+ {1, CS1_SW1, CS2_SW1, CS3_SW1 }, // 62 '
+ {1, CS1_SW3, CS2_SW3, CS3_SW3 }, // 63 Enter
+
+ {0, CS4_SW2, CS5_SW2, CS6_SW2 }, // 64 Shift
+ {0, CS4_SW4, CS5_SW4, CS6_SW4 }, // 65 Z
+ {0, CS4_SW5, CS5_SW5, CS6_SW5 }, // 66 X
+ {0, CS4_SW6, CS5_SW6, CS6_SW6 }, // 67 C
+ {0, CS4_SW7, CS5_SW7, CS6_SW7 }, // 68 V
+ {0, CS4_SW8, CS5_SW8, CS6_SW8 }, // 69 B
+ {0, CS4_SW9, CS5_SW9, CS6_SW9 }, // 70 N
+ {0, CS4_SW10, CS5_SW10, CS6_SW10 }, // 71 M
+ {0, CS4_SW11, CS5_SW11, CS6_SW11 }, // 72 ,<
+ {0, CS4_SW12, CS5_SW12, CS6_SW12 }, // 73 .>
+ {1, CS4_SW1, CS5_SW1, CS6_SW1 }, // 74 ?
+ {1, CS4_SW3, CS5_SW3, CS6_SW3 }, // 75 Shift
+ {1, CS4_SW5, CS5_SW5, CS6_SW5 }, // 76 Up
+
+ {0, CS7_SW2, CS8_SW2, CS9_SW2 }, // 77 Ctrl_L
+ {0, CS7_SW3, CS8_SW3, CS9_SW3 }, // 78 Win_L
+ {0, CS7_SW4, CS8_SW4, CS9_SW4 }, // 79 ALT_L
+ {0, CS7_SW8, CS8_SW8, CS9_SW8 }, // 80 SPACE
+ {0, CS7_SW12, CS8_SW12, CS9_SW12 }, // 81 ALT_L
+ {1, CS7_SW1, CS8_SW1, CS9_SW1 }, // 82 Win_L
+ {1, CS7_SW2, CS8_SW2, CS9_SW2 }, // 83 Fn
+ {1, CS7_SW3, CS8_SW3, CS9_SW3 }, // 84 Ctrl_L
+ {1, CS7_SW4, CS8_SW4, CS9_SW4 }, // 85 Left
+ {1, CS7_SW5, CS8_SW5, CS9_SW5 }, // 86 Down
+ {1, CS7_SW6, CS8_SW6, CS9_SW6 }, // 87 Right
+};
diff --git a/keyboards/moky/moky88/readme.md b/keyboards/moky/moky88/readme.md
new file mode 100644
index 00000000000..62dc876eb2c
--- /dev/null
+++ b/keyboards/moky/moky88/readme.md
@@ -0,0 +1,26 @@
+# moky88
+
+
+An in-switch RGB LED keyboard with RGB underglow.
+
+* Keyboard Maintainer: [Vertor](https://github.com/VertorWang)
+* Hardware Supported: moky88
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+ make moky/moky88:default
+
+Flashing example for this keyboard:
+
+ make moky/moky88:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/moky/moky88/rules.mk b/keyboards/moky/moky88/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/moky/moky88/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/noxary/valhalla_v2/config.h b/keyboards/noxary/valhalla_v2/config.h
new file mode 100644
index 00000000000..627429a6f25
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/config.h
@@ -0,0 +1,22 @@
+/*
+Copyright 2023 Gondolindrim
+
+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 .
+*/
+
+#pragma once
+
+#define BACKLIGHT_PWM_DRIVER PWMD3
+#define BACKLIGHT_PWM_CHANNEL 2
+#define BACKLIGHT_PAL_MODE 2
diff --git a/keyboards/noxary/valhalla_v2/halconf.h b/keyboards/noxary/valhalla_v2/halconf.h
new file mode 100644
index 00000000000..1251bb13acb
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2023 Gondolindrim
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#include_next
diff --git a/keyboards/noxary/valhalla_v2/info.json b/keyboards/noxary/valhalla_v2/info.json
new file mode 100644
index 00000000000..671bd0b775a
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/info.json
@@ -0,0 +1,223 @@
+{
+ "keyboard_name": "Valhalla V2",
+ "manufacturer": "Noxary",
+ "url": "",
+ "maintainer": "Gondolindrim",
+ "usb": {
+ "vid": "0x4E58",
+ "pid": "0x5649",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["C5" , "C4" , "A6" , "A5" , "A4" , "A3" , "B8" , "C2" , "C1" , "C0" , "B4" , "B3" , "D2" , "C12", "C11"],
+ "rows": ["B1" , "B10", "A2" , "A1" , "B0" , "A15", "C10", "B9" , "C3" , "A0"]
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "backlight": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "build": {
+ "lto": true
+ },
+ "eeprom": {
+ "driver": "wear_leveling",
+ "wear_leveling": {
+ "driver": "embedded_flash",
+ "backing_size": 4096
+ }
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F401",
+ "bootloader": "stm32-dfu",
+ "backlight": {
+ "as_caps_lock": true,
+ "driver": "pwm",
+ "levels": 20,
+ "pin": "A7"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+
+ {"label": "6", "matrix": [4, 5], "x": 6, "y": 0},
+ {"label": "7", "matrix": [5, 6], "x": 9, "y": 0},
+ {"label": "8", "matrix": [5, 7], "x": 10, "y": 0},
+ {"label": "9", "matrix": [5, 8], "x": 11, "y": 0},
+ {"label": "0", "matrix": [5, 9], "x": 12, "y": 0},
+ {"label": "-", "matrix": [5, 10], "x": 13, "y": 0},
+ {"label": "=", "matrix": [5, 11], "x": 14, "y": 0},
+ {"label": "Backspace", "matrix": [5, 12], "x": 15, "y": 0},
+ {"label": "Backspace", "matrix": [5, 13], "x": 16, "y": 0},
+ {"label": "Delete", "matrix": [8, 14], "x": 17, "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": [6, 6], "x": 8.5, "y": 1},
+ {"label": "U", "matrix": [6, 7], "x": 9.5, "y": 1},
+ {"label": "I", "matrix": [6, 8], "x": 10.5, "y": 1},
+ {"label": "O", "matrix": [6, 9], "x": 11.5, "y": 1},
+ {"label": "P", "matrix": [6, 10], "x": 12.5, "y": 1},
+ {"label": "[", "matrix": [6, 11], "x": 13.5, "y": 1},
+ {"label": "]", "matrix": [6, 12], "x": 14.5, "y": 1},
+ {"label": "\\", "matrix": [6, 13], "x": 15.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [6, 14], "x": 17, "y": 1},
+
+ {"label": "Caps Lock", "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": [7, 6], "x": 8.75, "y": 2},
+ {"label": "J", "matrix": [7, 7], "x": 9.75, "y": 2},
+ {"label": "K", "matrix": [7, 8], "x": 10.75, "y": 2},
+ {"label": "L", "matrix": [7, 9], "x": 11.75, "y": 2},
+ {"label": ";", "matrix": [7, 10], "x": 12.75, "y": 2},
+ {"label": "'", "matrix": [7, 11], "x": 13.75, "y": 2},
+ {"label": "Enter", "matrix": [7, 12], "x": 14.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [7, 14], "x": 17, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"label": "B", "matrix": [8, 6], "x": 8.25, "y": 3},
+ {"label": "N", "matrix": [8, 7], "x": 9.25, "y": 3},
+ {"label": "M", "matrix": [8, 8], "x": 10.25, "y": 3},
+ {"label": ",", "matrix": [8, 9], "x": 11.25, "y": 3},
+ {"label": ".", "matrix": [8, 10], "x": 12.25, "y": 3},
+ {"label": "/", "matrix": [8, 11], "x": 13.25, "y": 3},
+ {"label": "Shift", "matrix": [8, 12], "x": 14.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [8, 13], "x": 16, "y": 3},
+ {"label": "Fn", "matrix": [9, 14], "x": 17, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.75},
+ {"label": "Space", "matrix": [4, 4], "x": 5.75, "y": 4},
+
+ {"label": "Space", "matrix": [9, 6], "x": 8, "y": 4},
+ {"label": "Space", "matrix": [9, 7], "x": 9, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [9, 8], "x": 10.25, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [9, 9], "x": 11.75, "y": 4},
+ {"label": "Ctrl", "matrix": [9, 10], "x": 12.75, "y": 4, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [9, 11], "x": 15, "y": 4},
+ {"label": "\u2193", "matrix": [9, 12], "x": 16, "y": 4},
+ {"label": "\u2192", "matrix": [9, 13], "x": 17, "y": 4}
+ ]
+ },
+ "LAYOUT_full_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+
+ {"label": "6", "matrix": [4, 5], "x": 6, "y": 0},
+ {"label": "7", "matrix": [5, 6], "x": 9, "y": 0},
+ {"label": "8", "matrix": [5, 7], "x": 10, "y": 0},
+ {"label": "9", "matrix": [5, 8], "x": 11, "y": 0},
+ {"label": "0", "matrix": [5, 9], "x": 12, "y": 0},
+ {"label": "-", "matrix": [5, 10], "x": 13, "y": 0},
+ {"label": "=", "matrix": [5, 11], "x": 14, "y": 0},
+ {"label": "Backspace", "matrix": [5, 12], "x": 15, "y": 0, "w": 2},
+ {"label": "Delete", "matrix": [8, 14], "x": 17, "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": [6, 6], "x": 8.5, "y": 1},
+ {"label": "U", "matrix": [6, 7], "x": 9.5, "y": 1},
+ {"label": "I", "matrix": [6, 8], "x": 10.5, "y": 1},
+ {"label": "O", "matrix": [6, 9], "x": 11.5, "y": 1},
+ {"label": "P", "matrix": [6, 10], "x": 12.5, "y": 1},
+ {"label": "[", "matrix": [6, 11], "x": 13.5, "y": 1},
+ {"label": "]", "matrix": [6, 12], "x": 14.5, "y": 1},
+ {"label": "\\", "matrix": [6, 13], "x": 15.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [6, 14], "x": 17, "y": 1},
+
+ {"label": "Caps Lock", "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": [7, 6], "x": 8.75, "y": 2},
+ {"label": "J", "matrix": [7, 7], "x": 9.75, "y": 2},
+ {"label": "K", "matrix": [7, 8], "x": 10.75, "y": 2},
+ {"label": "L", "matrix": [7, 9], "x": 11.75, "y": 2},
+ {"label": ";", "matrix": [7, 10], "x": 12.75, "y": 2},
+ {"label": "'", "matrix": [7, 11], "x": 13.75, "y": 2},
+ {"label": "Enter", "matrix": [7, 12], "x": 14.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [7, 14], "x": 17, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"label": "B", "matrix": [8, 6], "x": 8.25, "y": 3},
+ {"label": "N", "matrix": [8, 7], "x": 9.25, "y": 3},
+ {"label": "M", "matrix": [8, 8], "x": 10.25, "y": 3},
+ {"label": ",", "matrix": [8, 9], "x": 11.25, "y": 3},
+ {"label": ".", "matrix": [8, 10], "x": 12.25, "y": 3},
+ {"label": "/", "matrix": [8, 11], "x": 13.25, "y": 3},
+ {"label": "Shift", "matrix": [8, 12], "x": 14.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [8, 13], "x": 16, "y": 3},
+ {"label": "Fn", "matrix": [9, 14], "x": 17, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.75},
+ {"label": "Space", "matrix": [4, 4], "x": 5.75, "y": 4},
+
+ {"label": "Space", "matrix": [9, 6], "x": 8, "y": 4},
+ {"label": "Space", "matrix": [9, 7], "x": 9, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [9, 8], "x": 10.25, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [9, 9], "x": 11.75, "y": 4},
+ {"label": "Ctrl", "matrix": [9, 10], "x": 12.75, "y": 4, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [9, 11], "x": 15, "y": 4},
+ {"label": "\u2193", "matrix": [9, 12], "x": 16, "y": 4},
+ {"label": "\u2192", "matrix": [9, 13], "x": 17, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c b/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c
new file mode 100755
index 00000000000..02272b9290e
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2023 Gondolindrim
+
+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 .
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ 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_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_BSLS, KC_PGUP,
+ 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_PGDN,
+ KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP, MO(1) ,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_all(
+ QK_BOOT , 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
diff --git a/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c b/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c
new file mode 100755
index 00000000000..02272b9290e
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2023 Gondolindrim
+
+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 .
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ 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_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_BSLS, KC_PGUP,
+ 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_PGDN,
+ KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP, MO(1) ,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_all(
+ QK_BOOT , 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
diff --git a/keyboards/noxary/valhalla_v2/keymaps/via/rules.mk b/keyboards/noxary/valhalla_v2/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/noxary/valhalla_v2/matrix_diagram.md b/keyboards/noxary/valhalla_v2/matrix_diagram.md
new file mode 100644
index 00000000000..895960ed969
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Noxary Valhalla V2
+
+```
+ ┌───────┐
+ 2u Backspace │5C │
+ └───────┘
+┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │45 │ │56 │57 │58 │59 │5A │5B │5C │5D │8E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│10 │11 │12 │13 │14 │15 │ │66 │67 │68 │69 │6A │6B │6C │6D │6E │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│20 │21 │22 │23 │24 │25 │ │76 │77 │78 │79 │7A │7B │7C │7E │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│30 │31 │32 │33 │34 │35 │ │86 │87 │88 │89 │8A │8B │8C │8D │8E │
+├─────┬──┴┬──┴──┬┴───┴─┬─┴─┬─┘ ┌┴──┬┴───┼───┴─┬─┴─┬─┴───┼──┬───┼───┼───┤
+│40 │41 │42 │43 │44 │ │96 │97 │98 │99 │9A │ │9B │9C │9D │
+└─────┴───┴─────┴──────┴───┘ └───┴────┴─────┴───┴─────┘ └───┴───┴───┘
+ 2.75u ┌──────────┐ ┌────────┐ 2.25u
+ Left Space │44 │ │97 │ Right Space
+ └──────────┘ └────────┘
+```
diff --git a/keyboards/noxary/valhalla_v2/mcuconf.h b/keyboards/noxary/valhalla_v2/mcuconf.h
new file mode 100644
index 00000000000..caa959ced79
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/mcuconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2023 Gondolindrim
+ *
+ * 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 .
+ */
+
+/*
+ * This file was auto-generated by:
+ * `qmk chibios-confmigrate -i keyboards/acheron/arctic/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
diff --git a/keyboards/noxary/valhalla_v2/readme.md b/keyboards/noxary/valhalla_v2/readme.md
new file mode 100644
index 00000000000..afd2dffd60f
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/readme.md
@@ -0,0 +1,32 @@
+# Noxary Valhalla V2
+
+
+
+An ergonomic 65% by Noxary
+
+* Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim)
+* Hardware Supported: proprietary PCB
+* Hardware Availability: group buy ran by Gondolindrim. Closed in february 22, 2024.
+
+
+## How to flash
+
+### Enter bootloader
+
+The DFU state in the bootloader can be accessed in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: press the button on the front of the PCB, next to caps lock, for at least five seconds
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+## Compile firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+ make noxary/valhalla_v2:default
+
+To directly flash the PCB after it is put into a DFU state, use
+
+ make noxary/valhalla_v2: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).
diff --git a/keyboards/noxary/valhalla_v2/rules.mk b/keyboards/noxary/valhalla_v2/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/noxary/valhalla_v2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/rot13labs/rotc0n/info.json b/keyboards/rot13labs/rotc0n/info.json
new file mode 100644
index 00000000000..a9dc27a4714
--- /dev/null
+++ b/keyboards/rot13labs/rotc0n/info.json
@@ -0,0 +1,39 @@
+{
+ "manufacturer": "rot13labs",
+ "keyboard_name": "rotc0n badge",
+ "maintainer": "c0ldbru",
+ "bootloader": "usbasploader",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["C0", "C1", "C2"],
+ "rows": ["B1", "B0"]
+ },
+ "processor": "atmega328p",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0xBEEF",
+ "vid": "0xFEED"
+ },
+ "community_layouts": ["ortho_2x3"],
+ "layouts": {
+ "LAYOUT_ortho_2x3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/rot13labs/rotc0n/keymaps/default/keymap.c b/keyboards/rot13labs/rotc0n/keymaps/default/keymap.c
new file mode 100644
index 00000000000..98de5b727dc
--- /dev/null
+++ b/keyboards/rot13labs/rotc0n/keymaps/default/keymap.c
@@ -0,0 +1,18 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /*
+ * ┌───┬───┬───┐
+ * │ R │ O │ T │
+ * ├───┼───┼───┤
+ * │ C │ 0 │ N │
+ * └───┴───┴───┘
+ */
+ [0] = LAYOUT_ortho_2x3(
+ KC_R, KC_O, KC_T,
+ KC_C, KC_0, KC_N
+ )
+};
diff --git a/keyboards/rot13labs/rotc0n/readme.md b/keyboards/rot13labs/rotc0n/readme.md
new file mode 100644
index 00000000000..895d3b02571
--- /dev/null
+++ b/keyboards/rot13labs/rotc0n/readme.md
@@ -0,0 +1,22 @@
+# rotcon
+
+
+
+rotcon 0 badge - 6 key macropad
+
+* Keyboard Maintainer: [c0ldbru](https://github.com/c0ldbru)
+* Hardware Supported: rotcon badge // atmega328p
+* Hardware Availability: https://goimagine.com/rotcon-0-badge/
+
+Make example for this keyboard (after setting up your build environment):
+
+ make rot13labs/rotc0n: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).
+
+## Bootloader
+
+You can enter the bootloader to flash on new firmware in one of two ways:
+
+* **Bootmagic**: Hold the "R" key (top left key) and hit reset
+* **boot button**: Hold the boot button on the top of the PCB and hit reset
diff --git a/keyboards/rot13labs/rotc0n/rules.mk b/keyboards/rot13labs/rotc0n/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/rot13labs/rotc0n/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/sha/config.h b/keyboards/sha/config.h
new file mode 100644
index 00000000000..f936d7b4737
--- /dev/null
+++ b/keyboards/sha/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Steven Karrmann (@skarrmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
\ No newline at end of file
diff --git a/keyboards/sha/info.json b/keyboards/sha/info.json
new file mode 100644
index 00000000000..8bb4091843a
--- /dev/null
+++ b/keyboards/sha/info.json
@@ -0,0 +1,107 @@
+{
+ "manufacturer": "Steven Karrmann",
+ "keyboard_name": "Sha",
+ "maintainer": "skarrmann",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14"],
+ "rows": ["GP28", "GP4", "GP27", "GP5", "GP26", "GP6", "GP15", "GP7"]
+ },
+ "processor": "RP2040",
+ "rgblight": {
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "rgb_test": true,
+ "alternating": true,
+ "twinkle": true
+ },
+ "default": {
+ "val": 0
+ },
+ "led_count": 25,
+ "max_brightness": 24,
+ "sleep": true
+ },
+ "url": "https://github.com/skarrmann/sha",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0000",
+ "vid": "0xFEED"
+ },
+ "ws2812": {
+ "driver": "vendor",
+ "pin": "GP16"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [1, 1], "x": 8, "y": 0},
+ {"matrix": [1, 2], "x": 9, "y": 0},
+ {"matrix": [1, 3], "x": 10, "y": 0},
+ {"matrix": [1, 4], "x": 11, "y": 0},
+ {"matrix": [1, 5], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [2, 1], "x": 1, "y": 1},
+ {"matrix": [2, 2], "x": 2, "y": 1},
+ {"matrix": [2, 3], "x": 3, "y": 1},
+ {"matrix": [2, 4], "x": 4, "y": 1},
+ {"matrix": [2, 5], "x": 5, "y": 1},
+ {"matrix": [3, 1], "x": 8, "y": 1},
+ {"matrix": [3, 2], "x": 9, "y": 1},
+ {"matrix": [3, 3], "x": 10, "y": 1},
+ {"matrix": [3, 4], "x": 11, "y": 1},
+ {"matrix": [3, 5], "x": 12, "y": 1},
+ {"matrix": [3, 6], "x": 13, "y": 1},
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [4, 1], "x": 1, "y": 2},
+ {"matrix": [4, 2], "x": 2, "y": 2},
+ {"matrix": [4, 3], "x": 3, "y": 2},
+ {"matrix": [4, 4], "x": 4, "y": 2},
+ {"matrix": [4, 5], "x": 5, "y": 2},
+ {"matrix": [5, 1], "x": 8, "y": 2},
+ {"matrix": [5, 2], "x": 9, "y": 2},
+ {"matrix": [5, 3], "x": 10, "y": 2},
+ {"matrix": [5, 4], "x": 11, "y": 2},
+ {"matrix": [5, 5], "x": 12, "y": 2},
+ {"matrix": [5, 6], "x": 13, "y": 2},
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [6, 1], "x": 1, "y": 3},
+ {"matrix": [6, 2], "x": 2, "y": 3},
+ {"matrix": [6, 3], "x": 3, "y": 3},
+ {"matrix": [6, 4], "x": 4, "y": 3},
+ {"matrix": [6, 5], "x": 5, "y": 3},
+ {"matrix": [6, 6], "x": 6, "y": 3},
+ {"matrix": [7, 0], "x": 7, "y": 3},
+ {"matrix": [7, 1], "x": 8, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3},
+ {"matrix": [7, 3], "x": 10, "y": 3},
+ {"matrix": [7, 4], "x": 11, "y": 3},
+ {"matrix": [7, 5], "x": 12, "y": 3},
+ {"matrix": [7, 6], "x": 13, "y": 3}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/sha/keymaps/default/config.h b/keyboards/sha/keymaps/default/config.h
new file mode 100644
index 00000000000..12d21f94ccc
--- /dev/null
+++ b/keyboards/sha/keymaps/default/config.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Steven Karrmann (@skarrmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGBLIGHT_LAYERS
\ No newline at end of file
diff --git a/keyboards/sha/keymaps/default/keymap.c b/keyboards/sha/keymaps/default/keymap.c
new file mode 100644
index 00000000000..f3a2bbf3659
--- /dev/null
+++ b/keyboards/sha/keymaps/default/keymap.c
@@ -0,0 +1,90 @@
+// Copyright 2023 Steven Karrmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+ _QWERTY,
+ _COLEMAK,
+ _SYMBOL,
+ _FUNCTION
+};
+
+#define SYM_TAB LT(_SYMBOL, KC_TAB)
+#define FUN_SPC LT(_FUNCTION, KC_SPC)
+#define QWERTY DF(_QWERTY)
+#define COLEMAK DF(_COLEMAK)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_QWERTY] = LAYOUT(
+ KC_GRV , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS,
+ KC_EQL , 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_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+ KC_LCTL, KC_LALT, KC_LGUI, KC_APP , KC_DEL , SYM_TAB, KC_ESC , KC_ENT , FUN_SPC, KC_BSPC, KC_APP , KC_RGUI, KC_RALT, KC_RCTL
+ ),
+ [_COLEMAK] = LAYOUT(
+ KC_GRV , KC_Q , KC_W , KC_F , KC_P , KC_G , KC_J , KC_L , KC_U , KC_Y , KC_SCLN, KC_MINS,
+ KC_EQL , KC_A , KC_R , KC_S , KC_T , KC_D , KC_H , KC_N , KC_E , KC_I , KC_O , KC_QUOT,
+ KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_K , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+ KC_LCTL, KC_LALT, KC_LGUI, KC_APP , KC_DEL , SYM_TAB, KC_ESC , KC_ENT , FUN_SPC, KC_BSPC, KC_APP , KC_RGUI, KC_RALT, KC_RCTL
+ ),
+ [_SYMBOL] = LAYOUT(
+ KC_TILD, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_UNDS,
+ KC_PLUS, KC_EXLM, KC_LPRN, KC_RPRN, KC_DLR , KC_AMPR, KC_PIPE, KC_HASH, KC_LCBR, KC_RCBR, KC_COLN, KC_DQUO,
+ _______, KC_AT , KC_LBRC, KC_RBRC, KC_BSLS, KC_PERC, KC_CIRC, KC_ASTR, KC_LABK, KC_RABK, KC_QUES, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [_FUNCTION] = LAYOUT(
+ QK_BOOT, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_PSCR, KC_SCRL, KC_HOME, KC_PGDN, KC_PGUP, KC_END , QWERTY ,
+ _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_INS , KC_CAPS, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, COLEMAK,
+ _______, KC_F9 , KC_F10 , KC_F11 , KC_F12 , RGB_TOG, KC_NUM , KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
+
+const rgblight_segment_t PROGMEM rgb_scroll_lock[] = RGBLIGHT_LAYER_SEGMENTS(
+ {6, 3, HSV_BLUE}
+);
+const rgblight_segment_t PROGMEM rgb_caps_lock[] = RGBLIGHT_LAYER_SEGMENTS(
+ {11, 3, HSV_GREEN}
+);
+const rgblight_segment_t PROGMEM rgb_num_lock[] = RGBLIGHT_LAYER_SEGMENTS(
+ {16, 3, HSV_RED}
+);
+const rgblight_segment_t PROGMEM rgb_qwerty[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0, 6, HSV_YELLOW},
+ {9, 2, HSV_YELLOW},
+ {14, 2, HSV_YELLOW},
+ {19, 6, HSV_YELLOW}
+);
+const rgblight_segment_t PROGMEM rgb_colemak[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0, 6, HSV_CYAN},
+ {9, 2, HSV_CYAN},
+ {14, 2, HSV_CYAN},
+ {19, 6, HSV_CYAN}
+);
+
+const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+ rgb_scroll_lock,
+ rgb_caps_lock,
+ rgb_num_lock,
+ rgb_qwerty,
+ rgb_colemak
+);
+
+void keyboard_post_init_user(void) {
+ rgblight_layers = rgb_layers;
+}
+
+bool led_update_user(led_t led_state) {
+ rgblight_set_layer_state(0, led_state.scroll_lock);
+ rgblight_set_layer_state(1, led_state.caps_lock);
+ rgblight_set_layer_state(2, led_state.num_lock);
+ return true;
+}
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+ rgblight_set_layer_state(3, layer_state_cmp(state, _QWERTY));
+ rgblight_set_layer_state(4, layer_state_cmp(state, _COLEMAK));
+ return state;
+}
\ No newline at end of file
diff --git a/keyboards/sha/keymaps/default/readme.md b/keyboards/sha/keymaps/default/readme.md
new file mode 100644
index 00000000000..0ff118c21a2
--- /dev/null
+++ b/keyboards/sha/keymaps/default/readme.md
@@ -0,0 +1,13 @@
+# Sha Default Keymap
+
+The default keymap uses a QWERTY base layout, with a secondary Colemak base layout. Both layouts have symbol placement adjustments on the outer columns, and editing keys and layers on the thumb keys.
+
+There are two extended layers:
+
+* SYMBOL: For typing additional symbols. Activated by layer-tap on the main left thumb key.
+* FUNCTION: For function and navigation keys. Activated by layer-tap on the main right thumb key.
+
+When using a Waveshare RP2040-Matrix, the [RGB Light - Lighting Layers](https://docs.qmk.fm/#/feature_rgblight?id=lighting-layers) feature is used to demonstrate how the 5x5 RGB LEDs can indicate keyboard state. The indicators are:
+
+* Base layer on the outer LED ring: QWERTY = yellow, Colemak = cyan
+* Lock status indicators using the center 3x3 LEDs: Scroll lock = blue, Caps lock = green, Num lock = red
\ No newline at end of file
diff --git a/keyboards/sha/readme.md b/keyboards/sha/readme.md
new file mode 100644
index 00000000000..ac1b1d970c7
--- /dev/null
+++ b/keyboards/sha/readme.md
@@ -0,0 +1,27 @@
+# Sha
+
+
+
+Sha is a 50 key ortholinear keyboard, powered by a Waveshare RP2040-Zero or Waveshare RP2040-Matrix.
+
+* Keyboard Maintainer: [Steven Karrmann](https://github.com/skarrmann)
+* Hardware Supported: Sha PCBs with either RP2040-Zero or RP2040-Matrix
+* Hardware Availability: [Sha GitHub repository](https://github.com/skarrmann/sha)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make sha:default
+
+Flashing example for this keyboard:
+
+ make sha:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key) and plug in the keyboard.
+* **Physical reset button**: Doublet-tap the EN/RESET button on the MCU board.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/sha/rules.mk b/keyboards/sha/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/sha/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/synthlabs/065/info.json b/keyboards/synthlabs/065/info.json
new file mode 100644
index 00000000000..d8d0d96c3f1
--- /dev/null
+++ b/keyboards/synthlabs/065/info.json
@@ -0,0 +1,606 @@
+{
+ "manufacturer": "Synth Labs",
+ "keyboard_name": "065",
+ "maintainer": "hongaaronc",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["GP22", "GP23", "GP24", "GP25", "GP26", "GP27", "GP28", "GP29", "GP15", "GP14", "GP13", "GP12", "GP11", "GP10", "GP9"],
+ "rows": ["GP0", "GP1", "GP21", "GP20", "GP19"]
+ },
+ "processor": "RP2040",
+ "rgb_matrix": {
+ "animations": {
+ "alpha_mods": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_sat": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "band_val": true,
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "cycle_up_down": true,
+ "dual_beacon": true,
+ "gradient_left_right": true,
+ "gradient_up_down": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "jellybean_raindrops": true,
+ "multisplash": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "pixel_rain": true,
+ "rainbow_beacon": true,
+ "rainbow_moving_chevron": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "solid_multisplash": true,
+ "solid_reactive": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_multinexus": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_simple": true,
+ "solid_reactive_wide": true,
+ "solid_splash": true,
+ "splash": true,
+ "typing_heatmap": true
+ },
+ "driver": "ws2812",
+ "sleep": true,
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"x": 11, "y": 0, "flags": 2},
+ {"matrix": [0, 1], "x": 14, "y": 0, "flags": 4},
+ {"x": 26, "y": 0, "flags": 2},
+ {"matrix": [0, 2], "x": 29, "y": 0, "flags": 4},
+ {"x": 41, "y": 0, "flags": 2},
+ {"matrix": [0, 3], "x": 44, "y": 0, "flags": 4},
+ {"x": 56, "y": 0, "flags": 2},
+ {"matrix": [0, 4], "x": 59, "y": 0, "flags": 4},
+ {"x": 70, "y": 0, "flags": 2},
+ {"matrix": [0, 5], "x": 74, "y": 0, "flags": 4},
+ {"x": 85, "y": 0, "flags": 2},
+ {"matrix": [0, 6], "x": 89, "y": 0, "flags": 4},
+ {"x": 100, "y": 0, "flags": 2},
+ {"matrix": [0, 7], "x": 104, "y": 0, "flags": 4},
+ {"x": 115, "y": 0, "flags": 2},
+ {"matrix": [0, 8], "x": 119, "y": 0, "flags": 4},
+ {"x": 130, "y": 0, "flags": 2},
+ {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4},
+ {"x": 145, "y": 0, "flags": 2},
+ {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4},
+ {"x": 160, "y": 0, "flags": 2},
+ {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4},
+ {"x": 175, "y": 0, "flags": 2},
+ {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4},
+ {"x": 194, "y": 0, "flags": 2},
+ {"matrix": [0, 13], "x": 201, "y": 0, "flags": 1},
+ {"x": 216, "y": 0, "flags": 2},
+ {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [1, 14], "x": 224, "y": 16, "flags": 1},
+ {"matrix": [1, 13], "x": 205, "y": 16, "flags": 1},
+ {"matrix": [1, 12], "x": 186, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 171, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 156, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 141, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 126, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 97, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 82, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 67, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 52, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 37, "y": 16, "flags": 4},
+ {"matrix": [1, 1], "x": 22, "y": 16, "flags": 4},
+ {"matrix": [1, 0], "x": 3, "y": 16, "flags": 1},
+ {"matrix": [2, 0], "x": 5, "y": 32, "flags": 1},
+ {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 70, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 85, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 100, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 115, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 130, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 145, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4},
+ {"matrix": [2, 11], "x": 175, "y": 32, "flags": 4},
+ {"matrix": [2, 13], "x": 199, "y": 32, "flags": 1},
+ {"matrix": [2, 14], "x": 224, "y": 32, "flags": 1},
+ {"matrix": [3, 14], "x": 224, "y": 48, "flags": 1},
+ {"matrix": [3, 13], "x": 209, "y": 48, "flags": 1},
+ {"matrix": [3, 12], "x": 188, "y": 48, "flags": 1},
+ {"matrix": [3, 11], "x": 168, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 153, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 138, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 123, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 108, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 93, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 78, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 63, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 33, "y": 48, "flags": 4},
+ {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
+ {"matrix": [4, 0], "x": 1, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 20, "y": 64, "flags": 1},
+ {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
+ {"matrix": [4, 5], "x": 74, "y": 64, "flags": 4},
+ {"matrix": [4, 7], "x": 104, "y": 64, "flags": 4},
+ {"matrix": [4, 9], "x": 134, "y": 64, "flags": 4},
+ {"matrix": [4, 10], "x": 151, "y": 64, "flags": 1},
+ {"matrix": [4, 11], "x": 169, "y": 64, "flags": 1},
+ {"matrix": [4, 12], "x": 194, "y": 64, "flags": 1},
+ {"matrix": [4, 13], "x": 209, "y": 64, "flags": 1},
+ {"matrix": [4, 14], "x": 224, "y": 64, "flags": 1}
+ ]
+ },
+ "url": "http://065.synthlabs.io",
+ "usb": {
+ "device_version": "0.0.1",
+ "force_nkro": true,
+ "pid": "0x3635",
+ "vid": "0x534E"
+ },
+ "ws2812": {
+ "driver": "vendor",
+ "pin": "GP18"
+ },
+ "community_layouts": [
+ "65_ansi_blocker",
+ "65_ansi_blocker_split_bs",
+ "65_ansi_blocker_tsangan",
+ "65_ansi_blocker_tsangan_split_bs"
+ ],
+ "layouts": {
+ "LAYOUT_65_ansi_blocker": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_split_bs": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [2, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_tsangan": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [2, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_split_bs_lshift_space": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [2, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 3},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 9], "x": 8, "y": 4, "w": 3},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [2, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 7], "x": 6.5, "y": 4},
+ {"matrix": [4, 9], "x": 7.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/synthlabs/065/keymaps/default/keymap.c b/keyboards/synthlabs/065/keymaps/default/keymap.c
new file mode 100644
index 00000000000..d0e0d04cddd
--- /dev/null
+++ b/keyboards/synthlabs/065/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 Aaron Hong (@hongaaronc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_all(
+ 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_DEL, KC_BSPC, KC_HOME,
+ 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_BSLS, KC_PGUP,
+ 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_PGDN,
+ 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_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_all(
+ 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_DEL, _______, _______,
+ _______, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_CAPS, _______, _______,
+ _______, _______, _______, KC_ENT, KC_ENT, KC_ENT, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/synthlabs/065/keymaps/via/keymap.c b/keyboards/synthlabs/065/keymaps/via/keymap.c
new file mode 100644
index 00000000000..d0e0d04cddd
--- /dev/null
+++ b/keyboards/synthlabs/065/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 Aaron Hong (@hongaaronc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_all(
+ 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_DEL, KC_BSPC, KC_HOME,
+ 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_BSLS, KC_PGUP,
+ 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_PGDN,
+ 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_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_all(
+ 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_DEL, _______, _______,
+ _______, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_CAPS, _______, _______,
+ _______, _______, _______, KC_ENT, KC_ENT, KC_ENT, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/synthlabs/065/keymaps/via/rules.mk b/keyboards/synthlabs/065/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/synthlabs/065/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/synthlabs/065/readme.md b/keyboards/synthlabs/065/readme.md
new file mode 100644
index 00000000000..be14a36f053
--- /dev/null
+++ b/keyboards/synthlabs/065/readme.md
@@ -0,0 +1,27 @@
+# Synth Labs 065
+
+
+
+The 065 Keyboard by Synth Labs.
+
+* Keyboard Maintainer: [Nostril](https://github.com/hongaaronc)
+* Hardware Supported: [Synth Labs 065 Soldered + Hotswap PCB](https://github.com/0xCB-dev/SL-065-PCB)
+* Hardware Designer: [0xCB](https://0xcb.dev/)
+* Hardware Availability: Awaiting GB, or order your own parts using [the open-source PCB production files](https://github.com/0xCB-dev/SL-065-PCB)
+
+
+Make example for this keyboard (after setting up your build environment):
+
+ make synthlabs/065:default
+
+Flashing example for this keyboard:
+
+ make synthlabs/065: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).
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the Escape key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/synthlabs/065/rules.mk b/keyboards/synthlabs/065/rules.mk
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/keyboards/theone/info.json b/keyboards/theone/info.json
new file mode 100644
index 00000000000..0f1d8e021cc
--- /dev/null
+++ b/keyboards/theone/info.json
@@ -0,0 +1,253 @@
+{
+ "manufacturer": "github.com/sowbug",
+ "keyboard_name": "Theone",
+ "bootloader": "stm32-dfu",
+ "diode_direction": "COL2ROW",
+ "dynamic_keymap": {
+ "layer_count": 8
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "key_lock": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B3"],
+ "rows": ["C14", "C15", "A0", "A1", "A2", "A3"]
+ },
+ "processor": "STM32F072",
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_sat": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "band_val": true,
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "cycle_up_down": true,
+ "digital_rain": true,
+ "dual_beacon": true,
+ "gradient_left_right": true,
+ "gradient_up_down": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "jellybean_raindrops": true,
+ "multisplash": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "pixel_rain": true,
+ "rainbow_beacon": true,
+ "rainbow_moving_chevron": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "solid_multisplash": true,
+ "solid_reactive": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_multinexus": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_simple": true,
+ "solid_reactive_wide": true,
+ "solid_splash": true,
+ "splash": true,
+ "typing_heatmap": true
+ },
+ "center_point": [112, 30],
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 40, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 50, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 85, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 95, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 110, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 120, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 130, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 140, "y": 0, "flags": 4},
+ {"matrix": [1, 14], "x": 152, "y": 0, "flags": 4},
+ {"matrix": [2, 14], "x": 152, "y": 10, "flags": 4},
+ {"matrix": [1, 13], "x": 130, "y": 10, "flags": 4},
+ {"matrix": [1, 12], "x": 120, "y": 10, "flags": 4},
+ {"matrix": [1, 11], "x": 110, "y": 10, "flags": 4},
+ {"matrix": [1, 10], "x": 100, "y": 10, "flags": 4},
+ {"matrix": [1, 9], "x": 90, "y": 10, "flags": 4},
+ {"matrix": [1, 8], "x": 80, "y": 10, "flags": 4},
+ {"matrix": [1, 7], "x": 70, "y": 10, "flags": 4},
+ {"matrix": [1, 6], "x": 60, "y": 10, "flags": 4},
+ {"matrix": [1, 5], "x": 50, "y": 10, "flags": 4},
+ {"matrix": [1, 4], "x": 40, "y": 10, "flags": 4},
+ {"matrix": [1, 3], "x": 30, "y": 10, "flags": 4},
+ {"matrix": [1, 2], "x": 20, "y": 10, "flags": 4},
+ {"matrix": [1, 1], "x": 10, "y": 10, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 10, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 20, "flags": 4},
+ {"matrix": [2, 1], "x": 15, "y": 20, "flags": 4},
+ {"matrix": [2, 2], "x": 25, "y": 20, "flags": 4},
+ {"matrix": [2, 3], "x": 35, "y": 20, "flags": 4},
+ {"matrix": [2, 4], "x": 45, "y": 20, "flags": 4},
+ {"matrix": [2, 5], "x": 55, "y": 20, "flags": 4},
+ {"matrix": [2, 6], "x": 65, "y": 20, "flags": 4},
+ {"matrix": [2, 7], "x": 75, "y": 20, "flags": 4},
+ {"matrix": [2, 8], "x": 85, "y": 20, "flags": 4},
+ {"matrix": [2, 9], "x": 95, "y": 20, "flags": 4},
+ {"matrix": [2, 10], "x": 105, "y": 20, "flags": 4},
+ {"matrix": [2, 11], "x": 115, "y": 20, "flags": 4},
+ {"matrix": [2, 12], "x": 125, "y": 20, "flags": 4},
+ {"matrix": [2, 13], "x": 135, "y": 20, "flags": 4},
+ {"matrix": [1, 16], "x": 152, "y": 20, "flags": 4},
+ {"matrix": [2, 16], "x": 152, "y": 30, "flags": 4},
+ {"matrix": [3, 13], "x": 127.5, "y": 30, "flags": 4},
+ {"matrix": [3, 11], "x": 117.5, "y": 30, "flags": 4},
+ {"matrix": [3, 10], "x": 107.5, "y": 30, "flags": 4},
+ {"matrix": [3, 9], "x": 97.5, "y": 30, "flags": 4},
+ {"matrix": [3, 8], "x": 87.5, "y": 30, "flags": 4},
+ {"matrix": [3, 7], "x": 77.5, "y": 30, "flags": 4},
+ {"matrix": [3, 6], "x": 67.5, "y": 30, "flags": 4},
+ {"matrix": [3, 5], "x": 57.5, "y": 30, "flags": 4},
+ {"matrix": [3, 4], "x": 47.5, "y": 30, "flags": 4},
+ {"matrix": [3, 3], "x": 37.5, "y": 30, "flags": 4},
+ {"matrix": [3, 2], "x": 27.5, "y": 30, "flags": 4},
+ {"matrix": [3, 1], "x": 17.5, "y": 30, "flags": 4},
+ {"matrix": [3, 0], "x": 0, "y": 30, "flags": 4},
+ {"matrix": [4, 0], "x": 0, "y": 40, "flags": 4},
+ {"matrix": [4, 2], "x": 22.5, "y": 40, "flags": 4},
+ {"matrix": [4, 3], "x": 32.5, "y": 40, "flags": 4},
+ {"matrix": [4, 4], "x": 42.5, "y": 40, "flags": 4},
+ {"matrix": [4, 5], "x": 52.5, "y": 40, "flags": 4},
+ {"matrix": [4, 6], "x": 62.5, "y": 40, "flags": 4},
+ {"matrix": [4, 7], "x": 72.5, "y": 40, "flags": 4},
+ {"matrix": [4, 8], "x": 82.5, "y": 40, "flags": 4},
+ {"matrix": [4, 9], "x": 92.5, "y": 40, "flags": 4},
+ {"matrix": [4, 10], "x": 102.5, "y": 40, "flags": 4},
+ {"matrix": [4, 11], "x": 112.5, "y": 40, "flags": 4},
+ {"matrix": [4, 13], "x": 122.5, "y": 40, "flags": 4},
+ {"matrix": [4, 14], "x": 142, "y": 42, "flags": 4},
+ {"matrix": [5, 15], "x": 152, "y": 52, "flags": 4},
+ {"matrix": [5, 14], "x": 142, "y": 52, "flags": 4},
+ {"matrix": [5, 13], "x": 132, "y": 52, "flags": 4},
+ {"matrix": [5, 12], "x": 120, "y": 50, "flags": 4},
+ {"matrix": [5, 10], "x": 110, "y": 50, "flags": 4},
+ {"matrix": [5, 9], "x": 100, "y": 50, "flags": 4},
+ {"matrix": [5, 6], "x": 37.5, "y": 50, "flags": 4},
+ {"matrix": [5, 2], "x": 25, "y": 50, "flags": 4},
+ {"matrix": [5, 1], "x": 12.5, "y": 50, "flags": 4},
+ {"matrix": [5, 0], "x": 0, "y": 50, "flags": 4}
+ ],
+ "max_brightness": 130,
+ "sleep": true
+ },
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x3249",
+ "vid": "0x49F5"
+ },
+ "ws2812": {
+ "pin": "B9"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+ {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+ {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+ {"label": "Ins", "matrix": [1, 14], "x": 15.2, "y": 0},
+ {"label": "~`", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "!1", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "@2", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "#3", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "$4", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "%5", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "^6", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "&7", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "*8", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "(9", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": ")0", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "_-", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "+=", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "Backsp", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"label": "Del", "matrix": [2, 14], "x": 15.2, "y": 1},
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
+ {"label": "{[", "matrix": [2, 11], "x": 11.5, "y": 2},
+ {"label": "}]", "matrix": [2, 12], "x": 12.5, "y": 2},
+ {"label": "|\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "PageUp", "matrix": [1, 16], "x": 15.2, "y": 2},
+ {"label": "Caps", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
+ {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3},
+ {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3},
+ {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"label": "PageDn", "matrix": [2, 16], "x": 15.2, "y": 3},
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": "<,", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": ">.", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "?/", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 14], "x": 14.2, "y": 4.2},
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"label": "Opt", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"label": "Cmd", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"label": "Cmd", "matrix": [5, 9], "x": 10, "y": 5},
+ {"label": "Fn", "matrix": [5, 10], "x": 11, "y": 5},
+ {"label": "Ctrl", "matrix": [5, 12], "x": 12, "y": 5},
+ {"label": "\u2190", "matrix": [5, 13], "x": 13.2, "y": 5.2},
+ {"label": "\u2193", "matrix": [5, 14], "x": 14.2, "y": 5.2},
+ {"label": "\u2192", "matrix": [5, 15], "x": 15.2, "y": 5.2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/theone/keymaps/default/keymap.c b/keyboards/theone/keymaps/default/keymap.c
new file mode 100644
index 00000000000..cd8f8a51311
--- /dev/null
+++ b/keyboards/theone/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2023 Persama (@Persama)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+// layer Mac
+[0] = LAYOUT(
+ KC_ESC, KC_BRID, KC_BRIU, KC_F3, KC_F4, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,
+ KC_GRV, 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_PGUP,
+ 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_BSLS, KC_PGDN,
+ 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_HOME,
+ KC_LSFT, 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+// layer Mac Fn
+[1] = LAYOUT(
+ _______, 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_INS,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+// layer win
+[2] = LAYOUT(
+ KC_ESC, 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_DEL,
+ KC_GRV, 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_PGUP,
+ 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_BSLS, KC_PGDN,
+ 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_HOME,
+ KC_LSFT, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+// layer win Fn
+[3] = LAYOUT(
+ _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/theone/keymaps/via/keymap.c b/keyboards/theone/keymaps/via/keymap.c
new file mode 100644
index 00000000000..cd8f8a51311
--- /dev/null
+++ b/keyboards/theone/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2023 Persama (@Persama)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+// layer Mac
+[0] = LAYOUT(
+ KC_ESC, KC_BRID, KC_BRIU, KC_F3, KC_F4, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,
+ KC_GRV, 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_PGUP,
+ 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_BSLS, KC_PGDN,
+ 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_HOME,
+ KC_LSFT, 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+// layer Mac Fn
+[1] = LAYOUT(
+ _______, 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_INS,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+// layer win
+[2] = LAYOUT(
+ KC_ESC, 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_DEL,
+ KC_GRV, 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_PGUP,
+ 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_BSLS, KC_PGDN,
+ 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_HOME,
+ KC_LSFT, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(3), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+// layer win Fn
+[3] = LAYOUT(
+ _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DF(0), DF(2), _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/theone/keymaps/via/rules.mk b/keyboards/theone/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/theone/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/theone/readme.md b/keyboards/theone/readme.md
new file mode 100644
index 00000000000..1993bc24505
--- /dev/null
+++ b/keyboards/theone/readme.md
@@ -0,0 +1,23 @@
+# theone
+
+ *theone is a standard 81 key keyboard.*
+
+ * Keyboard Maintainer: [txdyqiang]
+ * Hardware Supported: theone PCB
+ * Hardware Availability: Private
+
+ Make example for this keyboard (after setting up your build environment):
+
+ make theone:default
+
+ Flashing example for this keyboard:
+
+ make theone: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 one way:
+
+ * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
diff --git a/keyboards/theone/rules.mk b/keyboards/theone/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/theone/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/wilba_tech/wt65_h2/info.json b/keyboards/wilba_tech/wt65_h2/info.json
new file mode 100644
index 00000000000..606f66ede26
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_h2/info.json
@@ -0,0 +1,244 @@
+{
+ "manufacturer": "wilba.tech",
+ "keyboard_name": "WT65-H2",
+ "maintainer": "Wilba",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["F0", "F1", "F4", "F6", "F7"]
+ },
+ "processor": "atmega32u4",
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "url": "https://wilba.tech",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x0030",
+ "vid": "0x6582"
+ },
+ "layouts": {
+ "LAYOUT_65_ansi_blocker_wkl": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "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": "Home", "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": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+ {"label": "Ctrl", "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": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"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": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+ {"label": "GUI", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_wkl_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+ {"label": "Home", "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": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+ {"label": "Ctrl", "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": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"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": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+ {"label": "GUI", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+ {"label": "Home", "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": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+ {"label": "Ctrl", "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": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"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": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+ {"label": "GUI", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt65_h2/keymaps/default/keymap.c b/keyboards/wilba_tech/wt65_h2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..9b065bcd1e0
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_h2/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2024 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// Default layout for WT65-H2
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ // Default layer
+ [0] = LAYOUT_all(
+ 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_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_BSPC, KC_PGUP,
+ 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_ENT, KC_PGDN,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
+ KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ // Fn1 Layer
+ [1] = LAYOUT_all(
+ KC_TRNS, 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_INS,
+ KC_CAPS, 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_TRNS, KC_TRNS,
+ KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
diff --git a/keyboards/wilba_tech/wt65_h2/keymaps/via/keymap.c b/keyboards/wilba_tech/wt65_h2/keymaps/via/keymap.c
new file mode 100644
index 00000000000..4fc052443e4
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_h2/keymaps/via/keymap.c
@@ -0,0 +1,4 @@
+// Copyright 2024 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "../default/keymap.c"
diff --git a/keyboards/wilba_tech/wt65_h2/keymaps/via/rules.mk b/keyboards/wilba_tech/wt65_h2/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_h2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/wilba_tech/wt65_h2/matrix_diagram.md b/keyboards/wilba_tech/wt65_h2/matrix_diagram.md
new file mode 100644
index 00000000000..12b4696a40b
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_h2/matrix_diagram.md
@@ -0,0 +1,18 @@
+# Matrix Diagram for wilba.tech WT65-H2
+
+```
+ ┌───────┐
+ 2u Backspace │0D │
+ └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │0E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
+├─────┬──┼───┴─┬─┴───┴───┴───┴───┴───┴───┴─┬─┴───┼──┬───┼───┼───┤
+│40 │ │42 │46 │4B │ │4C │4D │4E │
+└─────┘ └─────┴───────────────────────────┴─────┘ └───┴───┴───┘
+```
diff --git a/keyboards/wilba_tech/wt65_h2/readme.md b/keyboards/wilba_tech/wt65_h2/readme.md
new file mode 100644
index 00000000000..d6de581da23
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_h2/readme.md
@@ -0,0 +1,19 @@
+# wilba.tech WT65-H2
+
+WT65-H2 is a keyboard PCB supporting 65% layout with WKL blockers, hotswap sockets and daughterboard USB-C.
+
+Initially designed for the [Bauer Lite](https://omnitype.com/products/bauer-lite)
+
+- Keyboard Maintainer: [wilba](https://github.com/wilba)
+- Hardware Supported: wilba.tech WT65-H2-BAUERLITE
+- Hardware Availability: [Omnitype](https://omnitype.com/products/bauer-extra-pcb)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make wilba_tech/wt65_h2:default
+
+Flashing example for this keyboard:
+
+ make wilba_tech/wt65_h2: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).
diff --git a/keyboards/wilba_tech/wt65_h2/rules.mk b/keyboards/wilba_tech/wt65_h2/rules.mk
new file mode 100644
index 00000000000..c80812f6e0a
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_h2/rules.mk
@@ -0,0 +1 @@
+# This file is intentionally blank
diff --git a/lib/python/qmk/build_targets.py b/lib/python/qmk/build_targets.py
index 1ab489cec3c..80f587bcc04 100644
--- a/lib/python/qmk/build_targets.py
+++ b/lib/python/qmk/build_targets.py
@@ -6,7 +6,7 @@ from typing import List, Union
from pathlib import Path
from dotty_dict import dotty, Dotty
from milc import cli
-from qmk.constants import QMK_FIRMWARE, INTERMEDIATE_OUTPUT_PREFIX
+from qmk.constants import QMK_FIRMWARE, INTERMEDIATE_OUTPUT_PREFIX, HAS_QMK_USERSPACE, QMK_USERSPACE
from qmk.commands import find_make, get_make_parallel_args, parse_configurator_json
from qmk.keyboard import keyboard_folder
from qmk.info import keymap_json
@@ -118,7 +118,10 @@ class BuildTarget:
self.prepare_build(build_target=build_target, **env_vars)
command = self.compile_command(build_target=build_target, dry_run=True, **env_vars)
from qmk.cli.generate.compilation_database import write_compilation_database # Lazy load due to circular references
- write_compilation_database(command=command, output_path=QMK_FIRMWARE / 'compile_commands.json', skip_clean=skip_clean, **env_vars)
+ output_path = QMK_FIRMWARE / 'compile_commands.json'
+ write_compilation_database(command=command, output_path=output_path, skip_clean=skip_clean, **env_vars)
+ if output_path.exists() and HAS_QMK_USERSPACE:
+ shutil.copy(str(output_path), str(QMK_USERSPACE / 'compile_commands.json'))
def compile(self, build_target: str = None, dry_run: bool = False, **env_vars) -> None:
if self._clean or self._compiledb:
diff --git a/lib/python/qmk/cli/generate/keyboard_h.py b/lib/python/qmk/cli/generate/keyboard_h.py
index b9e89032b9e..5863a0983ad 100755
--- a/lib/python/qmk/cli/generate/keyboard_h.py
+++ b/lib/python/qmk/cli/generate/keyboard_h.py
@@ -33,18 +33,11 @@ def _generate_layouts(keyboard, kb_info_json):
layout_keys = []
layout_matrix = [['KC_NO'] * col_num for _ in range(row_num)]
- for index, key_data in enumerate(layout_data['layout']):
+ for key_data in layout_data['layout']:
row, col = key_data['matrix']
identifier = f'k{ROW_LETTERS[row]}{COL_LETTERS[col]}'
-
if row >= row_num or col >= col_num:
- key_name = key_data.get('label', identifier)
- if row >= row_num:
- cli.log.error(f'{keyboard}/{layout_name}: Matrix row for key {index} ({key_name}) is {row} but must be less than {row_num}')
-
- if col >= col_num:
- cli.log.error(f'{keyboard}/{layout_name}: Matrix column for key {index} ({key_name}) is {col} but must be less than {col_num}')
-
+ cli.log.error(f'Skipping layouts due to {layout_name} containing invalid matrix values')
return []
layout_matrix[row][col] = identifier
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index d51741ecb6e..d42ba5c660f 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -7,7 +7,7 @@ from dotty_dict import dotty
from milc import cli
-from qmk.constants import CHIBIOS_PROCESSORS, LUFA_PROCESSORS, VUSB_PROCESSORS
+from qmk.constants import COL_LETTERS, ROW_LETTERS, CHIBIOS_PROCESSORS, LUFA_PROCESSORS, VUSB_PROCESSORS
from qmk.c_parse import find_layouts, parse_config_h_file, find_led_config
from qmk.json_schema import deep_update, json_load, validate
from qmk.keyboard import config_h, rules_mk
@@ -78,9 +78,11 @@ def _find_invalid_encoder_index(info_data):
return ret
-def _additional_validation(keyboard, info_data):
+def _validate_layouts(keyboard, info_data):
"""Non schema checks
"""
+ col_num = info_data.get('matrix_size', {}).get('cols', 0)
+ row_num = info_data.get('matrix_size', {}).get('rows', 0)
layouts = info_data.get('layouts', {})
layout_aliases = info_data.get('layout_aliases', {})
community_layouts = info_data.get('community_layouts', [])
@@ -90,6 +92,16 @@ def _additional_validation(keyboard, info_data):
if len(layouts) == 0 or all(not layout.get('json_layout', False) for layout in layouts.values()):
_log_error(info_data, 'No LAYOUTs defined! Need at least one layout defined in info.json.')
+ # Make sure all matrix values are in bounds
+ for layout_name, layout_data in layouts.items():
+ for index, key_data in enumerate(layout_data['layout']):
+ row, col = key_data['matrix']
+ key_name = key_data.get('label', f'k{ROW_LETTERS[row]}{COL_LETTERS[col]}')
+ if row >= row_num:
+ _log_error(info_data, f'{layout_name}: Matrix row for key {index} ({key_name}) is {row} but must be less than {row_num}')
+ if col >= col_num:
+ _log_error(info_data, f'{layout_name}: Matrix column for key {index} ({key_name}) is {col} but must be less than {col_num}')
+
# Warn if physical positions are offset (at least one key should be at x=0, and at least one key at y=0)
for layout_name, layout_data in layouts.items():
offset_x = min([_get_key_left_position(k) for k in layout_data['layout']])
@@ -122,12 +134,20 @@ def _additional_validation(keyboard, info_data):
if layout_name not in layouts and layout_name not in layout_aliases:
_log_error(info_data, 'Claims to support community layout %s but no %s() macro found' % (layout, layout_name))
+
+def _validate_keycodes(keyboard, info_data):
+ """Non schema checks
+ """
# keycodes with length > 7 must have short forms for visualisation purposes
for decl in info_data.get('keycodes', []):
if len(decl["key"]) > 7:
if not decl.get("aliases", []):
_log_error(info_data, f'Keycode {decl["key"]} has no short form alias')
+
+def _validate_encoders(keyboard, info_data):
+ """Non schema checks
+ """
# encoder IDs in layouts must be in range and not duplicated
found = _find_invalid_encoder_index(info_data)
for layout_name, encoder_index, reason in found:
@@ -141,7 +161,10 @@ def _validate(keyboard, info_data):
try:
validate(info_data, 'qmk.api.keyboard.v1')
- _additional_validation(keyboard, info_data)
+ # Additional validation
+ _validate_layouts(keyboard, info_data)
+ _validate_keycodes(keyboard, info_data)
+ _validate_encoders(keyboard, info_data)
except jsonschema.ValidationError as e:
json_path = '.'.join([str(p) for p in e.absolute_path])
diff --git a/platforms/chibios/drivers/ws2812_bitbang.c b/platforms/chibios/drivers/ws2812_bitbang.c
index e3b735a1a69..883a845d884 100644
--- a/platforms/chibios/drivers/ws2812_bitbang.c
+++ b/platforms/chibios/drivers/ws2812_bitbang.c
@@ -9,7 +9,11 @@
# if defined(STM32F0XX) || defined(STM32F1XX) || defined(GD32VF103) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX) || defined(WB32F3G71xx) || defined(WB32FQ95xx)
# define NOP_FUDGE 0.4
# else
-# error("NOP_FUDGE configuration required")
+# if defined(RP2040)
+# error "Please use `vendor` WS2812 driver for RP2040"
+# else
+# error "NOP_FUDGE configuration required"
+# endif
# define NOP_FUDGE 1 // this just pleases the compile so the above error is easier to spot
# endif
#endif
diff --git a/quantum/debounce/asym_eager_defer_pk.c b/quantum/debounce/asym_eager_defer_pk.c
index 954d43536c0..b6fcdc3d4e7 100644
--- a/quantum/debounce/asym_eager_defer_pk.c
+++ b/quantum/debounce/asym_eager_defer_pk.c
@@ -18,8 +18,9 @@
*/
/*
-Basic symmetric per-key algorithm. Uses an 8-bit counter per key.
-When no state changes have occured for DEBOUNCE milliseconds, we push the state.
+Asymetric per-key algorithm. After pressing a key, it immediately changes state,
+with no further inputs accepted until DEBOUNCE milliseconds have occurred. After
+releasing a key, that state is pushed after no changes occur for DEBOUNCE milliseconds.
*/
#include "debounce.h"
diff --git a/tmk_core/protocol/report.h b/tmk_core/protocol/report.h
index 3028cf94269..47bc4f2f2bb 100644
--- a/tmk_core/protocol/report.h
+++ b/tmk_core/protocol/report.h
@@ -22,6 +22,10 @@ along with this program. If not, see .
#include "keycode.h"
#include "util.h"
+#ifdef JOYSTICK_ENABLE
+# include "joystick.h"
+#endif
+
// clang-format off
/* HID report IDs */
diff --git a/util/install/fedora.sh b/util/install/fedora.sh
index 03e05a42fec..d3bc90b1765 100755
--- a/util/install/fedora.sh
+++ b/util/install/fedora.sh
@@ -3,6 +3,11 @@
_qmk_install() {
echo "Installing dependencies"
+ . /etc/os-release
+ if [ "$VERSION_ID" == "39" ]; then
+ sudo dnf $SKIP_PROMPT copr enable erovia/dfu-programmer
+ fi
+
# TODO: Check whether devel/headers packages are really needed
sudo dnf $SKIP_PROMPT install \
clang diffutils git gcc glibc-headers kernel-devel kernel-headers \