From ae705e3e55ec38767a3e80da645983154a73cbfc Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Tue, 1 Feb 2022 03:48:51 +0800 Subject: [Keyboard] move @ka2hiro 's boards into /kagizaraya (#16070) --- keyboards/chidori/.noci | 0 keyboards/chidori/board.c | 364 --------------------- keyboards/chidori/board.h | 190 ----------- keyboards/chidori/chidori.c | 17 - keyboards/chidori/chidori.h | 57 ---- keyboards/chidori/config.h | 164 ---------- keyboards/chidori/info.json | 23 -- keyboards/chidori/keymaps/default/config.h | 48 --- keyboards/chidori/keymaps/default/keymap.c | 170 ---------- keyboards/chidori/keymaps/default/readme.md | 1 - keyboards/chidori/keymaps/extended/config.h | 59 ---- keyboards/chidori/keymaps/extended/keymap.c | 171 ---------- keyboards/chidori/keymaps/extended/readme.md | 1 - keyboards/chidori/keymaps/oled_sample/keymap.c | 218 ------------ keyboards/chidori/keymaps/oled_sample/readme.md | 1 - keyboards/chidori/keymaps/oled_sample/rules.mk | 3 - keyboards/chidori/matrix.c | 36 -- keyboards/chidori/readme.md | 15 - keyboards/chidori/rules.mk | 25 -- keyboards/halberd/config.h | 123 ------- keyboards/halberd/halberd.c | 16 - keyboards/halberd/halberd.h | 40 --- keyboards/halberd/info.json | 10 - keyboards/halberd/keymaps/default/keymap.c | 148 --------- keyboards/halberd/keymaps/default/readme.md | 1 - keyboards/halberd/keymaps/right_modifiers/keymap.c | 160 --------- .../halberd/keymaps/right_modifiers/readme.md | 2 - keyboards/halberd/readme.md | 15 - keyboards/halberd/rules.mk | 18 - keyboards/kagizaraya/chidori/.noci | 0 keyboards/kagizaraya/chidori/board.c | 364 +++++++++++++++++++++ keyboards/kagizaraya/chidori/board.h | 190 +++++++++++ keyboards/kagizaraya/chidori/chidori.c | 17 + keyboards/kagizaraya/chidori/chidori.h | 57 ++++ keyboards/kagizaraya/chidori/config.h | 164 ++++++++++ keyboards/kagizaraya/chidori/info.json | 23 ++ .../kagizaraya/chidori/keymaps/default/config.h | 48 +++ .../kagizaraya/chidori/keymaps/default/keymap.c | 170 ++++++++++ .../kagizaraya/chidori/keymaps/default/readme.md | 1 + .../kagizaraya/chidori/keymaps/extended/config.h | 59 ++++ .../kagizaraya/chidori/keymaps/extended/keymap.c | 171 ++++++++++ .../kagizaraya/chidori/keymaps/extended/readme.md | 1 + .../chidori/keymaps/oled_sample/keymap.c | 218 ++++++++++++ .../chidori/keymaps/oled_sample/readme.md | 1 + .../chidori/keymaps/oled_sample/rules.mk | 3 + keyboards/kagizaraya/chidori/matrix.c | 36 ++ keyboards/kagizaraya/chidori/readme.md | 15 + keyboards/kagizaraya/chidori/rules.mk | 25 ++ keyboards/kagizaraya/halberd/config.h | 123 +++++++ keyboards/kagizaraya/halberd/halberd.c | 16 + keyboards/kagizaraya/halberd/halberd.h | 40 +++ keyboards/kagizaraya/halberd/info.json | 10 + .../kagizaraya/halberd/keymaps/default/keymap.c | 148 +++++++++ .../kagizaraya/halberd/keymaps/default/readme.md | 1 + .../halberd/keymaps/right_modifiers/keymap.c | 160 +++++++++ .../halberd/keymaps/right_modifiers/readme.md | 2 + keyboards/kagizaraya/halberd/readme.md | 15 + keyboards/kagizaraya/halberd/rules.mk | 18 + keyboards/kagizaraya/scythe/config.h | 132 ++++++++ keyboards/kagizaraya/scythe/info.json | 10 + .../kagizaraya/scythe/keymaps/default/keymap.c | 75 +++++ .../kagizaraya/scythe/keymaps/default/readme.md | 2 + .../kagizaraya/scythe/keymaps/forties/keymap.c | 205 ++++++++++++ .../kagizaraya/scythe/keymaps/forties/readme.md | 2 + keyboards/kagizaraya/scythe/readme.md | 15 + keyboards/kagizaraya/scythe/rules.mk | 21 ++ keyboards/kagizaraya/scythe/scythe.c | 16 + keyboards/kagizaraya/scythe/scythe.h | 51 +++ keyboards/scythe/config.h | 132 -------- keyboards/scythe/info.json | 10 - keyboards/scythe/keymaps/default/keymap.c | 75 ----- keyboards/scythe/keymaps/default/readme.md | 2 - keyboards/scythe/keymaps/forties/keymap.c | 205 ------------ keyboards/scythe/keymaps/forties/readme.md | 2 - keyboards/scythe/readme.md | 15 - keyboards/scythe/rules.mk | 21 -- keyboards/scythe/scythe.c | 16 - keyboards/scythe/scythe.h | 51 --- 78 files changed, 2625 insertions(+), 2625 deletions(-) delete mode 100644 keyboards/chidori/.noci delete mode 100644 keyboards/chidori/board.c delete mode 100644 keyboards/chidori/board.h delete mode 100644 keyboards/chidori/chidori.c delete mode 100644 keyboards/chidori/chidori.h delete mode 100644 keyboards/chidori/config.h delete mode 100644 keyboards/chidori/info.json delete mode 100644 keyboards/chidori/keymaps/default/config.h delete mode 100644 keyboards/chidori/keymaps/default/keymap.c delete mode 100644 keyboards/chidori/keymaps/default/readme.md delete mode 100644 keyboards/chidori/keymaps/extended/config.h delete mode 100644 keyboards/chidori/keymaps/extended/keymap.c delete mode 100644 keyboards/chidori/keymaps/extended/readme.md delete mode 100644 keyboards/chidori/keymaps/oled_sample/keymap.c delete mode 100644 keyboards/chidori/keymaps/oled_sample/readme.md delete mode 100644 keyboards/chidori/keymaps/oled_sample/rules.mk delete mode 100644 keyboards/chidori/matrix.c delete mode 100644 keyboards/chidori/readme.md delete mode 100644 keyboards/chidori/rules.mk delete mode 100644 keyboards/halberd/config.h delete mode 100644 keyboards/halberd/halberd.c delete mode 100644 keyboards/halberd/halberd.h delete mode 100644 keyboards/halberd/info.json delete mode 100644 keyboards/halberd/keymaps/default/keymap.c delete mode 100644 keyboards/halberd/keymaps/default/readme.md delete mode 100644 keyboards/halberd/keymaps/right_modifiers/keymap.c delete mode 100644 keyboards/halberd/keymaps/right_modifiers/readme.md delete mode 100644 keyboards/halberd/readme.md delete mode 100644 keyboards/halberd/rules.mk create mode 100644 keyboards/kagizaraya/chidori/.noci create mode 100644 keyboards/kagizaraya/chidori/board.c create mode 100644 keyboards/kagizaraya/chidori/board.h create mode 100644 keyboards/kagizaraya/chidori/chidori.c create mode 100644 keyboards/kagizaraya/chidori/chidori.h create mode 100644 keyboards/kagizaraya/chidori/config.h create mode 100644 keyboards/kagizaraya/chidori/info.json create mode 100644 keyboards/kagizaraya/chidori/keymaps/default/config.h create mode 100644 keyboards/kagizaraya/chidori/keymaps/default/keymap.c create mode 100644 keyboards/kagizaraya/chidori/keymaps/default/readme.md create mode 100644 keyboards/kagizaraya/chidori/keymaps/extended/config.h create mode 100644 keyboards/kagizaraya/chidori/keymaps/extended/keymap.c create mode 100644 keyboards/kagizaraya/chidori/keymaps/extended/readme.md create mode 100644 keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c create mode 100644 keyboards/kagizaraya/chidori/keymaps/oled_sample/readme.md create mode 100644 keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk create mode 100644 keyboards/kagizaraya/chidori/matrix.c create mode 100644 keyboards/kagizaraya/chidori/readme.md create mode 100644 keyboards/kagizaraya/chidori/rules.mk create mode 100644 keyboards/kagizaraya/halberd/config.h create mode 100644 keyboards/kagizaraya/halberd/halberd.c create mode 100644 keyboards/kagizaraya/halberd/halberd.h create mode 100644 keyboards/kagizaraya/halberd/info.json create mode 100644 keyboards/kagizaraya/halberd/keymaps/default/keymap.c create mode 100644 keyboards/kagizaraya/halberd/keymaps/default/readme.md create mode 100644 keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c create mode 100644 keyboards/kagizaraya/halberd/keymaps/right_modifiers/readme.md create mode 100644 keyboards/kagizaraya/halberd/readme.md create mode 100644 keyboards/kagizaraya/halberd/rules.mk create mode 100644 keyboards/kagizaraya/scythe/config.h create mode 100644 keyboards/kagizaraya/scythe/info.json create mode 100644 keyboards/kagizaraya/scythe/keymaps/default/keymap.c create mode 100644 keyboards/kagizaraya/scythe/keymaps/default/readme.md create mode 100644 keyboards/kagizaraya/scythe/keymaps/forties/keymap.c create mode 100644 keyboards/kagizaraya/scythe/keymaps/forties/readme.md create mode 100644 keyboards/kagizaraya/scythe/readme.md create mode 100644 keyboards/kagizaraya/scythe/rules.mk create mode 100644 keyboards/kagizaraya/scythe/scythe.c create mode 100644 keyboards/kagizaraya/scythe/scythe.h delete mode 100644 keyboards/scythe/config.h delete mode 100644 keyboards/scythe/info.json delete mode 100644 keyboards/scythe/keymaps/default/keymap.c delete mode 100644 keyboards/scythe/keymaps/default/readme.md delete mode 100644 keyboards/scythe/keymaps/forties/keymap.c delete mode 100644 keyboards/scythe/keymaps/forties/readme.md delete mode 100644 keyboards/scythe/readme.md delete mode 100644 keyboards/scythe/rules.mk delete mode 100644 keyboards/scythe/scythe.c delete mode 100644 keyboards/scythe/scythe.h diff --git a/keyboards/chidori/.noci b/keyboards/chidori/.noci deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/chidori/board.c b/keyboards/chidori/board.c deleted file mode 100644 index e00156eb90..0000000000 --- a/keyboards/chidori/board.c +++ /dev/null @@ -1,364 +0,0 @@ -/* Copyright 2019 ENDO Katsuhiro - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include -#include -#include "wait.h" -#include "print.h" -#include "debug.h" -#include "matrix.h" -#include "quantum.h" -#include "board.h" -#include "i2c_master.h" - -static board_info_t boards[NUM_BOARDS] = BOARD_INFOS; -static board_info_t* master_board = NULL; - -static bool board_is_master(board_info_t* board); -static bool board_is_initialized(board_info_t* board); -static board_info_t* get_board_by_index(uint8_t board_index); -static uint8_t board_merge_led_config(board_info_t* board, uint8_t iodir); -static uint8_t board_merge_led_status(board_info_t* board, uint8_t data); -static void board_master_init(void); -static void board_slave_init(void); - -// -// board interface -// -static void board_select_master_row(board_info_t* board, uint8_t row); -static void board_unselect_master_row(board_info_t* board, uint8_t row); -static void board_unselect_master_rows(board_info_t* board); -static bool board_read_cols_on_master_row(board_info_t* board, matrix_row_t current_matrix[], uint8_t row); -static void board_set_master_led(board_info_t* board, uint8_t led_index, bool status); -static void board_select_slave_row(board_info_t* board, uint8_t row); -static void board_unselect_slave_row(board_info_t* board, uint8_t row); -static void board_unselect_slave_rows(board_info_t* board); -static bool board_read_cols_on_slave_row(board_info_t* board, matrix_row_t current_matrix[], uint8_t row); -static void board_set_slave_led(board_info_t* board, uint8_t led_index, bool status); - -static board_interface_t master_interface = {board_select_master_row, board_unselect_master_row, board_unselect_master_rows, board_read_cols_on_master_row, board_set_master_led}; -static board_interface_t slave_interface = {board_select_slave_row, board_unselect_slave_row, board_unselect_slave_rows, board_read_cols_on_slave_row, board_set_slave_led}; - -static board_interface_t* get_interface(board_info_t* board) { - if (board_is_master(board)) { - return &master_interface; - } - return &slave_interface; -} - -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); -} - -static void board_set_slave_led(board_info_t* board, uint8_t led_index, bool status) { - board->led_status[led_index] = status; - uint8_t iodir = board_merge_led_config(board, 0xff); - uint8_t data = board_merge_led_status(board, 0x00); - i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRB, (const uint8_t*)&iodir, sizeof(iodir), BOARD_I2C_TIMEOUT); - i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_OLATB, (const uint8_t*)&data, sizeof(data), BOARD_I2C_TIMEOUT); -} - -static uint8_t board_merge_led_config(board_info_t* board, uint8_t iodir) { - for (uint8_t i = 0; i < NUM_LEDS; i++) { - iodir &= PIN2MASK(board->led_pins[i]); - } - return iodir; -} - -static bool board_slave_config(board_info_t* board) { - uint8_t set = 0xff; - uint8_t clear = 0x00; - i2c_status_t res = 0; - - // Set to input - res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRA, (const uint8_t*)&set, sizeof(set), BOARD_I2C_TIMEOUT); - if (res < 0) return false; - // RESTRICTION: LEDs only on PORT B. - set = board_merge_led_config(board, set); - res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRB, (const uint8_t*)&set, sizeof(set), BOARD_I2C_TIMEOUT); - if (res < 0) return false; - set = 0xff; - - // Pull up for input - enable - res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPPUA, (const uint8_t*)&set, sizeof(set), BOARD_I2C_TIMEOUT); - if (res < 0) return false; - res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPPUB, (const uint8_t*)&set, sizeof(set), BOARD_I2C_TIMEOUT); - if (res < 0) return false; - - // Disable interrupt - res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPINTENA, (const uint8_t*)&clear, sizeof(clear), BOARD_I2C_TIMEOUT); - if (res < 0) return false; - res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPINTENB, (const uint8_t*)&clear, sizeof(clear), BOARD_I2C_TIMEOUT); - if (res < 0) return false; - - // Polarity - same logic - res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IPOLA, (const uint8_t*)&clear, sizeof(clear), BOARD_I2C_TIMEOUT); - if (res < 0) return false; - res = i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IPOLB, (const uint8_t*)&clear, sizeof(clear), BOARD_I2C_TIMEOUT); - if (res < 0) return false; - - return true; -} - -static void board_slave_init(void) { - i2c_init(); - _delay_ms(500); - - for (uint8_t i = 0; i < NUM_BOARDS; i++) { - board_info_t* board = &boards[i]; - if (board_is_master(board)) { - continue; - } - if (i2c_start(EXPANDER_ADDR(board->i2c_address), BOARD_I2C_TIMEOUT) != I2C_STATUS_SUCCESS) { - continue; - } - i2c_stop(); - if (board_slave_config(board)) { - board->initialized = true; - } - } -} - -inline bool board_is_master(board_info_t* board) { - if (board) { - return board->master; - } - return false; -} - -inline uint8_t matrix2board(uint8_t row) { return row % NUM_ROWS; } - -inline uint8_t board_index(uint8_t row) { return row / NUM_ROWS; } - -static board_info_t* get_master_board(void) { - if (master_board == NULL) { - for (uint8_t i = 0; i < NUM_BOARDS; i++) { - if (boards[i].master) { - master_board = &boards[i]; - return master_board; - } - } - } - return NULL; -} - -inline bool board_is_initialized(board_info_t* board) { return board == NULL ? false : board->initialized; } - -static board_info_t* get_board_by_index(uint8_t board_index) { - if (board_index >= 0 && board_index < NUM_BOARDS) { - if (!board_is_initialized(&boards[board_index])) { - return NULL; - } - return &boards[board_index]; - } - return NULL; -} - -static board_info_t* get_board(uint8_t row) { - uint8_t idx = board_index(row); - if (idx >= 0 && idx < NUM_BOARDS) { - if (!board_is_initialized(&boards[idx])) { - return NULL; - } - return &boards[idx]; - } - return NULL; -} - -static uint8_t board_merge_led_status(board_info_t* board, uint8_t data) { - if (!board_is_initialized(board)) { - return data; - } - for (uint8_t i = 0; i < NUM_LEDS; i++) { - bool status = board->led_status[i]; - if (status) { - data |= (uint8_t)1 << PIN2INDEX(board->led_pins[i]); - } else { - data &= PIN2MASK(board->led_pins[i]); - } - } - return data; -} - -// -// Functions for slave -// -static uint8_t board_read_slave_cols(board_info_t* board) { - if (!board_is_initialized(board)) { - return 0xff; - } - uint8_t data = 0xff; - i2c_status_t res = i2c_readReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_GPIOA, &data, sizeof(data), BOARD_I2C_TIMEOUT); - return (res < 0) ? 0xff : data; -} - -static void board_select_slave_row(board_info_t* board, uint8_t board_row) { - if (!board_is_initialized(board)) { - return; - } - uint8_t pin = board->row_pins[board_row]; - uint8_t iodir = board_merge_led_config(board, PIN2MASK(pin)); - uint8_t status = board_merge_led_status(board, PIN2MASK(pin)); - i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRB, (const uint8_t*)&iodir, sizeof(iodir), BOARD_I2C_TIMEOUT); - i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_OLATB, (const uint8_t*)&status, sizeof(status), BOARD_I2C_TIMEOUT); -} - -static void board_unselect_slave_rows(board_info_t* board) { - if (!board_is_initialized(board)) { - return; - } - uint8_t iodir = board_merge_led_config(board, 0xff); - uint8_t data = board_merge_led_status(board, 0x00); - i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_IODIRB, (const uint8_t*)&iodir, sizeof(iodir), BOARD_I2C_TIMEOUT); - i2c_writeReg(EXPANDER_ADDR(board->i2c_address), EXPANDER_OLATB, (const uint8_t*)&data, sizeof(data), BOARD_I2C_TIMEOUT); -} - -static void board_unselect_slave_row(board_info_t* board, uint8_t board_row) { board_unselect_slave_rows(board); } - -/* - * row : matrix row (not board row) - */ -static bool board_read_cols_on_slave_row(board_info_t* board, matrix_row_t current_matrix[], uint8_t row) { - matrix_row_t last_row_value = current_matrix[row]; - current_matrix[row] = 0; - - uint8_t board_row = matrix2board(row); - board_select_slave_row(board, board_row); - wait_us(30); - - uint8_t cols = board_read_slave_cols(board); - for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { - uint8_t pin = board->col_pins[col_index]; - uint8_t pin_state = cols & PIN2BIT(pin); - current_matrix[row] |= pin_state ? 0 : (1 << col_index); - } - board_unselect_slave_row(board, board_row); - - return (last_row_value != current_matrix[row]); -} - -// -// 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]); -} - -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_rows(board_info_t* board) { - if (!board) { - return; - } - for (uint8_t x = 0; x < NUM_ROWS; x++) { - setPinInput(board->row_pins[x]); - } -} - -/* - * row : matrix row (not board row) - */ -static bool board_read_cols_on_master_row(board_info_t* board, matrix_row_t current_matrix[], uint8_t row) { - matrix_row_t last_row_value = current_matrix[row]; - current_matrix[row] = 0; - - uint8_t board_row = matrix2board(row); - board_select_master_row(board, board_row); - 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]); - current_matrix[row] |= pin_state ? 0 : (1 << col_index); - } - board_unselect_master_row(board, board_row); - - return (last_row_value != current_matrix[row]); -} - -static void board_master_init(void) { - board_info_t* board = get_master_board(); - if (!board) { - return; - } - for (uint8_t x = 0; x < NUM_COLS; x++) { - setPinInputHigh(board->col_pins[x]); - } - board->initialized = true; -} - -static void board_setup(void) { - for (uint8_t i = 0; i < NUM_BOARDS; i++) { - board_info_t* board = &boards[i]; - board->interface = get_interface(board); - } -} - -// -// Public functions -// - -// NOTE: Do not call this while matrix scanning... -void board_set_led_by_index(uint8_t board_index, uint8_t led_index, bool status) { - board_info_t* board = get_board_by_index(board_index); - if (!board) return; - if (led_index < 0 || led_index > NUM_LEDS) return; - (*board->interface->set_led)(board, led_index, status); -} - -bool board_read_cols_on_row(matrix_row_t current_matrix[], uint8_t row) { - bool result = false; - board_info_t* board = get_board(row); - if (!board) { - return false; - } - result = (*board->interface->read_cols_on_row)(board, current_matrix, row); - return result; -} - -void board_select_row(uint8_t row) { - board_info_t* board = get_board(row); - if (!board) { - return; - } - uint8_t board_row = matrix2board(row); - (*board->interface->select_row)(board, board_row); -} - -void board_unselect_row(uint8_t row) { - board_info_t* board = get_board(row); - if (!board) { - return; - } - uint8_t board_row = matrix2board(row); - (*board->interface->unselect_row)(board, board_row); -} - -void board_unselect_rows(void) { - for (uint8_t i = 0; i < NUM_BOARDS; i++) { - board_info_t* board = &boards[i]; - (*board->interface->unselect_rows)(board); - } -} - -void board_init(void) { - board_setup(); - board_master_init(); - board_slave_init(); - board_unselect_rows(); -} diff --git a/keyboards/chidori/board.h b/keyboards/chidori/board.h deleted file mode 100644 index 892ea6c0f1..0000000000 --- a/keyboards/chidori/board.h +++ /dev/null @@ -1,190 +0,0 @@ -/* Copyright 2019 ENDO Katsuhiro - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#define NUM_ROWS 4 -#define NUM_COLS 6 -#define NUM_LEDS 2 - -#define LED_GREEN 0 -#define LED_YELLOW 1 - -typedef struct board_info_t board_info_t; -typedef struct board_interface_t board_interface_t; - -struct board_info_t { - bool master; - bool initialized; - uint8_t i2c_address; - pin_t row_pins[NUM_ROWS]; - pin_t col_pins[NUM_COLS]; - pin_t led_pins[NUM_LEDS]; - bool led_status[NUM_LEDS]; - board_interface_t* interface; -}; - -struct board_interface_t { - void (*select_row)(board_info_t* board, uint8_t row); - void (*unselect_row)(board_info_t* board, uint8_t row); - void (*unselect_rows)(board_info_t* board); - bool (*read_cols_on_row)(board_info_t* board, matrix_row_t current_matrix[], uint8_t row); - void (*set_led)(board_info_t* board, uint8_t led_index, bool status); -}; - -#define BOARD_I2C_TIMEOUT 20 - -#define GPA0 0x00 -#define GPA1 0x01 -#define GPA2 0x02 -#define GPA3 0x03 -#define GPA4 0x04 -#define GPA5 0x05 -#define GPA6 0x06 -#define GPA7 0x07 -#define GPB0 0x08 -#define GPB1 0x09 -#define GPB2 0x0A -#define GPB3 0x0B -#define GPB4 0x0C -#define GPB5 0x0D -#define GPB6 0x0E -#define GPB7 0x0F - -//#define PORTA 0x00 -//#define PORTB 0x01 -#define PORT_MASK 0x08 -#define PIN_MASK 0x07 - -#define PIN2REGISTER(reg, pin) (reg & ((pin & PORT_MASK) >> 3)) -#define PIN2PORT(pin) ((pin & PORT_MASK) >> 3) -#define PIN2MASK(pin) (~(1 << PIN2INDEX(pin))) -#define PIN2INDEX(pin) (pin & ~PORT_MASK) -#define PIN2BIT(pin) (1 << PIN2INDEX(pin)) - -#define EXPANDER_ADDR(addr) (addr << 1) - -#define EXPANDER_IODIR(pin) (0x00 | PIN2PORT(pin)) -#define EXPANDER_IPOL(pin) (0x02 | PIN2PORT(pin)) -#define EXPANDER_GPINTEN(pin) (0x04 | PIN2PORT(pin)) -#define EXPANDER_DEFVAL(pin) (0x06 | PIN2PORT(pin)) -#define EXPANDER_INTCON(pin) (0x08 | PIN2PORT(pin)) -#define EXPANDER_IOCON(pin) (0x0A | PIN2PORT(pin)) -#define EXPANDER_GPPU(pin) (0x0C | PIN2PORT(pin)) -#define EXPANDER_INTF(pin) (0x0E | PIN2PORT(pin)) -#define EXPANDER_INTCAP(pin) (0x10 | PIN2PORT(pin)) -#define EXPANDER_GPIO(pin) (0x12 | PIN2PORT(pin)) -#define EXPANDER_OLAT(pin) (0x14 | PIN2PORT(pin)) - -#define EXPANDER_IODIRA 0x00 -#define EXPANDER_IODIRB 0x01 -#define EXPANDER_IPOLA 0x02 -#define EXPANDER_IPOLB 0x03 -#define EXPANDER_GPINTENA 0x04 -#define EXPANDER_GPINTENB 0x05 -#define EXPANDER_DEFVALA 0x06 -#define EXPANDER_DEFVALB 0x07 -#define EXPANDER_INTCONA 0x08 -#define EXPANDER_INTCONB 0x09 -#define EXPANDER_IOCONA 0x0A -#define EXPANDER_IOCONB 0x0B -#define EXPANDER_GPPUA 0x0C -#define EXPANDER_GPPUB 0x0D -#define EXPANDER_INTFA 0x0E -#define EXPANDER_INTFB 0x0F -#define EXPANDER_INTCAPA 0x10 -#define EXPANDER_INTCAPB 0x11 -#define EXPANDER_GPIOA 0x12 -#define EXPANDER_GPIOB 0x13 -#define EXPANDER_OLATA 0x14 -#define EXPANDER_OLATB 0x15 - -// -// Default board config -// -#ifndef NUM_BOARDS -# define NUM_BOARDS 2 -#endif - -// clang-format off -#ifndef BOARD_INFOS -#if NUM_BOARDS == 2 -#define BOARD_INFOS \ -{ \ - { \ - true, \ - false, \ - 0x00, \ - { D4, D5, D6, D7 }, \ - { D1, D0, C3, C2, C1, C0 }, \ - { B1, B2 }, \ - { false, false }, \ - NULL \ - }, \ - { \ - false, \ - false, \ - 0x20, \ - { GPB4, GPB5, GPB6, GPB7 }, \ - { GPA7, GPA6, GPA5, GPA4, GPA3, GPA2 }, \ - { GPB0, GPB1 }, \ - { false, false }, \ - NULL \ - }, \ -} -#elif NUM_BOARDS == 3 -#define BOARD_INFOS \ -{ \ - { \ - true, \ - false, \ - 0x00, \ - { D4, D5, D6, D7 }, \ - { D1, D0, C3, C2, C1, C0 }, \ - { B1, B2 }, \ - { false, false }, \ - NULL \ - }, \ - { \ - false, \ - false, \ - 0x20, \ - { GPB4, GPB5, GPB6, GPB7 }, \ - { GPA7, GPA6, GPA5, GPA4, GPA3, GPA2 }, \ - { GPB0, GPB1 }, \ - { false, false }, \ - NULL \ - }, \ - { \ - false, \ - false, \ - 0x21, \ - { GPB4, GPB5, GPB6, GPB7 }, \ - { GPA7, GPA6, GPA5, GPA4, GPA3, GPA2 }, \ - { GPB0, GPB1 }, \ - { false, false }, \ - NULL \ - }, \ -} -#endif -#endif -// clang-format on - -void board_set_led_by_index(uint8_t board_index, uint8_t led_index, bool status); -bool board_read_cols_on_row(matrix_row_t current_matrix[], uint8_t row); -void board_select_row(uint8_t row); -void board_unselect_row(uint8_t row); -void board_unselect_rows(void); -void board_init(void); diff --git a/keyboards/chidori/chidori.c b/keyboards/chidori/chidori.c deleted file mode 100644 index 229982724e..0000000000 --- a/keyboards/chidori/chidori.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 ENDO Katsuhiro - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "chidori.h" diff --git a/keyboards/chidori/chidori.h b/keyboards/chidori/chidori.h deleted file mode 100644 index d82b9217fb..0000000000 --- a/keyboards/chidori/chidori.h +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright 2019 ENDO Katsuhiro - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -// clang-format off -#define LAYOUT( \ - L01, L02, L03, L04, L05, L06, R01, R02, R03, R04, R05, R06, \ - L07, L08, L09, L10, L11, L12, R07, R08, R09, R10, R11, R12, \ - L13, L14, L15, L16, L17, L18, R13, R14, R15, R16, R17, R18, \ - L19, L20, L21, L22, L23, L24, R19, R20, R21, R22, R23, R24 \ -) { \ - { L01, L02, L03, L04, L05, L06 }, \ - { L07, L08, L09, L10, L11, L12 }, \ - { L13, L14, L15, L16, L17, L18 }, \ - { L19, L20, L21, L22, L23, L24 }, \ - { R01, R02, R03, R04, R05, R06 }, \ - { R07, R08, R09, R10, R11, R12 }, \ - { R13, R14, R15, R16, R17, R18 }, \ - { R19, R20, R21, R22, R23, R24 } \ -} - -#define LAYOUT_extended( \ - L01, L02, L03, L04, L05, L06, M01, M02, M03, M04, M05, M06, R01, R02, R03, R04, R05, R06, \ - L07, L08, L09, L10, L11, L12, M07, M08, M09, M10, M11, M12, R07, R08, R09, R10, R11, R12, \ - L13, L14, L15, L16, L17, L18, M13, M14, M15, M16, M17, M18, R13, R14, R15, R16, R17, R18, \ - L19, L20, L21, L22, L23, L24, M19, M20, M21, M22, M23, M24, R19, R20, R21, R22, R23, R24 \ -) { \ - { L01, L02, L03, L04, L05, L06 }, \ - { L07, L08, L09, L10, L11, L12 }, \ - { L13, L14, L15, L16, L17, L18 }, \ - { L19, L20, L21, L22, L23, L24 }, \ - { M01, M02, M03, M04, M05, M06 }, \ - { M07, M08, M09, M10, M11, M12 }, \ - { M13, M14, M15, M16, M17, M18 }, \ - { M19, M20, M21, M22, M23, M24 }, \ - { R01, R02, R03, R04, R05, R06 }, \ - { R07, R08, R09, R10, R11, R12 }, \ - { R13, R14, R15, R16, R17, R18 }, \ - { R19, R20, R21, R22, R23, R24 } \ -} -// clang-format on diff --git a/keyboards/chidori/config.h b/keyboards/chidori/config.h deleted file mode 100644 index 2db5d57ef7..0000000000 --- a/keyboards/chidori/config.h +++ /dev/null @@ -1,164 +0,0 @@ -/* -Copyright 2019 ENDO Katsuhiro - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3942 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Kagizaraya -#define PRODUCT Chidori - -/* key matrix size */ -#define MATRIX_ROWS 12 -#define MATRIX_COLS 6 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -/* -#define MATRIX_ROW_PINS \ - { D0, D5 } -#define MATRIX_COL_PINS \ - { F1, F0, B0 } -*/ -#define UNUSED_PINS - -/* COL2ROW, ROW2COL*/ -// #define DIODE_DIRECTION COL2ROW - -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - -// #define RGB_DI_PIN E2 -// #ifdef RGB_DI_PIN -// #define RGBLED_NUM 16 -// #define RGBLIGHT_HUE_STEP 8 -// #define RGBLIGHT_SAT_STEP 8 -// #define RGBLIGHT_VAL_STEP 8 -// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -// /*== all animations enable ==*/ -// #define RGBLIGHT_ANIMATIONS -// /*== or choose animations ==*/ -// #define RGBLIGHT_EFFECT_BREATHING -// #define RGBLIGHT_EFFECT_RAINBOW_MOOD -// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL -// #define RGBLIGHT_EFFECT_SNAKE -// #define RGBLIGHT_EFFECT_KNIGHT -// #define RGBLIGHT_EFFECT_CHRISTMAS -// #define RGBLIGHT_EFFECT_STATIC_GRADIENT -// #define RGBLIGHT_EFFECT_RGB_TEST -// #define RGBLIGHT_EFFECT_ALTERNATING -// /*== customize breathing effect ==*/ -// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -// /*==== use exp() and sin() ====*/ -// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -// #endif - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - -/* - * Magic Key Options - * - * Magic keys are hotkey commands that allow control over firmware functions of - * the keyboard. They are best used in combination with the HID Listen program, - * found here: https://www.pjrc.com/teensy/hid_listen.html - * - * The options below allow the magic key functionality to be changed. This is - * useful if your keyboard/keypad is missing keys and you want magic key support. - * - */ - -/* key combination for magic key command */ -/* defined by default; to change, uncomment and set to the combination you want */ -#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_LCTL))) - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION - -/* Bootmagic Lite key configuration */ -// #define BOOTMAGIC_LITE_ROW 0 -// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/chidori/info.json b/keyboards/chidori/info.json deleted file mode 100644 index 9c879c7649..0000000000 --- a/keyboards/chidori/info.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "keyboard_name": "Chidori", - "url": "", - "maintainer": "ka2hiro", - "layouts": { - "LAYOUT": { - "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3} - ] - }, - "LAYOUT_extended": { - "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, {"x":19, "y":0}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, {"x":19, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2}, {"x":19, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":17, "y":3}, {"x":18, "y":3}, {"x":19, "y":3} - ] - } - } -} diff --git a/keyboards/chidori/keymaps/default/config.h b/keyboards/chidori/keymaps/default/config.h deleted file mode 100644 index 1501061e79..0000000000 --- a/keyboards/chidori/keymaps/default/config.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2019 ENDO Katsuhiro - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* - * Board config - */ -/* -#define NUM_BOARDS 2 - -#define BOARD_INFOS \ -{ \ - { \ - true, \ - false, \ - 0x00, \ - { D4, D5, D6, D7 }, \ - { D1, D0, C3, C2, C1, C0 }, \ - { B1, B2 }, \ - { false, false }, \ - NULL \ - }, \ - { \ - false, \ - false, \ - 0x20, \ - { GPB4, GPB5, GPB6, GPB7 }, \ - { GPA7, GPA6, GPA5, GPA4, GPA3, GPA2 }, \ - { GPB0, GPB1 }, \ - { false, false }, \ - NULL \ - }, \ -} -*/ diff --git a/keyboards/chidori/keymaps/default/keymap.c b/keyboards/chidori/keymaps/default/keymap.c deleted file mode 100644 index 373b5ec83b..0000000000 --- a/keyboards/chidori/keymaps/default/keymap.c +++ /dev/null @@ -1,170 +0,0 @@ -/* Copyright 2019 ENDO Katsuhiro - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include QMK_KEYBOARD_H - -#include "board.h" - -enum layer_number { _QWERTY = 0, _COLEMAK, _DVORAK, _LOWER, _RAISE, _ADJUST }; - -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK }; - -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) -#define ADJUST MO(_ADJUST) - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Qwerty - * ,-----------------------------------------. ,-----------------------------------------. - * | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |ADJUST| Esc | Alt | GUI |LOWER |Space | | Space| RAISE| Left | Down | Up | Right| - * `-----------------------------------------' `-----------------------------------------' - */ - [_QWERTY] = LAYOUT( - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - ADJUST, KC_ESC, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT - ), - /* Colemak - * ,-----------------------------------------. ,-----------------------------------------. - * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | | K | M | , | . | / |Enter | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |ADJUST| Esc | Alt | GUI |LOWER |Space | | Space| RAISE| Left | Down | Up | Right| - * `-----------------------------------------' `-----------------------------------------' - */ - [_COLEMAK] = LAYOUT( - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, - KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - ADJUST, KC_ESC, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT - ), - - /* Dvorak - * ,-----------------------------------------. ,-----------------------------------------. - * | Tab | ' | , | . | P | Y | | F | G | C | R | L | Bksp | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Ctrl | A | O | E | U | I | | D | H | T | N | S | / | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Shift| ; | Q | J | K | X | | B | M | W | V | Z |Enter | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |ADJUST| Esc | Alt | GUI |LOWER |Space | | Space| RAISE| Left | Down | Up | Right| - * `-----------------------------------------' `-----------------------------------------' - */ - [_DVORAK] = LAYOUT( - KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, - KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, - KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT, - ADJUST, KC_ESC, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT - ), - - /* Lower - * ,-----------------------------------------. ,-----------------------------------------. - * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | - | _ | + | { | } | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | | Home | End | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | Next | Vol- | Vol+ | Play | - * `-----------------------------------------' `-----------------------------------------' - */ - [_LOWER] = LAYOUT( - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, - _______, _______, _______, _______, _______, _______, KC_MINS, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY - ), - - /* Raise - * ,-----------------------------------------. ,-----------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | | F12 | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | Next | Vol- | Vol+ | Play | - * `-----------------------------------------' `-----------------------------------------' - */ - [_RAISE] = LAYOUT( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY - ), - - /* Adjust (Lower + Raise) - * ,-----------------------------------------. ,-----------------------------------------. - * | | Reset| | | | | | |Qwerty|Colemk|Dvorak| | Ins | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Caps | | | | | Mac | | Win | - | = |Print |ScLock|Pause | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | KANA | | Home |PageDn|PageUp| End | - * `-----------------------------------------' `-----------------------------------------' - */ - [_ADJUST] = LAYOUT( - _______, RESET, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_INS, - KC_CAPS, _______, _______, _______, _______, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SLCK, KC_PAUS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END - ) -}; -// clang-format on - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - set_single_persistent_default_layer(_QWERTY); - } - return false; - case COLEMAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_COLEMAK); - } - return false; - case DVORAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_DVORAK); - } - return false; - } - return true; -} - -bool led_update_user(led_t led_state) { - board_set_led_by_index(0, LED_YELLOW, led_state.caps_lock); - board_set_led_by_index(1, LED_YELLOW, led_state.scroll_lock); - - return false; -} diff --git a/keyboards/chidori/keymaps/default/readme.md b/keyboards/chidori/keymaps/default/readme.md deleted file mode 100644 index 8e66dc4b39..0000000000 --- a/keyboards/chidori/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for chidori diff --git a/keyboards/chidori/keymaps/extended/config.h b/keyboards/chidori/keymaps/extended/config.h deleted file mode 100644 index 0c07b315a8..0000000000 --- a/keyboards/chidori/keymaps/extended/config.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright 2019 ENDO Katsuhiro - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* - * Board config - */ -#define NUM_BOARDS 3 - -/* -#define BOARD_INFOS \ -{ \ - { \ - true, \ - false, \ - 0x00, \ - { D4, D5, D6, D7 }, \ - { D1, D0, C3, C2, C1, C0 }, \ - { B1, B2 }, \ - { false, false }, \ - NULL \ - }, \ - { \ - false, \ - false, \ - 0x20, \ - { GPB4, GPB5, GPB6, GPB7 }, \ - { GPA7, GPA6, GPA5, GPA4, GPA3, GPA2 }, \ - { GPB0, GPB1 }, \ - { false, false }, \ - NULL \ - }, \ - { \ - false, \ - false, \ - 0x21, \ - { GPB4, GPB5, GPB6, GPB7 }, \ - { GPA7, GPA6, GPA5, GPA4, GPA3, GPA2 }, \ - { GPB0, GPB1 }, \ - { false, false }, \ - NULL \ - }, \ -} -*/ - diff --git a/keyboards/chidori/keymaps/extended/keymap.c b/keyboards/chidori/keymaps/extended/keymap.c deleted file mode 100644 index 174e9ff2e6..0000000000 --- a/keyboards/chidori/keymaps/extended/keymap.c +++ /dev/null @@ -1,171 +0,0 @@ -/* Copyright 2019 ENDO Katsuhiro - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include QMK_KEYBOARD_H - -#include "board.h" - -enum layer_number { _QWERTY = 0, _COLEMAK, _DVORAK, _LOWER, _RAISE, _ADJUST }; - -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK }; - -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) -#define ADJUST MO(_ADJUST) - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Qwerty - * ,-----------------------------------------. ,-----------------------------------------. ,-----------------------------------------. - * | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp | | 7 | 8 | 9 | |NumLck| Esc | - * |------+------+------+------+------+------| |------+------+------+------+------+------| |------+------+------| + |------+------| - * | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' | | 4 | 5 | 6 | | / | Tab | - * |------+------+------+------+------+------| |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter | | 1 | 2 | 3 | | * | = | - * |------+------+------+------+------+------| |------+------+------+------+------+------| |-------------+------|Enter |------+------| - * |ADJUST| Esc | Alt | GUI |LOWER |Space | | Space| RAISE| Left | Down | Up | Right| | 0 | . | | - | Bksp | - * `-----------------------------------------' `-----------------------------------------' `-----------------------------------------' - */ - [_QWERTY] = LAYOUT_extended( - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_NLCK, KC_ESC, - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_P4, KC_P5, KC_P6, _______, KC_PSLS, KC_TAB, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , KC_P1, KC_P2, KC_P3, KC_PENT, KC_PAST, KC_PEQL, - ADJUST, KC_ESC, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_P0, _______, KC_PDOT,_______, KC_PMNS, KC_BSPC - ), - /* Colemak - * ,-----------------------------------------. ,-----------------------------------------. ,-----------------------------------------. - * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp | | 7 | 8 | 9 | |NumLck| Esc | - * |------+------+------+------+------+------| |------+------+------+------+------+------| |------+------+------| + |------+------| - * | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' | | 4 | 5 | 6 | | / | Tab | - * |------+------+------+------+------+------| |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | | K | M | , | . | / |Enter | | 1 | 2 | 3 | | * | = | - * |------+------+------+------+------+------| |------+------+------+------+------+------| |-------------+------|Enter |------+------| - * |ADJUST| Esc | Alt | GUI |LOWER |Space | | Space| RAISE| Left | Down | Up | Right| | 0 | . | | - | Bksp | - * `-----------------------------------------' `-----------------------------------------' `-----------------------------------------' - */ - [_COLEMAK] = LAYOUT_extended( - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_NLCK, KC_ESC, - KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_P4, KC_P5, KC_P6, _______, KC_PSLS, KC_TAB, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , KC_P1, KC_P2, KC_P3, KC_PENT, KC_PAST, KC_PEQL, - ADJUST, KC_ESC, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_P0, _______, KC_PDOT,_______, KC_PMNS, KC_BSPC - ), - - /* Dvorak - * ,-----------------------------------------. ,-----------------------------------------. ,-----------------------------------------. - * | Tab | ' | , | . | P | Y | | F | G | C | R | L | Del | | 7 | 8 | 9 | |NumLck| Esc | - * |------+------+------+------+------+------| |------+------+------+------+------+------| |------+------+------| + |------+------| - * | Ctrl | A | O | E | U | I | | D | H | T | N | S | / | | 4 | 5 | 6 | | / | Tab | - * |------+------+------+------+------+------| |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Shift| ; | Q | J | K | X | | B | M | W | V | Z |Enter | | 1 | 2 | 3 | | * | = | - * |------+------+------+------+------+------| |------+------+------+------+------+------| |-------------+------|Enter |------+------| - * |ADJUST| Esc | Alt | GUI |LOWER |Space | | Space| RAISE| Left | Down | Up | Right| | 0 | . | | - | Bksp | - * `-----------------------------------------' `-----------------------------------------' `-----------------------------------------' - */ - [_DVORAK] = LAYOUT_extended( - KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DEL, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_NLCK, KC_ESC, - KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, KC_P4, KC_P5, KC_P6, _______, KC_PSLS, KC_TAB, - KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , KC_P1, KC_P2, KC_P3, KC_PENT, KC_PAST, KC_PEQL, - ADJUST, KC_ESC, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_P0, _______, KC_PDOT,_______, KC_PMNS, KC_BSPC - ), - - /* Lower - * ,-----------------------------------------. ,-----------------------------------------. ,-----------------------------------------. - * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | | | 7 | 8 | 9 | |NumLck| Esc | - * |------+------+------+------+------+------| |------+------+------+------+------+------| |------+------+------| + |------+------| - * | | | | | | | | - | _ | + | { | } | | | | 4 | 5 | 6 | | / | Tab | - * |------+------+------+------+------+------| |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | | Home | End | | | 1 | 2 | 3 | | * | = | - * |------+------+------+------+------+------| |------+------+------+------+------+------| |-------------+------|Enter |------+------| - * | | | | | | | | | | Next | Vol- | Vol+ | Play | | 0 | . | | - | Bksp | - * `-----------------------------------------'