Bring chip data in icebox in line with icepack - and icecube

1 files changed, 50 insertions, 50 deletions

diff --git a/icebox/icebox.py b/icebox/icebox.py
index cfbabc5..e37cb18 100644
--- a/icebox/icebox.py
+++ b/icebox/icebox.py
@@ -80,8 +80,8 @@ class iceconfig:
     def setup_empty_5k(self):
         self.clear()
         self.device = "5k"
-        self.max_x = 26
-        self.max_y = 33
+        self.max_x = 25
+        self.max_y = 31
 
         for x in range(1, self.max_x):
             for y in range(1, self.max_y):
@@ -2072,100 +2072,100 @@ ieren_db = {
     "5k": [ #TODO: is this correct?
         (1 ,  0, 0, 1 ,  0, 0),
         (1 ,  0, 1, 1 ,  0, 1),
-        (1 , 33, 0, 1 , 33, 0),
-        (1 , 33, 1, 1 , 33, 1),
+        (1 , 31, 0, 1 , 31, 0),
+        (1 , 31, 1, 1 , 31, 1),
         (2 ,  0, 0, 2 ,  0, 0),
         (2 ,  0, 1, 2 ,  0, 1),
-        (2 , 33, 0, 2 , 33, 0),
-        (2 , 33, 1, 2 , 33, 1),
+        (2 , 31, 0, 2 , 31, 0),
+        (2 , 31, 1, 2 , 31, 1),
         (3 ,  0, 0, 3 ,  0, 0),
         (3 ,  0, 1, 3 ,  0, 1),
-        (3 , 33, 0, 3 , 33, 0),
-        (3 , 33, 1, 3 , 33, 1),
+        (3 , 31, 0, 3 , 31, 0),
+        (3 , 31, 1, 3 , 31, 1),
         (4 ,  0, 0, 4 ,  0, 0),
         (4 ,  0, 1, 4 ,  0, 1),
-        (4 , 33, 0, 4 , 33, 0),
-        (4 , 33, 1, 4 , 33, 1),
+        (4 , 31, 0, 4 , 31, 0),
+        (4 , 31, 1, 4 , 31, 1),
         (5 ,  0, 0, 5 ,  0, 0),
         (5 ,  0, 1, 5 ,  0, 1),
-        (5 , 33, 0, 5 , 33, 0),
-        (5 , 33, 1, 5 , 33, 1),
+        (5 , 31, 0, 5 , 31, 0),
+        (5 , 31, 1, 5 , 31, 1),
         (6 ,  0, 0, 6 ,  0, 0),
         (6 ,  0, 1, 6 ,  0, 1),
-        (6 , 33, 0, 6 , 33, 0),
-        (6 , 33, 1, 6 , 33, 1),
+        (6 , 31, 0, 6 , 31, 0),
+        (6 , 31, 1, 6 , 31, 1),
         (7 ,  0, 0, 7 ,  0, 0),
         (7 ,  0, 1, 7 ,  0, 1),
-        (7 , 33, 0, 7 , 33, 0),
-        (7 , 33, 1, 7 , 33, 1),
+        (7 , 31, 0, 7 , 31, 0),
+        (7 , 31, 1, 7 , 31, 1),
         (8 ,  0, 0, 8 ,  0, 0),
         (8 ,  0, 1, 8 ,  0, 1),
-        (8 , 33, 0, 8 , 33, 0),
-        (8 , 33, 1, 8 , 33, 1),
+        (8 , 31, 0, 8 , 31, 0),
+        (8 , 31, 1, 8 , 31, 1),
         (9 ,  0, 0, 9 ,  0, 0),
         (9 ,  0, 1, 9 ,  0, 1),
-        (9 , 33, 0, 9 , 33, 0),
-        (9 , 33, 1, 9 , 33, 1),
+        (9 , 31, 0, 9 , 31, 0),
+        (9 , 31, 1, 9 , 31, 1),
         (10,  0, 0, 10,  0, 0),
         (10,  0, 1, 10,  0, 1),
-        (10, 33, 0, 10, 33, 0),
-        (10, 33, 1, 10, 33, 1),
+        (10, 31, 0, 10, 31, 0),
+        (10, 31, 1, 10, 31, 1),
         (11,  0, 0, 11,  0, 0),
         (11,  0, 1, 11,  0, 1),
-        (11, 33, 0, 11, 33, 0),
-        (11, 33, 1, 11, 33, 1),
+        (11, 31, 0, 11, 31, 0),
+        (11, 31, 1, 11, 31, 1),
         (12,  0, 0, 12,  0, 0),
         (12,  0, 1, 12,  0, 1),
-        (12, 33, 0, 12, 33, 0),
-        (12, 33, 1, 12, 33, 1),
+        (12, 31, 0, 12, 31, 0),
+        (12, 31, 1, 12, 31, 1),
         (13,  0, 0, 13,  0, 0),
         (13,  0, 1, 13,  0, 1),
-        (13, 33, 0, 13, 33, 0),
-        (13, 33, 1, 13, 33, 1),
+        (13, 31, 0, 13, 31, 0),
+        (13, 31, 1, 13, 31, 1),
         (14,  0, 0, 14,  0, 0),
         (14,  0, 1, 14,  0, 1),
-        (14, 33, 0, 14, 33, 0),
-        (14, 33, 1, 14, 33, 1),
+        (14, 31, 0, 14, 31, 0),
+        (14, 31, 1, 14, 31, 1),
         (15,  0, 0, 15,  0, 0),
         (15,  0, 1, 15,  0, 1),
-        (15, 33, 0, 15, 33, 0),
-        (15, 33, 1, 15, 33, 1),
+        (15, 31, 0, 15, 31, 0),
+        (15, 31, 1, 15, 31, 1),
         (16,  0, 0, 16,  0, 0),
         (16,  0, 1, 16,  0, 1),
-        (16, 33, 0, 16, 33, 0),
-        (16, 33, 1, 16, 33, 1),
+        (16, 31, 0, 16, 31, 0),
+        (16, 31, 1, 16, 31, 1),
         (17,  0, 0, 17,  0, 0),
         (17,  0, 1, 17,  0, 1),
-        (17, 33, 0, 17, 33, 0),
-        (17, 33, 1, 17, 33, 1),
+        (17, 31, 0, 17, 31, 0),
+        (17, 31, 1, 17, 31, 1),
         (18,  0, 0, 18,  0, 0),
         (18,  0, 1, 18,  0, 1),
-        (18, 33, 0, 18, 33, 0),
-        (18, 33, 1, 18, 33, 1),
+        (18, 31, 0, 18, 31, 0),
+        (18, 31, 1, 18, 31, 1),
         (19,  0, 0, 19,  0, 0),
         (19,  0, 1, 19,  0, 1),
-        (19, 33, 0, 19, 33, 0),
-        (19, 33, 1, 19, 33, 1),
+        (19, 31, 0, 19, 31, 0),
+        (19, 31, 1, 19, 31, 1),
         (20,  0, 0, 20,  0, 0),
         (20,  0, 1, 20,  0, 1),
-        (20, 33, 0, 20, 33, 0),
-        (20, 33, 1, 20, 33, 1),
+        (20, 31, 0, 20, 31, 0),
+        (20, 31, 1, 20, 31, 1),
         (21,  0, 0, 21,  0, 0),
         (21,  0, 1, 21,  0, 1),
-        (21, 33, 0, 21, 33, 0),
-        (21, 33, 1, 21, 33, 1),
+        (21, 31, 0, 21, 31, 0),
+        (21, 31, 1, 21, 31, 1),
         (22,  0, 0, 22,  0, 0),
         (22,  0, 1, 22,  0, 1),
-        (22, 33, 0, 22, 33, 0),
-        (22, 33, 1, 22, 33, 1),
+        (22, 31, 0, 22, 31, 0),
+        (22, 31, 1, 22, 31, 1),
         (23,  0, 0, 23,  0, 0),
         (23,  0, 1, 23,  0, 1),
-        (23, 33, 0, 23, 33, 0),
-        (23, 33, 1, 23, 33, 1),
+        (23, 31, 0, 23, 31, 0),
+        (23, 31, 1, 23, 31, 1),
         (24,  0, 0, 24,  0, 0),
         (24,  0, 1, 24,  0, 1),
-        (24, 33, 0, 24, 33, 0),
-        (24, 33, 1, 24, 33, 1)
+        (24, 31, 0, 24, 31, 0),
+        (24, 31, 1, 24, 31, 1)
     ]
 }