From d7e46f3f5724f700775b18dbc791e27f4510671e Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Thu, 27 Apr 2023 08:53:57 +0200
Subject: [PATCH] Updates mux_2024_rev_0_0.py
---
...x_2024_22_23_4_roles_addressing_table.json | 1 -
hardware_components/mux_2024_rev_0_0.py | 67 +++++--------------
2 files changed, 17 insertions(+), 51 deletions(-)
delete mode 100644 hardware_components/mux_2024_22_23_4_roles_addressing_table.json
diff --git a/hardware_components/mux_2024_22_23_4_roles_addressing_table.json b/hardware_components/mux_2024_22_23_4_roles_addressing_table.json
deleted file mode 100644
index 5e4554fd..00000000
--- a/hardware_components/mux_2024_22_23_4_roles_addressing_table.json
+++ /dev/null
@@ -1 +0,0 @@
-{"(1, A)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 0}, "(2, A)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 1}, "(3, A)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 2}, "(4, A)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 3}, "(5, A)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 4}, "(6, A)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 5}, "(7, A)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 6}, "(8, A)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 7}, "(1, B)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 8}, "(2, B)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 9}, "(3, B)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 10}, "(4, B)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 11}, "(5, B)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 12}, "(6, B)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 13}, "(7, B)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 14}, "(8, B)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x22", "MCP_GPIO": 15}, "(8, M)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 0}, "(7, M)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 1}, "(6, M)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 2}, "(5, M)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 3}, "(4, M)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 4}, "(3, M)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 5}, "(2, M)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 6}, "(1, M)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 7}, "(8, N)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 8}, "(7, N)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 9}, "(6, N)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 10}, "(5, N)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 11}, "(4, N)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 12}, "(3, N)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 13}, "(2, N)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 14}, "(1, N)": {"TCA_address": null, "TCA_channel": 0, "MCP_address": "0x23", "MCP_GPIO": 15}}
diff --git a/hardware_components/mux_2024_rev_0_0.py b/hardware_components/mux_2024_rev_0_0.py
index 8c4f8e8b..866db231 100644
--- a/hardware_components/mux_2024_rev_0_0.py
+++ b/hardware_components/mux_2024_rev_0_0.py
@@ -8,39 +8,6 @@ from digitalio import Direction # noqa
MUX_CONFIG = HARDWARE_CONFIG['mux']
-# d = {(1, 'A'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 0},
-# (2, 'A'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 1},
-# (3, 'A'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 2},
-# (4, 'A'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 3},
-# (5, 'A'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 4},
-# (6, 'A'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 5},
-# (7, 'A'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 6},
-# (8, 'A'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 7},
-# (1, 'B'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 8},
-# (2, 'B'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 9},
-# (3, 'B'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 10},
-# (4, 'B'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 11},
-# (5, 'B'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 12},
-# (6, 'B'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 13},
-# (7, 'B'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 14},
-# (8, 'B'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 34, 'MCP_GPIO': 15},
-# (8, 'M'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 0},
-# (7, 'M'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 1},
-# (6, 'M'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 2},
-# (5, 'M'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 3},
-# (4, 'M'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 4},
-# (3, 'M'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 5},
-# (2, 'M'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 6},
-# (1, 'M'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 7},
-# (8, 'N'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 8},
-# (7, 'N'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 9},
-# (6, 'N'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 10},
-# (5, 'N'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 11},
-# (4, 'N'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 12},
-# (3, 'N'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 13},
-# (2, 'N'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 14},
-# (1, 'N'): {'TCA_address': None, 'TCA_channel': 0, 'MCP_address': 35, 'MCP_GPIO': 15}}
-
inner_cabling ={'4_roles' : {(1, 'X'): {'MCP': 0, 'MCP_GPIO': 0},
(2, 'X'): {'MCP': 0, 'MCP_GPIO': 1},
(3, 'X'): {'MCP': 0, 'MCP_GPIO': 2},
@@ -73,7 +40,7 @@ inner_cabling ={'4_roles' : {(1, 'X'): {'MCP': 0, 'MCP_GPIO': 0},
(3, 'YY'): {'MCP': 1, 'MCP_GPIO': 13},
(2, 'YY'): {'MCP': 1, 'MCP_GPIO': 14},
(1, 'YY'): {'MCP': 1, 'MCP_GPIO': 15}},
- '2_roles': {(1, 'X'): {'MCP': 0, 'MCP_GPIO': 0}, # TODO: check 2_roles table !!!
+ '2_roles': {(1, 'X'): {'MCP': 0, 'MCP_GPIO': 0}, # TODO: WARNING check 2_roles table, it has not been verified yet !!!
(2, 'X'): {'MCP': 0, 'MCP_GPIO': 1},
(3, 'X'): {'MCP': 0, 'MCP_GPIO': 2},
(4, 'X'): {'MCP': 0, 'MCP_GPIO': 3},
@@ -81,14 +48,14 @@ inner_cabling ={'4_roles' : {(1, 'X'): {'MCP': 0, 'MCP_GPIO': 0},
(6, 'X'): {'MCP': 0, 'MCP_GPIO': 5},
(7, 'X'): {'MCP': 0, 'MCP_GPIO': 6},
(8, 'X'): {'MCP': 0, 'MCP_GPIO': 7},
- (1, 'Y'): {'MCP': 0, 'MCP_GPIO': 8},
- (2, 'Y'): {'MCP': 0, 'MCP_GPIO': 9},
- (3, 'Y'): {'MCP': 0, 'MCP_GPIO': 10},
- (4, 'Y'): {'MCP': 0, 'MCP_GPIO': 11},
- (5, 'Y'): {'MCP': 0, 'MCP_GPIO': 12},
- (6, 'Y'): {'MCP': 0, 'MCP_GPIO': 13},
- (7, 'Y'): {'MCP': 0, 'MCP_GPIO': 14},
- (8, 'Y'): {'MCP': 0, 'MCP_GPIO': 15},
+ (9, 'Y'): {'MCP': 0, 'MCP_GPIO': 8},
+ (10, 'Y'): {'MCP': 0, 'MCP_GPIO': 9},
+ (11, 'Y'): {'MCP': 0, 'MCP_GPIO': 10},
+ (12, 'Y'): {'MCP': 0, 'MCP_GPIO': 11},
+ (13, 'Y'): {'MCP': 0, 'MCP_GPIO': 12},
+ (14, 'Y'): {'MCP': 0, 'MCP_GPIO': 13},
+ (15, 'Y'): {'MCP': 0, 'MCP_GPIO': 14},
+ (16, 'Y'): {'MCP': 0, 'MCP_GPIO': 15},
(8, 'X'): {'MCP': 1, 'MCP_GPIO': 0},
(7, 'X'): {'MCP': 1, 'MCP_GPIO': 1},
(6, 'X'): {'MCP': 1, 'MCP_GPIO': 2},
@@ -97,14 +64,14 @@ inner_cabling ={'4_roles' : {(1, 'X'): {'MCP': 0, 'MCP_GPIO': 0},
(3, 'X'): {'MCP': 1, 'MCP_GPIO': 5},
(2, 'X'): {'MCP': 1, 'MCP_GPIO': 6},
(1, 'X'): {'MCP': 1, 'MCP_GPIO': 7},
- (8, 'Y'): {'MCP': 1, 'MCP_GPIO': 8},
- (7, 'Y'): {'MCP': 1, 'MCP_GPIO': 9},
- (6, 'Y'): {'MCP': 1, 'MCP_GPIO': 10},
- (5, 'Y'): {'MCP': 1, 'MCP_GPIO': 11},
- (4, 'Y'): {'MCP': 1, 'MCP_GPIO': 12},
- (3, 'Y'): {'MCP': 1, 'MCP_GPIO': 13},
- (2, 'Y'): {'MCP': 1, 'MCP_GPIO': 14},
- (1, 'Y'): {'MCP': 1, 'MCP_GPIO': 15}}}
+ (16, 'Y'): {'MCP': 1, 'MCP_GPIO': 8},
+ (15, 'Y'): {'MCP': 1, 'MCP_GPIO': 9},
+ (14, 'Y'): {'MCP': 1, 'MCP_GPIO': 10},
+ (13, 'Y'): {'MCP': 1, 'MCP_GPIO': 11},
+ (12, 'Y'): {'MCP': 1, 'MCP_GPIO': 12},
+ (11, 'Y'): {'MCP': 1, 'MCP_GPIO': 13},
+ (10, 'Y'): {'MCP': 1, 'MCP_GPIO': 14},
+ (9, 'Y'): {'MCP': 1, 'MCP_GPIO': 15}}}
class Mux(MuxAbstract):
--
GitLab