diff options
Diffstat (limited to 'keyboards/nightly_boards')
60 files changed, 1138 insertions, 1819 deletions
diff --git a/keyboards/nightly_boards/adellein/config.h b/keyboards/nightly_boards/adellein/config.h index e4e99106a3..d1703c1c80 100644 --- a/keyboards/nightly_boards/adellein/config.h +++ b/keyboards/nightly_boards/adellein/config.h @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * 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 { B1, B0, B5, B6 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B7, B3, B2, D0, D1, D2, D3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D5 -#ifdef RGB_DI_PIN #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -48,8 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif - /* Encoders */ #define ENCODERS_CW_KEY { { 3, 3 } } #define ENCODERS_CCW_KEY { { 1, 3 } } diff --git a/keyboards/nightly_boards/adellein/encoder_action.c b/keyboards/nightly_boards/adellein/encoder_action.c index 6b553d3969..522fb58d5a 100644 --- a/keyboards/nightly_boards/adellein/encoder_action.c +++ b/keyboards/nightly_boards/adellein/encoder_action.c @@ -26,7 +26,8 @@ void encoder_action_unregister(void) { keyevent_t encoder_event = (keyevent_t) { .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], .pressed = false, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state[index] = 0; action_exec(encoder_event); @@ -38,7 +39,8 @@ void encoder_action_register(uint8_t index, bool clockwise) { keyevent_t encoder_event = (keyevent_t) { .key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state[index] = (clockwise ^ 1) | (clockwise << 1); action_exec(encoder_event); diff --git a/keyboards/nightly_boards/adellein/info.json b/keyboards/nightly_boards/adellein/info.json index 7967cfc99b..d45356262d 100644 --- a/keyboards/nightly_boards/adellein/info.json +++ b/keyboards/nightly_boards/adellein/info.json @@ -8,11 +8,19 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B7", "B3", "B2", "D0", "D1", "D2", "D3"], + "rows": ["B1", "B0", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C7", "pin_b": "C6"} ] }, + "ws2812": { + "pin": "D5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h index acd477fa71..d56e19898b 100644 --- a/keyboards/nightly_boards/alter/rev1/config.h +++ b/keyboards/nightly_boards/alter/rev1/config.h @@ -14,25 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * 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 { F7, F6, F5, E6, D0, B7, D5, D3, D2, D1 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B0, B1, B2, B3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -49,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json index 21efb61c29..0c33b1c769 100644 --- a/keyboards/nightly_boards/alter/rev1/info.json +++ b/keyboards/nightly_boards/alter/rev1/info.json @@ -8,87 +8,103 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B0", "B1", "B2", "B3"], + "rows": ["F7", "F6", "F5", "E6", "D0", "B7", "D5", "D3", "D2", "D1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D6", "num_lock": "D7", "scroll_lock": "B4" }, + "ws2812": { + "pin": "F1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["alice_split_bs"], + "layout_aliases": { + "LAYOUT": "LAYOUT_alice_split_bs" + }, "layouts": { "LAYOUT_alice_split_bs": { - "layout": [ - {"x":0.5, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":11.25, "y":0}, - {"x":12.25, "y":0}, - {"x":13.25, "y":0}, - {"x":14.25, "y":0}, - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - {"x":18.25, "y":0}, - - {"x":0.25, "y":1}, - {"x":1.75, "y":1, "w":1.5}, - {"x":3.25, "y":1}, - {"x":4.25, "y":1}, - {"x":5.25, "y":1}, - {"x":6.25, "y":1}, - {"x":7.25, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1}, - {"x":16, "y":1}, - {"x":17, "y":1}, - {"x":18, "y":1, "w":1.5}, - - {"x":0, "y":2}, - {"x":1.5, "y":2, "w":1.75}, - {"x":3.25, "y":2}, - {"x":4.5, "y":2}, - {"x":5.5, "y":2}, - {"x":6.5, "y":2}, - {"x":7.5, "y":2}, - {"x":11.25, "y":2}, - {"x":12.25, "y":2}, - {"x":13.25, "y":2}, - {"x":14.25, "y":2}, - {"x":15.5, "y":2}, - {"x":16.5, "y":2}, - {"x":17.5, "y":2, "w":2.25}, - - {"x":1.25, "y":3, "w":2.25}, - {"x":3.5, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":10.75, "y":3}, - {"x":11.75, "y":3}, - {"x":12.75, "y":3}, - {"x":13.75, "y":3}, - {"x":15.25, "y":3}, - {"x":16.25, "y":3}, - {"x":17.25, "y":3, "w":1.75}, - {"x":19, "y":3}, - - {"x":1.25, "y":4, "w":1.5}, - {"x":5, "y":4, "w":1.5}, - {"x":6.5, "y":4, "w":2}, - {"x":8.5, "y":4, "w":1.25}, - {"x":10.5, "y":4, "w":2.75}, - {"x":13.25, "y":4, "w":1.5}, - {"x":18.25, "y":4, "w":1.5}] + "layout": [ + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [0, 1], "x": 3, "y": 0}, + {"matrix": [1, 1], "x": 4, "y": 0}, + {"matrix": [0, 2], "x": 5, "y": 0}, + {"matrix": [1, 2], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + + {"matrix": [0, 4], "x": 11.25, "y": 0}, + {"matrix": [1, 4], "x": 12.25, "y": 0}, + {"matrix": [0, 5], "x": 13.25, "y": 0}, + {"matrix": [1, 5], "x": 14.25, "y": 0}, + {"matrix": [0, 6], "x": 15.25, "y": 0}, + {"matrix": [1, 6], "x": 16.25, "y": 0}, + {"matrix": [1, 7], "x": 17.25, "y": 0}, + {"matrix": [0, 7], "x": 18.25, "y": 0}, + + {"matrix": [2, 0], "x": 0.25, "y": 1}, + {"matrix": [3, 0], "x": 1.75, "y": 1, "w": 1.5}, + {"matrix": [2, 1], "x": 3.25, "y": 1}, + {"matrix": [3, 1], "x": 4.25, "y": 1}, + {"matrix": [2, 2], "x": 5.25, "y": 1}, + {"matrix": [3, 2], "x": 6.25, "y": 1}, + {"matrix": [2, 3], "x": 7.25, "y": 1}, + + {"matrix": [2, 4], "x": 11, "y": 1}, + {"matrix": [3, 4], "x": 12, "y": 1}, + {"matrix": [2, 5], "x": 13, "y": 1}, + {"matrix": [3, 5], "x": 14, "y": 1}, + {"matrix": [2, 6], "x": 15, "y": 1}, + {"matrix": [3, 6], "x": 16, "y": 1}, + {"matrix": [2, 7], "x": 17, "y": 1}, + {"matrix": [3, 7], "x": 18, "y": 1, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [5, 1], "x": 3.25, "y": 2}, + {"matrix": [4, 2], "x": 4.5, "y": 2}, + {"matrix": [5, 2], "x": 5.5, "y": 2}, + {"matrix": [4, 3], "x": 6.5, "y": 2}, + {"matrix": [5, 3], "x": 7.5, "y": 2}, + + {"matrix": [4, 4], "x": 11.25, "y": 2}, + {"matrix": [5, 4], "x": 12.25, "y": 2}, + {"matrix": [4, 5], "x": 13.25, "y": 2}, + {"matrix": [5, 5], "x": 14.25, "y": 2}, + {"matrix": [4, 6], "x": 15.5, "y": 2}, + {"matrix": [5, 6], "x": 16.5, "y": 2}, + {"matrix": [4, 7], "x": 17.5, "y": 2, "w": 2.25}, + + {"matrix": [7, 0], "x": 1.25, "y": 3, "w": 2.25}, + {"matrix": [7, 1], "x": 3.5, "y": 3}, + {"matrix": [6, 2], "x": 5, "y": 3}, + {"matrix": [7, 2], "x": 6, "y": 3}, + {"matrix": [6, 3], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + + {"matrix": [6, 4], "x": 10.75, "y": 3}, + {"matrix": [7, 4], "x": 11.75, "y": 3}, + {"matrix": [6, 5], "x": 12.75, "y": 3}, + {"matrix": [7, 5], "x": 13.75, "y": 3}, + {"matrix": [6, 6], "x": 15.25, "y": 3}, + {"matrix": [7, 6], "x": 16.25, "y": 3}, + {"matrix": [6, 7], "x": 17.25, "y": 3, "w": 1.75}, + {"matrix": [7, 7], "x": 19, "y": 3}, + + {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.5}, + {"matrix": [8, 2], "x": 5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 6.5, "y": 4, "w": 2}, + {"matrix": [8, 3], "x": 8.5, "y": 4, "w": 1.25}, + {"matrix": [8, 4], "x": 10.5, "y": 4, "w": 2.75}, + {"matrix": [9, 5], "x": 13.25, "y": 4, "w": 1.5}, + {"matrix": [8, 7], "x": 18.25, "y": 4, "w": 1.5} + ] } } } diff --git a/keyboards/nightly_boards/alter/rev1/rev1.c b/keyboards/nightly_boards/alter/rev1/rev1.c deleted file mode 100644 index b250d32d12..0000000000 --- a/keyboards/nightly_boards/alter/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Neil Brian Ramirez - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include "rev1.h" diff --git a/keyboards/nightly_boards/alter/rev1/rev1.h b/keyboards/nightly_boards/alter/rev1/rev1.h deleted file mode 100644 index 8fbbc71aaf..0000000000 --- a/keyboards/nightly_boards/alter/rev1/rev1.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2020 Neil Brian Ramirez - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_alice_split_bs( \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K17, K07, \ - K20, K30, K21, K31, K22, K32, K23, K24, K34, K25, K35, K26, K36, K27, K37, \ - K40, K50, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, \ - K70, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, K77, \ - K90, K82, K92, K83, K84, K95, K87 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K30, K31, K32, KC_NO, K34, K35, K36, K37 }, \ - { K40, KC_NO, K42, K43, K44, K45, K46, K47 }, \ - { K50, K51, K52, K53, K54, K55, K56, KC_NO }, \ - { KC_NO, KC_NO, K62, K63, K64, K65, K66, K67 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { KC_NO, KC_NO, K82, K83, K84, KC_NO, KC_NO, K87 }, \ - { K90, KC_NO, K92, KC_NO, KC_NO, K95, KC_NO, KC_NO }, \ -} - -#define LAYOUT LAYOUT_alice_split_bs diff --git a/keyboards/nightly_boards/alter_lite/alter_lite.c b/keyboards/nightly_boards/alter_lite/alter_lite.c deleted file mode 100644 index 90e2d8c5b3..0000000000 --- a/keyboards/nightly_boards/alter_lite/alter_lite.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 DeskDaily - * 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 <http://www.gnu.org/licenses/>. - */ - -#include "alter_lite.h" diff --git a/keyboards/nightly_boards/alter_lite/alter_lite.h b/keyboards/nightly_boards/alter_lite/alter_lite.h deleted file mode 100644 index a268512dae..0000000000 --- a/keyboards/nightly_boards/alter_lite/alter_lite.h +++ /dev/null @@ -1,41 +0,0 @@ - /* Copyright 2020 DeskDaily - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ - K20, K21, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K31, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ - K41, K44, K45, K46, K48, K4B, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, KC_NO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, KC_NO, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F }, \ - { KC_NO, K31, KC_NO, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ - { KC_NO, K41, KC_NO, KC_NO, K44, K45, K46, KC_NO, K48, KC_NO, KC_NO, K4B, KC_NO, KC_NO, K4E, KC_NO }, \ -} diff --git a/keyboards/nightly_boards/alter_lite/config.h b/keyboards/nightly_boards/alter_lite/config.h index ee04e0a75e..e462b35b07 100644 --- a/keyboards/nightly_boards/alter_lite/config.h +++ b/keyboards/nightly_boards/alter_lite/config.h @@ -14,22 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* - * 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 { F0, F1, D3, D5, B5 } |