aboutsummaryrefslogtreecommitdiff
path: root/keyboards/matrix/noah
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/matrix/noah')
-rw-r--r--keyboards/matrix/noah/keyboard.json (renamed from keyboards/matrix/noah/info.json)12
-rw-r--r--keyboards/matrix/noah/matrix.c18
-rw-r--r--keyboards/matrix/noah/noah.c1
-rw-r--r--keyboards/matrix/noah/rules.mk27
4 files changed, 19 insertions, 39 deletions
diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/keyboard.json
index bc546cffc9..eb13e16aa2 100644
--- a/keyboards/matrix/noah/info.json
+++ b/keyboards/matrix/noah/keyboard.json
@@ -6,7 +6,8 @@
"usb": {
"vid": "0x4D58",
"pid": "0x0065",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "no_startup_check": true
},
"rgblight": {
"driver": "custom",
@@ -75,6 +76,15 @@
},
"driver": "is31fl3731"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgblight": true,
+ "rgb_matrix": true
+ },
+ "processor": "STM32F411",
+ "bootloader": "custom",
"community_layouts": ["65_iso_blocker"],
"layouts": {
"LAYOUT_default": {
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
diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk
index 3b75264222..407c120a52 100644
--- a/keyboards/matrix/noah/rules.mk
+++ b/keyboards/matrix/noah/rules.mk
@@ -1,32 +1,7 @@
-# MCU name
-MCU = STM32F411
-
-# Linker script to use
-# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
-# or <this_dir>/ld/
+# custom bootloader
MCU_LDSCRIPT = noah_boot
-
-# Board: it should exist either in <chibios>/os/hal/boards/
-# or <this_dir>/boards
BOARD = ST_NUCLEO64_F411RE
-# Bootloader selection
-BOOTLOADER = custom
-
-# 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
-NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in
-
-RGB_MATRIX_ENABLE = yes
-
-RGBLIGHT_ENABLE = yes
WS2812_DRIVER_REQUIRED = yes
CUSTOM_MATRIX = yes