diff options
Diffstat (limited to 'keyboards/marksard')
30 files changed, 256 insertions, 814 deletions
diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h index bf7aa7f198..5de3d8b15d 100644 --- a/keyboards/marksard/leftover30/config.h +++ b/keyboards/marksard/leftover30/config.h @@ -17,24 +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 { B6, B2, F7, F6, B3, B1, D4, D0 } -#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -51,7 +33,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/marksard/leftover30/info.json b/keyboards/marksard/leftover30/info.json index 39de1d6bda..7e88355591 100644 --- a/keyboards/marksard/leftover30/info.json +++ b/keyboards/marksard/leftover30/info.json @@ -8,201 +8,64 @@ "pid": "0xDFA8", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7", "C6"], + "rows": ["B6", "B2", "F7", "F6", "B3", "B1", "D4", "D0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5"} ] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [ - { - "label": "Q", - "x": 0.5, - "y": 0 - }, - { - "label": "W", - "x": 1.5, - "y": 0 - }, - { - "label": "E", - "x": 2.5, - "y": 0 - }, - { - "label": "R", - "x": 3.5, - "y": 0 - }, - { - "label": "T", - "x": 4.5, - "y": 0 - }, - { - "label": "Y", - "x": 5.5, - "y": 0 - }, - { - "label": "U", - "x": 6.5, - "y": 0 - }, - { - "label": "I", - "x": 7.5, - "y": 0 - }, - { - "label": "O", - "x": 8.5, - "y": 0 - }, - { - "label": "P", - "x": 9.5, - "y": 0 - }, - { - "label": "BS", - "x": 10.5, - "y": 0 - }, - { - "label": "A", - "x": 0.75, - "y": 1 - }, - { - "label": "S", - "x": 1.75, - "y": 1 - }, - { - "label": "D", - "x": 2.75, - "y": 1 - }, - { - "label": "F", - "x": 3.75, - "y": 1 - }, - { - "label": "G", - "x": 4.75, - "y": 1 - }, - { - "label": "H", - "x": 5.75, - "y": 1 - }, - { - "label": "J", - "x": 6.75, - "y": 1 - }, - { - "label": "K", - "x": 7.75, - "y": 1 - }, - { - "label": "L", - "x": 8.75, - "y": 1 - }, - { - "label": "Enter", - "x": 9.75, - "y": 1, - "w": 1.75 - }, - { - "label": "Z", - "x": 1.25, - "y": 2 - }, - { - "label": "X", - "x": 2.25, - "y": 2 - }, - { - "label": "C", - "x": 3.25, - "y": 2 - }, - { - "label": "V", - "x": 4.25, - "y": 2 - }, - { - "label": "B", - "x": 5.25, - "y": 2 - }, - { - "label": "N", - "x": 6.25, - "y": 2 - }, - { - "label": "M", - "x": 7.25, - "y": 2 - }, - { - "label": "<", - "x": 8.25, - "y": 2 - }, - { - "label": ">", - "x": 9.25, - "y": 2 - }, - { - "label": "?", - "x": 10.25, - "y": 2, - "w": 1.25 - }, - { - "label": "", - "x": 0, - "y": 3 - }, - { - "label": "Alt", - "x": 1.5, - "y": 3, - "w": 1.25 - }, - { - "label": "", - "x": 2.75, - "y": 3, - "w": 6.25 - }, - { - "label": "Fn1", - "x": 9, - "y": 3 - }, - { - "label": "Ctrl", - "x": 10, - "y": 3, - "w": 1.5 - } + {"matrix": [4, 4], "x": 0.5, "y": 0}, + {"matrix": [4, 3], "x": 1.5, "y": 0}, + {"matrix": [4, 2], "x": 2.5, "y": 0}, + {"matrix": [4, 1], "x": 3.5, "y": 0}, + {"matrix": [4, 0], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [0, 2], "x": 7.5, "y": 0}, + {"matrix": [0, 1], "x": 8.5, "y": 0}, + {"matrix": [0, 0], "x": 9.5, "y": 0}, + {"matrix": [3, 0], "x": 10.5, "y": 0}, + + {"matrix": [5, 4], "x": 0.75, "y": 1}, + {"matrix": [5, 3], "x": 1.75, "y": 1}, + {"matrix": [5, 2], "x": 2.75, "y": 1}, + {"matrix": [5, 1], "x": 3.75, "y": 1}, + {"matrix": [5, 0], "x": 4.75, "y": 1}, + {"matrix": [1, 4], "x": 5.75, "y": 1}, + {"matrix": [1, 3], "x": 6.75, "y": 1}, + {"matrix": [1, 2], "x": 7.75, "y": 1}, + {"matrix": [1, 1], "x": 8.75, "y": 1}, + {"matrix": [1, 0], "x": 9.75, "y": 1, "w": 1.75}, + + {"matrix": [6, 4], "x": 1.25, "y": 2}, + {"matrix": [6, 3], "x": 2.25, "y": 2}, + {"matrix": [6, 2], "x": 3.25, "y": 2}, + {"matrix": [6, 1], "x": 4.25, "y": 2}, + {"matrix": [6, 0], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 3], "x": 7.25, "y": 2}, + {"matrix": [2, 2], "x": 8.25, "y": 2}, + {"matrix": [2, 1], "x": 9.25, "y": 2}, + {"matrix": [2, 0], "x": 10.25, "y": 2, "w": 1.25}, + + {"matrix": [7, 4], "x": 0, "y": 3}, + + {"matrix": [3, 4], "x": 1.5, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 2.75, "y": 3, "w": 6.25}, + {"matrix": [3, 2], "x": 9, "y": 3}, + {"matrix": [3, 1], "x": 10, "y": 3, "w": 1.5} ] } } diff --git a/keyboards/marksard/leftover30/keymaps/default/config.h b/keyboards/marksard/leftover30/keymaps/default/config.h index 8bffbbb3b5..8d29b8e6c9 100644 --- a/keyboards/marksard/leftover30/keymaps/default/config.h +++ b/keyboards/marksard/leftover30/keymaps/default/config.h @@ -18,7 +18,6 @@ // place overrides here #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term #define TAPPING_TERM_PER_KEY diff --git a/keyboards/marksard/leftover30/leftover30.c b/keyboards/marksard/leftover30/leftover30.c index df8152144b..6d8b64cd90 100644 --- a/keyboards/marksard/leftover30/leftover30.c +++ b/keyboards/marksard/leftover30/leftover30.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "leftover30.h" +#include "quantum.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/marksard/leftover30/leftover30.h b/keyboards/marksard/leftover30/leftover30.h deleted file mode 100644 index 901b9b570a..0000000000 --- a/keyboards/marksard/leftover30/leftover30.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2020 marksard - * - * 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_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a,\ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,\ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,\ - k30, k31, k32, k33, k34\ -) \ -{ \ - { k09, k08, k07, k06, k05 }, \ - { k19, k18, k17, k16, k15 }, \ - { k29, k28, k27, k26, k25 }, \ - { k0a, k34, k33, k32, k31 }, \ -\ - { k04, k03, k02, k01, k00 }, \ - { k14, k13, k12, k11, k10 }, \ - { k24, k23, k22, k21, k20 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, k30 } \ -} diff --git a/keyboards/marksard/rhymestone/common/oled_helper.c b/keyboards/marksard/rhymestone/common/oled_helper.c index 354c1fb896..613798c941 100644 --- a/keyboards/marksard/rhymestone/common/oled_helper.c +++ b/keyboards/marksard/rhymestone/common/oled_helper.c @@ -1,8 +1,10 @@ -#ifdef OLED_ENABLE -#include QMK_KEYBOARD_H +#include "oled_helper.h" +#include "quantum.h" #include <stdio.h> #include <string.h> +#ifdef OLED_ENABLE + void render_logo(void) { static const char PROGMEM logo_buf[]={ diff --git a/keyboards/marksard/rhymestone/common/oled_helper.h b/keyboards/marksard/rhymestone/common/oled_helper.h index dc9a938f6c..9495937e2a 100644 --- a/keyboards/marksard/rhymestone/common/oled_helper.h +++ b/keyboards/marksard/rhymestone/common/oled_helper.h @@ -1,3 +1,8 @@ +#pragma once + +#include <stdint.h> +#include "action.h" + #ifdef OLED_ENABLE void render_logo(void); diff --git a/keyboards/marksard/rhymestone/rev1/config.h b/keyboards/marksard/rhymestone/rev1/config.h index 9cc003be13..32927c4506 100644 --- a/keyboards/marksard/rhymestone/rev1/config.h +++ b/keyboards/marksard/rhymestone/rev1/config.h @@ -17,27 +17,7 @@ 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 { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D3 - #ifdef RGBLIGHT_ENABLE -// #ifdef RGB_DI_PIN #define RGBLED_NUM 40 #define RGBLED_SPLIT {20, 20} #define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json index 6d68519512..07135b5be0 100644 --- a/keyboards/marksard/rhymestone/rev1/info.json +++ b/keyboards/marksard/rhymestone/rev1/info.json @@ -8,9 +8,20 @@ "pid": "0xDFA1", "device_version": "0.2.0" }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x10"], diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk index affdbd6f11..6f15328b5a 100644 --- a/keyboards/marksard/rhymestone/rules.mk +++ b/keyboards/marksard/rhymestone/rules.mk @@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output SPLIT_KEYBOARD = yes RGB_MATRIX_ENABLE = no -RGB_MATRIX_DRIVER = WS2812 DEFAULT_FOLDER = marksard/rhymestone/rev1 diff --git a/keyboards/marksard/treadstone32/keymaps/default/config.h b/keyboards/marksard/treadstone32/keymaps/default/config.h index 863588c5aa..82020a59b8 100644 --- a/keyboards/marksard/treadstone32/keymaps/default/config.h +++ b/keyboards/marksard/treadstone32/keymaps/default/config.h @@ -18,7 +18,6 @@ // place overrides here #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term #define TAPPING_TERM_PER_KEY diff --git a/keyboards/marksard/treadstone32/keymaps/like_jis/config.h b/keyboards/marksard/treadstone32/keymaps/like_jis/config.h index 863588c5aa..82020a59b8 100644 --- a/keyboards/marksard/treadstone32/keymaps/like_jis/config.h +++ b/keyboards/marksard/treadstone32/keymaps/like_jis/config.h @@ -18,7 +18,6 @@ // place overrides here #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term #define TAPPING_TERM_PER_KEY diff --git a/keyboards/marksard/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h index a460abd0ef..22435108df 100644 --- a/keyboards/marksard/treadstone32/lite/config.h +++ b/keyboards/marksard/treadstone32/lite/config.h @@ -17,24 +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 { B6, B2, F7, F6, B3, B1, F4, F5 } -#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } - -/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ -#define DIODE_DIRECTION COL2ROW -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ @@ -55,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) // USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json index 040083b968..878b4db2ac 100644 --- a/keyboards/marksard/treadstone32/lite/info.json +++ b/keyboards/marksard/treadstone32/lite/info.json @@ -3,6 +3,59 @@ "usb": { "device_version": "0.1.5" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7", "C6"], + "rows": ["B6", "B2", "F7", "F6", "B3", "B1", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [4, 4], "x": 0, "y": 0}, + {"matrix": [4, 3], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 1], "x": 3, "y": 0}, + {"matrix": [4, 0], "x": 4, "y": 0}, + + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [0, 2], "x": 7.5, "y": 0}, + {"matrix": [0, 1], "x": 8.5, "y": 0}, + {"matrix": [0, 0], "x": 9.5, "y": 0}, + + {"matrix": [5, 4], "x": 0.25, "y": 1}, + {"matrix": [5, 3], "x": 1.25, "y": 1}, + {"matrix": [5, 2], "x": 2.25, "y": 1}, + {"matrix": [5, 1], "x": 3.25, "y": 1}, + + {"matrix": [5, 0], "x": 4.25, "y": 1}, + {"matrix": [1, 4], "x": 5.25, "y": 1}, + {"matrix": [1, 3], "x": 6.25, "y": 1}, + {"matrix": [1, 2], "x": 7.25, "y": 1}, + {"matrix": [1, 1], "x": 8.25, "y": 1}, + {"matrix": [1, 0], "x": 9.25, "y": 1}, + + {"matrix": [6, 4], "x": 0, "y": 2}, + {"matrix": [6, 3], "x": 1, "y": 2}, + {"matrix": [6, 2], "x": 2, "y": 2}, + {"matrix": [6, 1], "x": 3, "y": 2}, + {"matrix": [6, 0], "x": 4, "y": 2}, + + {"matrix": [2, 4], "x": 5.5, "y": 2}, + {"matrix": [2, 3], "x": 6.5, "y": 2}, + {"matrix": [2, 2], "x": 7.5, "y": 2}, + {"matrix": [2, 1], "x": 8.5, "y": 2}, + {"matrix": [2, 0], "x": 9.5, "y": 2}, + + {"matrix": [7, 0], "x": 3.25, "y": 3, "w": 2}, + + {"matrix": [3, 4], "x": 5.25, "y": 3, "w": 2} + ] + } + } } diff --git a/keyboards/marksard/treadstone32/lite/lite.c b/keyboards/marksard/treadstone32/lite/lite.c deleted file mode 100644 index a1997feff0..0000000000 --- a/keyboards/marksard/treadstone32/lite/lite.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 marksard - * - * 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 "lite.h" diff --git a/keyboards/marksard/treadstone32/lite/lite.h b/keyboards/marksard/treadstone32/lite/lite.h deleted file mode 100644 index 90181124c0..0000000000 --- a/keyboards/marksard/treadstone32/lite/lite.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2019 marksard. - * - * 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" - -#define K_N KC_NO - -/* This 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( \ - L09, L08, L07, L06, L05, L04, L03, L02, L01, L00, \ - L19, L18, L17, L16, L15, L14, L13, L12, L11, L10, \ - L29, L28, L27, L26, L25, L24, L23, L22, L21, L20, \ - L35, L34 \ - ) \ - { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { K_N, K_N, K_N, K_N, L34 }, \ - { L05, L06, L07, L08, L09 }, \ - { L15, L16, L17, L18, L19 }, \ - { L25, L26, L27, L28, L29 }, \ - { L35, K_N, K_N, K_N, K_N } \ - } diff --git a/keyboards/marksard/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h index db39ee477c..1f3a9ec168 100644 --- a/keyboards/marksard/treadstone32/rev1/config.h +++ b/keyboards/marksard/treadstone32/rev1/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 { F1, F0, E6, B2, B4, D7, D6, D4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, C7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #ifndef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ @@ -56,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE) // USB_MAX_POWER_CONSUMPTION value for treadstone32 keyboard diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json index 51b46b22d2..00538f7e8a 100644 --- a/keyboards/marksard/treadstone32/rev1/info.json +++ b/keyboards/marksard/treadstone32/rev1/info.json @@ -3,6 +3,59 @@ "usb": { "device_version": "0.1.0" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "C7"], + "rows": ["F1", "F0", "E6", "B2", "B4", "D7", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [4, 4], "x": 0, "y": 0}, + {"matrix": [4, 3], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 1], "x": 3, "y": 0}, + {"matrix": [4, 0], "x": 4, "y": 0}, + + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [0, 2], "x": 7.5, "y": 0}, + {"matrix": [0, 1], "x": 8.5, "y": 0}, + {"matrix": [0, 0], "x": 9.5, "y": 0}, + + {"matrix": [5, 4], "x": 0.25, "y": 1}, + {"matrix": [5, 3], "x": 1.25, "y": 1}, + {"matrix": [5, 2], "x": 2.25, "y": 1}, + {"matrix": [5, 1], "x": 3.25, "y": 1}, + {"matrix": [5, 0], "x": 4.25, "y": 1}, + + {"matrix": [1, 4], "x": 5.25, "y": 1}, + {"matrix": [1, 3], "x": 6.25, "y": 1}, + {"matrix": [1, 2], "x": 7.25, "y": 1}, + {"matrix": [1, 1], "x": 8.25, "y": 1}, + {"matrix": [1, 0], "x": 9.25, "y": 1}, + + {"matrix": [6, 4], "x": 0, "y": 2}, + {"matrix": [6, 3], "x": 1, "y": 2}, + {"matrix": [6, 2], "x": 2, "y": 2}, + {"matrix": [6, 1], "x": 3, "y": 2}, + {"matrix": [6, 0], "x": 4, "y": 2}, + + {"matrix": [2, 4], "x": 5.5, "y": 2}, + {"matrix": [2, 3], "x": 6.5, "y": 2}, + {"matrix": [2, 2], "x": 7.5, "y": 2}, + {"matrix": [2, 1], "x": 8.5, "y": 2}, + {"matrix": [2, 0], "x": 9.5, "y": 2}, + + {"matrix": [7, 0], "x": 3.25, "y": 3, "w": 2}, + + {"matrix": [3, 4], "x": 5.25, "y": 3, "w": 2} + ] + } + } } diff --git a/keyboards/marksard/treadstone32/rev1/rev1.c b/keyboards/marksard/treadstone32/rev1/rev1.c deleted file mode 100644 index bf41abddbe..0000000000 --- a/keyboards/marksard/treadstone32/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 marksard - * - * 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/marksard/treadstone32/rev1/rev1.h b/keyboards/marksard/treadstone32/rev1/rev1.h deleted file mode 100644 index 90181124c0..0000000000 --- a/keyboards/marksard/treadstone32/rev1/rev1.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2019 marksard. - * - * 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" - -#define K_N KC_NO - -/* This 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( \ - L09, L08, L07, L06, L05, L04, L03, L02, L01, L00, \ - L19, L18, L17, L16, L15, L14, L13, L12, L11, L10, \ - L29, L28, L27, L26, L25, L24, L23, L22, L21, L20, \ - L35, L34 \ - ) \ - { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { K_N, K_N, K_N, K_N, L34 }, \ - { L05, L06, L07, L08, L09 }, \ - { L15, L16, L17, L18, L19 }, \ - { L25, L26, L27, L28, L29 }, \ - { L35, K_N, K_N, K_N, K_N } \ - } diff --git a/keyboards/marksard/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/common/oled_helper.c index 68adbe83a8..c3c8f23cbc 100644 --- a/keyboards/marksard/treadstone48/common/oled_helper.c +++ b/keyboards/marksard/treadstone48/common/oled_helper.c @@ -1,8 +1,10 @@ -#ifdef OLED_ENABLE -#include QMK_KEYBOARD_H +#include "oled_helper.h" +#include "quantum.h" #include <stdio.h> #include <string.h> +#ifdef OLED_ENABLE + void render_logo(void) { const char logo_buf[]={ diff --git a/keyboards/marksard/treadstone48/common/oled_helper.h b/keyboards/marksard/treadstone48/common/oled_helper.h index 56c2a5b236..3dc186f05c 100644 --- a/keyboards/marksard/treadstone48/common/oled_helper.h +++ b/keyboards/marksard/treadstone48/common/oled_helper.h @@ -1,5 +1,10 @@ +#pragma once + #ifdef OLED_ENABLE +#include <stdint.h> +#include "action.h" + void render_logo(void); void update_key_status(uint16_t keycode, keyrecord_t *record); void render_key_status(void); diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h index 505548a75d..5379417262 100644 --- a/keyboards/marksard/treadstone48/rev1/config.h +++ b/keyboards/marksard/treadstone48/rev1/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 { F4, F5, F6, F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #ifndef RS_EXTRA_LED #define RGBLED_NUM 12 #define RGBLED_SPLIT {12, 0} @@ -57,7 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json index 2c589cac51..6b24cc27e3 100644 --- a/keyboards/marksard/treadstone48/rev1/info.json +++ b/keyboards/marksard/treadstone48/rev1/info.json @@ -8,9 +8,17 @@ "pid": "0xDFA3", "device_version": "0.1.0" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h index 54ac1f2fce..f18bcf44e7 100644 --- a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h +++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h @@ -23,7 +23,6 @@ #endif #define TAPPING_TERM 225 #define PREVENT_STUCK_MODIFIERS -#define IGNORE_MOD_TAP_INTERRUPT #ifdef MOUSEKEY_ENABLE #undef MOUSEKEY_INTERVAL diff --git a/keyboards/marksard/treadstone48/rev1/rev1.c b/keyboards/marksard/treadstone48/rev1/rev1.c deleted file mode 100644 index 3daa3e8e81..0000000000 --- a/keyboards/marksard/treadstone48/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 marksard - * - * 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/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h index 02b08d3bf1..a605380716 100644 --- a/keyboards/marksard/treadstone48/rev2/config.h +++ b/keyboards/marksard/treadstone48/rev2/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 { F4, F5, F6, F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -51,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json index 34f44f1aba..e96ce9fd17 100644 --- a/keyboards/marksard/treadstone48/rev2/info.json +++ b/keyboards/marksard/treadstone48/rev2/info.json @@ -8,261 +8,73 @@ "pid": "0xDFA3", "device_version": "0.2.0" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "layout_aliases": { + "LAYOUT_full": "LAYOUT_base" + }, "layouts": { "LAYOUT_base": { "layout": [ - { - "label": "Esc", - "x": 1, - "y": 0 - }, - { - "label": "Q", - "x": 2.25, - "y": 0 - }, - { - "label": "W", - "x": 3.25, - "y": 0 - }, - { - "label": "E", - "x": 4.25, - "y": 0 - }, - { - "label": "R", - "x": 5.25, - "y": 0 - }, - { - "label": "T", - "x": 6.25, - "y": 0 - }, - { - "label": "Y", - "x": 7.75, - "y": 0 - }, - { - "label": "U", - "x": 8.75, - "y": 0 - }, - { - "label": "I", - "x": 9.75, - "y": 0 - }, - { - "label": "O", - "x": 10.75, - "y": 0 - }, - { - "label": "P", - "x": 11.75, - "y": 0 - }, - { - "label": "Backspace", - "x": 12.75, - "y": 0, - "w": 2 - }, - { - "label": "Tab", - "x": 1, - "y": 1, - "w": 1.5 - }, - { - "label": "A", - "x": 2.5, - "y": 1 - }, - { - "label": "S", - "x": 3.5, - "y": 1 - }, - { - "label": "D", - "x": 4.5, - "y": 1 - }, - { - "label": "F", - "x": 5.5, - "y": 1 - }, - { - "label": "G", - "x": 6.5, - "y": 1 - }, - { - "label": "H", - "x": 7.5, - "y": 1 - }, - { - "label": "J", - "x": 8.5, - "y": 1 - }, - { - "label": "K", - "x": 9.5, - "y": 1 - }, - { - "label": "L", - "x": 10.5, - "y": 1 - }, - { - "label": ":", - "x": 11.5, - "y": 1 - }, - { - "label": "Enter", - "x": 12.5, - "y": 1, - "w": 2.25 - }, - { - "label": "Shift", - "x": 0, - "y": 2, - "w": 2.25 - }, - { - "label": "Z", - "x": 2.25, - "y": 2 - }, - { - "label": "X", - "x": 3.25, - "y": 2 - }, - { - "label": "C", - "x": 4.25, - "y": 2 - }, - { - "label": "V", - "x": 5.25, - "y": 2 - }, - { - "label": "B", - "x": 6.25, - "y": 2 - }, - { - "label": "N", - "x": 7.75, - "y": 2 - }, - { - "label": "M", - "x": 8.75, - "y": 2 - }, - { - "label": "<", - "x": 9.75, - "y": 2 - }, - { - "label": ">", - "x": 10.75, - "y": 2 - }, - { - "label": "?", - "x": 11.75, - "y": 2 - }, - { - "label": "\u2191", - "x": 12.75, - "y": 2 - }, - { - "label": "Ctrl", - "x": 0.75, - "y": 3, - "w": 1.25 - }, - { - "label": "Win", - "x": 2, - "y": 3, - "w": 1.25 - }, - { - "label": "Alt", - "x": 3.25, - "y": 3, - "w": 1.25 - }, - { - "label": "Lower", - "x": 4.5, - "y": 3 - }, - { - "label": "Backspace", - "x": 5.5, - "y": 3, - "w": 2 - }, - { - "label": "Space", - "x": 7.5, - "y": 3, - "w": 2 - }, - { - "label": "Raise", - "x": 9.5, - "y": 3 - }, - { - "label": "Menu", - "x": 10.5, - "y": 3, - "w": 1.25 - }, - { - "label": "\u2190", - "x": 11.75, - "y": 3 - }, - { - "label": "\u2193", - "x": 12.75, - "y": 3 - }, - { - "label": "\u2192", - "x": 13.75, - "y": 3 - }, - { - "label": "Shift", - "x": 13.75, - "y": 2 - } + {"matrix": [4, 5], "x": 1, "y": 0}, + {"matrix": [4, 4], "x": 2.25, "y": 0}, + {"matrix": [4, 3], "x": 3.25, "y": 0}, + {"matrix": [4, 2], "x": 4.25, "y": 0}, + {"matrix": [4, 1], "x": 5.25, "y": 0}, + {"matrix": [4, 0], "x": 6.25, "y": 0}, + {"matrix": [0, 5], "x": 7.75, "y": 0}, + {"matrix": [0, 4], "x": 8.75, "y": 0}, + {"matrix": [0, 3], "x": 9.75, "y": 0}, + {"matrix": [0, 2], "x": 10.75, "y": 0}, + {"matrix": [0, 1], "x": 11.75, "y": 0}, + {"matrix": [0, 0], "x": 12.75, "y": 0, "w": 2}, + + {"matrix": [5, 5], "x": 1, "y": 1, "w": 1.5}, + {"matrix": [5, 4], "x": 2.5, "y": 1}, + {"matrix": [5, 3], "x": 3.5, "y": 1}, + {"matrix": [5, 2], "x": 4.5, "y": 1}, + {"matrix": [5, 1], "x": 5.5, "y": 1}, + {"matrix": [5, 0], "x": 6.5, "y": 1}, + {"matrix": [1, 5], "x": 7.5, "y": 1}, + {"matrix": [1, 4], "x": 8.5, "y": 1}, + {"matrix": [1, 3], "x": 9.5, "y": 1}, + {"matrix": [1, 2], "x": 10.5, "y": 1}, + {"matrix": [1, 1], "x": 11.5, "y": 1}, + {"matrix": [1, 0], "x": 12.5, "y": 1, "w": 2.25}, + + {"matrix": [6, 5], "x": 0, "y": 2, "w": 2.25}, + {"matrix": [6, 4], "x": 2.25, "y": 2}, + {"matrix": [6, 3], "x": 3.25, "y": 2}, + {"matrix": [6, 2], "x": 4.25, "y": 2}, + {"matrix": [6, 1], "x": 5.25, "y": 2}, + {"matrix": [6, 0], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.75, "y": 2}, + {"matrix": [2, 3], "x": 9.75, "y": 2}, + {"matrix": [2, 2], "x": 10.75, "y": 2}, + {"matrix": [2, 1], "x": 11.75, "y": 2}, + {"matrix": [2, 0], "x": 12.75, "y": 2}, + + {"matrix": [7, 5], "x": 0.75, "y": 3, "w": 1.25}, + {"matrix": [7, 4], "x": 2, "y": 3, "w": 1.25}, + {"matrix": [7, 3], "x": 3.25, "y": 3, "w": 1.25}, + {"matrix": [7, 2], "x": 4.5, "y": 3}, + {"matrix": [7, 1], "x": 5.5, "y": 3, "w": 2}, + {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2}, + {"matrix": [3, 5], "x": 9.5, "y": 3}, + {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 11.75, "y": 3}, + {"matrix": [3, 2], "x": 12.75, "y": 3}, + {"matrix": [3, 1], "x": 13.75, "y": 3}, + {"matrix": [3, 0], "x": 13.75, "y": 2} ] } } diff --git a/keyboards/marksard/treadstone48/rev2/rev2.c b/keyboards/marksard/treadstone48/rev2/rev2.c deleted file mode 100644 index f7e7bc7702..0000000000 --- a/keyboards/marksard/treadstone48/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 marksard - * - * 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 "rev2.h" diff --git a/keyboards/marksard/treadstone48/rev2/rev2.h b/keyboards/marksard/treadstone48/rev2/rev2.h deleted file mode 100644 index 651468c4a5..0000000000 --- a/keyboards/marksard/treadstone48/rev2/rev2.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2020 marksard - * - * 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_base( \ - L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, \ - L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, \ - L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, \ - L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75 \ - ) \ - { \ - { L45, L44, L43, L42, L41, L40 }, \ - { L55, L54, L53, L52, L51, L50 }, \ - { L65, L64, L63, L62, L61, L60 }, \ - { L75, L74, L73, L72, L71, L70 }, \ - { L05, L04, L03, L02, L01, L00 }, \ - { L15, L14, L13, L12, L11, L10 }, \ - { L25, L24, L23, L22, L21, L20 }, \ - { L35, L34, L33, L32, L31, L30 } \ - } - -// full Keymap -#define LAYOUT_full LAYOUT_base |