From 27b512d9f550dd1a42466733c0c3066742aeb300 Mon Sep 17 00:00:00 2001 From: noroadsleft <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 5 Jan 2019 15:34:19 -0800 Subject: [PATCH] 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. --- keyboards/handwired/tradestation/info.json | 12 +++---- keyboards/handwired/tradestation/readme.md | 26 ++++++++------- keyboards/handwired/tradestation/rules.mk | 3 +- .../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 @@ "keyboard_name": "Tradestation", "url": "", "maintainer": "Flehrad", - "bootloader": "", - "width": 4.3, - "height": 4.5, + "width": 4.375, + "height": 4.375, "layouts": { "LAYOUT_tradestation": { - "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}] + "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}] }, - "LAYOUT_ortho_4x4": { - "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}] + "LAYOUT_ortho_4x4": { + "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}] + } } } 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 @@ # Tradestation -QMK for Tradestation Macropad -This macropad was layout designed by Didier Luximon +[Image Gallery](https://imgur.com/a/yxQJXMT) + +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. This PCB supports an overall 4x4 matrix with unique spacing. + * Top two rows are 1U keys with 1/8U spacing * Bottom two rows are available with 4x2 1U as clusters of 2x1U or as 2x2 2U, spaced with 1/4U -For QMK Configurator, the info.json is utilised. -- For 2U keys , the first 1u row/column key assignment is the same as the 2u position. - -Build requires a pro micro. +If you like this simple PCB and want to make a donation, you can do so at [paypal.me/theboardpodcast](https://paypal.me/theboardpodcast). -Can be built as single PCB with custom case, or as two PCB style with standoffs. +- [The Board Podcast on YouTube](https://www.youtube.com/channel/UCg98oJZNffR9nDLJNkorjqw) +- [The Board Podcast on Libsyn](http://theboard.libsyn.com/) +- [The Board Podcast on Patreon](https://www.patreon.com/theboardpodcast) -If you like this simple PCB and want to make a donation, you can at https://paypal.me/theboardpodcast +Designed by Didier Luximon. -Check out our: +Keyboard Maintainer: [flehrad](https://github.com/flehrad) +Hardware Supported: Tradestation PCB, Pro Micro -YouTube (https://www.youtube.com/channel/UCg98oJZNffR9nDLJNkorjqw) +Make example for this keyboard (after setting up your build environment): -Podcast (www.libsyn.com/theboardpodcast) + make tradestation:default -Patreon (www.patreon.com/theboardpodcast) +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:/ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no RGBLIGHT_ENABLE = no - LAYOUTS = ortho_4x4 + +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 @@ #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 \ ) { \ - { 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, K22, \ + K30, K32 \ ) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, KC_NO, K22, KC_NO }, \ - { K30, KC_NO, K32, KC_NO } \ + { K00, K01, K02, K03 }, \ + { K10, K11, K12, K13 }, \ + { K20, KC_NO, K22, KC_NO }, \ + { K30, KC_NO, K32, KC_NO } \ } -- 2.39.5