aboutsummaryrefslogtreecommitdiff
path: root/keyboards/1upkeyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/1upkeyboards')
-rw-r--r--keyboards/1upkeyboards/1up60hse/config.h39
-rw-r--r--keyboards/1upkeyboards/1up60hse/keyboard.json (renamed from keyboards/1upkeyboards/1up60hse/info.json)19
-rw-r--r--keyboards/1upkeyboards/1up60hse/rules.mk13
-rw-r--r--keyboards/1upkeyboards/1up60hte/config.h25
-rw-r--r--keyboards/1upkeyboards/1up60hte/keyboard.json (renamed from keyboards/1upkeyboards/1up60hte/info.json)19
-rw-r--r--keyboards/1upkeyboards/1up60hte/rules.mk14
-rw-r--r--keyboards/1upkeyboards/1up60rgb/config.h7
-rw-r--r--keyboards/1upkeyboards/1up60rgb/keyboard.json (renamed from keyboards/1upkeyboards/1up60rgb/info.json)16
-rw-r--r--keyboards/1upkeyboards/1up60rgb/rules.mk12
-rw-r--r--keyboards/1upkeyboards/1upocarina/keyboard.json (renamed from keyboards/1upkeyboards/1upocarina/info.json)10
-rw-r--r--keyboards/1upkeyboards/1upocarina/rules.mk1
-rw-r--r--keyboards/1upkeyboards/1upslider8/keyboard.json (renamed from keyboards/1upkeyboards/1upslider8/info.json)0
-rw-r--r--keyboards/1upkeyboards/1upsuper16v3/keyboard.json (renamed from keyboards/1upkeyboards/1upsuper16v3/info.json)0
-rw-r--r--keyboards/1upkeyboards/1upsuper16v3/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json (renamed from keyboards/1upkeyboards/pi40/grid_v1_1/info.json)6
-rw-r--r--keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json (renamed from keyboards/1upkeyboards/pi40/mit_v1_0/info.json)6
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json (renamed from keyboards/1upkeyboards/pi40/mit_v1_1/info.json)6
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi40/rules.mk2
-rw-r--r--keyboards/1upkeyboards/pi50/grid/keyboard.json (renamed from keyboards/1upkeyboards/pi50/grid/info.json)0
-rw-r--r--keyboards/1upkeyboards/pi50/grid/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi50/info.json3
-rw-r--r--keyboards/1upkeyboards/pi50/mit/keyboard.json (renamed from keyboards/1upkeyboards/pi50/mit/info.json)0
-rw-r--r--keyboards/1upkeyboards/pi50/mit/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi60/config.h9
-rw-r--r--keyboards/1upkeyboards/pi60/keyboard.json (renamed from keyboards/1upkeyboards/pi60/info.json)11
-rw-r--r--keyboards/1upkeyboards/pi60/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi60_hse/config.h9
-rw-r--r--keyboards/1upkeyboards/pi60_hse/keyboard.json (renamed from keyboards/1upkeyboards/pi60_hse/info.json)11
-rw-r--r--keyboards/1upkeyboards/pi60_hse/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi60_rgb/config.h9
-rw-r--r--keyboards/1upkeyboards/pi60_rgb/keyboard.json (renamed from keyboards/1upkeyboards/pi60_rgb/info.json)11
-rw-r--r--keyboards/1upkeyboards/pi60_rgb/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi60_rgb_v2/keyboard.json (renamed from keyboards/1upkeyboards/pi60_rgb_v2/info.json)0
-rw-r--r--keyboards/1upkeyboards/pi60_rgb_v2/rules.mk0
-rw-r--r--keyboards/1upkeyboards/super16/config.h40
-rw-r--r--keyboards/1upkeyboards/super16/keyboard.json (renamed from keyboards/1upkeyboards/super16/info.json)15
-rw-r--r--keyboards/1upkeyboards/super16/rules.mk13
-rw-r--r--keyboards/1upkeyboards/super16v2/config.h5
-rw-r--r--keyboards/1upkeyboards/super16v2/keyboard.json (renamed from keyboards/1upkeyboards/super16v2/info.json)16
-rw-r--r--keyboards/1upkeyboards/super16v2/rules.mk14
-rw-r--r--keyboards/1upkeyboards/sweet16/config.h7
-rw-r--r--keyboards/1upkeyboards/sweet16/info.json8
-rw-r--r--keyboards/1upkeyboards/sweet16/rules.mk10
-rw-r--r--keyboards/1upkeyboards/sweet16/v1/info.json33
-rw-r--r--keyboards/1upkeyboards/sweet16/v1/keyboard.json99
-rw-r--r--keyboards/1upkeyboards/sweet16/v1/rules.mk4
-rw-r--r--keyboards/1upkeyboards/sweet16v2/kb2040/config.h22
-rw-r--r--keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json (renamed from keyboards/1upkeyboards/sweet16v2/kb2040/info.json)11
-rw-r--r--keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk0
-rw-r--r--keyboards/1upkeyboards/sweet16v2/pro_micro/config.h22
-rw-r--r--keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json (renamed from keyboards/1upkeyboards/sweet16v2/pro_micro/info.json)11
-rw-r--r--keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk0
55 files changed, 238 insertions, 350 deletions
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
deleted file mode 100644
index d876570c80..0000000000
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 MechMerlin
-
-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 <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/keyboard.json
index ffc2d4d765..990b51c1f8 100644
--- a/keyboards/1upkeyboards/1up60hse/info.json
+++ b/keyboards/1upkeyboards/1up60hse/keyboard.json
@@ -8,6 +8,19 @@
"pid": "0x6873",
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7"],
"rows": ["B3", "B2", "B1", "B0", "D4"]
@@ -18,6 +31,12 @@
"levels": 5,
"breathing": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
diff --git a/keyboards/1upkeyboards/1up60hse/rules.mk b/keyboards/1upkeyboards/1up60hse/rules.mk
deleted file mode 100644
index 11ed55a6f8..0000000000
--- a/keyboards/1upkeyboards/1up60hse/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
deleted file mode 100644
index eddf290b4c..0000000000
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2019 Bubnick
-
-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 <http://www.gnu.org/licenses/>.
-*/
-
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/keyboard.json
index 99275bf251..53e91017dd 100644
--- a/keyboards/1upkeyboards/1up60hte/info.json
+++ b/keyboards/1upkeyboards/1up60hte/keyboard.json
@@ -8,11 +8,30 @@
"pid": "0x6874",
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"],
"rows": ["B3", "B2", "B1", "B0", "D4"]
},
"diode_direction": "COL2ROW",
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"backlight": {
"pin": "B7"
},
diff --git a/keyboards/1upkeyboards/1up60hte/rules.mk b/keyboards/1upkeyboards/1up60hte/rules.mk
deleted file mode 100644
index aaea8522f6..0000000000
--- a/keyboards/1upkeyboards/1up60hte/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-LTO_ENABLE = yes
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/keyboard.json
index 0d288916cc..f4ba111251 100644
--- a/keyboards/1upkeyboards/1up60rgb/info.json
+++ b/keyboards/1upkeyboards/1up60rgb/keyboard.json
@@ -8,6 +8,22 @@
"pid": "0x7267",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/1upkeyboards/1up60rgb/rules.mk b/keyboards/1upkeyboards/1up60rgb/rules.mk
deleted file mode 100644
index 32e82925cc..0000000000
--- a/keyboards/1upkeyboards/1up60rgb/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/1upkeyboards/1upocarina/info.json b/keyboards/1upkeyboards/1upocarina/keyboard.json
index 008896d40e..1f33c048c1 100644
--- a/keyboards/1upkeyboards/1upocarina/info.json
+++ b/keyboards/1upkeyboards/1upocarina/keyboard.json
@@ -126,11 +126,11 @@
"layouts": {
"LAYOUT_1x5": {
"layout": [
- { "label": "z", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
- { "label": "x", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
- { "label": "esc", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
- { "label": "c", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
- { "label": "v", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }
+ { "label": "z", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "x", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "esc", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "c", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "v", "matrix": [0, 4], "x": 4, "y": 0 }
]
}
}
diff --git a/keyboards/1upkeyboards/1upocarina/rules.mk b/keyboards/1upkeyboards/1upocarina/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/1upkeyboards/1upocarina/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/1upkeyboards/1upslider8/info.json b/keyboards/1upkeyboards/1upslider8/keyboard.json
index 6b65361f67..6b65361f67 100644
--- a/keyboards/1upkeyboards/1upslider8/info.json
+++ b/keyboards/1upkeyboards/1upslider8/keyboard.json
diff --git a/keyboards/1upkeyboards/1upsuper16v3/info.json b/keyboards/1upkeyboards/1upsuper16v3/keyboard.json
index 7ef33a0342..7ef33a0342 100644
--- a/keyboards/1upkeyboards/1upsuper16v3/info.json
+++ b/keyboards/1upkeyboards/1upsuper16v3/keyboard.json
diff --git a/keyboards/1upkeyboards/1upsuper16v3/rules.mk b/keyboards/1upkeyboards/1upsuper16v3/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/1upkeyboards/1upsuper16v3/rules.mk
+++ /dev/null
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json
index c7028f4a4e..63f76eb1a6 100644
--- a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json
@@ -18,16 +18,14 @@
"driver": "vendor"
},
"features": {
- "audio": false,
- "backlight": false,
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
- "rgb_matrix": true,
- "rgblight": false
+ "oled": true,
+ "rgb_matrix": true
},
"matrix_pins": {
"rows": ["GP21", "GP20", "GP19", "GP18"],
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk b/keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk
+++ /dev/null
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json
index 6b89f2c2ab..ed1f139126 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json
@@ -18,16 +18,14 @@
"driver": "vendor"
},
"features": {
- "audio": false,
- "backlight": false,
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
- "rgb_matrix": true,
- "rgblight": false
+ "oled": true,
+ "rgb_matrix": true
},
"matrix_pins": {
"rows": ["GP21", "GP20", "GP19", "GP18"],
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk
+++ /dev/null
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json
index f19ef235d5..aa19a502b9 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json
@@ -18,16 +18,14 @@
"driver": "vendor"
},
"features": {
- "audio": false,
- "backlight": false,
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
- "rgb_matrix": true,
- "rgblight": false
+ "oled": true,
+ "rgb_matrix": true
},
"matrix_pins": {
"rows": ["GP21", "GP20", "GP19", "GP18"],
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk
+++ /dev/null
diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk
index 3451f44976..48aea570e0 100644
--- a/keyboards/1upkeyboards/pi40/rules.mk
+++ b/keyboards/1upkeyboards/pi40/rules.mk
@@ -1,3 +1 @@
-OLED_ENABLE = yes
-
DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0
diff --git a/keyboards/1upkeyboards/pi50/grid/info.json b/keyboards/1upkeyboards/pi50/grid/keyboard.json
index 5b23f27277..5b23f27277 100644
--- a/keyboards/1upkeyboards/pi50/grid/info.json
+++ b/keyboards/1upkeyboards/pi50/grid/keyboard.json
diff --git a/keyboards/1upkeyboards/pi50/grid/rules.mk b/keyboards/1upkeyboards/pi50/grid/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/1upkeyboards/pi50/grid/rules.mk
+++ /dev/null
diff --git a/keyboards/1upkeyboards/pi50/info.json b/keyboards/1upkeyboards/pi50/info.json
index 2a4fdef384..2ee1aed4cc 100644
--- a/keyboards/1upkeyboards/pi50/info.json
+++ b/keyboards/1upkeyboards/pi50/info.json
@@ -15,8 +15,6 @@
"layer_count": 10
},
"features": {
- "audio": false,
- "backlight": false,
"bootmagic": true,
"command": false,
"console": false,
@@ -24,7 +22,6 @@
"mousekey": true,
"nkro": false,
"rgb_matrix": true,
- "rgblight": false,
"oled": true
},
"matrix_pins": {
diff --git a/keyboards/1upkeyboards/pi50/mit/info.json b/keyboards/1upkeyboards/pi50/mit/keyboard.json
index b65a9b2cc9..b65a9b2cc9 100644
--- a/keyboards/1upkeyboards/pi50/mit/info.json
+++ b/keyboards/1upkeyboards/pi50/mit/keyboard.json
diff --git a/keyboards/1upkeyboards/pi50/mit/rules.mk b/keyboards/1upkeyboards/pi50/mit/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/1upkeyboards/pi50/mit/rules.mk
+++ /dev/null
diff --git a/keyboards/1upkeyboards/pi60/config.h b/keyboards/1upkeyboards/pi60/config.h
deleted file mode 100644
index a697e565c9..0000000000
--- a/keyboards/1upkeyboards/pi60/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE \ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/keyboard.json
index 06abb1a4a6..45c3876a6b 100644
--- a/keyboards/1upkeyboards/pi60/info.json
+++ b/keyboards/1upkeyboards/pi60/keyboard.json
@@ -15,8 +15,6 @@
"layer_count": 10
},
"features": {
- "audio": false,
- "backlight": false,
"bootmagic": true,
"command": false,
"console": false,
@@ -24,8 +22,13 @@
"extrakey": true,
"mousekey": true,
"nkro": false,
- "rgb_matrix": true,
- "rgblight": false
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
},
"ws2812": {
"pin": "GP17",
diff --git a/keyboards/1upkeyboards/pi60/rules.mk b/keyboards/1upkeyboards/pi60/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/1upkeyboards/pi60/rules.mk
+++ /dev/null
diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h
deleted file mode 100644
index 2c04274299..0000000000
--- a/keyboards/1upkeyboards/pi60_hse/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/keyboard.json
index 6b1fcdda41..d5a5f86187 100644
--- a/keyboards/1upkeyboards/pi60_hse/info.json
+++ b/keyboards/1upkeyboards/pi60_hse/keyboard.json
@@ -15,16 +15,19 @@
"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
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
},
"ws2812": {
"pin": "GP15",
diff --git a/keyboards/1upkeyboards/pi60_hse/rules.mk b/keyboards/1upkeyboards/pi60_hse/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/1upkeyboards/pi60_hse/rules.mk
+++ /dev/null
diff --git a/keyboards/1upkeyboards/pi60_rgb/config.h b/keyboards/1upkeyboards/pi60_rgb/config.h
deleted file mode 100644
index 2c04274299..0000000000
--- a/keyboards/1upkeyboards/pi60_rgb/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 ziptyze (@ziptyze)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/keyboard.json
index 044e0e3b4b..21dab3f71a 100644
--- a/keyboards/1upkeyboards/pi60_rgb/info.json
+++ b/keyboards/1upkeyboards/pi60_rgb/keyboard.json
@@ -15,16 +15,19 @@
"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
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
},
"ws2812": {
"pin": "GP19",
diff --git a/keyboards/1upkeyboards/pi60_rgb/rules.mk b/keyboards/1upkeyboards/pi60_rgb/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/1upkeyboards/pi60_rgb/rules.mk
+++ /dev/null
diff --git a/keyboards/1upkeyboards/pi60_rgb_v2/info.json b/keyboards/1upkeyboards/pi60_rgb_v2/keyboard.json
index 88b3e1ced4..88b3e1ced4 100644
--- a/keyboards/1upkeyboards/pi60_rgb_v2/info.json
+++ b/keyboards/1upkeyboards/pi60_rgb_v2/keyboard.json
diff --git a/keyboards/1upkeyboards/pi60_rgb_v2/rules.mk b/keyboards/1upkeyboards/pi60_rgb_v2/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/1upkeyboards/pi60_rgb_v2/rules.mk
+++ /dev/null
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
deleted file mode 100644
index 043d8b154b..0000000000
--- a/keyboards/1upkeyboards/super16/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2019 MechMerlin
-
-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 <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/keyboard.json
index 81b28c6655..9da4168d47 100644
--- a/keyboards/1upkeyboards/super16/info.json
+++ b/keyboards/1upkeyboards/super16/keyboard.json
@@ -77,6 +77,21 @@
},
"driver": "ws2812"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D4", "C6", "F6", "F7"],
"rows": ["D1", "D0", "F4", "F5"]
diff --git a/keyboards/1upkeyboards/super16/rules.mk b/keyboards/1upkeyboards/super16/rules.mk
deleted file mode 100644
index b5532d03ff..0000000000
--- a/keyboards/1upkeyboards/super16/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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
-RGB_MATRIX_ENABLE = yes
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 67af6d7cab..6abfa8f431 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -18,11 +18,6 @@
#define MOUSEKEY_MOVE_DELTA 25
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/keyboard.json
index 20a06f4c5e..652b03006e 100644
--- a/keyboards/1upkeyboards/super16v2/info.json
+++ b/keyboards/1upkeyboards/super16v2/keyboard.json
@@ -49,6 +49,22 @@
"driver": "ws2812",
"sleep": true
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D5", "D6", "C2", "D0"],
"rows": ["D1", "D2", "D3", "D4"]
diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk
deleted file mode 100644
index a7f5baf807..0000000000
--- a/keyboards/1upkeyboards/super16v2/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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
-ENCODER_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/1upkeyboards/sweet16/config.h b/keyboards/1upkeyboards/sweet16/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/1upkeyboards/sweet16/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/sweet16/info.json b/keyboards/1upkeyboards/sweet16/info.json
index ac9d944969..5fb70bb8e9 100644
--- a/keyboards/1upkeyboards/sweet16/info.json
+++ b/keyboards/1upkeyboards/sweet16/info.json
@@ -3,6 +3,14 @@
"manufacturer": "1up Keyboards",
"url": "",
"maintainer": "skullydazed",
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"usb": {
"vid": "0x6F75"
},
diff --git a/keyboards/1upkeyboards/sweet16/rules.mk b/keyboards/1upkeyboards/sweet16/rules.mk
index e5e771f051..7d269ac93f 100644
--- a/keyboards/1upkeyboards/sweet16/rules.mk
+++ b/keyboards/1upkeyboards/sweet16/rules.mk
@@ -1,11 +1 @@
-# Build Options
-#
DEFAULT_FOLDER = 1upkeyboards/sweet16/v1
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json
deleted file mode 100644
index bbecccae02..0000000000
--- a/keyboards/1upkeyboards/sweet16/v1/info.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "usb": {
- "pid": "0x0161",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 1,
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "snake": true,
- "knight": true,
- "christmas": true,
- "static_gradient": true,
- "rgb_test": true,
- "alternating": true,
- "twinkle": true
- }
- },
- "ws2812": {
- "pin": "B1"
- },
- "matrix_pins": {
- "cols": ["D1", "D0", "D4", "C6"],
- "rows": ["F4", "F5", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina"
-}
diff --git a/keyboards/1upkeyboards/sweet16/v1/keyboard.json b/keyboards/1upkeyboards/sweet16/v1/keyboard.json
new file mode 100644
index 0000000000..3ac73ce8eb
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16/v1/keyboard.json
@@ -0,0 +1,99 @@
+{
+ "keyboard_name": "Sweet16",
+ "manufacturer": "1up Keyboards",
+ "url": "",
+ "maintainer": "skullydazed",
+ "usb": {
+ "vid": "0x6F75",
+ "pid": "0x0161",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 1,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "rgb_test": true,
+ "alternating": true,
+ "twinkle": true
+ }
+ },
+ "ws2812": {
+ "pin": "B1"
+ },
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4", "C6"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_ortho_4x4": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"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": [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}
+ ]
+ },
+ "LAYOUT_numpad_4x4": {
+ "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, "h": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "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, "h": 2},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+ {"matrix": [3, 2], "x": 2, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/1upkeyboards/sweet16/v1/rules.mk b/keyboards/1upkeyboards/sweet16/v1/rules.mk
deleted file mode 100644
index 0912a1b4a6..0000000000
--- a/keyboards/1upkeyboards/sweet16/v1/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-
-LTO_ENABLE = yes
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
deleted file mode 100644
index 39e43b90cd..0000000000
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 ziptyze
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
index 40f96fb736..d8d6c5e3ea 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
@@ -12,8 +12,6 @@
"vid": "0x6F75"
},
"features": {
- "audio": false,
- "backlight": false,
"bootmagic": true,
"command": false,
"console": false,
@@ -21,8 +19,13 @@
"extrakey": true,
"mousekey": true,
"nkro": false,
- "rgb_matrix": true,
- "rgblight": false
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
},
"ws2812": {
"pin": "GP6",
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
+++ /dev/null
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
deleted file mode 100644
index 39e43b90cd..0000000000
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 ziptyze
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
index 31805fc967..d46f723a17 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
@@ -11,8 +11,6 @@
"vid": "0x6F75"
},
"features": {
- "audio": false,
- "backlight": false,
"bootmagic": true,
"command": false,
"console": false,
@@ -20,8 +18,13 @@
"extrakey": true,
"mousekey": true,
"nkro": false,
- "rgb_matrix": true,
- "rgblight": false
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
},
"ws2812": {
"pin": "D7"
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk b/keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk
+++ /dev/null