summaryrefslogtreecommitdiff
path: root/keyboards/flehrad/tradestation
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/flehrad/tradestation')
-rw-r--r--keyboards/flehrad/tradestation/config.h25
-rw-r--r--keyboards/flehrad/tradestation/info.json61
-rw-r--r--keyboards/flehrad/tradestation/tradestation.c16
-rw-r--r--keyboards/flehrad/tradestation/tradestation.h42
4 files changed, 33 insertions, 111 deletions
diff --git a/keyboards/flehrad/tradestation/config.h b/keyboards/flehrad/tradestation/config.h
index 374993cd17..41dafc075d 100644
--- a/keyboards/flehrad/tradestation/config.h
+++ b/keyboards/flehrad/tradestation/config.h
@@ -15,33 +15,8 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D1, C6, D4, D0 }
-#define MATRIX_COL_PINS { F7, B1, D7, E6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* 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
-
-#ifdef RGB_DI_PIN
-#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
-#define RGBLIGHT_EFFECT_TWINKLE
- #define RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/flehrad/tradestation/info.json b/keyboards/flehrad/tradestation/info.json
index 6d4d7c17b5..fff21fa7bc 100644
--- a/keyboards/flehrad/tradestation/info.json
+++ b/keyboards/flehrad/tradestation/info.json
@@ -8,50 +8,55 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F7", "B1", "D7", "E6"],
+ "rows": ["D1", "C6", "D4", "D0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_4x4"],
"layouts": {
"LAYOUT_tradestation": {
"layout": [
- {"x":0, "y":0},
- {"x":1.125, "y":0},
- {"x":2.25, "y":0},
- {"x":3.375, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1.125, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.375, "y": 0},
- {"x":0, "y":1.1},
- {"x":1.125, "y":1.1},
- {"x":2.25, "y":1.1},
- {"x":3.375, "y":1.1},
+ {"matrix": [1, 0], "x": 0, "y": 1.1},
+ {"matrix": [1, 1], "x": 1.125, "y": 1.1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1.1},
+ {"matrix": [1, 3], "x": 3.375, "y": 1.1},
- {"x":0, "y":2.25, "w":2},
- {"x":2.25, "y":2.25, "w":2},
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 2},
+ {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 2},
- {"x":0, "y":3.5, "w":2},
- {"x":2.25, "y":3.5, "w":2}
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2},
+ {"matrix": [3, 2], "x": 2.25, "y": 3.5, "w": 2}
]
},
"LAYOUT_ortho_4x4": {
"layout": [
- {"x":0, "y":0},
- {"x":1.125, "y":0},
- {"x":2.25, "y":0},
- {"x":3.375, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1.125, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.375, "y": 0},
- {"x":0, "y":1.1},
- {"x":1.125, "y":1.1},
- {"x":2.25, "y":1.1},
- {"x":3.375, "y":1.1},
+ {"matrix": [1, 0], "x": 0, "y": 1.1},
+ {"matrix": [1, 1], "x": 1.125, "y": 1.1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1.1},
+ {"matrix": [1, 3], "x": 3.375, "y": 1.1},
- {"x":0, "y":2.25},
- {"x":1.125, "y":2.25},
- {"x":2.25, "y":2.25},
- {"x":3.375, "y":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1.125, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.375, "y": 2.25},
- {"x":0, "y":3.5},
- {"x":1.125, "y":3.5},
- {"x":2.25, "y":3.5},
- {"x":3.375, "y":3.5}
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1.125, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.25, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.375, "y": 3.5}
]
}
}
diff --git a/keyboards/flehrad/tradestation/tradestation.c b/keyboards/flehrad/tradestation/tradestation.c
deleted file mode 100644
index bd572db83f..0000000000
--- a/keyboards/flehrad/tradestation/tradestation.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 flehrad
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "tradestation.h"
diff --git a/keyboards/flehrad/tradestation/tradestation.h b/keyboards/flehrad/tradestation/tradestation.h
deleted file mode 100644
index 8061432596..0000000000
--- a/keyboards/flehrad/tradestation/tradestation.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 flehrad
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 } \
-}
-
-#define LAYOUT_tradestation( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K22, \
- K30, K32 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, KC_NO, K22, KC_NO }, \
- { K30, KC_NO, K32, KC_NO } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 02:27:56 +0000