aboutsummaryrefslogtreecommitdiff
path: root/keyboards/keychron/q12
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keychron/q12')
-rw-r--r--keyboards/keychron/q12/ansi_encoder/keyboard.json (renamed from keyboards/keychron/q12/ansi_encoder/info.json)9
-rw-r--r--keyboards/keychron/q12/ansi_encoder/rules.mk16
-rw-r--r--keyboards/keychron/q12/iso_encoder/keyboard.json (renamed from keyboards/keychron/q12/iso_encoder/info.json)9
-rw-r--r--keyboards/keychron/q12/iso_encoder/rules.mk17
-rw-r--r--keyboards/keychron/q12/matrix.c3
5 files changed, 20 insertions, 34 deletions
diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/keyboard.json
index 7b1e46beb7..d2f90cb8ac 100644
--- a/keyboards/keychron/q12/ansi_encoder/info.json
+++ b/keyboards/keychron/q12/ansi_encoder/keyboard.json
@@ -15,6 +15,15 @@
},
"processor": "STM32L432",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "encoder": true,
+ "dip_switch": true
+ },
"layouts": {
"LAYOUT_ansi_103": {
"layout": [
diff --git a/keyboards/keychron/q12/ansi_encoder/rules.mk b/keyboards/keychron/q12/ansi_encoder/rules.mk
index 213c733c9c..3652da4b69 100644
--- a/keyboards/keychron/q12/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q12/ansi_encoder/rules.mk
@@ -1,19 +1,3 @@
-# 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 USB N-key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
# custom matrix setup
CUSTOM_MATRIX = lite
diff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/keyboard.json
index c66c1bb665..29e24a1491 100644
--- a/keyboards/keychron/q12/iso_encoder/info.json
+++ b/keyboards/keychron/q12/iso_encoder/keyboard.json
@@ -15,6 +15,15 @@
},
"processor": "STM32L432",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "encoder": true,
+ "dip_switch": true
+ },
"layouts": {
"LAYOUT_iso_104": {
"layout": [
diff --git a/keyboards/keychron/q12/iso_encoder/rules.mk b/keyboards/keychron/q12/iso_encoder/rules.mk
index 39b0594039..3652da4b69 100644
--- a/keyboards/keychron/q12/iso_encoder/rules.mk
+++ b/keyboards/keychron/q12/iso_encoder/rules.mk
@@ -1,21 +1,4 @@
-# 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 USB N-key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes # Enable Encoder
-DIP_SWITCH_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-
# custom matrix setup
CUSTOM_MATRIX = lite
-VPATH ?= keyboards/keychron/common
SRC += matrix.c
diff --git a/keyboards/keychron/q12/matrix.c b/keyboards/keychron/q12/matrix.c
index 8229517fd9..cf8361bd23 100644
--- a/keyboards/keychron/q12/matrix.c
+++ b/keyboards/keychron/q12/matrix.c
@@ -15,7 +15,8 @@
*/
#include "matrix.h"
-#include "quantum.h"
+#include "atomic_util.h"
+#include <string.h>
// Pin connected to DS of 74HC595
#define DATA_PIN C15