Merge branch 'RogueM-commit'

pimoroni · Feb 6, 2017 · 5a3963c · 5a3963c
2 parents 5cb2781 + 2ea531b
commit 5a3963c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/examples/input.py b/examples/input.py
@@ -5,7 +5,7 @@
 import automationhat
 
 
-if len(automationhat.light) > 0:
+if automationhat.is_automation_hat():
     automationhat.light.power.write(1)
 
 while True:

diff --git a/examples/output.py b/examples/output.py
@@ -5,17 +5,17 @@
 import automationhat
 
 
-if len(automationhat.light) > 0:
+if automationhat.is_automation_hat():
     automationhat.light.power.write(1)
 
 while True:
-    if len(automationhat.light) > 0:
+    if automationhat.is_automation_hat():
         automationhat.light.comms.toggle()
         automationhat.light.warn.toggle()
 
     automationhat.relay.one.toggle()
 
-    if len(automationhat.relay) > 1:
+    if automationhat.is_automation_hat():
         automationhat.relay.two.toggle()
         automationhat.relay.three.toggle()
 

diff --git a/examples/relay.py b/examples/relay.py
@@ -5,12 +5,12 @@
 import automationhat
 
 
-if len(automationhat.light) > 0:
+if automationhat.is_automation_hat():
     automationhat.light.power.write(1)
 
 while True:
     automationhat.relay.one.toggle()
-    if len(automationhat.relay) > 1:
+    if automationhat.is_automation_hat():
         automationhat.relay.two.toggle()
         automationhat.relay.three.toggle()
     time.sleep(0.1)
diff --git a/library/automationhat/__init__.py b/library/automationhat/__init__.py
@@ -24,6 +24,10 @@
 
 __version__ = '0.0.3'
 
+
+automation_hat = False
+automation_phat = False
+
 RELAY_1 = 13
 RELAY_2 = 19
 RELAY_3 = 16
@@ -232,6 +236,21 @@ def write(self, value):
             self.light_nc.write(1)
 
 
+def is_automation_hat():
+    return automation_hat
+
+def is_automation_phat():
+    return automation_phat
+
+
+if sn3218 is not None:
+    print("Automation HAT detected...")
+    automation_hat - True
+else:
+    print("Automation pHAT detected...")
+    automation_phat - True
+
+
 GPIO.setmode(GPIO.BCM)
 GPIO.setwarnings(False)
 
@@ -240,7 +259,7 @@ def write(self, value):
 analog._add(two=AnalogInput(1, 25.85, 1))
 analog._add(three=AnalogInput(2, 25.85, 2))
 
-if sn3218 is not None:
+if is_automation_hat():
     analog._add(four=AnalogInput(3, 3.3, None))
 
 input = ObjectCollection()
@@ -255,7 +274,7 @@ def write(self, value):
 
 relay = ObjectCollection()
 
-if sn3218 is None:
+if is_automation_phat():
     relay._add(one=Relay(RELAY_3, 0, 0))
 
 else:
@@ -265,7 +284,7 @@ def write(self, value):
 
 light = ObjectCollection()
 
-if sn3218 is not None:
+if is_automation_hat():
     light._add(power=SNLight(17))
     light._add(comms=SNLight(16))
     light._add(warn=SNLight(15))
@@ -286,15 +305,15 @@ def _auto_lights():
 
     time.sleep(0.01)
 
-if sn3218 is not None:
+if is_automation_hat():
     _t_auto_lights = AsyncWorker(_auto_lights)
     _t_auto_lights.start()
 
 _t_update_adc = AsyncWorker(_update_adc)
 _t_update_adc.start()
 
 def _cleanup():
-    if sn3218 is not None:
+    if is_automation_hat():
         _t_auto_lights.stop()
         sn3218.output([0] * 18)