summaryrefslogtreecommitdiff
path: root/keyboards/percent
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/percent')
-rw-r--r--keyboards/percent/booster/booster.c16
-rw-r--r--keyboards/percent/booster/booster.h32
-rw-r--r--keyboards/percent/booster/config.h8
-rw-r--r--keyboards/percent/booster/info.json43
-rw-r--r--keyboards/percent/canoe/canoe.c18
-rw-r--r--keyboards/percent/canoe/config.h5
-rw-r--r--keyboards/percent/canoe/info.json8
-rw-r--r--keyboards/percent/canoe/rules.mk1
-rw-r--r--keyboards/percent/canoe_gen2/config.h9
-rw-r--r--keyboards/percent/canoe_gen2/info.json5
-rw-r--r--keyboards/percent/skog/config.h4
-rw-r--r--keyboards/percent/skog/info.json8
-rw-r--r--keyboards/percent/skog/rules.mk1
-rw-r--r--keyboards/percent/skog/skog.c20
-rw-r--r--keyboards/percent/skog_lite/config.h6
-rw-r--r--keyboards/percent/skog_lite/info.json8
-rw-r--r--keyboards/percent/skog_lite/rules.mk1
-rw-r--r--keyboards/percent/skog_lite/skog_lite.c17
18 files changed, 55 insertions, 155 deletions
diff --git a/keyboards/percent/booster/booster.c b/keyboards/percent/booster/booster.c
deleted file mode 100644
index bbae5d6f4e..0000000000
--- a/keyboards/percent/booster/booster.c
+++ /dev/null
@@ -1,16 +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/>.
- */
-#include "booster.h"
diff --git a/keyboards/percent/booster/booster.h b/keyboards/percent/booster/booster.h
deleted file mode 100644
index be2d2cb12b..0000000000
--- a/keyboards/percent/booster/booster.h
+++ /dev/null
@@ -1,32 +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
-
-#include "quantum.h"
-
-#define LAYOUT_numpad_5x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, \
- K20, K21, K22, K23, \
- K30, K31, K32, \
- K40, K42, K33 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, KC_NO }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 }, \
- { K40, KC_NO, K42, KC_NO }, \
-}
diff --git a/keyboards/percent/booster/config.h b/keyboards/percent/booster/config.h
index b452a0dcb6..2978c96efd 100644
--- a/keyboards/percent/booster/config.h
+++ b/keyboards/percent/booster/config.h
@@ -17,14 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { D1, D6, D7, B4, B5 }
-#define MATRIX_COL_PINS { C7, D4, D2, D0 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -41,4 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/percent/booster/info.json b/keyboards/percent/booster/info.json
index f92476c9f6..79b9cb8026 100644
--- a/keyboards/percent/booster/info.json
+++ b/keyboards/percent/booster/info.json
@@ -8,6 +8,11 @@
"pid": "0x4253",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C7", "D4", "D2", "D0"],
+ "rows": ["D1", "D6", "D7", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7"
},
@@ -17,23 +22,27 @@
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [
- {"label":"K00 (D1,C7)", "x":0, "y":0},
- {"label":"K01 (D1,D4)", "x":1, "y":0},
- {"label":"K02 (D1,D2)", "x":2, "y":0},
- {"label":"K03 (D1,D0)", "x":3, "y":0},
- {"label":"K10 (D6,C7)", "x":0, "y":1},
- {"label":"K11 (D6,D4)", "x":1, "y":1},
- {"label":"K12 (D6,D2)", "x":2, "y":1},
- {"label":"K20 (D7,C7)", "x":0, "y":2},
- {"label":"K21 (D7,D4)", "x":1, "y":2},
- {"label":"K22 (D7,D2)", "x":2, "y":2},
- {"label":"K23 (D7,D0)", "x":3, "y":1, "h":2},
- {"label":"K30 (B4,C7)", "x":0, "y":3},
- {"label":"K31 (B4,D4)", "x":1, "y":3},
- {"label":"K32 (B4,D2)", "x":2, "y":3},
- {"label":"K40 (B5,C7)", "x":0, "y":4, "w":2},
- {"label":"K42 (B5,D2)", "x":2, "y":4},
- {"label":"K33 (B4,D0)", "x":3, "y":3, "h":2}
+ {"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": [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": 1, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
]
}
}
diff --git a/keyboards/percent/canoe/canoe.c b/keyboards/percent/canoe/canoe.c
deleted file mode 100644
index 572ff50b01..0000000000
--- a/keyboards/percent/canoe/canoe.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-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 "canoe.h"
diff --git a/keyboards/percent/canoe/config.h b/keyboards/percent/canoe/config.h
index 69f53905fc..b7aa6ca2e9 100644
--- a/keyboards/percent/canoe/config.h
+++ b/keyboards/percent/canoe/config.h
@@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_NUM 2
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/percent/canoe/info.json b/keyboards/percent/canoe/info.json
index 951e55ec64..8d57368916 100644
--- a/keyboards/percent/canoe/info.json
+++ b/keyboards/percent/canoe/info.json
@@ -8,9 +8,17 @@
"pid": "0x434E",
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"],
+ "rows": ["B0", "B1", "B2", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "D4"
},
+ "ws2812": {
+ "driver": "i2c"
+ },
"indicators": {
"caps_lock": "D1"
},
diff --git a/keyboards/percent/canoe/rules.mk b/keyboards/percent/canoe/rules.mk
index 25437c442c..6b0cec85a4 100644
--- a/keyboards/percent/canoe/rules.mk
+++ b/keyboards/percent/canoe/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
COMMAND_ENABLE = yes
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/percent/canoe_gen2/config.h b/keyboards/percent/canoe_gen2/config.h
index 7138fe3939..f5bfd30028 100644
--- a/keyboards/percent/canoe_gen2/config.h
+++ b/keyboards/percent/canoe_gen2/config.h
@@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B1,B3,B2,F5,F4}
-#define MATRIX_COL_PINS {B0,D0,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,F6,F7}
-
-/* COL2ROW or ROW2COL */
-#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/percent/canoe_gen2/info.json b/keyboards/percent/canoe_gen2/info.json
index e84a835991..9426dd27b9 100644
--- a/keyboards/percent/canoe_gen2/info.json
+++ b/keyboards/percent/canoe_gen2/info.json
@@ -8,6 +8,11 @@
"pid": "0x89F0",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B0", "D0", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "F6", "F7"],
+ "rows": ["B1", "B3", "B2", "F5", "F4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker_split_bs", "65_iso_blocker_split_bs"],
diff --git a/keyboards/percent/skog/config.h b/keyboards/percent/skog/config.h
index 274d30df72..6907429c39 100644
--- a/keyboards/percent/skog/config.h
+++ b/keyboards/percent/skog/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 }
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLED_NUM 2
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/percent/skog/info.json b/keyboards/percent/skog/info.json
index 80c7d832c4..bc9543b951 100644
--- a/keyboards/percent/skog/info.json
+++ b/keyboards/percent/skog/info.json
@@ -8,10 +8,18 @@
"pid": "0x422D",
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2"],
+ "rows": ["B0", "B1", "B2", "B3", "B5", "B6", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "D4",
"levels": 5
},
+ "ws2812": {
+ "driver": "i2c"
+ },
"indicators": {
"caps_lock": "D1",
"scroll_lock": "D6"
diff --git a/keyboards/percent/skog/rules.mk b/keyboards/percent/skog/rules.mk
index 25437c442c..6b0cec85a4 100644
--- a/keyboards/percent/skog/rules.mk
+++ b/keyboards/percent/skog/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
COMMAND_ENABLE = yes
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/percent/skog/skog.c b/keyboards/percent/skog/skog.c
deleted file mode 100644
index c44f0373fb..0000000000
--- a/keyboards/percent/skog/skog.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2018 Jumail Mundekkat / MxBlue
-
-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/>.
-
-ps2avrGB support code by Kenneth A. (bminiex/.[ch])
-*/
-
-#include "skog.h"
diff --git a/keyboards/percent/skog_lite/config.h b/keyboards/percent/skog_lite/config.h
index b00a612cd7..75b78de22d 100644
--- a/keyboards/percent/skog_lite/config.h
+++ b/keyboards/percent/skog_lite/config.h
@@ -20,12 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_NUM 18
-// 0 1 2 3 4 5 6 7 8 9 A B C D E
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B6, B5 }
-#define MATRIX_COL_PINS { C4, C2, D7, C7, C6, A0, A1, A2, A3, A7, A6, A4, A5, C5, C3}
-
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/percent/skog_lite/info.json b/keyboards/percent/skog_lite/info.json
index 74abc67bdc..5dc1e3b3bd 100644
--- a/keyboards/percent/skog_lite/info.json
+++ b/keyboards/percent/skog_lite/info.json
@@ -8,9 +8,17 @@
"pid": "0x422D",
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["C4", "C2", "D7", "C7", "C6", "A0", "A1", "A2", "A3", "A7", "A6", "A4", "A5", "C5", "C3"],
+ "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "D4"
},
+ "ws2812": {
+ "driver": "i2c"
+ },
"indicators": {
"caps_lock": "D1",
"scroll_lock": "D6"
diff --git a/keyboards/percent/skog_lite/rules.mk b/keyboards/percent/skog_lite/rules.mk
index 752df26315..747ea2aae3 100644
--- a/keyboards/percent/skog_lite/rules.mk
+++ b/keyboards/percent/skog_lite/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
diff --git a/keyboards/percent/skog_lite/skog_lite.c b/keyboards/percent/skog_lite/skog_lite.c
deleted file mode 100644
index c69843e617..0000000000
--- a/keyboards/percent/skog_lite/skog_lite.c
+++ /dev/null
@@ -1,17 +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/>.
- */
-
-#include "skog_lite.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 09:48:27 +0000