aboutsummaryrefslogtreecommitdiff
path: root/keyboards/1upkeyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/1upkeyboards')
-rw-r--r--keyboards/1upkeyboards/1up60hse/keyboard.json1
-rw-r--r--keyboards/1upkeyboards/1up60hte/keyboard.json2
-rw-r--r--keyboards/1upkeyboards/1up60rgb/keyboard.json3
-rw-r--r--keyboards/1upkeyboards/1upocarina/keyboard.json2
-rw-r--r--keyboards/1upkeyboards/1upslider8/keyboard.json2
-rw-r--r--keyboards/1upkeyboards/1upsuper16v3/keyboard.json2
-rw-r--r--keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json2
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json2
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json2
-rw-r--r--keyboards/1upkeyboards/pi50/config.h1
-rw-r--r--keyboards/1upkeyboards/pi50/info.json2
-rw-r--r--keyboards/1upkeyboards/pi50/pi50.c39
-rw-r--r--keyboards/1upkeyboards/pi60/keyboard.json2
-rw-r--r--keyboards/1upkeyboards/pi60_hse/keyboard.json2
-rw-r--r--keyboards/1upkeyboards/pi60_rgb/keyboard.json2
-rw-r--r--keyboards/1upkeyboards/super16/keyboard.json6
-rw-r--r--keyboards/1upkeyboards/super16v2/keyboard.json3
-rw-r--r--keyboards/1upkeyboards/sweet16/info.json3
-rw-r--r--keyboards/1upkeyboards/sweet16/v1/keyboard.json4
-rw-r--r--keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json2
-rw-r--r--keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json2
21 files changed, 4 insertions, 82 deletions
diff --git a/keyboards/1upkeyboards/1up60hse/keyboard.json b/keyboards/1upkeyboards/1up60hse/keyboard.json
index 990b51c1f8..9f1d0c0ff4 100644
--- a/keyboards/1upkeyboards/1up60hse/keyboard.json
+++ b/keyboards/1upkeyboards/1up60hse/keyboard.json
@@ -1,7 +1,6 @@
{
"keyboard_name": "1up60hse",
"manufacturer": "1upkeyboards",
- "url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x6F75",
diff --git a/keyboards/1upkeyboards/1up60hte/keyboard.json b/keyboards/1upkeyboards/1up60hte/keyboard.json
index 7f8a660d80..4f781f91ee 100644
--- a/keyboards/1upkeyboards/1up60hte/keyboard.json
+++ b/keyboards/1upkeyboards/1up60hte/keyboard.json
@@ -14,8 +14,6 @@
"features": {
"backlight": true,
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
"nkro": true,
diff --git a/keyboards/1upkeyboards/1up60rgb/keyboard.json b/keyboards/1upkeyboards/1up60rgb/keyboard.json
index f4ba111251..e863edae1b 100644
--- a/keyboards/1upkeyboards/1up60rgb/keyboard.json
+++ b/keyboards/1upkeyboards/1up60rgb/keyboard.json
@@ -1,7 +1,6 @@
{
"keyboard_name": "1UP RGB Underglow PCB",
"manufacturer": "1upkeyboards",
- "url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x6F75",
@@ -11,8 +10,6 @@
"features": {
"backlight": true,
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
"nkro": true,
diff --git a/keyboards/1upkeyboards/1upocarina/keyboard.json b/keyboards/1upkeyboards/1upocarina/keyboard.json
index 1f33c048c1..feeafdedbd 100644
--- a/keyboards/1upkeyboards/1upocarina/keyboard.json
+++ b/keyboards/1upkeyboards/1upocarina/keyboard.json
@@ -15,8 +15,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
diff --git a/keyboards/1upkeyboards/1upslider8/keyboard.json b/keyboards/1upkeyboards/1upslider8/keyboard.json
index 6b65361f67..fd969c8f06 100644
--- a/keyboards/1upkeyboards/1upslider8/keyboard.json
+++ b/keyboards/1upkeyboards/1upslider8/keyboard.json
@@ -14,8 +14,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
diff --git a/keyboards/1upkeyboards/1upsuper16v3/keyboard.json b/keyboards/1upkeyboards/1upsuper16v3/keyboard.json
index 7ef33a0342..b3b7ef5535 100644
--- a/keyboards/1upkeyboards/1upsuper16v3/keyboard.json
+++ b/keyboards/1upkeyboards/1upsuper16v3/keyboard.json
@@ -16,8 +16,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json
index 63f76eb1a6..6d9fc9fe01 100644
--- a/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json
@@ -19,8 +19,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json
index ed1f139126..6cd624bad0 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json
@@ -19,8 +19,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json
index aa19a502b9..402143991a 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json
@@ -19,8 +19,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
diff --git a/keyboards/1upkeyboards/pi50/config.h b/keyboards/1upkeyboards/pi50/config.h
index e20a9854a5..8d40ecdaec 100644
--- a/keyboards/1upkeyboards/pi50/config.h
+++ b/keyboards/1upkeyboards/pi50/config.h
@@ -8,3 +8,4 @@
#define I2C_DRIVER I2CD1
#define OLED_BRIGHTNESS 128
#define OLED_FONT_H "keyboards/1upkeyboards/pi50/lib/glcdfont.c"
+#define RGB_MATRIX_MODE_NAME_ENABLE
diff --git a/keyboards/1upkeyboards/pi50/info.json b/keyboards/1upkeyboards/pi50/info.json
index 409fbecbc8..dd222b2b5d 100644
--- a/keyboards/1upkeyboards/pi50/info.json
+++ b/keyboards/1upkeyboards/pi50/info.json
@@ -16,8 +16,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
diff --git a/keyboards/1upkeyboards/pi50/pi50.c b/keyboards/1upkeyboards/pi50/pi50.c
index ea73875970..c55b2669ef 100644
--- a/keyboards/1upkeyboards/pi50/pi50.c
+++ b/keyboards/1upkeyboards/pi50/pi50.c
@@ -18,43 +18,6 @@
#include <ctype.h>
#include <stdio.h>
-#if defined(RGB_MATRIX_EFFECT)
-# undef RGB_MATRIX_EFFECT
-#endif // defined(RGB_MATRIX_EFFECT)
-
-#define RGB_MATRIX_EFFECT(x) RGB_MATRIX_EFFECT_##x,
-enum {
- RGB_MATRIX_EFFECT_NONE,
-#include "rgb_matrix_effects.inc"
-#undef RGB_MATRIX_EFFECT
-#ifdef RGB_MATRIX_CUSTOM_KB
-# include "rgb_matrix_kb.inc"
-#endif
-#ifdef RGB_MATRIX_CUSTOM_USER
-# include "rgb_matrix_user.inc"
-#endif
-};
-
-#define RGB_MATRIX_EFFECT(x) \
- case RGB_MATRIX_EFFECT_##x: \
- return #x;
-const char* rgb_matrix_name(uint8_t effect) {
- switch (effect) {
- case RGB_MATRIX_EFFECT_NONE:
- return "NONE";
-#include "rgb_matrix_effects.inc"
-#undef RGB_MATRIX_EFFECT
-#ifdef RGB_MATRIX_CUSTOM_KB
-# include "rgb_matrix_kb.inc"
-#endif
-#ifdef RGB_MATRIX_CUSTOM_USER
-# include "rgb_matrix_user.inc"
-#endif
- default:
- return "UNKNOWN";
- }
-}
-
#ifdef OLED_ENABLE
static uint32_t oled_logo_timer = 0;
@@ -148,7 +111,7 @@ void user_oled_magic(void) {
oled_write_P(led_state.num_lock ? PSTR("Num(x) ") : PSTR("Num( ) "), false);
oled_write_P(led_state.scroll_lock ? PSTR("Scrl(x)") : PSTR("Scrl( )"), false);
- char *mode_name = strdup(rgb_matrix_name(rgb_matrix_get_mode()));
+ char *mode_name = strdup(rgb_matrix_get_mode_name(rgb_matrix_get_mode()));
if (mode_name != NULL) {
int len = strlen(mode_name);
bool capitalize_next = true;
diff --git a/keyboards/1upkeyboards/pi60/keyboard.json b/keyboards/1upkeyboards/pi60/keyboard.json
index ca3007ee76..b25204bd13 100644
--- a/keyboards/1upkeyboards/pi60/keyboard.json
+++ b/keyboards/1upkeyboards/pi60/keyboard.json
@@ -16,8 +16,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
diff --git a/keyboards/1upkeyboards/pi60_hse/keyboard.json b/keyboards/1upkeyboards/pi60_hse/keyboard.json
index d5a5f86187..ec60c0c3f8 100644
--- a/keyboards/1upkeyboards/pi60_hse/keyboard.json
+++ b/keyboards/1upkeyboards/pi60_hse/keyboard.json
@@ -16,8 +16,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
diff --git a/keyboards/1upkeyboards/pi60_rgb/keyboard.json b/keyboards/1upkeyboards/pi60_rgb/keyboard.json
index 21dab3f71a..6e362eb8c9 100644
--- a/keyboards/1upkeyboards/pi60_rgb/keyboard.json
+++ b/keyboards/1upkeyboards/pi60_rgb/keyboard.json
@@ -16,8 +16,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
diff --git a/keyboards/1upkeyboards/super16/keyboard.json b/keyboards/1upkeyboards/super16/keyboard.json
index 9da4168d47..3b5859474a 100644
--- a/keyboards/1upkeyboards/super16/keyboard.json
+++ b/keyboards/1upkeyboards/super16/keyboard.json
@@ -1,7 +1,6 @@
{
"keyboard_name": "super16",
"manufacturer": "1upkeyboards",
- "url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x6F75",
@@ -79,8 +78,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
@@ -97,8 +94,7 @@
"rows": ["D1", "D0", "F4", "F5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_4x4", "numpad_4x4"],
"layouts": {
"LAYOUT_ortho_4x4": {
diff --git a/keyboards/1upkeyboards/super16v2/keyboard.json b/keyboards/1upkeyboards/super16v2/keyboard.json
index 652b03006e..5c5123453c 100644
--- a/keyboards/1upkeyboards/super16v2/keyboard.json
+++ b/keyboards/1upkeyboards/super16v2/keyboard.json
@@ -1,7 +1,6 @@
{
"keyboard_name": "super16v2",
"manufacturer": "1upkeyboards",
- "url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x6F75",
@@ -51,8 +50,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
diff --git a/keyboards/1upkeyboards/sweet16/info.json b/keyboards/1upkeyboards/sweet16/info.json
index 5fb70bb8e9..78c59fb2ae 100644
--- a/keyboards/1upkeyboards/sweet16/info.json
+++ b/keyboards/1upkeyboards/sweet16/info.json
@@ -1,12 +1,9 @@
{
"keyboard_name": "Sweet16",
"manufacturer": "1up Keyboards",
- "url": "",
"maintainer": "skullydazed",
"features": {
"bootmagic": false,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
diff --git a/keyboards/1upkeyboards/sweet16/v1/keyboard.json b/keyboards/1upkeyboards/sweet16/v1/keyboard.json
index 3ac73ce8eb..a8c5bf7e92 100644
--- a/keyboards/1upkeyboards/sweet16/v1/keyboard.json
+++ b/keyboards/1upkeyboards/sweet16/v1/keyboard.json
@@ -1,7 +1,6 @@
{
"keyboard_name": "Sweet16",
"manufacturer": "1up Keyboards",
- "url": "",
"maintainer": "skullydazed",
"usb": {
"vid": "0x6F75",
@@ -49,8 +48,7 @@
"rows": ["F4", "F5", "F6", "F7"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json b/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
index d8d6c5e3ea..40a0ec4039 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
@@ -13,8 +13,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
index d46f723a17..d8ff291e69 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
@@ -12,8 +12,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,