summaryrefslogtreecommitdiffstats
path: root/keyboards/1upkeyboards/pi40
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/1upkeyboards/pi40')
-rw-r--r--keyboards/1upkeyboards/pi40/config.h3
-rw-r--r--keyboards/1upkeyboards/pi40/grid_v1_1/info.json13
-rw-r--r--keyboards/1upkeyboards/pi40/keymaps/default/keymap.c2
-rw-r--r--keyboards/1upkeyboards/pi40/keymaps/via/keymap.c2
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_0/info.json13
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_1/info.json13
-rw-r--r--keyboards/1upkeyboards/pi40/rules.mk2
7 files changed, 24 insertions, 24 deletions
diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h
index 5d3841ae85..633bdfffee 100644
--- a/keyboards/1upkeyboards/pi40/config.h
+++ b/keyboards/1upkeyboards/pi40/config.h
@@ -10,9 +10,8 @@
#define OLED_BRIGHTNESS 128
#define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c"
-#define RGB_DI_PIN GP0
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
# define RGBLIGHT_LIMIT_VAL 150
#ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
index b3c64f7dd4..8199aa2448 100644
--- a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
@@ -13,6 +13,10 @@
"dynamic_keymap": {
"layer_count": 10
},
+ "ws2812": {
+ "pin": "GP0",
+ "driver": "vendor"
+ },
"features": {
"audio": false,
"backlight": false,
@@ -26,16 +30,13 @@
"rgblight": false
},
"matrix_pins": {
- "rows": [ "GP21", "GP20", "GP19", "GP18" ],
- "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ]
+ "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"
- }
+ {"pin_a": "GP14", "pin_b": "GP13"}
]
},
"rgb_matrix": {
diff --git a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
index 9aeaccb754..bc0d37eca0 100644
--- a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_ONE] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
[_TWO] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_THREE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
index 8f5226ddf8..e8a14d493f 100644
--- a/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
@@ -253,7 +253,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_ONE] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
[_TWO] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_THREE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
index d476109f79..a8122e6957 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
@@ -13,6 +13,10 @@
"dynamic_keymap": {
"layer_count": 10
},
+ "ws2812": {
+ "pin": "GP0",
+ "driver": "vendor"
+ },
"features": {
"audio": false,
"backlight": false,
@@ -26,16 +30,13 @@
"rgblight": false
},
"matrix_pins": {
- "rows": [ "GP21", "GP20", "GP19", "GP18" ],
- "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ]
+ "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"
- }
+ {"pin_a": "GP14", "pin_b": "GP13"}
]
},
"rgb_matrix": {
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
index 9e01928554..a25635f9d4 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
@@ -13,6 +13,10 @@
"dynamic_keymap": {
"layer_count": 10
},
+ "ws2812": {
+ "pin": "GP0",
+ "driver": "vendor"
+ },
"features": {
"audio": false,
"backlight": false,
@@ -26,16 +30,13 @@
"rgblight": false
},
"matrix_pins": {
- "rows": [ "GP21", "GP20", "GP19", "GP18" ],
- "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ]
+ "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"
- }
+ {"pin_a": "GP14", "pin_b": "GP13"}
]
},
"rgb_matrix": {
diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk
index 75f06c3f2b..e858deae6a 100644
--- a/keyboards/1upkeyboards/pi40/rules.mk
+++ b/keyboards/1upkeyboards/pi40/rules.mk
@@ -1,5 +1,3 @@
-WS2812_DRIVER = vendor
-
OLED_ENABLE = yes
OLED_DRIVER = SSD1306