summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorWill Wolff-Myren <willwm@gmail.com>2016-07-14 00:39:01 -0700
committerWill Wolff-Myren <willwm@gmail.com>2016-07-14 00:39:01 -0700
commitb58724543086dc04603d7289c038267779357629 (patch)
treef1f0eae15180c78cacffccda1c7433001ecbd543 /keyboards
parent825aead3bdb74effee17d9436d79f2952550b5cf (diff)
Replaced ordinary-base.{png|json} with new base layout.
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ergodox_ez/keymaps/teckinesis/ordinary-base.pngbin99605 -> 0 bytes
-rw-r--r--keyboards/ergodox_ez/keymaps/teckinesis/ordinary-base.txt27
-rw-r--r--keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.json452
-rw-r--r--keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.pngbin0 -> 94828 bytes
4 files changed, 452 insertions, 27 deletions
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-base.png b/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-base.png
deleted file mode 100644
index 9c561a10aa..0000000000
--- a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-base.png
+++ /dev/null
Binary files differ
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-base.txt b/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-base.txt
deleted file mode 100644
index 25731ea2e6..0000000000
--- a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-base.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-[{x:3.5},"#\n3",{x:10.5},"*\n8"],
-[{y:-0.875,x:2.5},"@\n2",{x:1},"$\n4",{x:8.5},"&\n7",{x:1},"(\n9"],
-[{y:-0.875,x:5.5},"%\n5",{c:"#ff4444"},"Esc",{x:4.5,c:"#cccccc"},"_\n\n\n\n\n\n-","^\n6"],
-[{y:-0.875,c:"#2277ff",w:1.5},"Special\n\n~\n\n\n\nShift\n`",{c:"#cccccc"},"!\n1",{x:14.5},")\n0",{c:"#2277ff",w:1.5},"+\n\nSpecial\n\n\n\n=\nShift"],
-[{y:-0.375,x:3.5,c:"#cccccc"},"E",{x:10.5},"I"],
-[{y:-0.875,x:2.5},"W",{x:1},"R",{x:8.5},"U",{x:1},"O"],
-[{y:-0.875,x:5.5},"T",{h:1.5},"{\n\n\n\n\n\n[",{x:4.5,h:1.5},"}\n\n\n\n\n\n]","Y"],
-[{y:-0.875,c:"#2277ff",w:1.5},"Media\n\nTab\n\n\n\nShift",{c:"#cccccc"},"Q",{x:14.5},"P",{c:"#2277ff",w:1.5},"|\n\\\nMedia\n\n\n\n\nShift"],
-[{y:-0.375,x:3.5,c:"#cccccc"},"D",{x:10.5},"K"],
-[{y:-0.875,x:2.5},"S",{x:1},"F",{x:8.5},"J",{x:1},"L"],
-[{y:-0.875,x:5.5},"G",{x:6.5},"H"],
-[{y:-0.875,c:"#2277ff",w:1.5},"Symbols\n\n\n\n\n\nShift",{c:"#cccccc"},"A",{x:14.5},":\n;",{c:"#2277ff",w:1.5},"\"\n'\nSymbols\n\n\n\n\nShift"],
-[{y:-0.625,x:6.5,c:"#54d6de",fa:[0,0,0,1],h:1.5},"< Tab\n\n\nShift Tab",{x:4.5,h:1.5},"Tab >\n\n\nTab"],
-[{y:-0.75,x:3.5,c:"#cccccc"},"C",{x:10.5},"<\n,"],
-[{y:-0.875,x:2.5},"X",{x:1},"V",{x:8.5},"M",{x:1},">\n."],
-[{y:-0.875,x:5.5},"B",{x:6.5},"N"],
-[{y:-0.875,c:"#2277ff",w:1.5},"Capitals\n\n\n\n\n\nShift",{c:"#cccccc"},"Z",{x:14.5},"?\n/",{c:"#2277ff",w:1.5},"\n\nCapitals\n\n\n\n\nShift"],
-[{y:-0.375,x:3.5,c:"#77aaff"},"Option\n\n\nLAlt",{x:10.5},"Option\n\n\nRAlt"],
-[{y:-0.875,x:2.5},"Hyper",{x:1},"Cmd\n\n\nSuper",{x:8.5},"Cmd\n\n\nSuper",{x:1},"Hyper"],
-[{y:-0.75,x:0.5},"Ctrl\n\n\nLCtrl","Meh",{x:14.5},"Meh","Ctrl\n\n\nRCtrl"],
-[{r:30,rx:6.5,ry:4.25,y:-1,x:1,c:"#54d6de"},"Home","End"],
-[{h:2},"< Del\n\n\nBackspace",{h:2},"Del >\n\n\nDelete","Page\n\n\n\n\n\nUp"],
-[{x:2},"Page\n\n\n\n\n\nDown"],
-[{r:-30,rx:13,y:-1,x:-3},"Left","Right"],
-[{x:-3},"Up",{h:2},"Enter",{h:2},"Space"],
-[{x:-3},"Down"]
-
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.json b/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.json
new file mode 100644
index 0000000000..f1efab2721
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.json
@@ -0,0 +1,452 @@
+[
+ {
+ "name": "teckinesis",
+ "author": "Will Wolff-Myren",
+ "notes": "# teckinesis Layout # \r\n\r\n*A blend of TECK and Kinesis layouts, based on [\"The Ordinary Layout\" by Nicholas Keene](http://qmk.fm/keyboards/ergodox_ez/keymaps/ordinary/#the-ordinary-layout-a-familiar-and-powerful-layout)*\r\n\r\n## The Base Layout ##\r\n\r\n(placeholder)\r\n\r\n## The Symbols Layer ##\r\n\r\n(placeholder)\r\n\r\n## The Media Layer ##\r\n\r\n(placeholder)",
+ "switchMount": "cherry",
+ "switchBrand": "gateron",
+ "switchType": "KS-3-Tea"
+ },
+ [
+ {
+ "x": 3.5
+ },
+ "#\n3",
+ {
+ "x": 10.5
+ },
+ ")\n0"
+ ],
+ [
+ {
+ "y": -0.875,
+ "x": 2.5
+ },
+ "@\n2",
+ {
+ "x": 1
+ },
+ "$\n4"
+ ],
+ [
+ {
+ "y": -0.995,
+ "x": 14
+ },
+ "(\n9",
+ {
+ "x": 1
+ },
+ "_\n-"
+ ],
+ [
+ {
+ "y": -0.8799999999999999,
+ "x": 5.5
+ },
+ "%\n5",
+ "^\n6",
+ {
+ "x": 4.5
+ },
+ "&\n7",
+ "*\n8"
+ ],
+ [
+ {
+ "y": -0.875,
+ "x": 1.5
+ },
+ "!\n1",
+ {
+ "x": 14.5
+ },
+ "+\n="
+ ],
+ [
+ {
+ "y": -0.995,
+ "c": "#2277ff",
+ "w": 1.5
+ },
+ "Media\n\nEsc\n\n\n\nShift",
+ {
+ "x": 16.5,
+ "w": 1.5
+ },
+ "~\n`\nMedia\n\n\n\n\nShift"
+ ],
+ [
+ {
+ "y": -0.3799999999999999,
+ "x": 3.5,
+ "c": "#cccccc"
+ },
+ "E",
+ {
+ "x": 10.5
+ },
+ "I"
+ ],
+ [
+ {
+ "y": -0.875,
+ "x": 2.5
+ },
+ "W",
+ {
+ "x": 1
+ },
+ "R",
+ {
+ "x": 8.5
+ },
+ "U",
+ {
+ "x": 1
+ },
+ "O"
+ ],
+ [
+ {
+ "y": -0.875,
+ "x": 5.5
+ },
+ "T",
+ {
+ "h": 1.5
+ },
+ "{\n\n\n\n\n\n[",
+ {
+ "x": 4.5,
+ "h": 1.5
+ },
+ "}\n\n\n\n\n\n]",
+ "Y"
+ ],
+ [
+ {
+ "y": -0.875,
+ "x": 1.5
+ },
+ "Q",
+ {
+ "x": 14.5
+ },
+ "P"
+ ],
+ [
+ {
+ "y": -0.9950000000000001,
+ "c": "#2277ff",
+ "w": 1.5
+ },
+ "Symbols\n\n?\n/\n\n\nShift",
+ {
+ "x": 16.5,
+ "w": 1.5
+ },
+ "|\n\\\nSymbols\n\n\n\n\nShift"
+ ],
+ [
+ {
+ "y": -0.3799999999999999,
+ "x": 3.5,
+ "c": "#cccccc"
+ },
+ "D",
+ {
+ "x": 10.5
+ },
+ "K"
+ ],
+ [
+ {
+ "y": -0.875,
+ "x": 2.5
+ },
+ "S",
+ {
+ "x": 1
+ },
+ "F",
+ {
+ "x": 8.5
+ },
+ "J",
+ {
+ "x": 1
+ },
+ "L"
+ ],
+ [
+ {
+ "y": -0.875,
+ "x": 5.5
+ },
+ "G",
+ {
+ "x": 6.5
+ },
+ "H"
+ ],
+ [
+ {
+ "y": -0.875,
+ "x": 1.5
+ },
+ "A",
+ {
+ "x": 14.5
+ },
+ ":\n;"
+ ],
+ [
+ {
+ "y": -0.9950000000000001,
+ "c": "#2277ff",
+ "w": 1.5
+ },
+ "Capitals\n\n\n\n\n\nShift",
+ {
+ "x": 16.5,
+ "w": 1.5
+ },
+ "\n\nCapitals\n\n\n\n\nShift"
+ ],
+ [
+ {
+ "y": -0.6299999999999999,
+ "x": 6.5,
+ "c": "#54d6de",
+ "fa": [
+ 0,
+ 0,
+ 0,
+ 1
+ ],
+ "h": 1.5
+ },
+ "< Tab\n\n\nShift Tab",
+ {
+ "x": 4.5,
+ "h": 1.5
+ },
+ "Tab >\n\n\nTab"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 3.5,
+ "c": "#cccccc"
+ },
+ "C",
+ {
+ "x": 10.5
+ },
+ "<\n,"
+ ],
+ [
+ {
+ "y": -0.875,
+ "x": 2.5
+ },
+ "X",
+ {
+ "x": 1
+ },
+ "V",
+ {
+ "x": 8.5
+ },
+ "M",
+ {
+ "x": 1
+ },
+ ">\n."
+ ],
+ [
+ {
+ "y": -0.875,
+ "x": 5.5
+ },
+ "B",
+ {
+ "x": 6.5
+ },
+ "N"
+ ],
+ [
+ {
+ "y": -0.875,
+ "x": 1.5
+ },
+ "Z",
+ {
+ "x": 14.5
+ },
+ "?\n/"
+ ],
+ [
+ {
+ "y": -0.9950000000000001,
+ "c": "#2277ff",
+ "w": 1.5
+ },
+ "Ctrl",
+ {
+ "x": 16.5,
+ "w": 1.5
+ },
+ "Ctrl"
+ ],
+ [
+ {
+ "y": -0.3799999999999999,
+ "x": 3.5,
+ "c": "#77aaff"
+ },
+ "Option\n\n\nLAlt",
+ {
+ "x": 10.5
+ },
+ "Option\n\n\nRAlt"
+ ],
+ [
+ {
+ "y": -0.875,
+ "x": 2.5,
+ "f": 3
+ },
+ "Hyper\n\n}\n]",
+ {
+ "x": 1
+ },
+ "Cmd\n\n\nSuper",
+ {
+ "x": 8.5,
+ "fa": [
+ 5,
+ 0,
+ 0,
+ 1,
+ 0,
+ 0,
+ 0
+ ]
+ },
+ "<i class='mss mss-Unicode-Command-3'></i>\n\n\nSuper",
+ {
+ "x": 1,
+ "fa": [
+ 5,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1
+ ]
+ },
+ "\n\n~\n`\n\n\nHyper"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 0.5,
+ "f": 2
+ },
+ "Print\n\n\n\n\n\nScreen",
+ {
+ "f": 3
+ },
+ "Meh\n\n{\n[",
+ {
+ "x": 14.5,
+ "fa": [
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 2
+ ]
+ },
+ "\n\n\"\n'\n\n\nMeh"
+ ],
+ [
+ {
+ "y": -0.9950000000000001,
+ "x": 18,
+ "f": 2
+ },
+ "Special\n\n\n\n\n\nShift"
+ ],
+ [
+ {
+ "r": 30,
+ "rx": 6.5,
+ "ry": 4.25,
+ "y": -1,
+ "x": 1,
+ "c": "#54d6de",
+ "f": 3
+ },
+ "Home",
+ "End"
+ ],
+ [
+ {
+ "fa": [
+ 0,
+ 0,
+ 0,
+ 1
+ ],
+ "h": 2
+ },
+ "< Del\n\n\nBackspace",
+ {
+ "h": 2
+ },
+ "Del >\n\n\nDelete",
+ "Page\n\n\n\n\n\nUp"
+ ],
+ [
+ {
+ "x": 2
+ },
+ "Page\n\n\n\n\n\nDown"
+ ],
+ [
+ {
+ "r": -30,
+ "rx": 13,
+ "y": -1,
+ "x": -3
+ },
+ "Left",
+ "Right"
+ ],
+ [
+ {
+ "x": -3
+ },
+ "Up",
+ {
+ "h": 2
+ },
+ "Enter",
+ {
+ "h": 2
+ },
+ "Space"
+ ],
+ [
+ {
+ "x": -3
+ },
+ "Down"
+ ]
+] \ No newline at end of file
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.png b/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.png
new file mode 100644
index 0000000000..f1a5eda0d1
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.png
Binary files differ