From ae8abc3bba69991cf4cac51a2e175ce2b8625726 Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Sun, 28 May 2023 15:11:08 +0200
Subject: [PATCH 01/19] [keyboard] Phoenix Project No 1 support
---
keyboards/rico/phoenix_project_no1/config.h | 22 +++
keyboards/rico/phoenix_project_no1/info.json | 132 ++++++++++++++++++
.../keymaps/default/keymap.c | 51 +++++++
.../phoenix_project_no1/keymaps/via/keymap.c | 51 +++++++
.../phoenix_project_no1/keymaps/via/rules.mk | 1 +
keyboards/rico/phoenix_project_no1/readme.md | 34 +++++
keyboards/rico/phoenix_project_no1/rules.mk | 3 +
7 files changed, 294 insertions(+)
create mode 100644 keyboards/rico/phoenix_project_no1/config.h
create mode 100644 keyboards/rico/phoenix_project_no1/info.json
create mode 100644 keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c
create mode 100644 keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c
create mode 100644 keyboards/rico/phoenix_project_no1/keymaps/via/rules.mk
create mode 100644 keyboards/rico/phoenix_project_no1/readme.md
create mode 100644 keyboards/rico/phoenix_project_no1/rules.mk
diff --git a/keyboards/rico/phoenix_project_no1/config.h b/keyboards/rico/phoenix_project_no1/config.h
new file mode 100644
index 000000000000..368e808a1016
--- /dev/null
+++ b/keyboards/rico/phoenix_project_no1/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2023 Eric Becourt (Rico at https://github.com/mymakercorner)
+ *
+ * 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
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
new file mode 100644
index 000000000000..a60fc75640b7
--- /dev/null
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -0,0 +1,132 @@
+{
+ "usb": {
+ "vid": "0x21C0",
+ "pid": "0x9901",
+ "device_version": "1.0.0"
+ },
+ "keyboard_name": "Phoenix Project No 1",
+ "manufacturer": "Rico",
+ "url": "https://github.com/mymakercorner/Phoenix_Project_No1",
+ "maintainer": "Rico",
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "board": "GENERIC_RP_RP2040",
+ "width": 16,
+ "height": 5,
+ "debounce": 5,
+ "features": {
+ "audio": false,
+ "backlight": false,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["GP24", "GP0", "GP14", "GP13", "GP12", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP25", "GP2", "GP1"],
+ "rows": ["GP27", "GP29", "GP19", "GP20", "GP26"]
+ },
+ "rgblight": {
+ "led_count": 16,
+ "pin": "GP28",
+ "hue_steps": 10,
+ "saturation_steps": 17,
+ "brightness_steps": 17,
+ "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
+ }
+ },
+ "bootmagic": {
+ "enabled": true,
+ "matrix": [0, 0]
+ },
+ "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 },
+ { "matrix": [0, 14], "x": 14, "y": 0 },
+ { "matrix": [0, 15], "x": 15, "y": 0 },
+ { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "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], "w": 1.5, "x": 13.5, "y": 1 },
+ { "matrix": [1, 15], "x": 15.0, "y": 1 },
+ { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "matrix": [2, 2], "x": 1.75, "y": 2 },
+ { "matrix": [2, 3], "x": 2.75, "y": 2 },
+ { "matrix": [2, 4], "x": 3.75, "y": 2 },
+ { "matrix": [2, 5], "x": 4.75, "y": 2 },
+ { "matrix": [2, 6], "x": 5.75, "y": 2 },
+ { "matrix": [2, 7], "x": 6.75, "y": 2 },
+ { "matrix": [2, 8], "x": 7.75, "y": 2 },
+ { "matrix": [2, 9], "x": 8.75, "y": 2 },
+ { "matrix": [2, 10], "x": 9.75, "y": 2 },
+ { "matrix": [2, 11], "x": 10.75, "y": 2 },
+ { "matrix": [2, 12], "x": 11.75, "y": 2 },
+ { "matrix": [2, 13], "x": 12.75, "y": 2 },
+ { "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2 },
+ { "matrix": [2, 15], "x": 15.0, "y": 2 },
+ { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+ { "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, 13], "w": 1.75, "x": 12.25, "y": 3 },
+ { "matrix": [3, 14], "x": 14.0, "y": 3 },
+ { "matrix": [3, 15], "x": 15.0, "y": 3 },
+ { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+ { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+ { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+ { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+ { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4 },
+ { "matrix": [4, 12], "w": 1.5, "x": 11.5, "y": 4 },
+ { "matrix": [4, 13], "x": 13.0, "y": 4 },
+ { "matrix": [4, 14], "x": 14.0, "y": 4 },
+ { "matrix": [4, 15], "x": 15.0, "y": 4 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c b/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c
new file mode 100644
index 000000000000..a4d58d9097e0
--- /dev/null
+++ b/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2023 Eric Becourt (Rico at https://github.com/mymakercorner)
+ *
+ * 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
+
+// clang-format off
+
+enum layer_names {
+ _BASE,
+ _FN,
+ _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = 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_NO, 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_NO, KC_ENT, KC_PGDN,
+ KC_LSFT, KC_NO, 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(_FN),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+ ),
+ [_FN] = LAYOUT(
+ RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [_FN2] = LAYOUT(
+ QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
+
+// clang-format on
diff --git a/keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c b/keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c
new file mode 100644
index 000000000000..a4d58d9097e0
--- /dev/null
+++ b/keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2023 Eric Becourt (Rico at https://github.com/mymakercorner)
+ *
+ * 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
+
+// clang-format off
+
+enum layer_names {
+ _BASE,
+ _FN,
+ _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = 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_NO, 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_NO, KC_ENT, KC_PGDN,
+ KC_LSFT, KC_NO, 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(_FN),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+ ),
+ [_FN] = LAYOUT(
+ RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [_FN2] = LAYOUT(
+ QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
+
+// clang-format on
diff --git a/keyboards/rico/phoenix_project_no1/keymaps/via/rules.mk b/keyboards/rico/phoenix_project_no1/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/rico/phoenix_project_no1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/rico/phoenix_project_no1/readme.md b/keyboards/rico/phoenix_project_no1/readme.md
new file mode 100644
index 000000000000..8039d87f88ef
--- /dev/null
+++ b/keyboards/rico/phoenix_project_no1/readme.md
@@ -0,0 +1,34 @@
+# Phoenix Project No 1
+
+
+
+
+This is an open source collection of M65-A keyboard replacement PCBs, available both in solderable and hotswap variants.
+
+* Keyboard Maintainer: [Eric Becourt, aka Rico](https://github.com/mymakercorner)
+* Hardware Supported: Phoenix Project No 1 Type S (solder) and Type H (hotswap)
+* Hardware Availability: hardware is open source, Github repository contains everything to easily have fully assembled PCBs at JLCPCB
+
+More details in Github repository [here](https://github.com/mymakercorner/Phoenix_Project_No1)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make rico/phoenix_project_no1:default
+
+Flashing example for this keyboard:
+
+ make rico/phoenix_project_no1: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
+
+You can enter the bootloader in 5 ways:
+
+* **QMK software ways:**
+ * **Bootmagic reset**: hold down the key at (0,0) in the matrix (the top left key or Escape) and plug in the keyboard
+ * **Keycode in layout**: press the key mapped to `QK_BOOT` that is the top left key or Escape on layer 2
+ * **Physical BOOTSEL button**: double tap the BOOTSEL button
+* **Native RP2040 MCU ways:**
+ * **Physical BOOTSEL and RESET button**: while keyboard is plugged maintain RESET button pressed, press BOOTSEL button then release the RESET button
+ * **Physical RESET button**: maintain RESET button pressed while plugging in the keyboard
diff --git a/keyboards/rico/phoenix_project_no1/rules.mk b/keyboards/rico/phoenix_project_no1/rules.mk
new file mode 100644
index 000000000000..5ee11875f8dc
--- /dev/null
+++ b/keyboards/rico/phoenix_project_no1/rules.mk
@@ -0,0 +1,3 @@
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = rp2040_flash
+WS2812_DRIVER = vendor
From 89ad5bca8bcd5c4fbb113ff304a9b98031b7c8fc Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Sun, 28 May 2023 15:36:29 +0200
Subject: [PATCH 02/19] [update] keyboards/rico/phoenix_project_no1/info.json
Corrected alignment of width, height and debounce fields
Co-authored-by: Ryan
---
keyboards/rico/phoenix_project_no1/info.json | 3 ---
1 file changed, 3 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
index a60fc75640b7..dedbdacbba62 100644
--- a/keyboards/rico/phoenix_project_no1/info.json
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -11,9 +11,6 @@
"processor": "RP2040",
"bootloader": "rp2040",
"board": "GENERIC_RP_RP2040",
- "width": 16,
- "height": 5,
- "debounce": 5,
"features": {
"audio": false,
"backlight": false,
From 2b90e4799b3d80d9af31a50d835def756d078c1d Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Sun, 28 May 2023 15:37:09 +0200
Subject: [PATCH 03/19] [update] keyboards/rico/phoenix_project_no1/info.json
Corrected alignment of bootmagic, enabled and matrix fields
Co-authored-by: Ryan
---
keyboards/rico/phoenix_project_no1/info.json | 4 ----
1 file changed, 4 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
index dedbdacbba62..7978ff1c24ee 100644
--- a/keyboards/rico/phoenix_project_no1/info.json
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -45,10 +45,6 @@
"static_gradient": true,
"twinkle": true
}
- },
- "bootmagic": {
- "enabled": true,
- "matrix": [0, 0]
},
"layouts": {
"LAYOUT": {
From 0dce4246698eaf9b1cbe6927609243c67e37da65 Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Sun, 28 May 2023 18:35:19 +0200
Subject: [PATCH 04/19] [update] keyboards/rico/phoenix_project_no1/config.h
Co-authored-by: Joel Challis
---
keyboards/rico/phoenix_project_no1/config.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/config.h b/keyboards/rico/phoenix_project_no1/config.h
index 368e808a1016..43fb63ce470f 100644
--- a/keyboards/rico/phoenix_project_no1/config.h
+++ b/keyboards/rico/phoenix_project_no1/config.h
@@ -18,5 +18,3 @@
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
From bddf0f20fe5ba8ce1bc97aa8cede60b32b2bad42 Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Sun, 28 May 2023 18:44:29 +0200
Subject: [PATCH 05/19] [update] keyboards/rico/phoenix_project_no1/info.json
Those options are false by default, no need to explicitely add. them
Co-authored-by: Joel Challis
---
keyboards/rico/phoenix_project_no1/info.json | 2 --
1 file changed, 2 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
index 7978ff1c24ee..5b479d1fe649 100644
--- a/keyboards/rico/phoenix_project_no1/info.json
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -12,8 +12,6 @@
"bootloader": "rp2040",
"board": "GENERIC_RP_RP2040",
"features": {
- "audio": false,
- "backlight": false,
"bootmagic": true,
"command": false,
"console": false,
From 10fc217942511a5912ea87e49d97754d43c4c11e Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Sun, 28 May 2023 18:45:17 +0200
Subject: [PATCH 06/19] [update] keyboards/rico/phoenix_project_no1/info.json
Don't add fields with qmk default values
Co-authored-by: Joel Challis
---
keyboards/rico/phoenix_project_no1/info.json | 3 ---
1 file changed, 3 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
index 5b479d1fe649..769ca5d2591a 100644
--- a/keyboards/rico/phoenix_project_no1/info.json
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -28,9 +28,6 @@
"rgblight": {
"led_count": 16,
"pin": "GP28",
- "hue_steps": 10,
- "saturation_steps": 17,
- "brightness_steps": 17,
"animations": {
"alternating": true,
"breathing": true,
From 5f0f1ab8b4308cb870e1021c59b2d391d47e4ee5 Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Sun, 28 May 2023 18:55:57 +0200
Subject: [PATCH 07/19] [update] Added a fourth layer to default and via
keymaps
This in order to comply with default value of DYNAMIC_KEYMAP_LAYER_COUNT that is 4.
---
.../rico/phoenix_project_no1/keymaps/default/keymap.c | 10 +++++++++-
.../rico/phoenix_project_no1/keymaps/via/keymap.c | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c b/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c
index a4d58d9097e0..e550c625e7e6 100644
--- a/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c
+++ b/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c
@@ -21,7 +21,8 @@
enum layer_names {
_BASE,
_FN,
- _FN2
+ _FN2,
+ _FN3
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -45,6 +46,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [_FN3] = LAYOUT(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/rico/phoenix_project_no1/keymaps/via/keymap.c b/keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c
index a4d58d9097e0..e550c625e7e6 100644
--- a/keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c
+++ b/keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c
@@ -21,7 +21,8 @@
enum layer_names {
_BASE,
_FN,
- _FN2
+ _FN2,
+ _FN3
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -45,6 +46,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [_FN3] = LAYOUT(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};
From 4c2d93166e2bcd88b2bf147ebecbe8b9d03b95f5 Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Mon, 29 May 2023 19:08:21 +0200
Subject: [PATCH 08/19] [doc] PCB renders now hosted on Imgur.
---
keyboards/rico/phoenix_project_no1/readme.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/readme.md b/keyboards/rico/phoenix_project_no1/readme.md
index 8039d87f88ef..4007e7274225 100644
--- a/keyboards/rico/phoenix_project_no1/readme.md
+++ b/keyboards/rico/phoenix_project_no1/readme.md
@@ -1,7 +1,7 @@
# Phoenix Project No 1
-
-
+
+
This is an open source collection of M65-A keyboard replacement PCBs, available both in solderable and hotswap variants.
From 20af7eccf54135f1847130ed4a33568ded21ceac Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Mon, 29 May 2023 19:10:25 +0200
Subject: [PATCH 09/19] [update] keyboards/rico/phoenix_project_no1/rules.mk
Co-authored-by: Drashna Jaelre
---
keyboards/rico/phoenix_project_no1/rules.mk | 2 --
1 file changed, 2 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/rules.mk b/keyboards/rico/phoenix_project_no1/rules.mk
index 5ee11875f8dc..997fce7e65c8 100644
--- a/keyboards/rico/phoenix_project_no1/rules.mk
+++ b/keyboards/rico/phoenix_project_no1/rules.mk
@@ -1,3 +1 @@
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = rp2040_flash
WS2812_DRIVER = vendor
From ed1a9527a98737d9f59af7698f34d03f590e91ec Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Mon, 29 May 2023 19:12:08 +0200
Subject: [PATCH 10/19] [update] keyboards/rico/phoenix_project_no1/info.json
Co-authored-by: Drashna Jaelre
---
keyboards/rico/phoenix_project_no1/info.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
index 769ca5d2591a..4150b05bb328 100644
--- a/keyboards/rico/phoenix_project_no1/info.json
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -25,9 +25,11 @@
"cols": ["GP24", "GP0", "GP14", "GP13", "GP12", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP25", "GP2", "GP1"],
"rows": ["GP27", "GP29", "GP19", "GP20", "GP26"]
},
+ "ws2812": {
+ "pin": "GP28"
+ },
"rgblight": {
"led_count": 16,
- "pin": "GP28",
"animations": {
"alternating": true,
"breathing": true,
From 20bd79f69bcb05f079dae9f0e67f33e5d3691f80 Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Mon, 29 May 2023 22:33:05 +0200
Subject: [PATCH 11/19] [cleanup] Reverted back to 3 layers as requested.
Added dynamic_keymap.layer_count = 3 in info.json.
This is mandatory in order for VIA client to understand we don't need
more than 3 layers.
---
keyboards/rico/phoenix_project_no1/info.json | 5 ++++-
.../rico/phoenix_project_no1/keymaps/default/keymap.c | 10 +---------
.../rico/phoenix_project_no1/keymaps/via/keymap.c | 10 +---------
3 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
index 4150b05bb328..a63a0ed2c78d 100644
--- a/keyboards/rico/phoenix_project_no1/info.json
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -43,7 +43,10 @@
"twinkle": true
}
},
- "layouts": {
+ "dynamic_keymap": {
+ "layer_count": 3
+ },
+ "layouts": {
"LAYOUT": {
"layout": [
{ "matrix": [0, 0], "x": 0, "y": 0 },
diff --git a/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c b/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c
index e550c625e7e6..a4d58d9097e0 100644
--- a/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c
+++ b/keyboards/rico/phoenix_project_no1/keymaps/default/keymap.c
@@ -21,8 +21,7 @@
enum layer_names {
_BASE,
_FN,
- _FN2,
- _FN3
+ _FN2
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -46,13 +45,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
- [_FN3] = LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/rico/phoenix_project_no1/keymaps/via/keymap.c b/keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c
index e550c625e7e6..a4d58d9097e0 100644
--- a/keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c
+++ b/keyboards/rico/phoenix_project_no1/keymaps/via/keymap.c
@@ -21,8 +21,7 @@
enum layer_names {
_BASE,
_FN,
- _FN2,
- _FN3
+ _FN2
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -46,13 +45,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
- [_FN3] = LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};
From b705fd274fbfce41219be2d52c9dc9d39e315e50 Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Mon, 29 May 2023 22:39:15 +0200
Subject: [PATCH 12/19] [bugfix] Reverted suggested modification.
Compilation was failing.
Also there is no such "ws2812" field described in info_config.hjson,
This field was most probably ignored during info.json parsing.
---
keyboards/rico/phoenix_project_no1/info.json | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
index a63a0ed2c78d..1a19c3d59d3a 100644
--- a/keyboards/rico/phoenix_project_no1/info.json
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -25,11 +25,9 @@
"cols": ["GP24", "GP0", "GP14", "GP13", "GP12", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP25", "GP2", "GP1"],
"rows": ["GP27", "GP29", "GP19", "GP20", "GP26"]
},
- "ws2812": {
- "pin": "GP28"
- },
"rgblight": {
"led_count": 16,
+ "pin": "GP28",
"animations": {
"alternating": true,
"breathing": true,
From 87405d090a00cf1a1b5c3f3ed42ea247fe7a8b6c Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Tue, 30 May 2023 08:17:51 +0200
Subject: [PATCH 13/19] [update] keyboards/rico/phoenix_project_no1/info.json
Co-authored-by: Drashna Jaelre
---
keyboards/rico/phoenix_project_no1/info.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
index 1a19c3d59d3a..a63a0ed2c78d 100644
--- a/keyboards/rico/phoenix_project_no1/info.json
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -25,9 +25,11 @@
"cols": ["GP24", "GP0", "GP14", "GP13", "GP12", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP25", "GP2", "GP1"],
"rows": ["GP27", "GP29", "GP19", "GP20", "GP26"]
},
+ "ws2812": {
+ "pin": "GP28"
+ },
"rgblight": {
"led_count": 16,
- "pin": "GP28",
"animations": {
"alternating": true,
"breathing": true,
From ceb7da4519b9833c054a70203388a67bc0346a5a Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Tue, 30 May 2023 08:19:51 +0200
Subject: [PATCH 14/19] [update] keyboards/rico/phoenix_project_no1/info.json
Co-authored-by: Joel Challis
---
keyboards/rico/phoenix_project_no1/info.json | 3 ---
1 file changed, 3 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
index a63a0ed2c78d..5f521dcfa609 100644
--- a/keyboards/rico/phoenix_project_no1/info.json
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -43,9 +43,6 @@
"twinkle": true
}
},
- "dynamic_keymap": {
- "layer_count": 3
- },
"layouts": {
"LAYOUT": {
"layout": [
From 6da46e4b7a800dbb389857744374caae51b31316 Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Tue, 30 May 2023 08:33:06 +0200
Subject: [PATCH 15/19] [cleanup] Added vendor driver in ws2812 section.
---
keyboards/rico/phoenix_project_no1/info.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
index 5f521dcfa609..c2ba2c2a52cc 100644
--- a/keyboards/rico/phoenix_project_no1/info.json
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -26,7 +26,8 @@
"rows": ["GP27", "GP29", "GP19", "GP20", "GP26"]
},
"ws2812": {
- "pin": "GP28"
+ "pin": "GP28",
+ "driver": "vendor"
},
"rgblight": {
"led_count": 16,
From fd25ee7ae0c44518716b628a34bebd0df1b34725 Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Tue, 30 May 2023 08:34:29 +0200
Subject: [PATCH 16/19] [update] keyboards/rico/phoenix_project_no1/rules.mk
Co-authored-by: Ryan
---
keyboards/rico/phoenix_project_no1/rules.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/keyboards/rico/phoenix_project_no1/rules.mk b/keyboards/rico/phoenix_project_no1/rules.mk
index 997fce7e65c8..6e7633bfe015 100644
--- a/keyboards/rico/phoenix_project_no1/rules.mk
+++ b/keyboards/rico/phoenix_project_no1/rules.mk
@@ -1 +1 @@
-WS2812_DRIVER = vendor
+# This file intentionally left blank
From 16606b7a5121731321bb92dddbb01a6538dfbb50 Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Tue, 30 May 2023 19:14:40 +0200
Subject: [PATCH 17/19] [cleanup] Convert tabs to spaces.
---
keyboards/rico/phoenix_project_no1/info.json | 138 +++++++++----------
1 file changed, 69 insertions(+), 69 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
index c2ba2c2a52cc..6e060b5a78e6 100644
--- a/keyboards/rico/phoenix_project_no1/info.json
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -48,75 +48,75 @@
"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 },
- { "matrix": [0, 14], "x": 14, "y": 0 },
- { "matrix": [0, 15], "x": 15, "y": 0 },
- { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
- { "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], "w": 1.5, "x": 13.5, "y": 1 },
- { "matrix": [1, 15], "x": 15.0, "y": 1 },
- { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
- { "matrix": [2, 2], "x": 1.75, "y": 2 },
- { "matrix": [2, 3], "x": 2.75, "y": 2 },
- { "matrix": [2, 4], "x": 3.75, "y": 2 },
- { "matrix": [2, 5], "x": 4.75, "y": 2 },
- { "matrix": [2, 6], "x": 5.75, "y": 2 },
- { "matrix": [2, 7], "x": 6.75, "y": 2 },
- { "matrix": [2, 8], "x": 7.75, "y": 2 },
- { "matrix": [2, 9], "x": 8.75, "y": 2 },
- { "matrix": [2, 10], "x": 9.75, "y": 2 },
- { "matrix": [2, 11], "x": 10.75, "y": 2 },
- { "matrix": [2, 12], "x": 11.75, "y": 2 },
- { "matrix": [2, 13], "x": 12.75, "y": 2 },
- { "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2 },
- { "matrix": [2, 15], "x": 15.0, "y": 2 },
- { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
- { "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, 13], "w": 1.75, "x": 12.25, "y": 3 },
- { "matrix": [3, 14], "x": 14.0, "y": 3 },
- { "matrix": [3, 15], "x": 15.0, "y": 3 },
- { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
- { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
- { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
- { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
- { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4 },
- { "matrix": [4, 12], "w": 1.5, "x": 11.5, "y": 4 },
- { "matrix": [4, 13], "x": 13.0, "y": 4 },
- { "matrix": [4, 14], "x": 14.0, "y": 4 },
- { "matrix": [4, 15], "x": 15.0, "y": 4 }
+ { "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, 14], "x": 14, "y": 0 },
+ { "matrix": [0, 15], "x": 15, "y": 0 },
+ { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "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], "w": 1.5, "x": 13.5, "y": 1 },
+ { "matrix": [1, 15], "x": 15.0, "y": 1 },
+ { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "matrix": [2, 2], "x": 1.75, "y": 2 },
+ { "matrix": [2, 3], "x": 2.75, "y": 2 },
+ { "matrix": [2, 4], "x": 3.75, "y": 2 },
+ { "matrix": [2, 5], "x": 4.75, "y": 2 },
+ { "matrix": [2, 6], "x": 5.75, "y": 2 },
+ { "matrix": [2, 7], "x": 6.75, "y": 2 },
+ { "matrix": [2, 8], "x": 7.75, "y": 2 },
+ { "matrix": [2, 9], "x": 8.75, "y": 2 },
+ { "matrix": [2, 10], "x": 9.75, "y": 2 },
+ { "matrix": [2, 11], "x": 10.75, "y": 2 },
+ { "matrix": [2, 12], "x": 11.75, "y": 2 },
+ { "matrix": [2, 13], "x": 12.75, "y": 2 },
+ { "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2 },
+ { "matrix": [2, 15], "x": 15.0, "y": 2 },
+ { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+ { "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, 13], "w": 1.75, "x": 12.25, "y": 3 },
+ { "matrix": [3, 14], "x": 14.0, "y": 3 },
+ { "matrix": [3, 15], "x": 15.0, "y": 3 },
+ { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+ { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+ { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+ { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+ { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4 },
+ { "matrix": [4, 12], "w": 1.5, "x": 11.5, "y": 4 },
+ { "matrix": [4, 13], "x": 13.0, "y": 4 },
+ { "matrix": [4, 14], "x": 14.0, "y": 4 },
+ { "matrix": [4, 15], "x": 15.0, "y": 4 }
]
}
}
From c7b85454962f7f21e1e1f6245a5851cf2a16936a Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Wed, 31 May 2023 19:55:41 +0200
Subject: [PATCH 18/19] [update] keyboards/rico/phoenix_project_no1/readme.md
Smaller size version of images.
Co-authored-by: Ryan
---
keyboards/rico/phoenix_project_no1/readme.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/readme.md b/keyboards/rico/phoenix_project_no1/readme.md
index 4007e7274225..c70b944717fe 100644
--- a/keyboards/rico/phoenix_project_no1/readme.md
+++ b/keyboards/rico/phoenix_project_no1/readme.md
@@ -1,7 +1,7 @@
# Phoenix Project No 1
-
-
+
+
This is an open source collection of M65-A keyboard replacement PCBs, available both in solderable and hotswap variants.
From 79259ef9cf4f1ddd4090d87d4b528e3ba2e40aba Mon Sep 17 00:00:00 2001
From: Rico <95101980+mymakercorner@users.noreply.github.com>
Date: Wed, 31 May 2023 20:04:54 +0200
Subject: [PATCH 19/19] [cleanup] Applied qmk format-json on info.json
---
keyboards/rico/phoenix_project_no1/info.json | 172 +++++++++----------
1 file changed, 86 insertions(+), 86 deletions(-)
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/info.json
index 6e060b5a78e6..7b13e4a0dfa4 100644
--- a/keyboards/rico/phoenix_project_no1/info.json
+++ b/keyboards/rico/phoenix_project_no1/info.json
@@ -1,16 +1,10 @@
{
- "usb": {
- "vid": "0x21C0",
- "pid": "0x9901",
- "device_version": "1.0.0"
- },
- "keyboard_name": "Phoenix Project No 1",
"manufacturer": "Rico",
- "url": "https://github.com/mymakercorner/Phoenix_Project_No1",
+ "keyboard_name": "Phoenix Project No 1",
"maintainer": "Rico",
- "processor": "RP2040",
- "bootloader": "rp2040",
"board": "GENERIC_RP_RP2040",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
@@ -20,17 +14,12 @@
"nkro": false,
"rgblight": true
},
- "diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["GP24", "GP0", "GP14", "GP13", "GP12", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP25", "GP2", "GP1"],
"rows": ["GP27", "GP29", "GP19", "GP20", "GP26"]
},
- "ws2812": {
- "pin": "GP28",
- "driver": "vendor"
- },
+ "processor": "RP2040",
"rgblight": {
- "led_count": 16,
"animations": {
"alternating": true,
"breathing": true,
@@ -42,81 +31,92 @@
"snake": true,
"static_gradient": true,
"twinkle": true
- }
+ },
+ "led_count": 16
+ },
+ "url": "https://github.com/mymakercorner/Phoenix_Project_No1",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x9901",
+ "vid": "0x21C0"
+ },
+ "ws2812": {
+ "driver": "vendor",
+ "pin": "GP28"
},
"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 },
- { "matrix": [0, 14], "x": 14, "y": 0 },
- { "matrix": [0, 15], "x": 15, "y": 0 },
- { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
- { "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], "w": 1.5, "x": 13.5, "y": 1 },
- { "matrix": [1, 15], "x": 15.0, "y": 1 },
- { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
- { "matrix": [2, 2], "x": 1.75, "y": 2 },
- { "matrix": [2, 3], "x": 2.75, "y": 2 },
- { "matrix": [2, 4], "x": 3.75, "y": 2 },
- { "matrix": [2, 5], "x": 4.75, "y": 2 },
- { "matrix": [2, 6], "x": 5.75, "y": 2 },
- { "matrix": [2, 7], "x": 6.75, "y": 2 },
- { "matrix": [2, 8], "x": 7.75, "y": 2 },
- { "matrix": [2, 9], "x": 8.75, "y": 2 },
- { "matrix": [2, 10], "x": 9.75, "y": 2 },
- { "matrix": [2, 11], "x": 10.75, "y": 2 },
- { "matrix": [2, 12], "x": 11.75, "y": 2 },
- { "matrix": [2, 13], "x": 12.75, "y": 2 },
- { "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2 },
- { "matrix": [2, 15], "x": 15.0, "y": 2 },
- { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
- { "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, 13], "w": 1.75, "x": 12.25, "y": 3 },
- { "matrix": [3, 14], "x": 14.0, "y": 3 },
- { "matrix": [3, 15], "x": 15.0, "y": 3 },
- { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
- { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
- { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
- { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
- { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4 },
- { "matrix": [4, 12], "w": 1.5, "x": 11.5, "y": 4 },
- { "matrix": [4, 13], "x": 13.0, "y": 4 },
- { "matrix": [4, 14], "x": 14.0, "y": 4 },
- { "matrix": [4, 15], "x": 15.0, "y": 4 }
+ {"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, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "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, 14], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2},
+ {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 15], "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, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+ {"matrix": [3, 15], "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, 10], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4}
]
}
}