Merge pull request #182 from awygle/lm

Add support for cm36 and swg25tr lm4k packages.
diff --git a/icebox/icebox.py b/icebox/icebox.py
index 27bd243..41d6bac 100644
--- a/icebox/icebox.py
+++ b/icebox/icebox.py
@@ -2489,43 +2489,47 @@
         ( 7,  6, 1,  7,  6, 0),
     ],
     "lm4k": [
-        ( 6,  0,  0,  6,  0,  1),
-        ( 6,  0,  1,  6,  0,  0),
-        ( 7,  0,  0,  7,  0,  1),
-        ( 7,  0,  1,  7,  0,  0),
-        ( 8,  0,  0,  8,  0,  1),
-        ( 8,  0,  1,  8,  0,  0),
-        (10,  0,  0, 10,  0,  1),
-        (12,  0,  0, 12,  0,  1),
-        (12,  0,  1, 12,  0,  0),
-        (13,  0,  0, 13,  0,  1),
-        (13,  0,  1, 13,  0,  0),
-        (19,  0,  0, 19,  0,  1),
-        (19,  0,  1, 19,  0,  0),
-        (21,  0,  0, 21,  0,  1),
-        (21,  0,  1, 21,  0,  0),
-        (22,  0,  0, 22,  0,  1),
-        (23,  0,  0, 23,  0,  1),
-        (23,  0,  1, 23,  0,  0),
-        (24,  0,  0, 24,  0,  1),
-        (24,  0,  1, 24,  0,  0),
         ( 4, 21,  0,  4, 21,  1),
         ( 4, 21,  1,  4, 21,  0),
         ( 5, 21,  1,  5, 21,  0),
+        ( 6,  0,  0,  6,  0,  1),
+        ( 6,  0,  1,  6,  0,  0),
         ( 6, 21,  0,  6, 21,  1),
+        ( 7,  0,  0,  7,  0,  1),
+        ( 7,  0,  1,  7,  0,  0),
         ( 7, 21,  1,  7, 21,  0),
+        ( 8,  0,  0,  8,  0,  1),
+        ( 8,  0,  1,  8,  0,  0),
+        ( 9, 21,  1,  9, 21,  0),
         ( 9, 21,  0,  9, 21,  1),
+        (10,  0,  0, 10,  0,  1),
+        (12,  0,  0, 12,  0,  1),
+        (12,  0,  1, 12,  0,  0),
         (12, 21,  1, 12, 21,  0),
+        (13,  0,  0, 13,  0,  1),
+        (13,  0,  1, 13,  0,  0),
         (13, 21,  0, 13, 21,  1),
+        (14,  0,  1, 14,  0,  0),
         (15, 21,  0, 15, 21,  1),
+        (16, 21,  1, 16, 21,  0),
         (17, 21,  1, 17, 21,  0),
         (18, 21,  0, 18, 21,  1),
+        (19,  0,  0, 19,  0,  1),
+        (19,  0,  1, 19,  0,  0),
         (19, 21,  0, 19, 21,  1),
         (19, 21,  1, 19, 21,  0),
+        (21,  0,  0, 21,  0,  1),
+        (21,  0,  1, 21,  0,  0),
         (21, 21,  1, 21, 21,  0),
+        (22,  0,  0, 22,  0,  1),
+        (22,  0,  1, 22,  0,  0),
         (22, 21,  1, 22, 21,  0),
+        (23,  0,  0, 23,  0,  1),
+        (23,  0,  1, 23,  0,  0),
         (23, 21,  0, 23, 21,  1),
         (23, 21,  1, 23, 21,  0),
+        (24,  0,  0, 24,  0,  1),
+        (24,  0,  1, 24,  0,  0),
     ],
     "5k": [
         ( 8,  0,  0,  8,  0,  1),
@@ -4873,6 +4877,56 @@
         ( "F7", 21,  0, 1),
         ( "G3", 13,  0, 0),
         ( "G6", 23,  0, 1),
+    ],
+    "lm4k-cm36": [
+        ( "A1",  5, 21, 1),
+        ( "A2",  7, 21, 1),
+        ( "A3",  9, 21, 1),
+        ( "A4", 16, 21, 1),
+        ( "A5", 19, 21, 1),
+        ( "A6", 22, 21, 1),
+        ( "B1",  4, 21, 1),
+        ( "B2",  6, 21, 0),
+        ( "B3", 12, 21, 1),
+        ( "B4", 13, 21, 0),
+        ( "B5", 21, 21, 1),
+        ( "B6", 23, 21, 1),
+        ( "C1",  7,  0, 1),
+        ( "C5", 23, 21, 0),
+        ( "C6", 23,  0, 0),
+        ( "D1",  6,  0, 1),
+        ( "D6", 24,  0, 0),
+        ( "E1",  7,  0, 0),
+        ( "E2", 13,  0, 0),
+        ( "E3", 14,  0, 1),
+        ( "E5", 22,  0, 1),
+        ( "E6", 24,  0, 1),
+        ( "F1",  6,  0, 0),
+        ( "F2", 10,  0, 0),
+        ( "F3", 12,  0, 1),
+        ( "F4", 19,  0, 0),
+        ( "F5", 22,  0, 0),
+        ( "F6", 23,  0, 1),
+    ],
+    "lm4k-swg25tr": [
+        ( "A1", 22, 21, 1),
+        ( "A3", 13, 21, 0),
+        ( "A4", 12, 21, 1),
+        ( "A5",  5, 21, 1),
+        ( "B1", 21, 21, 1),
+        ( "B5",  6, 21, 0),
+        ( "C1", 23,  0, 1),
+        ( "C2", 19, 21, 1),
+        ( "C4", 13,  0, 0),
+        ( "C5",  7,  0, 1),
+        ( "D1", 24,  0, 0),
+        ( "D2", 23,  0, 0),
+        ( "D3", 19,  0, 0),
+        ( "D5",  6,  0, 1),
+        ( "E1", 24,  0, 1),
+        ( "E3", 12,  0, 1),
+        ( "E4",  7,  0, 0),
+        ( "E5",  6,  0, 0),
     ]
 }