aboutsummaryrefslogtreecommitdiff
path: root/keyboards/kagizaraya
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kagizaraya')
-rw-r--r--keyboards/kagizaraya/chidori/board.c17
-rw-r--r--keyboards/kagizaraya/chidori/keyboard.json (renamed from keyboards/kagizaraya/chidori/info.json)5
-rw-r--r--keyboards/kagizaraya/chidori/keymaps/default/keymap.c2
-rw-r--r--keyboards/kagizaraya/chidori/matrix.c1
-rw-r--r--keyboards/kagizaraya/chidori/rules.mk10
-rw-r--r--keyboards/kagizaraya/halberd/keyboard.json (renamed from keyboards/kagizaraya/halberd/info.json)9
-rw-r--r--keyboards/kagizaraya/halberd/keymaps/default/keymap.c11
-rw-r--r--keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c9
-rw-r--r--keyboards/kagizaraya/halberd/rules.mk12
-rw-r--r--keyboards/kagizaraya/miniaxe/keyboard.json (renamed from keyboards/kagizaraya/miniaxe/info.json)9
-rw-r--r--keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c12
-rw-r--r--keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c10
-rw-r--r--keyboards/kagizaraya/miniaxe/rules.mk15
-rw-r--r--keyboards/kagizaraya/scythe/keyboard.json (renamed from keyboards/kagizaraya/scythe/info.json)8
-rw-r--r--keyboards/kagizaraya/scythe/rules.mk15
15 files changed, 46 insertions, 99 deletions
diff --git a/keyboards/kagizaraya/chidori/board.c b/keyboards/kagizaraya/chidori/board.c
index 34e57a8874..07bdcf165e 100644
--- a/keyboards/kagizaraya/chidori/board.c
+++ b/keyboards/kagizaraya/chidori/board.c
@@ -19,7 +19,6 @@
#include "print.h"
#include "debug.h"
#include "matrix.h"
-#include "quantum.h"
#include "board.h"
#include "i2c_master.h"
@@ -61,8 +60,8 @@ static board_interface_t* get_interface(board_info_t* board) {
static void board_set_master_led(board_info_t* board, uint8_t led_index, bool status) {
pin_t pin = board->led_pins[led_index];
board->led_status[led_index] = status;
- setPinOutput(pin);
- status ? writePinHigh(pin) : writePinLow(pin);
+ gpio_set_pin_output(pin);
+ status ? gpio_write_pin_high(pin) : gpio_write_pin_low(pin);
}
static void board_set_slave_led(board_info_t* board, uint8_t led_index, bool status) {
@@ -255,18 +254,18 @@ static bool board_read_cols_on_slave_row(board_info_t* board, matrix_row_t curre
// Functions for master board
//
static void board_select_master_row(board_info_t* board, uint8_t board_row) {
- setPinOutput(board->row_pins[board_row]);
- writePinLow(board->row_pins[board_row]);
+ gpio_set_pin_output(board->row_pins[board_row]);
+ gpio_write_pin_low(board->row_pins[board_row]);
}
-static void board_unselect_master_row(board_info_t* board, uint8_t board_row) { setPinInputHigh(board->row_pins[board_row]); }
+static void board_unselect_master_row(board_info_t* board, uint8_t board_row) { gpio_set_pin_input_high(board->row_pins[board_row]); }
static void board_unselect_master_rows(board_info_t* board) {
if (!board) {
return;
}
for (uint8_t x = 0; x < NUM_ROWS; x++) {
- setPinInput(board->row_pins[x]);
+ gpio_set_pin_input(board->row_pins[x]);
}
}
@@ -282,7 +281,7 @@ static bool board_read_cols_on_master_row(board_info_t* board, matrix_row_t curr
wait_us(30);
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
- uint8_t pin_state = readPin(board->col_pins[col_index]);
+ uint8_t pin_state = gpio_read_pin(board->col_pins[col_index]);
current_matrix[row] |= pin_state ? 0 : (1 << col_index);
}
board_unselect_master_row(board, board_row);
@@ -296,7 +295,7 @@ static void board_master_init(void) {
return;
}
for (uint8_t x = 0; x < NUM_COLS; x++) {
- setPinInputHigh(board->col_pins[x]);
+ gpio_set_pin_input_high(board->col_pins[x]);
}
board->initialized = true;
}
diff --git a/keyboards/kagizaraya/chidori/info.json b/keyboards/kagizaraya/chidori/keyboard.json
index 6603f54b03..f1b064baba 100644
--- a/keyboards/kagizaraya/chidori/info.json
+++ b/keyboards/kagizaraya/chidori/keyboard.json
@@ -11,6 +11,11 @@
},
"processor": "atmega328p",
"bootloader": "usbasploader",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/kagizaraya/chidori/keymaps/default/keymap.c b/keyboards/kagizaraya/chidori/keymaps/default/keymap.c
index ac9055c634..bd52119d96 100644
--- a/keyboards/kagizaraya/chidori/keymaps/default/keymap.c
+++ b/keyboards/kagizaraya/chidori/keymaps/default/keymap.c
@@ -129,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------' `-----------------------------------------'
*/
[_ADJUST] = LAYOUT(
- _______, QK_BOOT, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_INS,
+ _______, QK_BOOT, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_INS,
KC_CAPS, _______, _______, _______, _______, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SCRL, KC_PAUS,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
diff --git a/keyboards/kagizaraya/chidori/matrix.c b/keyboards/kagizaraya/chidori/matrix.c
index 6228125d92..e506916f38 100644
--- a/keyboards/kagizaraya/chidori/matrix.c
+++ b/keyboards/kagizaraya/chidori/matrix.c
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
#include "matrix.h"
#include "board.h"
diff --git a/keyboards/kagizaraya/chidori/rules.mk b/keyboards/kagizaraya/chidori/rules.mk
index f94317cf22..6641bc6b5a 100644
--- a/keyboards/kagizaraya/chidori/rules.mk
+++ b/keyboards/kagizaraya/chidori/rules.mk
@@ -1,16 +1,6 @@
# 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 = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = lite
# project specific files
diff --git a/keyboards/kagizaraya/halberd/info.json b/keyboards/kagizaraya/halberd/keyboard.json
index b8e0925241..ecaa267cbd 100644
--- a/keyboards/kagizaraya/halberd/info.json
+++ b/keyboards/kagizaraya/halberd/keyboard.json
@@ -31,6 +31,15 @@
"ws2812": {
"pin": "F0"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["D7", "B4", "C7", "C6", "B6", "B5", "F7", "F6", "F5", "F4", "F1"],
"rows": ["D6", "D4", "D5", "E6"]
diff --git a/keyboards/kagizaraya/halberd/keymaps/default/keymap.c b/keyboards/kagizaraya/halberd/keymaps/default/keymap.c
index ecc0e328a7..139c4f6c98 100644
--- a/keyboards/kagizaraya/halberd/keymaps/default/keymap.c
+++ b/keyboards/kagizaraya/halberd/keymaps/default/keymap.c
@@ -25,8 +25,7 @@ enum layer_names {
// Defines the keycodes used by our macros in process_record_user
enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- LOWER,
+ LOWER = SAFE_RANGE,
RAISE,
ADJUST,
};
@@ -105,19 +104,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ADJUST] = LAYOUT(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
KC_F11, KC_F12, RGB_RMOD, RGB_SAI, RGB_SAD, _______, RGB_VAI, RGB_VAD, _______, _______, _______,
- QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+ QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
_______, _______, _______, _______, _______, _______, _______
)
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case QWERTY:
- if (record->event.pressed) {
- // persistant_default_layer_set(1UL<<_QWERTY);
- set_single_persistent_default_layer(_QWERTY);
- }
- return false;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
diff --git a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
index a5c017336a..500e3a93a4 100644
--- a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
+++ b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
@@ -25,8 +25,7 @@ enum layer_names {
// Defines the keycodes used by our macros in process_record_user
enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- LOWER,
+ LOWER = SAFE_RANGE,
RAISE,
ADJUST,
};
@@ -112,12 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case QWERTY:
- if (record->event.pressed) {
- // persistant_default_layer_set(1UL<<_QWERTY);
- set_single_persistent_default_layer(_QWERTY);
- }
- return false;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
diff --git a/keyboards/kagizaraya/halberd/rules.mk b/keyboards/kagizaraya/halberd/rules.mk
deleted file mode 100644
index 266798f905..0000000000
--- a/keyboards/kagizaraya/halberd/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 = 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/kagizaraya/miniaxe/info.json b/keyboards/kagizaraya/miniaxe/keyboard.json
index 9b7f3104a0..fa9f4d79df 100644
--- a/keyboards/kagizaraya/miniaxe/info.json
+++ b/keyboards/kagizaraya/miniaxe/keyboard.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"rgblight": {
@@ -33,6 +34,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"direct": [
["F1", "E6", "B0", "B2", "B3"],
diff --git a/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c b/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c
index 81f8004e69..307426ecca 100644
--- a/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c
+++ b/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c
@@ -24,8 +24,7 @@ enum layer_names {
};
enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- LOWER,
+ LOWER = SAFE_RANGE,
RAISE,
ADJUST,
};
@@ -105,20 +104,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ADJUST] = LAYOUT_split_3x5_3(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______,
- QK_BOOT, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+ QK_BOOT, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
_______, _______, _______, _______, _______, _______
)
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case QWERTY:
- if (record->event.pressed) {
- // persistant_default_layer_set(1UL<<_QWERTY);
- set_single_persistent_default_layer(_QWERTY);
- }
- return false;
- break;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
diff --git a/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c b/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c
index 8b4417f62d..c162c12045 100644
--- a/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c
+++ b/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c
@@ -24,8 +24,7 @@ enum layer_names {
};
enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- LOWER,
+ LOWER = SAFE_RANGE,
RAISE,
ADJUST,
};
@@ -112,13 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case QWERTY:
- if (record->event.pressed) {
- // persistant_default_layer_set(1UL<<_QWERTY);
- set_single_persistent_default_layer(_QWERTY);
- }
- return false;
- break;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
diff --git a/keyboards/kagizaraya/miniaxe/rules.mk b/keyboards/kagizaraya/miniaxe/rules.mk
deleted file mode 100644
index ee687e87af..0000000000
--- a/keyboards/kagizaraya/miniaxe/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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 = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-DEBUG_ENABLE = no
-SPLIT_KEYBOARD = yes # Use shared split_common code
diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/keyboard.json
index 6603e790c4..eeebbe85a6 100644
--- a/keyboards/kagizaraya/scythe/info.json
+++ b/keyboards/kagizaraya/scythe/keyboard.json
@@ -17,6 +17,7 @@
"pin": "B7"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"rgblight": {
@@ -45,6 +46,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "backlight": true,
+ "rgblight": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/kagizaraya/scythe/rules.mk b/keyboards/kagizaraya/scythe/rules.mk
deleted file mode 100644
index aa7fc332fe..0000000000
--- a/keyboards/kagizaraya/scythe/rules.mk
+++ /dev/null
@@ -1,15 +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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes # Use shared split_common
-RGBLIGHT_SPLIT = yes