aboutsummaryrefslogtreecommitdiff
path: root/keyboards/matrix
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/matrix')
-rw-r--r--keyboards/matrix/abelx/abelx.c1
-rw-r--r--keyboards/matrix/abelx/matrix.c4
-rw-r--r--keyboards/matrix/cain_re/keyboard.json (renamed from keyboards/matrix/cain_re/info.json)9
-rw-r--r--keyboards/matrix/cain_re/rules.mk12
-rw-r--r--keyboards/matrix/falcon/keyboard.json (renamed from keyboards/matrix/falcon/info.json)9
-rw-r--r--keyboards/matrix/falcon/rules.mk12
-rw-r--r--keyboards/matrix/m12og/rev1/matrix.c3
-rw-r--r--keyboards/matrix/m12og/rev2/keyboard.json (renamed from keyboards/matrix/m12og/rev2/info.json)9
-rw-r--r--keyboards/matrix/m12og/rev2/rules.mk12
-rw-r--r--keyboards/matrix/m20add/matrix.c4
-rw-r--r--keyboards/matrix/m20add/rgb_ring.c4
-rw-r--r--keyboards/matrix/me/keyboard.json (renamed from keyboards/matrix/me/info.json)9
-rw-r--r--keyboards/matrix/me/rules.mk12
-rw-r--r--keyboards/matrix/noah/matrix.c18
-rw-r--r--keyboards/matrix/noah/noah.c1
15 files changed, 48 insertions, 71 deletions
diff --git a/keyboards/matrix/abelx/abelx.c b/keyboards/matrix/abelx/abelx.c
index 0a3071a402..ee7ffde134 100644
--- a/keyboards/matrix/abelx/abelx.c
+++ b/keyboards/matrix/abelx/abelx.c
@@ -79,6 +79,7 @@ void setleds_custom(rgb_led_t *start_led, uint16_t num_leds)
}
const rgblight_driver_t rgblight_driver = {
+ .init = ws2812_init,
.setleds = setleds_custom,
};
diff --git a/keyboards/matrix/abelx/matrix.c b/keyboards/matrix/abelx/matrix.c
index d8d87b7d89..d74ed95775 100644
--- a/keyboards/matrix/abelx/matrix.c
+++ b/keyboards/matrix/abelx/matrix.c
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include "quantum.h"
#include "matrix.h"
#include "tca6424.h"
#include "abelx.h"
diff --git a/keyboards/matrix/cain_re/info.json b/keyboards/matrix/cain_re/keyboard.json
index 37e129f1f2..02c6cbbeb5 100644
--- a/keyboards/matrix/cain_re/info.json
+++ b/keyboards/matrix/cain_re/keyboard.json
@@ -30,6 +30,15 @@
"ws2812": {
"pin": "E6"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F1", "F4", "F5", "F6", "B5", "B6", "B3", "B2", "B1", "D0", "B4", "D6"],
"rows": ["F0", "C7", "C6", "D5", "D2", "D4", "D7", "B7", "D1"]
diff --git a/keyboards/matrix/cain_re/rules.mk b/keyboards/matrix/cain_re/rules.mk
deleted file mode 100644
index b851d0ab39..0000000000
--- a/keyboards/matrix/cain_re/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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/keyboard.json
index 4984562fe0..0c387f5bc2 100644
--- a/keyboards/matrix/falcon/info.json
+++ b/keyboards/matrix/falcon/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x474E",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F6", "B3", "B2", "B1", "B0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
"rows": ["F1", "B7", "F7", "F5", "F4"]
diff --git a/keyboards/matrix/falcon/rules.mk b/keyboards/matrix/falcon/rules.mk
deleted file mode 100644
index 951dd07d6e..0000000000
--- a/keyboards/matrix/falcon/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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/matrix/m12og/rev1/matrix.c b/keyboards/matrix/m12og/rev1/matrix.c
index 9c36153da1..c127aa35b9 100644
--- a/keyboards/matrix/m12og/rev1/matrix.c
+++ b/keyboards/matrix/m12og/rev1/matrix.c
@@ -14,12 +14,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdint.h>
-#include <stdbool.h>
#include "util.h"
#include "matrix.h"
#include "debounce.h"
-#include "quantum.h"
static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
diff --git a/keyboards/matrix/m12og/rev2/info.json b/keyboards/matrix/m12og/rev2/keyboard.json
index 2205db43fa..42df6a75e8 100644
--- a/keyboards/matrix/m12og/rev2/info.json
+++ b/keyboards/matrix/m12og/rev2/keyboard.json
@@ -29,6 +29,15 @@
"ws2812": {
"pin": "B3"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D0", "D2", "D6", "D4", "D5"],
"rows": ["E6", "F0", "B7", "C7", "D3", "B0", "D1"]
diff --git a/keyboards/matrix/m12og/rev2/rules.mk b/keyboards/matrix/m12og/rev2/rules.mk
deleted file mode 100644
index f1af8ca4c9..0000000000
--- a/keyboards/matrix/m12og/rev2/rules.mk
+++ /dev/null
@@ -1,12 +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 = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/matrix/m20add/matrix.c b/keyboards/matrix/m20add/matrix.c
index e9ddbdff62..85f5863725 100644
--- a/keyboards/matrix/m20add/matrix.c
+++ b/keyboards/matrix/m20add/matrix.c
@@ -2,10 +2,6 @@
* matrix.c
*/
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include "quantum.h"
#include "matrix.h"
#include "tca6424.h"
#include "m20add.h"
diff --git a/keyboards/matrix/m20add/rgb_ring.c b/keyboards/matrix/m20add/rgb_ring.c
index f32875cf4f..ecdac9130a 100644
--- a/keyboards/matrix/m20add/rgb_ring.c
+++ b/keyboards/matrix/m20add/rgb_ring.c
@@ -18,9 +18,13 @@
#include "rgb_ring.h"
+#include <stdint.h>
+#include <stdbool.h>
#include <string.h>
#include "quantum.h"
#include "rgblight.h"
+#include "timer.h"
+#include "action.h"
#include "drivers/led/issi/is31fl3731.h"
#include "i2c_master.h"
diff --git a/keyboards/matrix/me/info.json b/keyboards/matrix/me/keyboard.json
index 147fc7c5c8..8349fbd7e6 100644
--- a/keyboards/matrix/me/info.json
+++ b/keyboards/matrix/me/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x454D",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B7", "B3", "B2", "B1", "B0", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "D7"],
"rows": ["D3", "D5", "D4", "D6", "B5", "B4"]
diff --git a/keyboards/matrix/me/rules.mk b/keyboards/matrix/me/rules.mk
deleted file mode 100644
index 951dd07d6e..0000000000
--- a/keyboards/matrix/me/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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/matrix/noah/matrix.c b/keyboards/matrix/noah/matrix.c
index 90e7006b78..14e8188cb5 100644
--- a/keyboards/matrix/noah/matrix.c
+++ b/keyboards/matrix/noah/matrix.c
@@ -2,16 +2,10 @@
* matrix.c
*/
-#include <stdint.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-#include <hal.h>
-#include "quantum.h"
+#include "matrix.h"
#include "timer.h"
#include "wait.h"
#include "print.h"
-#include "matrix.h"
#ifndef DEBOUNCE
# define DEBOUNCE 5
@@ -167,16 +161,16 @@ matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
void matrix_print(void)
{
- printf("\nr/c 01234567\n");
+ xprintf("\nr/c 01234567\n");
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
- printf("%X0: ", row);
+ xprintf("%X0: ", row);
matrix_row_t data = matrix_get_row(row);
for (int col = 0; col < MATRIX_COLS; col++) {
if (data & (1<<col))
- printf("1");
+ xprintf("1");
else
- printf("0");
+ xprintf("0");
}
- printf("\n");
+ xprintf("\n");
}
}
diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c
index b5c52f9952..a01d1b11bc 100644
--- a/keyboards/matrix/noah/noah.c
+++ b/keyboards/matrix/noah/noah.c
@@ -55,6 +55,7 @@ void setleds_custom(rgb_led_t *ledarray, uint16_t num_leds) {
}
const rgblight_driver_t rgblight_driver = {
+ .init = ws2812_init,
.setleds = setleds_custom,
};
#endif