summaryrefslogtreecommitdiff
path: root/keyboards/projectkb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/projectkb')
-rw-r--r--keyboards/projectkb/alice/rev1/config.h4
-rw-r--r--keyboards/projectkb/alice/rev1/info.json10
-rw-r--r--keyboards/projectkb/alice/rev1/rules.mk2
-rw-r--r--keyboards/projectkb/alice/rev2/config.h4
-rw-r--r--keyboards/projectkb/alice/rev2/info.json10
-rw-r--r--keyboards/projectkb/alice/rev2/rules.mk2
-rw-r--r--keyboards/projectkb/signature65/config.h6
-rw-r--r--keyboards/projectkb/signature65/info.json5
-rw-r--r--keyboards/projectkb/signature65/signature65.c17
-rw-r--r--keyboards/projectkb/signature87/config.h5
-rw-r--r--keyboards/projectkb/signature87/info.json5
-rw-r--r--keyboards/projectkb/signature87/signature87.c1
-rw-r--r--keyboards/projectkb/signature87/signature87.h2
13 files changed, 31 insertions, 42 deletions
diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h
index 54918d2b49..e6990c6c48 100644
--- a/keyboards/projectkb/alice/rev1/config.h
+++ b/keyboards/projectkb/alice/rev1/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B2, B10, B11, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15, B12 }
-#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/projectkb/alice/rev1/info.json b/keyboards/projectkb/alice/rev1/info.json
new file mode 100644
index 0000000000..cbeebbb670
--- /dev/null
+++ b/keyboards/projectkb/alice/rev1/info.json
@@ -0,0 +1,10 @@
+{
+ "ws2812": {
+ "driver": "spi"
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B10", "B11", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15", "B12"],
+ "rows": ["B1", "B0", "A7", "A5", "A4"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/projectkb/alice/rev1/rules.mk b/keyboards/projectkb/alice/rev1/rules.mk
index e1e604dfc5..ab88066b0a 100644
--- a/keyboards/projectkb/alice/rev1/rules.mk
+++ b/keyboards/projectkb/alice/rev1/rules.mk
@@ -10,8 +10,6 @@ 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
-WS2812_DRIVER = spi
-
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/projectkb/alice/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h
index 1ac58753c7..cd1726d7eb 100644
--- a/keyboards/projectkb/alice/rev2/config.h
+++ b/keyboards/projectkb/alice/rev2/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B1, B0, A7, A1, A5, A4, A3, A10, B9, B8, B7, B6, B5, B4, B3, A15 }
-#define MATRIX_ROW_PINS { B2, B10, B11, A2, A0 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/projectkb/alice/rev2/info.json b/keyboards/projectkb/alice/rev2/info.json
new file mode 100644
index 0000000000..0ddf3403f5
--- /dev/null
+++ b/keyboards/projectkb/alice/rev2/info.json
@@ -0,0 +1,10 @@
+{
+ "ws2812": {
+ "driver": "spi"
+ },
+ "matrix_pins": {
+ "cols": ["B1", "B0", "A7", "A1", "A5", "A4", "A3", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+ "rows": ["B2", "B10", "B11", "A2", "A0"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/projectkb/alice/rev2/rules.mk b/keyboards/projectkb/alice/rev2/rules.mk
index e1e604dfc5..ab88066b0a 100644
--- a/keyboards/projectkb/alice/rev2/rules.mk
+++ b/keyboards/projectkb/alice/rev2/rules.mk
@@ -10,8 +10,6 @@ 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
-WS2812_DRIVER = spi
-
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/projectkb/signature65/config.h b/keyboards/projectkb/signature65/config.h
index 2972b51fa1..4d31d4b095 100644
--- a/keyboards/projectkb/signature65/config.h
+++ b/keyboards/projectkb/signature65/config.h
@@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
-#define MATRIX_COL_PINS { B14, A2, B9, B8, B5, B4, B3, A15, B11, B10, B2, A3, B1, B0, A4, A5 }
-// 1 2 3 4 5
-#define MATRIX_ROW_PINS { A8, A9, B13, A6, A7 }
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/projectkb/signature65/info.json b/keyboards/projectkb/signature65/info.json
index 2f0f01621b..6b7229d7e6 100644
--- a/keyboards/projectkb/signature65/info.json
+++ b/keyboards/projectkb/signature65/info.json
@@ -8,6 +8,11 @@
"pid": "0x0165",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B14", "A2", "B9", "B8", "B5", "B4", "B3", "A15", "B11", "B10", "B2", "A3", "B1", "B0", "A4", "A5"],
+ "rows": ["A8", "A9", "B13", "A6", "A7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/projectkb/signature65/signature65.c b/keyboards/projectkb/signature65/signature65.c
deleted file mode 100644
index c5255dddb9..0000000000
--- a/keyboards/projectkb/signature65/signature65.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2022 Project Keyboard
- *
- * 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/>.
- */
-
-#include "signature65.h"
diff --git a/keyboards/projectkb/signature87/config.h b/keyboards/projectkb/signature87/config.h
index 394e5ac706..4d31d4b095 100644
--- a/keyboards/projectkb/signature87/config.h
+++ b/keyboards/projectkb/signature87/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// 0 1 2 3 4 5 6 7 8 9 A B
-#define MATRIX_COL_PINS { A7, A6, A5, A4, A3, A2, A15, B3, B4 }
-#define MATRIX_ROW_PINS { B13, B12, A8, B15, A10, A9, B9, B8, B1, B0, B10, B2 }
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/projectkb/signature87/info.json b/keyboards/projectkb/signature87/info.json
index 76ff092fb2..cc6d437f71 100644
--- a/keyboards/projectkb/signature87/info.json
+++ b/keyboards/projectkb/signature87/info.json
@@ -8,6 +8,11 @@
"pid": "0x0187",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A7", "A6", "A5", "A4", "A3", "A2", "A15", "B3", "B4"],
+ "rows": ["B13", "B12", "A8", "B15", "A10", "A9", "B9", "B8", "B1", "B0", "B10", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"community_layouts": ["tkl_ansi"],
diff --git a/keyboards/projectkb/signature87/signature87.c b/keyboards/projectkb/signature87/signature87.c
deleted file mode 100644
index e210f67de9..0000000000
--- a/keyboards/projectkb/signature87/signature87.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "signature87.h" \ No newline at end of file
diff --git a/keyboards/projectkb/signature87/signature87.h b/keyboards/projectkb/signature87/signature87.h
index b97570ef95..48d7d2f40d 100644
--- a/keyboards/projectkb/signature87/signature87.h
+++ b/keyboards/projectkb/signature87/signature87.h
@@ -71,7 +71,7 @@
}
#define LAYOUT_wkl_ansi( \
- K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K06, K16, k07, K17, K08, K18, \
+ K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K06, K16, K07, K17, K08, K18, \
K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, K38, \
K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K57, K47, K58, K48, \
K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, \