Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 15 insertions, 0 deletions

diff --git a/keyboards/handwired/tradestation/info.json b/keyboards/handwired/tradestation/info.json
new file mode 100644
index 0000000000..f26d4ec371
--- /dev/null
+++ b/keyboards/handwired/tradestation/info.json
@@ -0,0 +1,15 @@
+{
+    "keyboard_name": "Tradestation",
+    "url": "",
+    "maintainer": "Flehrad",
+    "bootloader": "",
+    "width": 4.3,
+    "height": 4.5,
+    "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_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}]
+    }
+}