Sort pinloc_db entries

1 files changed, 386 insertions, 386 deletions

diff --git a/icebox/icebox.py b/icebox/icebox.py
index 59f47d5..c2469dd 100644
--- a/icebox/icebox.py
+++ b/icebox/icebox.py
@@ -1702,20 +1702,16 @@ ieren_db = {
 pinloc_db = {
     "1k-cb132": [
         ( "A1",  1, 17, 1),
-        ("A10", 10, 17, 0),
-        ("A12", 12, 17, 0),
         ( "A2",  2, 17, 1),
         ( "A4",  4, 17, 0),
         ( "A5",  4, 17, 1),
         ( "A6",  6, 17, 1),
         ( "A7",  7, 17, 0),
+        ("A10", 10, 17, 0),
+        ("A12", 12, 17, 0),
         ( "B1",  0, 14, 1),
         ("B14", 13, 15, 0),
         ( "C1",  0, 14, 0),
-        ("C10", 11, 17, 0),
-        ("C11", 11, 17, 1),
-        ("C12", 12, 17, 1),
-        ("C14", 13, 14, 0),
         ( "C3",  0, 13, 1),
         ( "C4",  1, 17, 0),
         ( "C5",  3, 17, 0),
@@ -1723,11 +1719,11 @@ pinloc_db = {
         ( "C7",  6, 17, 0),
         ( "C8",  8, 17, 0),
         ( "C9",  9, 17, 0),
+        ("C10", 11, 17, 0),
+        ("C11", 11, 17, 1),
+        ("C12", 12, 17, 1),
+        ("C14", 13, 14, 0),
         ( "D1",  0, 11, 1),
-        ("D10",  9, 17, 1),
-        ("D11", 10, 17, 1),
-        ("D12", 13, 15, 1),
-        ("D14", 13, 13, 1),
         ( "D3",  0, 13, 0),
         ( "D4",  0, 12, 1),
         ( "D5",  2, 17, 0),
@@ -1735,60 +1731,59 @@ pinloc_db = {
         ( "D7",  5, 17, 1),
         ( "D8",  7, 17, 1),
         ( "D9",  8, 17, 1),
+        ("D10",  9, 17, 1),
+        ("D11", 10, 17, 1),
+        ("D12", 13, 15, 1),
+        ("D14", 13, 13, 1),
         ( "E1",  0, 11, 0),
+        ( "E4",  0, 12, 0),
         ("E11", 13, 14, 1),
         ("E12", 13, 13, 0),
         ("E14", 13, 12, 0),
-        ( "E4",  0, 12, 0),
+        ( "F3",  0, 10, 0),
+        ( "F4",  0, 10, 1),
         ("F11", 13, 12, 1),
         ("F12", 13, 11, 1),
         ("F14", 13,  8, 1),
-        ( "F3",  0, 10, 0),
-        ( "F4",  0, 10, 1),
         ( "G1",  0,  8, 1),
+        ( "G3",  0,  8, 0),
+        ( "G4",  0,  6, 1),
         ("G11", 13, 11, 0),
         ("G12", 13,  9, 1),
         ("G14", 13,  9, 0),
-        ( "G3",  0,  8, 0),
-        ( "G4",  0,  6, 1),
         ( "H1",  0,  9, 0),
-        ("H11", 13,  8, 0),
-        ("H12", 13,  7, 1),
         ( "H3",  0,  9, 1),
         ( "H4",  0,  6, 0),
+        ("H11", 13,  8, 0),
+        ("H12", 13,  7, 1),
         ( "J1",  0,  5, 1),
+        ( "J3",  0,  5, 0),
         ("J11", 13,  7, 0),
         ("J12", 13,  6, 1),
-        ( "J3",  0,  5, 0),
+        ( "K3",  0,  3, 0),
+        ( "K4",  0,  3, 1),
         ("K11", 13,  4, 1),
         ("K12", 13,  4, 0),
         ("K14", 13,  6, 0),
-        ( "K3",  0,  3, 0),
-        ( "K4",  0,  3, 1),
         ( "L1",  0,  2, 0),
-        ("L12", 13,  2, 0),
-        ("L14", 13,  3, 1),
         ( "L4",  1,  0, 1),
         ( "L5",  3,  0, 1),
         ( "L6",  4,  0, 1),
         ( "L7",  8,  0, 0),
         ( "L8",  9,  0, 0),
         ( "L9", 10,  0, 0),
+        ("L12", 13,  2, 0),
+        ("L14", 13,  3, 1),
         ( "M1",  0,  2, 1),
-        ("M11", 11,  0, 0),
-        ("M12", 13,  1, 0),
         ( "M3",  1,  0, 0),
         ( "M4",  3,  0, 0),
         ( "M6",  5,  0, 1),
         ( "M7",  6,  0, 0),
         ( "M8",  8,  0, 1),
         ( "M9",  9,  0, 1),
+        ("M11", 11,  0, 0),
+        ("M12", 13,  1, 0),
         ("N14", 13,  2, 1),
-        ("P10", 10,  0, 1),
-        ("P11", 11,  0, 1),
-        ("P12", 12,  0, 0),
-        ("P13", 12,  0, 1),
-        ("P14", 13,  1, 1),
         ( "P2",  2,  0, 0),
         ( "P3",  2,  0, 1),
         ( "P4",  4,  0, 0),
@@ -1796,43 +1791,93 @@ pinloc_db = {
         ( "P7",  6,  0, 1),
         ( "P8",  7,  0, 0),
         ( "P9",  7,  0, 1),
+        ("P10", 10,  0, 1),
+        ("P11", 11,  0, 1),
+        ("P12", 12,  0, 0),
+        ("P13", 12,  0, 1),
+        ("P14", 13,  1, 1),
+    ],
+    "1k-qn84": [
+        ( "A1",  0, 14, 0),
+        ( "A2",  0, 13, 0),
+        ( "A3",  0, 12, 0),
+        ( "A4",  0, 11, 0),
+        ( "A5",  0, 10, 0),
+        ( "A8",  0,  9, 0),
+        ( "A9",  0,  8, 1),
+        ("A10",  0,  5, 1),
+        ("A11",  0,  4, 0),
+        ("A12",  0,  2, 0),
+        ("A13",  4,  0, 0),
+        ("A14",  6,  0, 1),
+        ("A16",  6,  0, 0),
+        ("A19",  9,  0, 1),
+        ("A20", 10,  0, 1),
+        ("A22", 11,  0, 1),
+        ("A23", 12,  0, 0),
+        ("A25", 13,  4, 0),
+        ("A26", 13,  6, 0),
+        ("A27", 13,  7, 1),
+        ("A29", 13,  8, 1),
+        ("A31", 13, 11, 1),
+        ("A32", 13, 12, 1),
+        ("A33", 13, 13, 1),
+        ("A34", 13, 14, 0),
+        ("A35", 13, 15, 0),
+        ("A38", 11, 17, 0),
+        ("A39", 10, 17, 0),
+        ("A40",  9, 17, 0),
+        ("A41",  8, 17, 0),
+        ("A43",  7, 17, 0),
+        ("A44",  6, 17, 0),
+        ("A45",  5, 17, 0),
+        ("A46",  4, 17, 0),
+        ("A47",  3, 17, 0),
+        ("A48",  1, 17, 1),
+        ( "B1",  0, 13, 1),
+        ( "B2",  0, 12, 1),
+        ( "B3",  0, 11, 1),
+        ( "B4",  0, 10, 1),
+        ( "B5",  0,  9, 1),
+        ( "B7",  0,  8, 0),
+        ( "B8",  0,  5, 0),
+        ( "B9",  0,  3, 0),
+        ("B10",  5,  0, 0),
+        ("B11",  5,  0, 1),
+        ("B12",  7,  0, 0),
+        ("B13",  8,  0, 0),
+        ("B14",  9,  0, 0),
+        ("B15", 10,  0, 0),
+        ("B17", 11,  0, 0),
+        ("B18", 12,  0, 1),
+        ("B19", 13,  3, 1),
+        ("B20", 13,  6, 1),
+        ("B21", 13,  7, 0),
+        ("B22", 13,  9, 0),
+        ("B23", 13, 11, 0),
+        ("B24", 13, 12, 0),
+        ("B26", 13, 14, 1),
+        ("B27", 13, 15, 1),
+        ("B29", 10, 17, 1),
+        ("B30",  9, 17, 1),
+        ("B31",  8, 17, 1),
+        ("B32",  6, 17, 1),
+        ("B34",  4, 17, 1),
+        ("B35",  3, 17, 1),
+        ("B36",  2, 17, 1),
     ],
     "1k-tq144": [
         (  "1",  0, 14, 1),
+        (  "2",  0, 14, 0),
+        (  "3",  0, 13, 1),
+        (  "4",  0, 13, 0),
+        (  "7",  0, 12, 1),
+        (  "8",  0, 12, 0),
+        (  "9",  0, 11, 1),
         ( "10",  0, 11, 0),
-        ("101", 13, 13, 0),
-        ("102", 13, 13, 1),
-        ("104", 13, 14, 0),
-        ("105", 13, 14, 1),
-        ("106", 13, 15, 0),
-        ("107", 13, 15, 1),
         ( "11",  0, 10, 1),
-        ("112", 12, 17, 1),
-        ("113", 12, 17, 0),
-        ("114", 11, 17, 1),
-        ("115", 11, 17, 0),
-        ("116", 10, 17, 1),
-        ("117", 10, 17, 0),
-        ("118",  9, 17, 1),
-        ("119",  9, 17, 0),
         ( "12",  0, 10, 0),
-        ("120",  8, 17, 1),
-        ("121",  8, 17, 0),
-        ("122",  7, 17, 1),
-        ("128",  7, 17, 0),
-        ("129",  6, 17, 1),
-        ("134",  5, 17, 1),
-        ("135",  5, 17, 0),
-        ("136",  4, 17, 1),
-        ("137",  4, 17, 0),
-        ("138",  3, 17, 1),
-        ("139",  3, 17, 0),
-        ("141",  2, 17, 1),
-        ("142",  2, 17, 0),
-        ("143",  1, 17, 1),
-        ("144",  1, 17, 0),
         ( "19",  0,  9, 1),
-        (  "2",  0, 14, 0),
         ( "20",  0,  9, 0),
         ( "21",  0,  8, 1),
         ( "22",  0,  8, 0),
@@ -1842,7 +1887,6 @@ pinloc_db = {
         ( "26",  0,  5, 0),
         ( "28",  0,  4, 1),
         ( "29",  0,  4, 0),
-        (  "3",  0, 13, 1),
         ( "31",  0,  3, 1),
         ( "32",  0,  3, 0),
         ( "33",  0,  2, 1),
@@ -1850,7 +1894,6 @@ pinloc_db = {
         ( "37",  1,  0, 0),
         ( "38",  1,  0, 1),
         ( "39",  2,  0, 0),
-        (  "4",  0, 13, 0),
         ( "41",  2,  0, 1),
         ( "42",  3,  0, 0),
         ( "43",  3,  0, 1),
@@ -1870,7 +1913,6 @@ pinloc_db = {
         ( "64", 10,  0, 1),
         ( "67", 11,  0, 0),
         ( "68", 11,  0, 1),
-        (  "7",  0, 12, 1),
         ( "70", 12,  0, 0),
         ( "71", 12,  0, 1),
         ( "73", 13,  1, 0),
@@ -1879,12 +1921,10 @@ pinloc_db = {
         ( "76", 13,  2, 1),
         ( "78", 13,  3, 1),
         ( "79", 13,  4, 0),
-        (  "8",  0, 12, 0),
         ( "80", 13,  4, 1),
         ( "81", 13,  6, 0),
         ( "87", 13,  6, 1),
         ( "88", 13,  7, 0),
-        (  "9",  0, 11, 1),
         ( "90", 13,  7, 1),
         ( "91", 13,  8, 0),
         ( "93", 13,  8, 1),
@@ -1894,18 +1934,51 @@ pinloc_db = {
         ( "97", 13, 11, 1),
         ( "98", 13, 12, 0),
         ( "99", 13, 12, 1),
+        ("101", 13, 13, 0),
+        ("102", 13, 13, 1),
+        ("104", 13, 14, 0),
+        ("105", 13, 14, 1),
+        ("106", 13, 15, 0),
+        ("107", 13, 15, 1),
+        ("112", 12, 17, 1),
+        ("113", 12, 17, 0),
+        ("114", 11, 17, 1),
+        ("115", 11, 17, 0),
+        ("116", 10, 17, 1),
+        ("117", 10, 17, 0),
+        ("118",  9, 17, 1),
+        ("119",  9, 17, 0),
+        ("120",  8, 17, 1),
+        ("121",  8, 17, 0),
+        ("122",  7, 17, 1),
+        ("128",  7, 17, 0),
+        ("129",  6, 17, 1),
+        ("134",  5, 17, 1),
+        ("135",  5, 17, 0),
+        ("136",  4, 17, 1),
+        ("137",  4, 17, 0),
+        ("138",  3, 17, 1),
+        ("139",  3, 17, 0),
+        ("141",  2, 17, 1),
+        ("142",  2, 17, 0),
+        ("143",  1, 17, 1),
+        ("144",  1, 17, 0),
     ],
     "1k-vq100": [
         (  "1",  0, 14, 1),
+        (  "2",  0, 14, 0),
+        (  "3",  0, 13, 1),
+        (  "4",  0, 13, 0),
+        (  "7",  0, 12, 1),
+        (  "8",  0, 12, 0),
+        (  "9",  0, 10, 1),
         ( "10",  0, 10, 0),
-        ("100",  1, 17, 1),
         ( "12",  0,  9, 1),
         ( "13",  0,  9, 0),
         ( "15",  0,  8, 1),
         ( "16",  0,  8, 0),
         ( "18",  0,  6, 1),
         ( "19",  0,  6, 0),
-        (  "2",  0, 14, 0),
         ( "20",  0,  4, 1),
         ( "21",  0,  4, 0),
         ( "24",  0,  2, 1),
@@ -1914,13 +1987,11 @@ pinloc_db = {
         ( "27",  2,  0, 1),
         ( "28",  3,  0, 0),
         ( "29",  3,  0, 1),
-        (  "3",  0, 13, 1),
         ( "30",  4,  0, 0),
         ( "33",  6,  0, 1),
         ( "34",  7,  0, 0),
         ( "36",  6,  0, 0),
         ( "37",  7,  0, 1),
-        (  "4",  0, 13, 0),
         ( "40",  9,  0, 1),
         ( "41", 10,  0, 0),
         ( "42", 10,  0, 1),
@@ -1943,14 +2014,12 @@ pinloc_db = {
         ( "66", 13, 12, 0),
         ( "68", 13, 13, 0),
         ( "69", 13, 13, 1),
-        (  "7",  0, 12, 1),
         ( "71", 13, 14, 0),
         ( "72", 13, 14, 1),
         ( "73", 13, 15, 0),
         ( "74", 13, 15, 1),
         ( "78", 12, 17, 1),
         ( "79", 12, 17, 0),
-        (  "8",  0, 12, 0),
         ( "80", 11, 17, 1),
         ( "81", 10, 17, 1),
         ( "82", 10, 17, 0),
@@ -1959,7 +2028,6 @@ pinloc_db = {
         ( "86",  8, 17, 1),
         ( "87",  8, 17, 0),
         ( "89",  7, 17, 0),
-        (  "9",  0, 10, 1),
         ( "90",  6, 17, 1),
         ( "91",  6, 17, 0),
         ( "93",  5, 17, 1),
@@ -1968,120 +2036,121 @@ pinloc_db = {
         ( "96",  4, 17, 0),
         ( "97",  3, 17, 1),
         ( "99",  2, 17, 1),
+        ("100",  1, 17, 1),
     ],
-    "1k-qn84": [
-        ( "A1",  0, 14, 0),
-        ("A10",  0,  5, 1),
-        ("A11",  0,  4, 0),
-        ("A12",  0,  2, 0),
-        ("A13",  4,  0, 0),
-        ("A14",  6,  0, 1),
-        ("A16",  6,  0, 0),
-        ("A19",  9,  0, 1),
-        ( "A2",  0, 13, 0),
-        ("A20", 10,  0, 1),
-        ("A22", 11,  0, 1),
-        ("A23", 12,  0, 0),
-        ("A25", 13,  4, 0),
-        ("A26", 13,  6, 0),
-        ("A27", 13,  7, 1),
-        ("A29", 13,  8, 1),
-        ( "A3",  0, 12, 0),
-        ("A31", 13, 11, 1),
-        ("A32", 13, 12, 1),
-        ("A33", 13, 13, 1),
-        ("A34", 13, 14, 0),
-        ("A35", 13, 15, 0),
-        ("A38", 11, 17, 0),
-        ("A39", 10, 17, 0),
-        ( "A4",  0, 11, 0),
-        ("A40",  9, 17, 0),
-        ("A41",  8, 17, 0),
-        ("A43",  7, 17, 0),
-        ("A44",  6, 17, 0),
-        ("A45",  5, 17, 0),
-        ("A46",  4, 17, 0),
-        ("A47",  3, 17, 0),
-        ("A48",  1, 17, 1),
-        ( "A5",  0, 10, 0),
-        ( "A8",  0,  9, 0),
-        ( "A9",  0,  8, 1),
-        ( "B1",  0, 13, 1),
-        ("B10",  5,  0, 0),
-        ("B11",  5,  0, 1),
-        ("B12",  7,  0, 0),
-        ("B13",  8,  0, 0),
-        ("B14",  9,  0, 0),
-        ("B15", 10,  0, 0),
-        ("B17", 11,  0, 0),
-        ("B18", 12,  0, 1),
-        ("B19", 13,  3, 1),
-        ( "B2",  0, 12, 1),
-        ("B20", 13,  6, 1),
-        ("B21", 13,  7, 0),
-        ("B22", 13,  9, 0),
-        ("B23", 13, 11, 0),
-        ("B24", 13, 12, 0),
-        ("B26", 13, 14, 1),
-        ("B27", 13, 15, 1),
-        ("B29", 10, 17, 1),
-        ( "B3",  0, 11, 1),
-        ("B30",  9, 17, 1),
-        ("B31",  8, 17, 1),
-        ("B32",  6, 17, 1),
-        ("B34",  4, 17, 1),
-        ("B35",  3, 17, 1),
-        ("B36",  2, 17, 1),
-        ( "B4",  0, 10, 1),
-        ( "B5",  0,  9, 1),
-        ( "B7",  0,  8, 0),
-        ( "B8",  0,  5, 0),
-        ( "B9",  0,  3, 0),
+    "8k-cb132:4k": [
+        ( "A1",  2, 33, 0),
+        ( "A2",  3, 33, 0),
+        ( "A3",  3, 33, 1),
+        ( "A4",  5, 33, 0),
+        ( "A5", 10, 33, 1),
+        ( "A6", 16, 33, 1),
+        ( "A7", 17, 33, 0),
+        ("A10", 25, 33, 0),
+        ("A11", 26, 33, 0),
+        ("A12", 30, 33, 1),
+        ( "B1",  0, 30, 1),
+        ("B14", 33, 28, 0),
+        ( "C1",  0, 30, 0),
+        ( "C3",  0, 27, 1),
+        ( "C4",  4, 33, 0),
+        ( "C5",  8, 33, 1),
+        ( "C6", 11, 33, 1),
+        ( "C7", 14, 33, 1),
+        ( "C9", 20, 33, 1),
+        ("C10", 22, 33, 1),
+        ("C11", 28, 33, 1),
+        ("C12", 29, 33, 1),
+        ("C14", 33, 24, 1),
+        ( "D1",  0, 25, 1),
+        ( "D3",  0, 27, 0),
+        ( "D4",  0, 22, 1),
+        ( "D5",  9, 33, 0),
+        ( "D6", 11, 33, 0),
+        ( "D7", 13, 33, 1),
+        ( "D9", 21, 33, 1),
+        ("D10", 27, 33, 0),
+        ("D11", 26, 33, 1),
+        ("D12", 33, 27, 1),
+        ("D14", 33, 23, 1),
+        ( "E1",  0, 25, 0),
+        ( "E4",  0, 22, 0),
+        ("E11", 33, 20, 1),
+        ("E12", 33, 21, 0),
+        ("E14", 33, 21, 1),
+        ( "F3",  0, 21, 0),
+        ( "F4",  0, 21, 1),
+        ("F11", 33, 19, 1),
+        ("F12", 33, 15, 0),
+        ("F14", 33, 16, 1),
+        ( "G1",  0, 17, 0),
+        ( "G3",  0, 17, 1),
+        ( "G4",  0, 20, 0),
+        ("G11", 33, 14, 1),
+        ("G12", 33, 11, 0),
+        ("G14", 33, 17, 0),
+        ( "H1",  0, 16, 1),
+        ( "H3",  0, 16, 0),
+        ( "H4",  0, 20, 1),
+        ("H11", 33, 10, 1),
+        ("H12", 33,  6, 1),
+        ( "J1",  0, 18, 0),
+        ( "J3",  0, 18, 1),
+        ("J11", 33,  6, 0),
+        ("J12", 33,  5, 1),
+        ( "K3",  0, 11, 1),
+        ( "K4",  0, 11, 0),
+        ("K11", 33,  4, 1),
+        ("K12", 33,  4, 0),
+        ("K14", 33,  5, 0),
+        ( "L1",  0,  6, 1),
+        ( "L4", 12,  0, 0),
+        ( "L5", 11,  0, 1),
+        ( "L6", 15,  0, 0),
+        ( "L8", 20,  0, 1),
+        ( "L9", 29,  0, 0),
+        ("L12", 33,  2, 0),
+        ("L14", 33,  3, 1),
+        ( "M1",  0,  6, 0),
+        ( "M3",  8,  0, 0),
+        ( "M4",  7,  0, 1),
+        ( "M6", 14,  0, 1),
+        ( "M7", 15,  0, 1),
+        ( "M9", 22,  0, 1),
+        ("M11", 30,  0, 0),
+        ("M12", 33,  1, 0),
+        ( "N1",  0,  4, 1),
+        ("N14", 33,  2, 1),
+        ( "P1",  0,  4, 0),
+        ( "P2",  4,  0, 0),
+        ( "P3",  5,  0, 1),
+        ( "P4", 12,  0, 1),
+        ( "P5", 13,  0, 0),
+        ( "P7", 16,  0, 1),
+        ( "P8", 17,  0, 0),
+        ( "P9", 21,  0, 1),
+        ("P10", 29,  0, 1),
+        ("P11", 30,  0, 1),
+        ("P12", 31,  0, 0),
+        ("P13", 31,  0, 1),
+        ("P14", 33,  1, 1),
     ],
     "8k-tq144:4k": [
         (  "1",  0, 30, 1),
+        (  "2",  0, 30, 0),
+        (  "3",  0, 28, 1),
+        (  "4",  0, 28, 0),
+        (  "7",  0, 27, 1),
+        (  "8",  0, 27, 0),
+        (  "9",  0, 25, 1),
         ( "10",  0, 25, 0),
-        ("101", 33, 27, 1),
-        ("102", 33, 28, 0),
-        ("104", 33, 29, 1),
-        ("105", 33, 30, 0),
-        ("106", 33, 30, 1),
-        ("107", 33, 31, 0),
         ( "11",  0, 22, 1),
-        ("110", 31, 33, 1),
-        ("112", 31, 33, 0),
-        ("113", 30, 33, 1),
-        ("114", 30, 33, 0),
-        ("115", 29, 33, 1),
-        ("116", 29, 33, 0),
-        ("117", 28, 33, 1),
-        ("118", 27, 33, 0),
-        ("119", 26, 33, 1),
         ( "12",  0, 22, 0),
-        ("120", 26, 33, 0),
-        ("121", 25, 33, 0),
-        ("122", 20, 33, 1),
-        ("124", 20, 33, 0),
-        ("125", 19, 33, 1),
-        ("128", 17, 33, 0),
-        ("129", 16, 33, 1),
-        ("130", 11, 33, 1),
-        ("134",  8, 33, 1),
-        ("135",  8, 33, 0),
-        ("136",  7, 33, 1),
-        ("137",  7, 33, 0),
-        ("138",  6, 33, 1),
-        ("139",  6, 33, 0),
-        ("141",  5, 33, 0),
-        ("142",  4, 33, 1),
-        ("143",  4, 33, 0),
-        ("144",  3, 33, 1),
         ( "15",  0, 20, 1),
         ( "16",  0, 20, 0),
         ( "17",  0, 18, 1),
         ( "18",  0, 18, 0),
         ( "19",  0, 17, 1),
-        (  "2",  0, 30, 0),
         ( "20",  0, 17, 0),
         ( "21",  0, 16, 1),
         ( "22",  0, 16, 0),
@@ -2091,7 +2160,6 @@ pinloc_db = {
         ( "26",  0, 11, 0),
         ( "28",  0,  6, 1),
         ( "29",  0,  6, 0),
-        (  "3",  0, 28, 1),
         ( "31",  0,  5, 1),
         ( "32",  0,  5, 0),
         ( "33",  0,  4, 1),
@@ -2099,7 +2167,6 @@ pinloc_db = {
         ( "37",  4,  0, 0),
         ( "38",  4,  0, 1),
         ( "39",  6,  0, 1),
-        (  "4",  0, 28, 0),
         ( "41",  7,  0, 1),
         ( "42",  8,  0, 0),
         ( "43", 11,  0, 1),
@@ -2118,7 +2185,6 @@ pinloc_db = {
         ( "64", 29,  0, 1),
         ( "67", 30,  0, 0),
         ( "68", 30,  0, 1),
-        (  "7",  0, 27, 1),
         ( "70", 31,  0, 0),
         ( "71", 31,  0, 1),
         ( "73", 33,  1, 0),
@@ -2127,7 +2193,6 @@ pinloc_db = {
         ( "76", 33,  2, 1),
         ( "78", 33,  3, 1),
         ( "79", 33,  4, 0),
-        (  "8",  0, 27, 0),
         ( "80", 33,  4, 1),
         ( "81", 33,  5, 0),
         ( "82", 33,  5, 1),
@@ -2136,7 +2201,6 @@ pinloc_db = {
         ( "85", 33, 10, 1),
         ( "87", 33, 14, 1),
         ( "88", 33, 15, 0),
-        (  "9",  0, 25, 1),
         ( "90", 33, 15, 1),
         ( "91", 33, 16, 0),
         ( "93", 33, 16, 1),
@@ -2146,96 +2210,124 @@ pinloc_db = {
         ( "97", 33, 21, 0),
         ( "98", 33, 21, 1),
         ( "99", 33, 23, 1),
+        ("101", 33, 27, 1),
+        ("102", 33, 28, 0),
+        ("104", 33, 29, 1),
+        ("105", 33, 30, 0),
+        ("106", 33, 30, 1),
+        ("107", 33, 31, 0),
+        ("110", 31, 33, 1),
+        ("112", 31, 33, 0),
+        ("113", 30, 33, 1),
+        ("114", 30, 33, 0),
+        ("115", 29, 33, 1),
+        ("116", 29, 33, 0),
+        ("117", 28, 33, 1),
+        ("118", 27, 33, 0),
+        ("119", 26, 33, 1),
+        ("120", 26, 33, 0),
+        ("121", 25, 33, 0),
+        ("122", 20, 33, 1),
+        ("124", 20, 33, 0),
+        ("125", 19, 33, 1),
+        ("128", 17, 33, 0),
+        ("129", 16, 33, 1),
+        ("130", 11, 33, 1),
+        ("134",  8, 33, 1),
+        ("135",  8, 33, 0),
+        ("136",  7, 33, 1),
+        ("137",  7, 33, 0),
+        ("138",  6, 33, 1),
+        ("139",  6, 33, 0),
+        ("141",  5, 33, 0),
+        ("142",  4, 33, 1),
+        ("143",  4, 33, 0),
+        ("144",  3, 33, 1),
     ],
-    "8k-cb132:4k": [
+    "8k-cb132": [
         ( "A1",  2, 33, 0),
-        ("A10", 25, 33, 0),
-        ("A11", 26, 33, 0),
-        ("A12", 30, 33, 1),
         ( "A2",  3, 33, 0),
         ( "A3",  3, 33, 1),
         ( "A4",  5, 33, 0),
         ( "A5", 10, 33, 1),
         ( "A6", 16, 33, 1),
         ( "A7", 17, 33, 0),
+        ("A10", 25, 33, 0),
+        ("A11", 26, 33, 0),
+        ("A12", 30, 33, 1),
         ( "B1",  0, 30, 1),
         ("B14", 33, 28, 0),
         ( "C1",  0, 30, 0),
-        ("C10", 22, 33, 1),
-        ("C11", 28, 33, 1),
-        ("C12", 29, 33, 1),
-        ("C14", 33, 24, 1),
         ( "C3",  0, 27, 1),
         ( "C4",  4, 33, 0),
         ( "C5",  8, 33, 1),
         ( "C6", 11, 33, 1),
         ( "C7", 14, 33, 1),
         ( "C9", 20, 33, 1),
+        ("C10", 22, 33, 1),
+        ("C11", 28, 33, 1),
+        ("C12", 29, 33, 1),
+        ("C14", 33, 24, 1),
         ( "D1",  0, 25, 1),
-        ("D10", 27, 33, 0),
-        ("D11", 26, 33, 1),
-        ("D12", 33, 27, 1),
-        ("D14", 33, 23, 1),
         ( "D3",  0, 27, 0),
         ( "D4",  0, 22, 1),
         ( "D5",  9, 33, 0),
         ( "D6", 11, 33, 0),
         ( "D7", 13, 33, 1),
         ( "D9", 21, 33, 1),
+        ("D10", 27, 33, 0),
+        ("D11", 26, 33, 1),
+        ("D12", 33, 27, 1),
+        ("D14", 33, 23, 1),
         ( "E1",  0, 25, 0),
+        ( "E4",  0, 22, 0),
         ("E11", 33, 20, 1),
         ("E12", 33, 21, 0),
         ("E14", 33, 21, 1),
-        ( "E4",  0, 22, 0),
+        ( "F3",  0, 21, 0),
+        ( "F4",  0, 21, 1),
         ("F11", 33, 19, 1),
         ("F12", 33, 15, 0),
         ("F14", 33, 16, 1),
-        ( "F3",  0, 21, 0),
-        ( "F4",  0, 21, 1),
         ( "G1",  0, 17, 0),
+        ( "G3",  0, 17, 1),
+        ( "G4",  0, 20, 0),
         ("G11", 33, 14, 1),
         ("G12", 33, 11, 0),
         ("G14", 33, 17, 0),
-        ( "G3",  0, 17, 1),
-        ( "G4",  0, 20, 0),
         ( "H1",  0, 16, 1),
-        ("H11", 33, 10, 1),
-        ("H12", 33,  6, 1),
         ( "H3",  0, 16, 0),
         ( "H4",  0, 20, 1),
+        ("H11", 33, 10, 1),
+        ("H12", 33,  6, 1),
         ( "J1",  0, 18, 0),
+        ( "J3",  0, 18, 1),
         ("J11", 33,  6, 0),
         ("J12", 33,  5, 1),
-        ( "J3",  0, 18, 1),
+        ( "K3",  0, 11, 1),
+        ( "K4",  0, 11, 0),
         ("K11", 33,  4, 1),
         ("K12", 33,  4, 0),
         ("K14", 33,  5, 0),
-        ( "K3",  0, 11, 1),
-        ( "K4",  0, 11, 0),
         ( "L1",  0,  6, 1),
-        ("L12", 33,  2, 0),
-        ("L14", 33,  3, 1),
         ( "L4", 12,  0, 0),
         ( "L5", 11,  0, 1),
         ( "L6", 15,  0, 0),
         ( "L8", 20,  0, 1),
         ( "L9", 29,  0, 0),
+        ("L12", 33,  2, 0),
+        ("L14", 33,  3, 1),
         ( "M1",  0,  6, 0),
-        ("M11", 30,  0, 0),
-        ("M12", 33,  1, 0),
         ( "M3",  8,  0, 0),
         ( "M4",  7,  0, 1),
         ( "M6", 14,  0, 1),
         ( "M7", 15,  0, 1),
         ( "M9", 22,  0, 1),
+        ("M11", 30,  0, 0),
+        ("M12", 33,  1, 0),
         ( "N1",  0,  4, 1),
         ("N14", 33,  2, 1),
         ( "P1",  0,  4, 0),
-        ("P10", 29,  0, 1),
-        ("P11", 30,  0, 1),
-        ("P12", 31,  0, 0),
-        ("P13", 31,  0, 1),
-        ("P14", 33,  1, 1),
         ( "P2",  4,  0, 0),
         ( "P3",  5,  0, 1),
         ( "P4", 12,  0, 1),
@@ -2243,123 +2335,24 @@ pinloc_db = {
         ( "P7", 16,  0, 1),
         ( "P8", 17,  0, 0),
         ( "P9", 21,  0, 1),
-    ],
-    "8k-cb132": [
-        ( "A1",  2, 33, 0),
-        ("A10", 25, 33, 0),
-        ("A11", 26, 33, 0),
-        ("A12", 30, 33, 1),
-        ( "A2",  3, 33, 0),
-        ( "A3",  3, 33, 1),
-        ( "A4",  5, 33, 0),
-        ( "A5", 10, 33, 1),
-        ( "A6", 16, 33, 1),
-        ( "A7", 17, 33, 0),
-        ( "B1",  0, 30, 1),
-        ("B14", 33, 28, 0),
-        ( "C1",  0, 30, 0),
-        ("C10", 22, 33, 1),
-        ("C11", 28, 33, 1),
-        ("C12", 29, 33, 1),
-        ("C14", 33, 24, 1),
-        ( "C3",  0, 27, 1),
-        ( "C4",  4, 33, 0),
-        ( "C5",  8, 33, 1),
-        ( "C6", 11, 33, 1),
-        ( "C7", 14, 33, 1),
-        ( "C9", 20, 33, 1),
-        ( "D1",  0, 25, 1),
-        ("D10", 27, 33, 0),
-        ("D11", 26, 33, 1),
-        ("D12", 33, 27, 1),
-        ("D14", 33, 23, 1),
-        ( "D3",  0, 27, 0),
-        ( "D4",  0, 22, 1),
-        ( "D5",  9, 33, 0),
-        ( "D6", 11, 33, 0),
-        ( "D7", 13, 33, 1),
-        ( "D9", 21, 33, 1),
-        ( "E1",  0, 25, 0),
-        ("E11", 33, 20, 1),
-        ("E12", 33, 21, 0),
-        ("E14", 33, 21, 1),
-        ( "E4",  0, 22, 0),
-        ("F11", 33, 19, 1),
-        ("F12", 33, 15, 0),
-        ("F14", 33, 16, 1),
-        ( "F3",  0, 21, 0),
-        ( "F4",  0, 21, 1),
-        ( "G1",  0, 17, 0),
-        ("G11", 33, 14, 1),
-        ("G12", 33, 11, 0),
-        ("G14", 33, 17, 0),
-        ( "G3",  0, 17, 1),
-        ( "G4",  0, 20, 0),
-        ( "H1",  0, 16, 1),
-        ("H11", 33, 10, 1),
-        ("H12", 33,  6, 1),
-        ( "H3",  0, 16, 0),
-        ( "H4",  0, 20, 1),
-        ( "J1",  0, 18, 0),
-        ("J11", 33,  6, 0),
-        ("J12", 33,  5, 1),
-        ( "J3",  0, 18, 1),
-        ("K11", 33,  4, 1),
-        ("K12", 33,  4, 0),
-        ("K14", 33,  5, 0),
-        ( "K3",  0, 11, 1),
-        ( "K4",  0, 11, 0),
-        ( "L1",  0,  6, 1),
-        ("L12", 33,  2, 0),
-        ("L14", 33,  3, 1),
-        ( "L4", 12,  0, 0),
-        ( "L5", 11,  0, 1),
-        ( "L6", 15,  0, 0),
-        ( "L8", 20,  0, 1),
-        ( "L9", 29,  0, 0),
-        ( "M1",  0,  6, 0),
-        ("M11", 30,  0, 0),
-        ("M12", 33,  1, 0),
-        ( "M3",  8,  0, 0),
-        ( "M4",  7,  0, 1),
-        ( "M6", 14,  0, 1),
-        ( "M7", 15,  0, 1),
-        ( "M9", 22,  0, 1),
-        ( "N1",  0,  4, 1),
-        ("N14", 33,  2, 1),
-        ( "P1",  0,  4, 0),
         ("P10", 29,  0, 1),
         ("P11", 30,  0, 1),
         ("P12", 31,  0, 0),
         ("P13", 31,  0, 1),
         ("P14", 33,  1, 1),
-        ( "P2",  4,  0, 0),
-        ( "P3",  5,  0, 1),
-        ( "P4", 12,  0, 1),
-        ( "P5", 13,  0, 0),
-        ( "P7", 16,  0, 1),
-        ( "P8", 17,  0, 0),
-        ( "P9", 21,  0, 1),
     ],
     "8k-ct256": [
         ( "A1",  4, 33, 1),
-        ("A10", 22, 33, 1),
-        ("A11", 22, 33, 0),
-        ("A15", 27, 33, 0),
-        ("A16", 27, 33, 1),
         ( "A2",  5, 33, 1),
         ( "A5",  8, 33, 0),
         ( "A6",  9, 33, 0),
         ( "A7", 12, 33, 0),
         ( "A9", 18, 33, 1),
+        ("A10", 22, 33, 1),
+        ("A11", 22, 33, 0),
+        ("A15", 27, 33, 0),
+        ("A16", 27, 33, 1),
         ( "B1",  0, 30, 0),
-        ("B10", 24, 33, 0),
-        ("B11", 23, 33, 1),
-        ("B12", 24, 33, 1),
-        ("B13", 26, 33, 1),
-        ("B14", 30, 33, 0),
-        ("B15", 31, 33, 0),
-        ("B16", 33, 30, 0),
         ( "B2",  0, 31, 0),
         ( "B3",  3, 33, 0),
         ( "B4",  6, 33, 1),
@@ -2368,13 +2361,14 @@ pinloc_db = {
         ( "B7", 11, 33, 0),
         ( "B8", 13, 33, 0),
         ( "B9", 16, 33, 0),
+        ("B10", 24, 33, 0),
+        ("B11", 23, 33, 1),
+        ("B12", 24, 33, 1),
+        ("B13", 26, 33, 1),
+        ("B14", 30, 33, 0),
+        ("B15", 31, 33, 0),
+        ("B16", 33, 30, 0),
         ( "C1",  0, 28, 1),
-        ("C10", 23, 33, 0),
-        ("C11", 25, 33, 1),
-        ("C12", 29, 33, 1),
-        ("C13", 28, 33, 1),
-        ("C14", 31, 33, 1),
-        ("C16", 33, 28, 0),
         ( "C2",  0, 28, 0),
         ( "C3",  1, 33, 0),
         ( "C4",  3, 33, 1),
@@ -2383,13 +2377,13 @@ pinloc_db = {
         ( "C7", 11, 33, 1),
         ( "C8", 17, 33, 0),
         ( "C9", 20, 33, 0),
+        ("C10", 23, 33, 0),
+        ("C11", 25, 33, 1),
+        ("C12", 29, 33, 1),
+        ("C13", 28, 33, 1),
+        ("C14", 31, 33, 1),
+        ("C16", 33, 28, 0),
         ( "D1",  0, 25, 0),
-        ("D10", 20, 33, 1),
-        ("D11", 25, 33, 0),
-        ("D13", 30, 33, 1),
-        ("D14", 33, 31, 0),
-        ("D15", 33, 26, 0),
-        ("D16", 33, 24, 0),
         ( "D2",  0, 27, 0),
         ( "D3",  1, 33, 1),
         ( "D4",  2, 33, 1),
@@ -2398,31 +2392,41 @@ pinloc_db = {
         ( "D7",  9, 33, 1),
         ( "D8", 14, 33, 1),
         ( "D9", 19, 33, 0),
-        ("E10", 26, 33, 0),
-        ("E11", 29, 33, 0),
-        ("E13", 33, 30, 1),
-        ("E14", 33, 27, 1),
-        ("E16", 33, 23, 0),
+        ("D10", 20, 33, 1),
+        ("D11", 25, 33, 0),
+        ("D13", 30, 33, 1),
+        ("D14", 33, 31, 0),
+        ("D15", 33, 26, 0),
+        ("D16", 33, 24, 0),
         ( "E2",  0, 23, 0),
         ( "E3",  0, 24, 0),
         ( "E4",  0, 31, 1),
         ( "E5",  2, 33, 0),
         ( "E6",  7, 33, 0),
         ( "E9", 19, 33, 1),
+        ("E10", 26, 33, 0),
+        ("E11", 29, 33, 0),
+        ("E13", 33, 30, 1),
+        ("E14", 33, 27, 1),
+        ("E16", 33, 23, 0),
         ( "F1",  0, 20, 0),
-        ("F11", 33, 26, 1),
-        ("F12", 33, 25, 1),
-        ("F13", 33, 28, 1),
-        ("F14", 33, 25, 0),
-        ("F15", 33, 22, 0),
-        ("F16", 33, 21, 0),
         ( "F2",  0, 21, 0),
         ( "F3",  0, 22, 0),
         ( "F4",  0, 27, 1),
         ( "F5",  0, 30, 1),
         ( "F7", 16, 33, 1),
         ( "F9", 17, 33, 1),
+        ("F11", 33, 26, 1),
+        ("F12", 33, 25, 1),
+        ("F13", 33, 28, 1),
+        ("F14", 33, 25, 0),
+        ("F15", 33, 22, 0),
+        ("F16", 33, 21, 0),
         ( "G1",  0, 17, 0),
+        ( "G2",  0, 19, 0),
+        ( "G3",  0, 22, 1),
+        ( "G4",  0, 24, 1),
+        ( "G5",  0, 25, 1),
         ("G10", 33, 20, 1),
         ("G11", 33, 21, 1),
         ("G12", 33, 24, 1),
@@ -2430,22 +2434,22 @@ pinloc_db = {
         ("G14", 33, 22, 1),
         ("G15", 33, 20, 0),
         ("G16", 33, 19, 0),
-        ( "G2",  0, 19, 0),
-        ( "G3",  0, 22, 1),
-        ( "G4",  0, 24, 1),
-        ( "G5",  0, 25, 1),
         ( "H1",  0, 16, 0),
-        ("H11", 33, 16, 1),
-        ("H12", 33, 19, 1),
-        ("H13", 33, 16, 0),
-        ("H14", 33, 17, 1),
-        ("H16", 33, 17, 0),
         ( "H2",  0, 18, 0),
         ( "H3",  0, 21, 1),
         ( "H4",  0, 19, 1),
         ( "H5",  0, 23, 1),
         ( "H6",  0, 20, 1),
+        ("H11", 33, 16, 1),
+        ("H12", 33, 19, 1),
+        ("H13", 33, 16, 0),
+        ("H14", 33, 17, 1),
+        ("H16", 33, 17, 0),
         ( "J1",  0, 14, 0),
+        ( "J2",  0, 14, 1),
+        ( "J3",  0, 16, 1),
+        ( "J4",  0, 18, 1),
+        ( "J5",  0, 17, 1),
         ("J10", 33,  7, 1),
         ("J11", 33,  9, 1),
         ("J12", 33, 14, 1),
@@ -2453,41 +2457,31 @@ pinloc_db = {
         ("J14", 33, 13, 1),
         ("J15", 33, 11, 1),
         ("J16", 33, 15, 1),
-        ( "J2",  0, 14, 1),
-        ( "J3",  0, 16, 1),
-        ( "J4",  0, 18, 1),
-        ( "J5",  0, 17, 1),
         ( "K1",  0, 13, 1),
+        ( "K3",  0, 13, 0),
+        ( "K4",  0, 11, 1),
+        ( "K5",  0,  9, 1),
+        ( "K9", 17,  0, 0),
         ("K11", 29,  0, 0),
         ("K12", 33,  6, 1),
         ("K13", 33, 10, 1),
         ("K14", 33, 11, 0),
         ("K15", 33, 12, 0),
         ("K16", 33, 13, 0),
-        ( "K3",  0, 13, 0),
-        ( "K4",  0, 11, 1),
-        ( "K5",  0,  9, 1),
-        ( "K9", 17,  0, 0),
         ( "L1",  0, 12, 0),
-        ("L10", 19,  0, 1),
-        ("L11", 26,  0, 1),
-        ("L12", 33,  4, 1),
-        ("L13", 33,  5, 1),
-        ("L14", 33,  6, 0),
-        ("L16", 33, 10, 0),
         ( "L3",  0, 10, 0),
         ( "L4",  0, 12, 1),
         ( "L5",  0,  6, 1),
         ( "L6",  0, 10, 1),
         ( "L7",  0,  8, 1),
         ( "L9", 13,  0, 0),
+        ("L10", 19,  0, 1),
+        ("L11", 26,  0, 1),
+        ("L12", 33,  4, 1),
+        ("L13", 33,  5, 1),
+        ("L14", 33,  6, 0),
+        ("L16", 33, 10, 0),
         ( "M1",  0, 11, 0),
-        ("M11", 23,  0, 1),
-        ("M12", 27,  0, 1),
-        ("M13", 33,  3, 1),
-        ("M14", 33,  4, 0),
-        ("M15", 33,  8, 0),
-        ("M16", 33,  7, 0),
         ( "M2",  0,  9, 0),
         ( "M3",  0,  7, 0),
         ( "M4",  0,  5, 0),
@@ -2496,9 +2490,12 @@ pinloc_db = {
         ( "M7",  8,  0, 0),
         ( "M8", 10,  0, 0),
         ( "M9", 16,  0, 0),
-        ("N10", 20,  0, 1),
-        ("N12", 26,  0, 0),
-        ("N16", 33,  5, 0),
+        ("M11", 23,  0, 1),
+        ("M12", 27,  0, 1),
+        ("M13", 33,  3, 1),
+        ("M14", 33,  4, 0),
+        ("M15", 33,  8, 0),
+        ("M16", 33,  7, 0),
         ( "N2",  0,  8, 0),
         ( "N3",  0,  6, 0),
         ( "N4",  0,  3, 0),
@@ -2506,14 +2503,10 @@ pinloc_db = {
         ( "N6",  2,  0, 0),
         ( "N7",  9,  0, 0),
         ( "N9", 15,  0, 0),
+        ("N10", 20,  0, 1),
+        ("N12", 26,  0, 0),
+        ("N16", 33,  5, 0),
         ( "P1",  0,  5, 1),
-        ("P10", 20,  0, 0),
-        ("P11", 30,  0, 1),
-        ("P12", 30,  0, 0),
-        ("P13", 29,  0, 1),
-        ("P14", 33,  2, 0),
-        ("P15", 33,  2, 1),
-        ("P16", 33,  3, 0),
         ( "P2",  0,  4, 1),
         ( "P4",  3,  0, 0),
         ( "P5",  5,  0, 0),
@@ -2521,26 +2514,27 @@ pinloc_db = {
         ( "P7", 14,  0, 1),
         ( "P8", 12,  0, 0),
         ( "P9", 17,  0, 1),
+        ("P10", 20,  0, 0),
+        ("P11", 30,  0, 1),
+        ("P12", 30,  0, 0),
+        ("P13", 29,  0, 1),
+        ("P14", 33,  2, 0),
+        ("P15", 33,  2, 1),
+        ("P16", 33,  3, 0),
         ( "R1",  0,  3, 1),
-        ("R10", 19,  0, 0),
-        ("R11", 31,  0, 0),
-        ("R12", 31,  0, 1),
-        ("R14", 33,  1, 0),
-        ("R15", 33,  1, 1),
-        ("R16", 28,  0, 0),
         ( "R2",  3,  0, 1),
         ( "R3",  5,  0, 1),
         ( "R4",  7,  0, 1),
         ( "R5",  6,  0, 0),
         ( "R6", 11,  0, 1),
         ( "R9", 16,  0, 1),
+        ("R10", 19,  0, 0),
+        ("R11", 31,  0, 0),
+        ("R12", 31,  0, 1),
+        ("R14", 33,  1, 0),
+        ("R15", 33,  1, 1),
+        ("R16", 28,  0, 0),
         ( "T1",  2,  0, 1),
-        ("T10", 21,  0, 0),
-        ("T11", 21,  0, 1),
-        ("T13", 24,  0, 0),
-        ("T14", 23,  0, 0),
-        ("T15", 22,  0, 1),
-        ("T16", 27,  0, 0),
         ( "T2",  4,  0, 1),
         ( "T3",  6,  0, 1),
         ( "T5", 10,  0, 1),
@@ -2548,6 +2542,12 @@ pinloc_db = {
         ( "T7", 13,  0, 1),
         ( "T8", 14,  0, 0),
         ( "T9", 15,  0, 1),
+        ("T10", 21,  0, 0),
+        ("T11", 21,  0, 1),
+        ("T13", 24,  0, 0),
+        ("T14", 23,  0, 0),
+        ("T15", 22,  0, 1),
+        ("T16", 27,  0, 0),
     ]
 }