Merge d56f8992a5 into 2b095c8c77

modules/base_plugins/gpio_actor/__init__.py

@@ -62,9 +62,10 @@ class GPIOPWM(ActorBase):
         :param power: int value between 0 - 100
         :return: 
         '''
-        if power is not None:
-            self.power = int(power)
-        self.p.ChangeDutyCycle(self.power)
+        if self.p:
+            if power is not None:
+                self.power = int(power)
+            self.p.ChangeDutyCycle(self.power)
 
     def off(self):
         print "GPIO OFF"
@@ -104,4 +105,24 @@ class Dummy(ActorBase):
         print "OFF"
 
 
+@cbpi.actor
+class DummyPWM(ActorBase):
+
+    power = 100
+
+    def on(self, power=100):
+        '''
+        Code to switch on the actor
+        :param power: int value between 0 - 100
+        :return:
+        '''
+        self.power = int(power) if power is not None else 100
+        print "DummyPWM ON %s" % self.power
+
+    def off(self):
+        self.power = 100
+        print "OFF"
 
+    def set_power(self, power):
+        self.power = int(power)
+        print "DummyPWM POWER %s" % self.power

modules/core/core.py

@@ -485,7 +485,7 @@ class CraftBeerPi(ActorAPI, SensorAPI):
                 try:
                     method(self)
                 except Exception as e:
-                    self.app.logger.error("Exception" + method.__name__ + ": " + str(e))
+                    self.app.logger.error("Exception " + method.__name__ + ": " + str(e))
                 self.socketio.sleep(interval)