diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2019-01-05 15:34:19 -0800 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-01-05 15:34:19 -0800 |
| commit | 27b512d9f550dd1a42466733c0c3066742aeb300 (patch) | |
| tree | 59213c889625d8c7fcceca45380d7d940ec55d76 | |
| parent | 9153ff59d4996425df0cc9cd60b959cd45200f79 (diff) | |
| download | qmk_firmware-27b512d9f550dd1a42466733c0c3066742aeb300.tar.gz qmk_firmware-27b512d9f550dd1a42466733c0c3066742aeb300.zip | |
Keyboard: Tradestation code tidy and readme refactor (#4784)
* Tradestation: tidy code
- correct JSON syntax on info.json
- visual key alignment on info.json
- white space changes on rules.mk and tradestation.h (readability/QMK conventions)
* Tradestation: readme refactor
Modify readme.md to more closely match QMK template.
* Tradestation: readme update
Update The Board podcast link for libsyn.
| -rw-r--r-- | keyboards/handwired/tradestation/info.json | 12 | ||||
| -rw-r--r-- | keyboards/handwired/tradestation/readme.md | 26 | ||||
| -rw-r--r-- | keyboards/handwired/tradestation/rules.mk | 3 | ||||
| -rw-r--r-- | keyboards/handwired/tradestation/tradestation.h | 32 |
4 files changed, 38 insertions, 35 deletions
diff --git a/keyboards/handwired/tradestation/info.json b/keyboards/handwired/tradestation/info.json index f26d4ec37..e59c217cb 100644 --- a/keyboards/handwired/tradestation/info.json +++ b/keyboards/handwired/tradestation/info.json | |||
| @@ -2,14 +2,14 @@ | |||
| 2 | "keyboard_name": "Tradestation", | 2 | "keyboard_name": "Tradestation", |
| 3 | "url": "", | 3 | "url": "", |
| 4 | "maintainer": "Flehrad", | 4 | "maintainer": "Flehrad", |
| 5 | "bootloader": "", | 5 | "width": 4.375, |
| 6 | "width": 4.3, | 6 | "height": 4.375, |
| 7 | "height": 4.5, | ||
| 8 | "layouts": { | 7 | "layouts": { |
| 9 | "LAYOUT_tradestation": { | 8 | "LAYOUT_tradestation": { |
| 10 | "layout": [{"x":0, "y":0}, {"x":1.1, "y":0}, {"x":2.2, "y":0}, {"x":3.3, "y":0}, {"x":0, "y":1.1}, {"x":1.1, "y":1.1}, {"x":2.2, "y":1.1}, {"x":3.3, "y":1.1}, {"x":0, "y":2.25, "w":2}, {"x":2.25, "y":2.25, "w":2}, {"x":0, "y":3.5, "w":2}, {"x":2.25, "y":3.5, "w":2}] | 9 | "layout": [{"x":0, "y":0},{"x":1.125, "y":0},{"x":2.25, "y":0},{"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},{"x":0, "y":2.25, "w":2},{"x":2.25, "y":2.25, "w":2},{"x":0, "y":3.5, "w":2},{"x":2.25, "y":3.5, "w":2}] |
| 11 | }, | 10 | }, |
| 12 | "LAYOUT_ortho_4x4": { | 11 | "LAYOUT_ortho_4x4": { |
| 13 | "layout": [{"x":0, "y":0}, {"x":1.1, "y":0}, {"x":2.2, "y":0}, {"x":3.3, "y":0}, {"x":0, "y":1.1}, {"x":1.1, "y":1.1}, {"x":2.2, "y":1.1}, {"x":3.3, "y":1.1}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2.25, "y":2.25}, {"x":3.25, "y":2.25}, {"x":0, "y":3.5}, {"x":1, "y":3.5}, {"x":2.25, "y":3.5}, {"x":3.25, "y":3.5}] | 12 | "layout": [{"x":0, "y":0},{"x":1.125, "y":0},{"x":2.25, "y":0},{"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},{"x":0, "y":2.25},{"x":1.125, "y":2.25},{"x":2.25, "y":2.25},{"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}] |
| 13 | } | ||
| 14 | } | 14 | } |
| 15 | } | 15 | } |
diff --git a/keyboards/handwired/tradestation/readme.md b/keyboards/handwired/tradestation/readme.md index 69c0331a9..3a8c39e26 100644 --- a/keyboards/handwired/tradestation/readme.md +++ b/keyboards/handwired/tradestation/readme.md | |||
| @@ -1,25 +1,27 @@ | |||
| 1 | # Tradestation | 1 | # Tradestation |
| 2 | QMK for Tradestation Macropad | ||
| 3 | 2 | ||
| 4 | This macropad was layout designed by Didier Luximon | 3 | [Image Gallery](https://imgur.com/a/yxQJXMT) |
| 4 | |||
| 5 | A 4x4 ortholinear macropad, with options for 2U keys on the bottom half. Can be built as single PCB with custom case, or as two-PCB style with standoffs. Requires a Pro Micro. | ||
| 5 | 6 | ||
| 6 | This PCB supports an overall 4x4 matrix with unique spacing. | 7 | This PCB supports an overall 4x4 matrix with unique spacing. |
| 8 | |||
| 7 | * Top two rows are 1U keys with 1/8U spacing | 9 | * Top two rows are 1U keys with 1/8U spacing |
| 8 | * Bottom two rows are available with 4x2 1U as clusters of 2x1U or as 2x2 2U, spaced with 1/4U | 10 | * Bottom two rows are available with 4x2 1U as clusters of 2x1U or as 2x2 2U, spaced with 1/4U |
| 9 | 11 | ||
| 10 | For QMK Configurator, the info.json is utilised. | 12 | If you like this simple PCB and want to make a donation, you can do so at [paypal.me/theboardpodcast](https://paypal.me/theboardpodcast). |
| 11 | - For 2U keys , the first 1u row/column key assignment is the same as the 2u position. | ||
| 12 | |||
| 13 | Build requires a pro micro. | ||
| 14 | 13 | ||
| 15 | Can be built as single PCB with custom case, or as two PCB style with standoffs. | 14 | - [The Board Podcast on YouTube](https://www.youtube.com/channel/UCg98oJZNffR9nDLJNkorjqw) |
| 15 | - [The Board Podcast on Libsyn](http://theboard.libsyn.com/) | ||
| 16 | - [The Board Podcast on Patreon](https://www.patreon.com/theboardpodcast) | ||
| 16 | 17 | ||
| 17 | If you like this simple PCB and want to make a donation, you can at https://paypal.me/theboardpodcast | 18 | Designed by Didier Luximon. |
| 18 | 19 | ||
| 19 | Check out our: | 20 | Keyboard Maintainer: [flehrad](https://github.com/flehrad) |
| 21 | Hardware Supported: Tradestation PCB, Pro Micro | ||
| 20 | 22 | ||
| 21 | YouTube (https://www.youtube.com/channel/UCg98oJZNffR9nDLJNkorjqw) | 23 | Make example for this keyboard (after setting up your build environment): |
| 22 | 24 | ||
| 23 | Podcast (www.libsyn.com/theboardpodcast) | 25 | make tradestation:default |
| 24 | 26 | ||
| 25 | Patreon (www.patreon.com/theboardpodcast) | 27 | See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). |
diff --git a/keyboards/handwired/tradestation/rules.mk b/keyboards/handwired/tradestation/rules.mk index 9d49888b5..649b63bab 100644 --- a/keyboards/handwired/tradestation/rules.mk +++ b/keyboards/handwired/tradestation/rules.mk | |||
| @@ -62,4 +62,5 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https:/ | |||
| 62 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 62 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
| 63 | AUDIO_ENABLE = no | 63 | AUDIO_ENABLE = no |
| 64 | RGBLIGHT_ENABLE = no | 64 | RGBLIGHT_ENABLE = no |
| 65 | LAYOUTS = ortho_4x4 | 65 | |
| 66 | LAYOUTS = ortho_4x4 | ||
diff --git a/keyboards/handwired/tradestation/tradestation.h b/keyboards/handwired/tradestation/tradestation.h index 15e40e3b5..60b53b7dd 100644 --- a/keyboards/handwired/tradestation/tradestation.h +++ b/keyboards/handwired/tradestation/tradestation.h | |||
| @@ -3,25 +3,25 @@ | |||
| 3 | #include "quantum.h" | 3 | #include "quantum.h" |
| 4 | 4 | ||
| 5 | #define LAYOUT_ortho_4x4( \ | 5 | #define LAYOUT_ortho_4x4( \ |
| 6 | K00, K01, K02, K03, \ | 6 | K00, K01, K02, K03, \ |
| 7 | K10, K11, K12, K13, \ | 7 | K10, K11, K12, K13, \ |
| 8 | K20, K21, K22, K23, \ | 8 | K20, K21, K22, K23, \ |
| 9 | K30, K31, K32, K33 \ | 9 | K30, K31, K32, K33 \ |
| 10 | ) { \ | 10 | ) { \ |
| 11 | { K00, K01, K02, K03 }, \ | 11 | { K00, K01, K02, K03 }, \ |
| 12 | { K10, K11, K12, K13 }, \ | 12 | { K10, K11, K12, K13 }, \ |
| 13 | { K20, K21, K22, K23 }, \ | 13 | { K20, K21, K22, K23 }, \ |
| 14 | { K30, K31, K32, K33 } \ | 14 | { K30, K31, K32, K33 } \ |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | #define LAYOUT_tradestation( \ | 17 | #define LAYOUT_tradestation( \ |
| 18 | K00, K01, K02, K03, \ | 18 | K00, K01, K02, K03, \ |
| 19 | K10, K11, K12, K13, \ | 19 | K10, K11, K12, K13, \ |
| 20 | K20, K22, \ | 20 | K20, K22, \ |
| 21 | K30, K32 \ | 21 | K30, K32 \ |
| 22 | ) { \ | 22 | ) { \ |
| 23 | { K00, K01, K02, K03 }, \ | 23 | { K00, K01, K02, K03 }, \ |
| 24 | { K10, K11, K12, K13 }, \ | 24 | { K10, K11, K12, K13 }, \ |
| 25 | { K20, KC_NO, K22, KC_NO }, \ | 25 | { K20, KC_NO, K22, KC_NO }, \ |
| 26 | { K30, KC_NO, K32, KC_NO } \ | 26 | { K30, KC_NO, K32, KC_NO } \ |
| 27 | } | 27 | } |
