summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/1upkeyboards/pi40/config.h14
-rw-r--r--keyboards/1upkeyboards/pi40/grid_v1_1/config.h6
-rw-r--r--keyboards/1upkeyboards/pi40/grid_v1_1/info.json149
-rw-r--r--keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi40/info.json123
-rw-r--r--keyboards/1upkeyboards/pi40/keymaps/default/keymap.c36
-rw-r--r--keyboards/1upkeyboards/pi40/keymaps/via/keymap.c82
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_0/config.h4
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_0/info.json148
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_1/config.h4
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_1/info.json148
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi40/pi40.c22
-rw-r--r--keyboards/1upkeyboards/pi40/rules.mk21
15 files changed, 522 insertions, 235 deletions
diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h
index dfed1e4e6f..5d3841ae85 100644
--- a/keyboards/1upkeyboards/pi40/config.h
+++ b/keyboards/1upkeyboards/pi40/config.h
@@ -3,26 +3,14 @@
#pragma once
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 10
-
-#ifdef OLED_ENABLE
-# define OLED_DISPLAY_128X32
+#define OLED_DISPLAY_128X32
#define I2C1_SCL_PIN GP17
#define I2C1_SDA_PIN GP16
#define I2C_DRIVER I2CD0
#define OLED_BRIGHTNESS 128
#define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c"
-#endif
-
-#define DIODE_DIRECTION COL2ROW
-
-#define MATRIX_ROW_PINS { GP21, GP20, GP19, GP18 }
-#define MATRIX_COL_PINS { GP1, GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12 }
#define RGB_DI_PIN GP0
-#define RGB_MATRIX_LED_COUNT 47
-#define RGBLED_NUM 47
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
# define RGBLIGHT_LIMIT_VAL 150
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/config.h b/keyboards/1upkeyboards/pi40/grid_v1_1/config.h
new file mode 100644
index 0000000000..00ed9f3196
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 ziptyze (@ziptyze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGB_MATRIX_LED_COUNT 48 \ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
new file mode 100644
index 0000000000..b3c64f7dd4
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
@@ -0,0 +1,149 @@
+{
+ "keyboard_name": "pi40",
+ "manufacturer": "1upkeyboards",
+ "maintainer": "ziptyze",
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "usb": {
+ "vid": "0x6F75",
+ "pid": "0x5600",
+ "device_version": "1.1.0"
+ },
+ "diode_direction": "COL2ROW",
+ "dynamic_keymap": {
+ "layer_count": 10
+ },
+ "features": {
+ "audio": false,
+ "backlight": false,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true,
+ "rgblight": false
+ },
+ "matrix_pins": {
+ "rows": [ "GP21", "GP20", "GP19", "GP18" ],
+ "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ]
+ },
+ "encoder": {
+ "enabled": true,
+ "rotary": [
+ {
+ "pin_a": "GP14",
+ "pin_b": "GP13"
+ }
+ ]
+ },
+ "rgb_matrix": {
+ "driver": "WS2812",
+ "layout": [
+ { "flags": 1, "matrix": [0, 0], "x": 9, "y": 8 },
+ { "flags": 4, "matrix": [0, 1], "x": 28, "y": 8 },
+ { "flags": 4, "matrix": [0, 2], "x": 46, "y": 8 },
+ { "flags": 4, "matrix": [0, 3], "x": 65, "y": 8 },
+ { "flags": 4, "matrix": [0, 4], "x": 84, "y": 8 },
+ { "flags": 4, "matrix": [0, 5], "x": 102, "y": 8 },
+ { "flags": 4, "matrix": [0, 6], "x": 121, "y": 8 },
+ { "flags": 4, "matrix": [0, 7], "x": 140, "y": 8 },
+ { "flags": 4, "matrix": [0, 8], "x": 159, "y": 8 },
+ { "flags": 4, "matrix": [0, 9], "x": 177, "y": 8 },
+ { "flags": 4, "matrix": [0, 10], "x": 196, "y": 8 },
+ { "flags": 1, "matrix": [0, 11], "x": 215, "y": 8 },
+ { "flags": 1, "matrix": [1, 11], "x": 215, "y": 24 },
+ { "flags": 4, "matrix": [1, 10], "x": 196, "y": 24 },
+ { "flags": 4, "matrix": [1, 9], "x": 177, "y": 24 },
+ { "flags": 4, "matrix": [1, 8], "x": 159, "y": 24 },
+ { "flags": 4, "matrix": [1, 7], "x": 140, "y": 24 },
+ { "flags": 4, "matrix": [1, 6], "x": 121, "y": 24 },
+ { "flags": 4, "matrix": [1, 5], "x": 102, "y": 24 },
+ { "flags": 4, "matrix": [1, 4], "x": 84, "y": 24 },
+ { "flags": 4, "matrix": [1, 3], "x": 65, "y": 24 },
+ { "flags": 4, "matrix": [1, 2], "x": 46, "y": 24 },
+ { "flags": 4, "matrix": [1, 1], "x": 28, "y": 24 },
+ { "flags": 1, "matrix": [1, 0], "x": 9, "y": 24 },
+ { "flags": 1, "matrix": [2, 0], "x": 9, "y": 40 },
+ { "flags": 4, "matrix": [2, 1], "x": 28, "y": 40 },
+ { "flags": 4, "matrix": [2, 2], "x": 46, "y": 40 },
+ { "flags": 4, "matrix": [2, 3], "x": 65, "y": 40 },
+ { "flags": 4, "matrix": [2, 4], "x": 84, "y": 40 },
+ { "flags": 4, "matrix": [2, 5], "x": 102, "y": 40 },
+ { "flags": 4, "matrix": [2, 6], "x": 121, "y": 40 },
+ { "flags": 4, "matrix": [2, 7], "x": 140, "y": 40 },
+ { "flags": 4, "matrix": [2, 8], "x": 159, "y": 40 },
+ { "flags": 4, "matrix": [2, 9], "x": 177, "y": 40 },
+ { "flags": 4, "matrix": [2, 10], "x": 196, "y": 40 },
+ { "flags": 1, "matrix": [2, 11], "x": 215, "y": 40 },
+ { "flags": 1, "matrix": [3, 11], "x": 215, "y": 56 },
+ { "flags": 1, "matrix": [3, 10], "x": 196, "y": 56 },
+ { "flags": 1, "matrix": [3, 9], "x": 177, "y": 56 },
+ { "flags": 1, "matrix": [3, 8], "x": 159, "y": 56 },
+ { "flags": 1, "matrix": [3, 7], "x": 140, "y": 56 },
+ { "flags": 1, "matrix": [3, 6], "x": 121, "y": 56 },
+ { "flags": 1, "matrix": [3, 4], "x": 84, "y": 56 },
+ { "flags": 1, "matrix": [3, 3], "x": 65, "y": 56 },
+ { "flags": 1, "matrix": [3, 2], "x": 46, "y": 56 },
+ { "flags": 1, "matrix": [3, 1], "x": 28, "y": 56 },
+ { "flags": 1, "matrix": [3, 0], "x": 9, "y": 56 },
+ { "flags": 1, "matrix": [3, 5], "x": 102, "y": 56 }
+ ]
+ },
+ "layouts": {
+ "LAYOUT_ortho_4x12": {
+ "layout": [
+ { "matrix": [0, 12], "x": 11, "y": 0 },
+ { "matrix": [0, 0], "x": 0, "y": 1 },
+ { "matrix": [0, 1], "x": 1, "y": 1 },
+ { "matrix": [0, 2], "x": 2, "y": 1 },
+ { "matrix": [0, 3], "x": 3, "y": 1 },
+ { "matrix": [0, 4], "x": 4, "y": 1 },
+ { "matrix": [0, 5], "x": 5, "y": 1 },
+ { "matrix": [0, 6], "x": 6, "y": 1 },
+ { "matrix": [0, 7], "x": 7, "y": 1 },
+ { "matrix": [0, 8], "x": 8, "y": 1 },
+ { "matrix": [0, 9], "x": 9, "y": 1 },
+ { "matrix": [0, 10], "x": 10, "y": 1 },
+ { "matrix": [0, 11], "x": 11, "y": 1 },
+ { "matrix": [1, 0], "x": 0, "y": 2 },
+ { "matrix": [1, 1], "x": 1, "y": 2 },
+ { "matrix": [1, 2], "x": 2, "y": 2 },
+ { "matrix": [1, 3], "x": 3, "y": 2 },
+ { "matrix": [1, 4], "x": 4, "y": 2 },
+ { "matrix": [1, 5], "x": 5, "y": 2 },
+ { "matrix": [1, 6], "x": 6, "y": 2 },
+ { "matrix": [1, 7], "x": 7, "y": 2 },
+ { "matrix": [1, 8], "x": 8, "y": 2 },
+ { "matrix": [1, 9], "x": 9, "y": 2 },
+ { "matrix": [1, 10], "x": 10, "y": 2 },
+ { "matrix": [1, 11], "x": 11, "y": 2 },
+ { "matrix": [2, 0], "x": 0, "y": 3 },
+ { "matrix": [2, 1], "x": 1, "y": 3 },
+ { "matrix": [2, 2], "x": 2, "y": 3 },
+ { "matrix": [2, 3], "x": 3, "y": 3 },
+ { "matrix": [2, 4], "x": 4, "y": 3 },
+ { "matrix": [2, 5], "x": 5, "y": 3 },
+ { "matrix": [2, 6], "x": 6, "y": 3 },
+ { "matrix": [2, 7], "x": 7, "y": 3 },
+ { "matrix": [2, 8], "x": 8, "y": 3 },
+ { "matrix": [2, 9], "x": 9, "y": 3 },
+ { "matrix": [2, 10], "x": 10, "y": 3 },
+ { "matrix": [2, 11], "x": 11, "y": 3 },
+ { "matrix": [3, 0], "x": 0, "y": 4 },
+ { "matrix": [3, 1], "x": 1, "y": 4 },
+ { "matrix": [3, 2], "x": 2, "y": 4 },
+ { "matrix": [3, 3], "x": 3, "y": 4 },
+ { "matrix": [3, 4], "x": 4, "y": 4 },
+ { "matrix": [3, 5], "x": 5, "y": 4 },
+ { "matrix": [3, 6], "x": 6, "y": 4 },
+ { "matrix": [3, 7], "x": 7, "y": 4 },
+ { "matrix": [3, 8], "x": 8, "y": 4 },
+ { "matrix": [3, 9], "x": 9, "y": 4 },
+ { "matrix": [3, 10], "x": 10, "y": 4 },
+ { "matrix": [3, 11], "x": 11, "y": 4 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk b/keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk
diff --git a/keyboards/1upkeyboards/pi40/info.json b/keyboards/1upkeyboards/pi40/info.json
deleted file mode 100644
index 42c0bc7b12..0000000000
--- a/keyboards/1upkeyboards/pi40/info.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
- "keyboard_name": "pi40",
- "manufacturer": "1upkeyboards",
- "usb": {
- "vid": "0x6F75",
- "pid": "0x5600",
- "device_version": "0.0.1"
- },
- "encoder": {
- "rotary": [
- {"pin_a": "GP14", "pin_b": "GP13"}
- ]
- },
- "processor": "RP2040",
- "bootloader": "rp2040",
- "board": "GENERIC_RP_RP2040",
- "layouts": {
- "LAYOUT": {
- "layout": [
- { "matrix": [3, 6], "x": 11, "y": 0 },
- { "matrix": [0, 0], "x": 0, "y": 1 },
- { "matrix": [0, 1], "x": 1, "y": 1 },
- { "matrix": [0, 2], "x": 2, "y": 1 },
- { "matrix": [0, 3], "x": 3, "y": 1 },
- { "matrix": [0, 4], "x": 4, "y": 1 },
- { "matrix": [0, 5], "x": 5, "y": 1 },
- { "matrix": [0, 6], "x": 6, "y": 1 },
- { "matrix": [0, 7], "x": 7, "y": 1 },
- { "matrix": [0, 8], "x": 8, "y": 1 },
- { "matrix": [0, 9], "x": 9, "y": 1 },
- { "matrix": [0, 10], "x": 10, "y": 1 },
- { "matrix": [0, 11], "x": 11, "y": 1 },
- { "matrix": [1, 0], "x": 0, "y": 2 },
- { "matrix": [1, 1], "x": 1, "y": 2 },
- { "matrix": [1, 2], "x": 2, "y": 2 },
- { "matrix": [1, 3], "x": 3, "y": 2 },
- { "matrix": [1, 4], "x": 4, "y": 2 },
- { "matrix": [1, 5], "x": 5, "y": 2 },
- { "matrix": [1, 6], "x": 6, "y": 2 },
- { "matrix": [1, 7], "x": 7, "y": 2 },
- { "matrix": [1, 8], "x": 8, "y": 2 },
- { "matrix": [1, 9], "x": 9, "y": 2 },
- { "matrix": [1, 10], "x": 10, "y": 2 },
- { "matrix": [1, 11], "x": 11, "y": 2 },
- { "matrix": [2, 0], "x": 0, "y": 3 },
- { "matrix": [2, 1], "x": 1, "y": 3 },
- { "matrix": [2, 2], "x": 2, "y": 3 },
- { "matrix": [2, 3], "x": 3, "y": 3 },
- { "matrix": [2, 4], "x": 4, "y": 3 },
- { "matrix": [2, 5], "x": 5, "y": 3 },
- { "matrix": [2, 6], "x": 6, "y": 3 },
- { "matrix": [2, 7], "x": 7, "y": 3 },
- { "matrix": [2, 8], "x": 8, "y": 3 },
- { "matrix": [2, 9], "x": 9, "y": 3 },
- { "matrix": [2, 10], "x": 10, "y": 3 },
- { "matrix": [2, 11], "x": 11, "y": 3 },
- { "matrix": [3, 0], "x": 0, "y": 4 },
- { "matrix": [3, 1], "x": 1, "y": 4 },
- { "matrix": [3, 2], "x": 2, "y": 4 },
- { "matrix": [3, 3], "x": 3, "y": 4 },
- { "matrix": [3, 4], "x": 4, "y": 4 },
- { "matrix": [3, 5], "x": 5, "y": 4, "w": 2},
- { "matrix": [3, 7], "x": 7, "y": 4 },
- { "matrix": [3, 8], "x": 8, "y": 4 },
- { "matrix": [3, 9], "x": 9, "y": 4 },
- { "matrix": [3, 10], "x": 10, "y": 4 },
- { "matrix": [3, 11], "x": 11, "y": 4 }
- ]
- },
- "LAYOUT_ortho_4x12": {
- "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": [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": [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 },
- { "matrix": [2, 7], "x": 7, "y": 2 },
- { "matrix": [2, 8], "x": 8, "y": 2 },
- { "matrix": [2, 9], "x": 9, "y": 2 },
- { "matrix": [2, 10], "x": 10, "y": 2 },
- { "matrix": [2, 11], "x": 11, "y": 2 },
- { "matrix": [3, 0], "x": 0, "y": 3 },
- { "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, "label": "ENC" },
- { "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 }
- ]
- }
- }
-} \ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
index 16c1dcadb4..9aeaccb754 100644
--- a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
@@ -26,8 +26,8 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
- * ╱⎺⎺⎺⎺╲
- * |RGBTOG|
+ * ╱⎺⎺⎺⎺╲
+ * |RGBTOG|
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
@@ -39,17 +39,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |Adjust| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
* `-----------------------------------------------------------------------------------'
*/
- [_ONE] = LAYOUT (
+ [_ONE] = LAYOUT_ortho_4x12 (
RGB_TOG,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_ESC, 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_ENT ,
- MO(3), KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
+ MO(3), KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
/* Lower
- * ╱⎺⎺⎺⎺╲
- * | MUTE |
+ * ╱⎺⎺⎺⎺╲
+ * | MUTE |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
@@ -61,17 +61,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | Next | Vol- | Vol+ | Play |
* `-----------------------------------------------------------------------------------'
*/
- [_TWO] = LAYOUT (
+ [_TWO] = LAYOUT_ortho_4x12 (
KC_MUTE,
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
),
/* Raise
- * ╱⎺⎺⎺⎺╲
- * | MUTE |
+ * ╱⎺⎺⎺⎺╲
+ * | MUTE |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
@@ -83,17 +83,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | Mute | | Next | Vol- | Vol+ | Play |
* `-----------------------------------------------------------------------------------'
*/
- [_THREE] = LAYOUT (
+ [_THREE] = LAYOUT_ortho_4x12 (
KC_MUTE,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
),
/* Adjust (Lower + Raise)
- * ╱⎺⎺⎺⎺╲
- * | MUTE |
+ * ╱⎺⎺⎺⎺╲
+ * | MUTE |
* v-----------------------RGB CONTROL------------------v ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | Reset|Debug | RGB |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-| Del |
@@ -105,12 +105,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | Mute | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_FOUR] = LAYOUT (
+ [_FOUR] = LAYOUT_ortho_4x12 (
KC_MUTE,
- _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+ _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
index f8302db749..8f5226ddf8 100644
--- a/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
@@ -32,8 +32,8 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
- * ╱⎺⎺⎺⎺╲
- * |RGBTOG|
+ * ╱⎺⎺⎺⎺╲
+ * |RGBTOG|
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
@@ -45,17 +45,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |Adjust| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
* `-----------------------------------------------------------------------------------'
*/
- [_ONE] = LAYOUT (
+ [_ONE] = LAYOUT_ortho_4x12 (
RGB_TOG,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_ESC, 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_ENT ,
- MO(3), KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ MO(3), KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
/* Lower
- * ╱⎺⎺⎺⎺╲
- * | MUTE |
+ * ╱⎺⎺⎺⎺╲
+ * | MUTE |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
@@ -67,17 +67,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | Next | Vol- | Vol+ | Play |
* `-----------------------------------------------------------------------------------'
*/
- [_TWO] = LAYOUT (
+ [_TWO] = LAYOUT_ortho_4x12 (
KC_MUTE,
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
),
/* Raise
- * ╱⎺⎺⎺⎺╲
- * | MUTE |
+ * ╱⎺⎺⎺⎺╲
+ * | MUTE |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
@@ -89,17 +89,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | Mute | | Next | Vol- | Vol+ | Play |
* `-----------------------------------------------------------------------------------'
*/
- [_THREE] = LAYOUT (
+ [_THREE] = LAYOUT_ortho_4x12 (
KC_MUTE,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
),
/* Adjust (Lower + Raise)
- * ╱⎺⎺⎺⎺╲
- * | MUTE |
+ * ╱⎺⎺⎺⎺╲
+ * | MUTE |
* v-----------------------RGB CONTROL------------------v ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | Reset|Debug | RGB |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-| Del |
@@ -111,17 +111,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | Mute | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_FOUR] = LAYOUT (
+ [_FOUR] = LAYOUT_ortho_4x12 (
KC_MUTE,
- _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+ _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Placeholder
- * ╱⎺⎺⎺⎺╲
- * | |
+ * ╱⎺⎺⎺⎺╲
+ * | |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | |
@@ -133,17 +133,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_FIVE] = LAYOUT (
+ [_FIVE] = LAYOUT_ortho_4x12 (
_______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Placeholder
- * ╱⎺⎺⎺⎺╲
- * | |
+ * ╱⎺⎺⎺⎺╲
+ * | |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | |
@@ -155,17 +155,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_SIX] = LAYOUT (
+ [_SIX] = LAYOUT_ortho_4x12 (
_______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Placeholder
- * ╱⎺⎺⎺⎺╲
- * | |
+ * ╱⎺⎺⎺⎺╲
+ * | |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | |
@@ -177,17 +177,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_SEVEN] = LAYOUT (
+ [_SEVEN] = LAYOUT_ortho_4x12 (
_______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Placeholder
- * ╱⎺⎺⎺⎺╲
- * | |
+ * ╱⎺⎺⎺⎺╲
+ * | |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | |
@@ -199,17 +199,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_EIGHT] = LAYOUT (
+ [_EIGHT] = LAYOUT_ortho_4x12 (
_______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Placeholder
- * ╱⎺⎺⎺⎺╲
- * | |
+ * ╱⎺⎺⎺⎺╲
+ * | |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | |
@@ -221,17 +221,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_NINE] = LAYOUT (
+ [_NINE] = LAYOUT_ortho_4x12 (
_______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Placeholder
- * ╱⎺⎺⎺⎺╲
- * | |
+ * ╱⎺⎺⎺⎺╲
+ * | |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | |
@@ -243,12 +243,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_TEN] = LAYOUT (
+ [_TEN] = LAYOUT_ortho_4x12 (
_______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/config.h b/keyboards/1upkeyboards/pi40/mit_v1_0/config.h
new file mode 100644
index 0000000000..a4d7d0e39a
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/config.h
@@ -0,0 +1,4 @@
+// Copyright 2022 ziptyze (@ziptyze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#define RGB_MATRIX_LED_COUNT 47 \ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
new file mode 100644
index 0000000000..d476109f79
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
@@ -0,0 +1,148 @@
+{
+ "keyboard_name": "pi40",
+ "manufacturer": "1upkeyboards",
+ "maintainer": "ziptyze",
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "usb": {
+ "vid": "0x6F75",
+ "pid": "0x5600",
+ "device_version": "1.0.0"
+ },
+ "diode_direction": "COL2ROW",
+ "dynamic_keymap": {
+ "layer_count": 10
+ },
+ "features": {
+ "audio": false,
+ "backlight": false,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true,
+ "rgblight": false
+ },
+ "matrix_pins": {
+ "rows": [ "GP21", "GP20", "GP19", "GP18" ],
+ "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ]
+ },
+ "encoder": {
+ "enabled": true,
+ "rotary": [
+ {
+ "pin_a": "GP14",
+ "pin_b": "GP13"
+ }
+ ]
+ },
+ "rgb_matrix": {
+ "driver": "WS2812",
+ "layout": [
+ { "flags": 1, "matrix": [0, 0], "x": 9, "y": 8 },
+ { "flags": 4, "matrix": [0, 1], "x": 28, "y": 8 },
+ { "flags": 4, "matrix": [0, 2], "x": 46, "y": 8 },
+ { "flags": 4, "matrix": [0, 3], "x": 65, "y": 8 },
+ { "flags": 4, "matrix": [0, 4], "x": 84, "y": 8 },
+ { "flags": 4, "matrix": [0, 5], "x": 102, "y": 8 },
+ { "flags": 4, "matrix": [0, 6], "x": 121, "y": 8 },
+ { "flags": 4, "matrix": [0, 7], "x": 140, "y": 8 },
+ { "flags": 4, "matrix": [0, 8], "x": 159, "y": 8 },
+ { "flags": 4, "matrix": [0, 9], "x": 177, "y": 8 },
+ { "flags": 4, "matrix": [0, 10], "x": 196, "y": 8 },
+ { "flags": 1, "matrix": [0, 11], "x": 215, "y": 8 },
+ { "flags": 1, "matrix": [1, 11], "x": 215, "y": 24 },
+ { "flags": 4, "matrix": [1, 10], "x": 196, "y": 24 },
+ { "flags": 4, "matrix": [1, 9], "x": 177, "y": 24 },
+ { "flags": 4, "matrix": [1, 8], "x": 159, "y": 24 },
+ { "flags": 4, "matrix": [1, 7], "x": 140, "y": 24 },
+ { "flags": 4, "matrix": [1, 6], "x": 121, "y": 24 },
+ { "flags": 4, "matrix": [1, 5], "x": 102, "y": 24 },
+ { "flags": 4, "matrix": [1, 4], "x": 84, "y": 24 },
+ { "flags": 4, "matrix": [1, 3], "x": 65, "y": 24 },
+ { "flags": 4, "matrix": [1, 2], "x": 46, "y": 24 },
+ { "flags": 4, "matrix": [1, 1], "x": 28, "y": 24 },
+ { "flags": 1, "matrix": [1, 0], "x": 9, "y": 24 },
+ { "flags": 1, "matrix": [2, 0], "x": 9, "y": 40 },
+ { "flags": 4, "matrix": [2, 1], "x": 28, "y": 40 },
+ { "flags": 4, "matrix": [2, 2], "x": 46, "y": 40 },
+ { "flags": 4, "matrix": [2, 3], "x": 65, "y": 40 },
+ { "flags": 4, "matrix": [2, 4], "x": 84, "y": 40 },
+ { "flags": 4, "matrix": [2, 5], "x": 102, "y": 40 },
+ { "flags": 4, "matrix": [2, 6], "x": 121, "y": 40 },
+ { "flags": 4, "matrix": [2, 7], "x": 140, "y": 40 },
+ { "flags": 4, "matrix": [2, 8], "x": 159, "y": 40 },
+ { "flags": 4, "matrix": [2, 9], "x": 177, "y": 40 },
+ { "flags": 4, "matrix": [2, 10], "x": 196, "y": 40 },
+ { "flags": 1, "matrix": [2, 11], "x": 215, "y": 40 },
+ { "flags": 1, "matrix": [3, 11], "x": 215, "y": 56 },
+ { "flags": 1, "matrix": [3, 10], "x": 196, "y": 56 },
+ { "flags": 1, "matrix": [3, 9], "x": 177, "y": 56 },
+ { "flags": 1, "matrix": [3, 8], "x": 159, "y": 56 },
+ { "flags": 1, "matrix": [3, 7], "x": 140, "y": 56 },
+ { "flags": 1, "matrix": [3, 5], "x": 112, "y": 56 },
+ { "flags": 1, "matrix": [3, 4], "x": 84, "y": 56 },
+ { "flags": 1, "matrix": [3, 3], "x": 65, "y": 56 },
+ { "flags": 1, "matrix": [3, 2], "x": 46, "y": 56 },
+ { "flags": 1, "matrix": [3, 1], "x": 28, "y": 56 },
+ { "flags": 1, "matrix": [3, 0], "x": 9, "y": 56 }
+ ]
+ },
+ "layouts": {
+ "LAYOUT_ortho_4x12": {
+ "layout": [
+ { "matrix": [3, 6], "x": 11, "y": 0 },
+ { "matrix": [0, 0], "x": 0, "y": 1 },
+ { "matrix": [0, 1], "x": 1, "y": 1 },
+ { "matrix": [0, 2], "x": 2, "y": 1 },
+ { "matrix": [0, 3], "x": 3, "y": 1 },
+ { "matrix": [0, 4], "x": 4, "y": 1 },
+ { "matrix": [0, 5], "x": 5, "y": 1 },
+ { "matrix": [0, 6], "x": 6, "y": 1 },
+ { "matrix": [0, 7], "x": 7, "y": 1 },
+ { "matrix": [0, 8], "x": 8, "y": 1 },
+ { "matrix": [0, 9], "x": 9, "y": 1 },
+ { "matrix": [0, 10], "x": 10, "y": 1 },
+ { "matrix": [0, 11], "x": 11, "y": 1 },
+ { "matrix": [1, 0], "x": 0, "y": 2 },
+ { "matrix": [1, 1], "x": 1, "y": 2 },
+ { "matrix": [1, 2], "x": 2, "y": 2 },
+ { "matrix": [1, 3], "x": 3, "y": 2 },
+ { "matrix": [1, 4], "x": 4, "y": 2 },
+ { "matrix": [1, 5], "x": 5, "y": 2 },
+ { "matrix": [1, 6], "x": 6, "y": 2 },
+ { "matrix": [1, 7], "x": 7, "y": 2 },
+ { "matrix": [1, 8], "x": 8, "y": 2 },
+ { "matrix": [1, 9], "x": 9, "y": 2 },
+ { "matrix": [1, 10], "x": 10, "y": 2 },
+ { "matrix": [1, 11], "x": 11, "y": 2 },
+ { "matrix": [2, 0], "x": 0, "y": 3 },
+ { "matrix": [2, 1], "x": 1, "y": 3 },
+ { "matrix": [2, 2], "x": 2, "y": 3 },
+ { "matrix": [2, 3], "x": 3, "y": 3 },
+ { "matrix": [2, 4], "x": 4, "y": 3 },
+ { "matrix": [2, 5], "x": 5, "y": 3 },
+ { "matrix": [2, 6], "x": 6, "y": 3 },
+ { "matrix": [2, 7], "x": 7, "y": 3 },
+ { "matrix": [2, 8], "x": 8, "y": 3 },
+ { "matrix": [2, 9], "x": 9, "y": 3 },
+ { "matrix": [2, 10], "x": 10, "y": 3 },
+ { "matrix": [2, 11], "x": 11, "y": 3 },
+ { "matrix": [3, 0], "x": 0, "y": 4 },
+ { "matrix": [3, 1], "x": 1, "y": 4 },
+ { "matrix": [3, 2], "x": 2, "y": 4 },
+ { "matrix": [3, 3], "x": 3, "y": 4 },
+ { "matrix": [3, 4], "x": 4, "y": 4 },
+ { "matrix": [3, 5], "x": 5, "y": 4 },
+ { "matrix": [0, 12], "x": 6, "y": 4 },
+ { "matrix": [3, 7], "x": 7, "y": 4 },
+ { "matrix": [3, 8], "x": 8, "y": 4 },
+ { "matrix": [3, 9], "x": 9, "y": 4 },
+ { "matrix": [3, 10], "x": 10, "y": 4 },
+ { "matrix": [3, 11], "x": 11, "y": 4 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/config.h b/keyboards/1upkeyboards/pi40/mit_v1_1/config.h
new file mode 100644
index 0000000000..a4d7d0e39a
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/config.h
@@ -0,0 +1,4 @@
+// Copyright 2022 ziptyze (@ziptyze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#define RGB_MATRIX_LED_COUNT 47 \ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
new file mode 100644
index 0000000000..9e01928554
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
@@ -0,0 +1,148 @@
+{
+ "keyboard_name": "pi40",
+ "manufacturer": "1upkeyboards",
+ "maintainer": "ziptyze",
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "usb": {
+ "vid": "0x6F75",
+ "pid": "0x5600",
+ "device_version": "1.1.0"
+ },
+ "diode_direction": "COL2ROW",
+ "dynamic_keymap": {
+ "layer_count": 10
+ },
+ "features": {
+ "audio": false,
+ "backlight": false,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true,
+ "rgblight": false
+ },
+ "matrix_pins": {
+ "rows": [ "GP21", "GP20", "GP19", "GP18" ],
+ "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ]
+ },
+ "encoder": {
+ "enabled": true,
+ "rotary": [
+ {
+ "pin_a": "GP14",
+ "pin_b": "GP13"
+ }
+ ]
+ },
+ "rgb_matrix": {
+ "driver": "WS2812",
+ "layout": [
+ { "flags": 1, "matrix": [0, 0], "x": 9, "y": 8 },
+ { "flags": 4, "matrix": [0, 1], "x": 28, "y": 8 },
+ { "flags": 4, "matrix": [0, 2], "x": 46, "y": 8 },
+ { "flags": 4, "matrix": [0, 3], "x": 65, "y": 8 },
+ { "flags": 4, "matrix": [0, 4], "x": 84, "y": 8 },
+ { "flags": 4, "matrix": [0, 5], "x": 102, "y": 8 },
+ { "flags": 4, "matrix": [0, 6], "x": 121, "y": 8 },
+ { "flags": 4, "matrix": [0, 7], "x": 140, "y": 8 },
+ { "flags": 4, "matrix": [0, 8], "x": 159, "y": 8 },
+ { "flags": 4, "matrix": [0, 9], "x": 177, "y": 8 },
+ { "flags": 4, "matrix": [0, 10], "x": 196, "y": 8 },
+ { "flags": 1, "matrix": [0, 11], "x": 215, "y": 8 },
+ { "flags": 1, "matrix": [1, 11], "x": 215, "y": 24 },
+ { "flags": 4, "matrix": [1, 10], "x": 196, "y": 24 },
+ { "flags": 4, "matrix": [1, 9], "x": 177, "y": 24 },
+ { "flags": 4, "matrix": [1, 8], "x": 159, "y": 24 },
+ { "flags": 4, "matrix": [1, 7], "x": 140, "y": 24 },
+ { "flags": 4, "matrix": [1, 6], "x": 121, "y": 24 },
+ { "flags": 4, "matrix": [1, 5], "x": 102, "y": 24 },
+ { "flags": 4, "matrix": [1, 4], "x": 84, "y": 24 },
+ { "flags": 4, "matrix": [1, 3], "x": 65, "y": 24 },
+ { "flags": 4, "matrix": [1, 2], "x": 46, "y": 24 },
+ { "flags": 4, "matrix": [1, 1], "x": 28, "y": 24 },
+ { "flags": 1, "matrix": [1, 0], "x": 9, "y": 24 },
+ { "flags": 1, "matrix": [2, 0], "x": 9, "y": 40 },
+ { "flags": 4, "matrix": [2, 1], "x": 28, "y": 40 },
+ { "flags": 4, "matrix": [2, 2], "x": 46, "y": 40 },
+ { "flags": 4, "matrix": [2, 3], "x": 65, "y": 40 },
+ { "flags": 4, "matrix": [2, 4], "x": 84, "y": 40 },
+ { "flags": 4, "matrix": [2, 5], "x": 102, "y": 40 },
+ { "flags": 4, "matrix": [2, 6], "x": 121, "y": 40 },
+ { "flags": 4, "matrix": [2, 7], "x": 140, "y": 40 },
+ { "flags": 4, "matrix": [2, 8], "x": 159, "y": 40 },
+ { "flags": 4, "matrix": [2, 9], "x": 177, "y": 40 },
+ { "flags": 4, "matrix": [2, 10], "x": 196, "y": 40 },
+ { "flags": 1, "matrix": [2, 11], "x": 215, "y": 40 },
+ { "flags": 1, "matrix": [3, 11], "x": 215, "y": 56 },
+ { "flags": 1, "matrix": [3, 10], "x": 196, "y": 56 },
+ { "flags": 1, "matrix": [3, 9], "x": 177, "y": 56 },
+ { "flags": 1, "matrix": [3, 8], "x": 159, "y": 56 },
+ { "flags": 1, "matrix": [3, 7], "x": 140, "y": 56 },
+ { "flags": 1, "matrix": [3, 5], "x": 112, "y": 56 },
+ { "flags": 1, "matrix": [3, 4], "x": 84, "y": 56 },
+ { "flags": 1, "matrix": [3, 3], "x": 65, "y": 56 },
+ { "flags": 1, "matrix": [3, 2], "x": 46, "y": 56 },
+ { "flags": 1, "matrix": [3, 1], "x": 28, "y": 56 },
+ { "flags": 1, "matrix": [3, 0], "x": 9, "y": 56 }
+ ]
+ },
+ "layouts": {
+ "LAYOUT_ortho_4x12": {
+ "layout": [
+ { "matrix": [0, 12], "x": 11, "y": 0 },
+ { "matrix": [0, 0], "x": 0, "y": 1 },
+ { "matrix": [0, 1], "x": 1, "y": 1 },
+ { "matrix": [0, 2], "x": 2, "y": 1 },
+ { "matrix": [0, 3], "x": 3, "y": 1 },
+ { "matrix": [0, 4], "x": 4, "y": 1 },
+ { "matrix": [0, 5], "x": 5, "y": 1 },
+ { "matrix": [0, 6], "x": 6, "y": 1 },
+ { "matrix": [0, 7], "x": 7, "y": 1 },
+ { "matrix": [0, 8], "x": 8, "y": 1 },
+ { "matrix": [0, 9], "x": 9, "y": 1 },
+ { "matrix": [0, 10], "x": 10, "y": 1 },
+ { "matrix": [0, 11], "x": 11, "y": 1 },
+ { "matrix": [1, 0], "x": 0, "y": 2 },
+ { "matrix": [1, 1], "x": 1, "y": 2 },
+ { "matrix": [1, 2], "x": 2, "y": 2 },
+ { "matrix": [1, 3], "x": 3, "y": 2 },
+ { "matrix": [1, 4], "x": 4, "y": 2 },
+ { "matrix": [1, 5], "x": 5, "y": 2 },
+ { "matrix": [1, 6], "x": 6, "y": 2 },
+ { "matrix": [1, 7], "x": 7, "y": 2 },
+ { "matrix": [1, 8], "x": 8, "y": 2 },
+ { "matrix": [1, 9], "x": 9, "y": 2 },
+ { "matrix": [1, 10], "x": 10, "y": 2 },
+ { "matrix": [1, 11], "x": 11, "y": 2 },
+ { "matrix": [2, 0], "x": 0, "y": 3 },
+ { "matrix": [2, 1], "x": 1, "y": 3 },
+ { "matrix": [2, 2], "x": 2, "y": 3 },
+ { "matrix": [2, 3], "x": 3, "y": 3 },
+ { "matrix": [2, 4], "x": 4, "y": 3 },
+ { "matrix": [2, 5], "x": 5, "y": 3 },
+ { "matrix": [2, 6], "x": 6, "y": 3 },
+ { "matrix": [2, 7], "x": 7, "y": 3 },
+ { "matrix": [2, 8], "x": 8, "y": 3 },
+ { "matrix": [2, 9], "x": 9, "y": 3 },
+ { "matrix": [2, 10], "x": 10, "y": 3 },
+ { "matrix": [2, 11], "x": 11, "y": 3 },
+ { "matrix": [3, 0], "x": 0, "y": 4 },
+ { "matrix": [3, 1], "x": 1, "y": 4 },
+ { "matrix": [3, 2], "x": 2, "y": 4 },
+ { "matrix": [3, 3], "x": 3, "y": 4 },
+ { "matrix": [3, 4], "x": 4, "y": 4 },
+ { "matrix": [3, 5], "x": 5, "y": 4 },
+ { "matrix": [3, 6], "x": 6, "y": 4 },
+ { "matrix": [3, 7], "x": 7, "y": 4 },
+ { "matrix": [3, 8], "x": 8, "y": 4 },
+ { "matrix": [3, 9], "x": 9, "y": 4 },
+ { "matrix": [3, 10], "x": 10, "y": 4 },
+ { "matrix": [3, 11], "x": 11, "y": 4 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk
diff --git a/keyboards/1upkeyboards/pi40/pi40.c b/keyboards/1upkeyboards/pi40/pi40.c
index 8e2fc4c3d3..085f0da8f8 100644
--- a/keyboards/1upkeyboards/pi40/pi40.c
+++ b/keyboards/1upkeyboards/pi40/pi40.c
@@ -57,28 +57,6 @@ static const char PROGMEM my_logo[] = {
#endif
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
- // Key Matrix to LED Index
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 },
- { 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12 },
- { 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35 },
- { 46, 45, 44, 43, 42, 41, NO_LED, 40, 39, 38, 37, 36 }
-}, {
- // LED Index to Physical Position
- { 9, 8 }, { 28, 8 }, { 46, 8 }, { 65, 8 }, { 84, 8 }, { 102, 8 }, { 121, 8 }, { 140, 8 }, { 159, 8 }, { 177, 8 }, { 196, 8 }, { 215, 8 },
- { 215, 24 }, { 196, 24 }, { 177, 24 }, { 159, 24 }, { 140, 24 }, { 121, 24 }, { 102, 24 }, { 84, 24 }, { 65, 24 }, { 46, 24 }, { 28, 24 }, { 9, 24 },
- { 9, 40 }, { 28, 40 }, { 46, 40 }, { 65, 40 }, { 84, 40 }, { 102, 40 }, { 121, 40 }, { 140, 40 }, { 159, 40 }, { 177, 40 }, { 196, 40 }, { 215, 40 },
- { 215, 56 }, { 196, 56 }, { 177, 56 }, { 159, 56 }, { 140, 56 }, { 112, 56 }, { 84, 56 }, { 65, 56 }, { 46, 56 }, { 28, 56 }, { 9, 56 }
-}, {
- // LED Index to Flag
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-} };
-#endif
-
#ifdef OLED_ENABLE
void init_timer(void){
diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk
index 017a3fe1cf..75f06c3f2b 100644
--- a/keyboards/1upkeyboards/pi40/rules.mk
+++ b/keyboards/1upkeyboards/pi40/rules.mk
@@ -1,21 +1,6 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # 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
-
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-
WS2812_DRIVER = vendor
-ENCODER_ENABLE = yes
OLED_ENABLE = yes
-OLED_DRIVER = SSD1306 \ No newline at end of file
+OLED_DRIVER = SSD1306
+
+DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 22:01:52 +0000