aboutsummaryrefslogtreecommitdiff
path: root/keyboards/matrix/m12og
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/matrix/m12og')
-rw-r--r--keyboards/matrix/m12og/rev1/keyboard.json (renamed from keyboards/matrix/m12og/rev1/info.json)11
-rw-r--r--keyboards/matrix/m12og/rev1/matrix.c3
-rw-r--r--keyboards/matrix/m12og/rev1/rev1.c2
-rw-r--r--keyboards/matrix/m12og/rev1/rules.mk22
-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/rev2.c4
-rw-r--r--keyboards/matrix/m12og/rev2/rules.mk12
7 files changed, 26 insertions, 37 deletions
diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/keyboard.json
index 38a9de45ac..c956720a8d 100644
--- a/keyboards/matrix/m12og/rev1/info.json
+++ b/keyboards/matrix/m12og/rev1/keyboard.json
@@ -31,6 +31,17 @@
"ws2812": {
"pin": "B8"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
+ "bootloader": "custom",
+ "processor": "STM32F103",
"layout_aliases": {
"LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
},
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/rev1/rev1.c b/keyboards/matrix/m12og/rev1/rev1.c
index 702d3857c4..f517703c60 100644
--- a/keyboards/matrix/m12og/rev1/rev1.c
+++ b/keyboards/matrix/m12og/rev1/rev1.c
@@ -29,4 +29,6 @@ void keyboard_post_init_kb(void) {
rgblight_enable_noeeprom();
rgblight_sethsv_noeeprom(5, 255, 255);
rgblight_mode_noeeprom(37);
+
+ keyboard_post_init_user();
}
diff --git a/keyboards/matrix/m12og/rev1/rules.mk b/keyboards/matrix/m12og/rev1/rules.mk
index 136d07cbaa..077011cdc1 100644
--- a/keyboards/matrix/m12og/rev1/rules.mk
+++ b/keyboards/matrix/m12og/rev1/rules.mk
@@ -1,26 +1,6 @@
-# MCU name
-MCU = STM32F103
-
+# custom bootloader
MCU_LDSCRIPT = m12og_v1
-
BOARD = m12og_v1
-# Bootloader selection
-BOOTLOADER = custom
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # HAS TO BE ON! Otherwise the custom matrix doesn't work
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
-
CUSTOM_MATRIX = lite
SRC += matrix.c
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/rev2.c b/keyboards/matrix/m12og/rev2/rev2.c
index 1a35dff7a9..fb424b164f 100644
--- a/keyboards/matrix/m12og/rev2/rev2.c
+++ b/keyboards/matrix/m12og/rev2/rev2.c
@@ -4,10 +4,12 @@
#include "quantum.h"
-void matrix_init_user(void) {
+void matrix_init_kb(void) {
setPinOutput(C6);
setPinOutput(B2);
setPinOutput(B1);
+
+ matrix_init_user();
}
bool led_update_kb(led_t led_state) {
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