Pass console to buttons not unit

1 files changed, 97 insertions, 98 deletions

diff --git a/fw_1884_buttons.py b/fw_1884_buttons.py
index e1ed548..7b46ea1 100644
--- a/fw_1884_buttons.py
+++ b/fw_1884_buttons.py
@@ -24,7 +24,6 @@ import buttons
 
 
 def init_buttons(console):
-    unit = console.unit
     strips = console.strips
     return {5: [None,
                 None,
@@ -75,74 +74,74 @@ def init_buttons(console):
                 None,
                 None,
                 None,
-                buttons.StripSelButton(unit, 'Strip 1 Sel', strips[1]),
-                buttons.StripSelButton(unit, 'Strip 2 Sel', strips[2]),
-                buttons.StripSelButton(unit, 'Strip 3 Sel', strips[3]),
-                buttons.StripSelButton(unit, 'Strip 4 Sel', strips[4]),
-                buttons.StripSelButton(unit, 'Strip 5 Sel', strips[5]),
-                buttons.StripSelButton(unit, 'Strip 6 Sel', strips[6]),
-                buttons.StripSelButton(unit, 'Strip 7 Sel', strips[7]),
-                buttons.StripSelButton(unit, 'Strip 8 Sel', strips[8]),
-                buttons.StripSoloButton(unit, 'Strip 1 Solo', strips[1]),
-                buttons.StripSoloButton(unit, 'Strip 2 Solo', strips[2]),
-                buttons.StripSoloButton(unit, 'Strip 3 Solo', strips[3]),
-                buttons.StripSoloButton(unit, 'Strip 4 Solo', strips[4]),
-                buttons.StripSoloButton(unit, 'Strip 5 Solo', strips[5]),
-                buttons.StripSoloButton(unit, 'Strip 6 Solo', strips[6]),
-                buttons.StripSoloButton(unit, 'Strip 7 Solo', strips[7]),
-                buttons.StripSoloButton(unit, 'Strip 8 Solo', strips[8]),
+                buttons.StripSelButton(console, 'Strip 1 Sel', strips[1]),
+                buttons.StripSelButton(console, 'Strip 2 Sel', strips[2]),
+                buttons.StripSelButton(console, 'Strip 3 Sel', strips[3]),
+                buttons.StripSelButton(console, 'Strip 4 Sel', strips[4]),
+                buttons.StripSelButton(console, 'Strip 5 Sel', strips[5]),
+                buttons.StripSelButton(console, 'Strip 6 Sel', strips[6]),
+                buttons.StripSelButton(console, 'Strip 7 Sel', strips[7]),
+                buttons.StripSelButton(console, 'Strip 8 Sel', strips[8]),
+                buttons.StripSoloButton(console, 'Strip 1 Solo', strips[1]),
+                buttons.StripSoloButton(console, 'Strip 2 Solo', strips[2]),
+                buttons.StripSoloButton(console, 'Strip 3 Solo', strips[3]),
+                buttons.StripSoloButton(console, 'Strip 4 Solo', strips[4]),
+                buttons.StripSoloButton(console, 'Strip 5 Solo', strips[5]),
+                buttons.StripSoloButton(console, 'Strip 6 Solo', strips[6]),
+                buttons.StripSoloButton(console, 'Strip 7 Solo', strips[7]),
+                buttons.StripSoloButton(console, 'Strip 8 Solo', strips[8]),
                 ],
-            7: [buttons.StripMuteButton(unit, 'Strip 1 Mute', strips[1]),
-                buttons.StripMuteButton(unit, 'Strip 2 Mute', strips[2]),
-                buttons.StripMuteButton(unit, 'Strip 3 Mute', strips[3]),
-                buttons.StripMuteButton(unit, 'Strip 4 Mute', strips[4]),
-                buttons.StripMuteButton(unit, 'Strip 5 Mute', strips[5]),
-                buttons.StripMuteButton(unit, 'Strip 6 Mute', strips[6]),
-                buttons.StripMuteButton(unit, 'Strip 7 Mute', strips[7]),
-                buttons.StripMuteButton(unit, 'Strip 8 Mute', strips[8]),
-                buttons.EncoderButton(unit, 'AUX5'),
-                buttons.EncoderButton(unit, 'AUX7'),
-                buttons.EncoderButton(unit, 'AUX6'),
-                buttons.EncoderButton(unit, 'AUX8'),
-                None,
-                None,
-                None,
-                None,
-                buttons.Button(unit, 'FLIP'),
-                buttons.EncoderButton(unit, 'AUX1'),
-                buttons.EncoderButton(unit, 'AUX3'),
-                buttons.EncoderButton(unit, 'PAN'),
-                buttons.EncoderButton(unit, 'AUX2'),
-                buttons.EncoderButton(unit, 'AUX4'),
-                None,
-                None,
-                buttons.Button(unit, 'Control Panel'),
-                buttons.Button(unit, 'F1'),
-                buttons.Button(unit, 'ALL SAFE'),
-                buttons.Button(unit, 'F5'),
-                buttons.Button(unit, 'CUT'),
-                buttons.Button(unit, 'COPY'),
-                buttons.ModButton(unit, 'ALT'),
-                buttons.ModButton(unit, 'SHIFT'),
+            7: [buttons.StripMuteButton(console, 'Strip 1 Mute', strips[1]),
+                buttons.StripMuteButton(console, 'Strip 2 Mute', strips[2]),
+                buttons.StripMuteButton(console, 'Strip 3 Mute', strips[3]),
+                buttons.StripMuteButton(console, 'Strip 4 Mute', strips[4]),
+                buttons.StripMuteButton(console, 'Strip 5 Mute', strips[5]),
+                buttons.StripMuteButton(console, 'Strip 6 Mute', strips[6]),
+                buttons.StripMuteButton(console, 'Strip 7 Mute', strips[7]),
+                buttons.StripMuteButton(console, 'Strip 8 Mute', strips[8]),
+                buttons.EncoderButton(console, 'AUX5'),
+                buttons.EncoderButton(console, 'AUX7'),
+                buttons.EncoderButton(console, 'AUX6'),
+                buttons.EncoderButton(console, 'AUX8'),
+                None,
+                None,
+                None,
+                None,
+                buttons.Button(console, 'FLIP'),
+                buttons.EncoderButton(console, 'AUX1'),
+                buttons.EncoderButton(console, 'AUX3'),
+                buttons.EncoderButton(console, 'PAN'),
+                buttons.EncoderButton(console, 'AUX2'),
+                buttons.EncoderButton(console, 'AUX4'),
+                None,
+                None,
+                buttons.Button(console, 'Control Panel'),
+                buttons.Button(console, 'F1'),
+                buttons.Button(console, 'ALL SAFE'),
+                buttons.Button(console, 'F5'),
+                buttons.Button(console, 'CUT'),
+                buttons.Button(console, 'COPY'),
+                buttons.ModButton(console, 'ALT'),
+                buttons.ModButton(console, 'SHIFT'),
                 ],
-            8: [buttons.Button(unit, 'F2'),
-                buttons.ClrSoloButton(unit, 'CLR SOLO'),
-                buttons.LoopButton(unit, 'LOOP'),
-                buttons.Button(unit, 'DEL'),
-                buttons.Button(unit, 'PASTE'),
-                buttons.Button(unit, 'UNDO'),
-                buttons.ModButton(unit, 'CTRL'),
-                buttons.Button(unit, 'Foot Switch'),
-                buttons.Button(unit, 'Gain Enc A'),
-                buttons.Button(unit, 'Gain Enc B'),
-                buttons.Button(unit, 'Q Enc A'),
-                buttons.Button(unit, 'Q Enc B'),
+            8: [buttons.Button(console, 'F2'),
+                buttons.ClrSoloButton(console, 'CLR SOLO'),
+                buttons.LoopButton(console, 'LOOP'),
+                buttons.Button(console, 'DEL'),
+                buttons.Button(console, 'PASTE'),
+                buttons.Button(console, 'UNDO'),
+                buttons.ModButton(console, 'CTRL'),
+                buttons.Button(console, 'Foot Switch'),
+                buttons.Button(console, 'Gain Enc A'),
+                buttons.Button(console, 'Gain Enc B'),
+                buttons.Button(console, 'Q Enc A'),
+                buttons.Button(console, 'Q Enc B'),
                 None,
                 None,
                 None,
                 None,
-                buttons.Button(unit, 'Freq Enc A'),
-                buttons.Button(unit, 'Freq Enc B'),
+                buttons.Button(console, 'Freq Enc A'),
+                buttons.Button(console, 'Freq Enc B'),
                 None,
                 None,
                 None,
@@ -150,45 +149,45 @@ def init_buttons(console):
                 None,
                 None,
                 None,
-                buttons.ComputerButton(unit, 'COMPUTER'),
+                buttons.ComputerButton(console, 'COMPUTER'),
                 None,
                 None,
-                buttons.Button(unit, 'CLOCK'),
-                buttons.Button(unit, 'ROUTE'),
+                buttons.Button(console, 'CLOCK'),
+                buttons.Button(console, 'ROUTE'),
                 None,
                 None,
                 ],
-            9: [buttons.Button(unit, 'F7'),
-                buttons.Button(unit, 'F8'),
-                buttons.Button(unit, 'F9'),
-                buttons.Button(unit, 'F10'),
-                buttons.Button(unit, 'READ'),
-                buttons.Button(unit, 'WRT'),
-                buttons.Button(unit, 'TCH'),
-                buttons.Button(unit, 'LATCH'),
-                buttons.Button(unit, 'HIGH'),
-                buttons.Button(unit, 'HI-MID'),
-                buttons.Button(unit, 'LOW-MID'),
-                buttons.Button(unit, 'LOW'),
-                buttons.ArrowButton(unit, 'UP'),
-                buttons.ArrowButton(unit, 'LEFT'),
-                buttons.ArrowButton(unit, 'DOWN'),
-                buttons.ArrowButton(unit, 'RIGHT'),
-                buttons.Button(unit, 'REC ENABLE'),
-                buttons.NudgeButton(unit, 'NUDGE LEFT', -1),
-                buttons.NudgeButton(unit, 'NUDGE RIGHT', 1),
-                buttons.BankSwitchButton(unit, 'BANK LEFT', -1),
-                buttons.BankSwitchButton(unit, 'BANK RIGHT', 1),
-                buttons.Button(unit, 'LOCATE LEFT'),
-                buttons.Button(unit, 'LOCATE RIGHT'),
-                buttons.Button(unit, 'SHTL'),
-                buttons.Button(unit, 'SET'),
-                buttons.Button(unit, 'IN'),
-                buttons.Button(unit, 'OUT'),
-                buttons.TransportButton(unit, 'REW'),
-                buttons.TransportButton(unit, 'F.FWD'),
-                buttons.TransportButton(unit, 'STOP'),
-                buttons.TransportButton(unit, 'PLAY'),
-                buttons.TransportButton(unit, 'REC'),
+            9: [buttons.Button(console, 'F7'),
+                buttons.Button(console, 'F8'),
+                buttons.Button(console, 'F9'),
+                buttons.Button(console, 'F10'),
+                buttons.Button(console, 'READ'),
+                buttons.Button(console, 'WRT'),
+                buttons.Button(console, 'TCH'),
+                buttons.Button(console, 'LATCH'),
+                buttons.Button(console, 'HIGH'),
+                buttons.Button(console, 'HI-MID'),
+                buttons.Button(console, 'LOW-MID'),
+                buttons.Button(console, 'LOW'),
+                buttons.ArrowButton(console, 'UP'),
+                buttons.ArrowButton(console, 'LEFT'),
+                buttons.ArrowButton(console, 'DOWN'),
+                buttons.ArrowButton(console, 'RIGHT'),
+                buttons.Button(console, 'REC ENABLE'),
+                buttons.NudgeButton(console, 'NUDGE LEFT', -1),
+                buttons.NudgeButton(console, 'NUDGE RIGHT', 1),
+                buttons.BankSwitchButton(console, 'BANK LEFT', -1),
+                buttons.BankSwitchButton(console, 'BANK RIGHT', 1),
+                buttons.Button(console, 'LOCATE LEFT'),
+                buttons.Button(console, 'LOCATE RIGHT'),
+                buttons.Button(console, 'SHTL'),
+                buttons.Button(console, 'SET'),
+                buttons.Button(console, 'IN'),
+                buttons.Button(console, 'OUT'),
+                buttons.TransportButton(console, 'REW'),
+                buttons.TransportButton(console, 'F.FWD'),
+                buttons.TransportButton(console, 'STOP'),
+                buttons.TransportButton(console, 'PLAY'),
+                buttons.TransportButton(console, 'REC'),
                 ]
             }