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/keymaps/default/keymap.c2
-rw-r--r--keyboards/matrix/m12og/rev1/matrix.c15
-rw-r--r--keyboards/matrix/m12og/rev1/rev1.c4
-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/keymaps/default/keymap.c2
-rw-r--r--keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c2
-rw-r--r--keyboards/matrix/m12og/rev2/keymaps/via/keymap.c2
-rw-r--r--keyboards/matrix/m12og/rev2/rev2.c14
-rw-r--r--keyboards/matrix/m12og/rev2/rules.mk12
11 files changed, 42 insertions, 53 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/keymaps/default/keymap.c b/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c
index d6e96a4813..5fa7ebdd73 100644
--- a/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c
+++ b/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT_tkl_ansi_tsangan(
KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, KC_TRNS, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/matrix/m12og/rev1/matrix.c b/keyboards/matrix/m12og/rev1/matrix.c
index 9c36153da1..3317abbe29 100644
--- a/keyboards/matrix/m12og/rev1/matrix.c
+++ b/keyboards/matrix/m12og/rev1/matrix.c
@@ -14,33 +14,30 @@
* 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;
static void select_col(uint8_t col) {
- setPinOutput(col_pins[col]);
- writePinHigh(col_pins[col]);
+ gpio_set_pin_output(col_pins[col]);
+ gpio_write_pin_high(col_pins[col]);
}
-static void unselect_col(uint8_t col) { setPinInputLow(col_pins[col]); }
+static void unselect_col(uint8_t col) { gpio_set_pin_input_low(col_pins[col]); }
static void unselect_cols(void) {
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
- setPinInputLow(col_pins[x]);
+ gpio_set_pin_input_low(col_pins[x]);
}
}
static void init_pins(void) {
unselect_cols();
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
- setPinInputLow(row_pins[x]);
+ gpio_set_pin_input_low(row_pins[x]);
}
}
@@ -58,7 +55,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
matrix_row_t current_row_value = last_row_value;
// Check row pin state
- if (readPin(row_pins[row_index]) != 0) {
+ if (gpio_read_pin(row_pins[row_index]) != 0) {
// Pin LO, set col bit
current_row_value |= (MATRIX_ROW_SHIFTER << current_col);
} else {
diff --git a/keyboards/matrix/m12og/rev1/rev1.c b/keyboards/matrix/m12og/rev1/rev1.c
index 702d3857c4..7506edc8e9 100644
--- a/keyboards/matrix/m12og/rev1/rev1.c
+++ b/keyboards/matrix/m12og/rev1/rev1.c
@@ -17,7 +17,7 @@
#include "quantum.h"
void board_init(void) {
- writePinLow(A8);
+ gpio_write_pin_low(A8);
}
void bootloader_jump(void) {
@@ -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/keymaps/default/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c
index 71436fddd0..790625465b 100644
--- a/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c
+++ b/keyboards/matrix/m12og/rev2/keymaps/default/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______,
- QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
_______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT),
};
diff --git a/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c
index 4c3b86ec4b..68fdb33f68 100644
--- a/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c
+++ b/keyboards/matrix/m12og/rev2/keymaps/iso/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
- QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
_______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT),
};
diff --git a/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c b/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c
index 2f0bbe2c69..db99fef7db 100644
--- a/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c
+++ b/keyboards/matrix/m12og/rev2/keymaps/via/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_NUM, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______,
- QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
_______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
),
diff --git a/keyboards/matrix/m12og/rev2/rev2.c b/keyboards/matrix/m12og/rev2/rev2.c
index 1a35dff7a9..bf6129c806 100644
--- a/keyboards/matrix/m12og/rev2/rev2.c
+++ b/keyboards/matrix/m12og/rev2/rev2.c
@@ -5,17 +5,19 @@
#include "quantum.h"
void matrix_init_user(void) {
- setPinOutput(C6);
- setPinOutput(B2);
- setPinOutput(B1);
+ gpio_set_pin_output(C6);
+ gpio_set_pin_output(B2);
+ gpio_set_pin_output(B1);
+
+ matrix_init_user();
}
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if (res) {
- writePin(B1, !led_state.num_lock);
- writePin(C6, !led_state.caps_lock);
- writePin(B2, !led_state.scroll_lock);
+ gpio_write_pin(B1, !led_state.num_lock);
+ gpio_write_pin(C6, !led_state.caps_lock);
+ gpio_write_pin(B2, !led_state.scroll_lock);
}
return res;
}
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