From c29b227726d85012bf1a9702f1f52ff2f4768726 Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <jonas@zeunert.org>
Date: Wed, 11 Mar 2020 21:41:56 +0100
Subject: [PATCH] rework flipper

---
 Flipper.py               |  9 ---------
 events/StartGameEvent.py |  6 ++++--
 networking/Networking.py |  6 ++++++
 solenoids/Flipper.py     | 11 +++++++++++
 solenoids/MainFlipper.py |  6 ++++++
 solenoids/TopFlipper.py  |  6 ++++++
 6 files changed, 33 insertions(+), 11 deletions(-)
 delete mode 100644 Flipper.py
 create mode 100644 solenoids/Flipper.py
 create mode 100644 solenoids/MainFlipper.py
 create mode 100644 solenoids/TopFlipper.py

diff --git a/Flipper.py b/Flipper.py
deleted file mode 100644
index 00d4044..0000000
--- a/Flipper.py
+++ /dev/null
@@ -1,9 +0,0 @@
-class Flipper:
-    def __init__(self):
-        pass
-
-    def activate(self):
-        pass
-
-    def deactivate(self):
-        pass
\ No newline at end of file
diff --git a/events/StartGameEvent.py b/events/StartGameEvent.py
index 528ff52..ece6b21 100644
--- a/events/StartGameEvent.py
+++ b/events/StartGameEvent.py
@@ -1,8 +1,10 @@
 from solenoids.OutHoleSolenoid import OutHoleSolenoid
+from solenoids.MainFlipper import MainFlipper
+
 
 class StartGameEvent:
-    def __init__(self, flipper):
-        self.flipper = flipper
+    def __init__(self):
+        self.flipper = MainFlipper()
         self.outHoleSolenoid = OutHoleSolenoid()
 
     def trigger(self):
diff --git a/networking/Networking.py b/networking/Networking.py
index bf4a9a2..4f10e5b 100644
--- a/networking/Networking.py
+++ b/networking/Networking.py
@@ -42,6 +42,12 @@ class Networking(metaclass=Singleton):
         
     def deactivateLamp(self, lamp):
         self.get("/lamps/" + lamp + "/deactivate")
+
+    def activateFlipper(self, name):
+        self.get("/flippers/" + name + "/activate")
+
+    def deactivateFlipper(self, name):
+        self.get("/flippers/" + name + "deactivate")
         
     def lampStatus(self, lamp):
         return json.loads(self.get("/lamps/" + lamp + "/status"))
diff --git a/solenoids/Flipper.py b/solenoids/Flipper.py
new file mode 100644
index 0000000..2753b75
--- /dev/null
+++ b/solenoids/Flipper.py
@@ -0,0 +1,11 @@
+from networking.Networking import Networking
+
+class Flipper:
+    def __init__(self, name):
+        self.name = name
+
+    def activate(self):
+        Networking().activateFlipper(self.name)
+
+    def deactivate(self):
+        Networking().deactivateFlipper(self.name)
\ No newline at end of file
diff --git a/solenoids/MainFlipper.py b/solenoids/MainFlipper.py
new file mode 100644
index 0000000..8fcde18
--- /dev/null
+++ b/solenoids/MainFlipper.py
@@ -0,0 +1,6 @@
+from solenoids.Flipper import Flipper
+
+
+class MainFlipper(Flipper):
+    def __init__(self):
+        super(Flipper, self).__init__("Flipper Relay")
\ No newline at end of file
diff --git a/solenoids/TopFlipper.py b/solenoids/TopFlipper.py
new file mode 100644
index 0000000..158327c
--- /dev/null
+++ b/solenoids/TopFlipper.py
@@ -0,0 +1,6 @@
+from solenoids.Flipper import Flipper
+
+
+class TopFlipper(Flipper):
+    def __init__(self):
+        super(TopFlipper, self).__init__("Top Flipper Relay")
\ No newline at end of file