summaryrefslogtreecommitdiff
path: root/keyboards/marksard/treadstone32
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/marksard/treadstone32')
-rw-r--r--keyboards/marksard/treadstone32/keymaps/default/config.h1
-rw-r--r--keyboards/marksard/treadstone32/keymaps/like_jis/config.h1
-rw-r--r--keyboards/marksard/treadstone32/lite/config.h19
-rw-r--r--keyboards/marksard/treadstone32/lite/info.json55
-rw-r--r--keyboards/marksard/treadstone32/lite/lite.c16
-rw-r--r--keyboards/marksard/treadstone32/lite/lite.h45
-rw-r--r--keyboards/marksard/treadstone32/rev1/config.h20
-rw-r--r--keyboards/marksard/treadstone32/rev1/info.json55
-rw-r--r--keyboards/marksard/treadstone32/rev1/rev1.c16
-rw-r--r--keyboards/marksard/treadstone32/rev1/rev1.h45
10 files changed, 108 insertions, 165 deletions
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 } \
- }
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-13 17:46:59 +0000