Merge pull request #65 from julianschill/develop

Merge develop to master

Author: julianschill

src/led_effect.py

@@ -35,7 +35,7 @@ def __setitem__(self, a, v):
             super(colorArray, self).__setitem__(a*3+1, v[1])
             super(colorArray, self).__setitem__(a*3+2, v[2])
     def __len__(self):
-        return super(colorArray, self).__len__() / 3
+        return super(colorArray, self).__len__() // 3
     def reverse(self):
         self[:] = [c for cl in range(len(self)-1,-1, -1)
                         for c in self[cl]]
@@ -794,7 +794,7 @@ def nextFrame(self, eventtime):
                self.frameHandler.heaterCurrent[self.handler.heater] > 0.0:
 
                 if self.frameHandler.heaterCurrent[self.handler.heater] <= \
-                   self.frameHandler.heaterTarget[self.handler.heater]-5:
+                   self.frameHandler.heaterTarget[self.handler.heater]-2:
 
                     s = int((self.frameHandler.
                                 heaterCurrent[self.handler.heater] / 
@@ -963,7 +963,7 @@ def nextFrame(self, eventtime):
             heaterLast    = self.frameHandler.heaterLast[self.handler.heater]
 
             if heaterTarget > 0.0 and heaterCurrent > 0.0:
-                if heaterCurrent <= heaterTarget-5:
+                if heaterCurrent <= heaterTarget-2:
                     spark = int((heaterCurrent / heaterTarget) * 80)
                     brightness = int((heaterCurrent / heaterTarget) * 100)
                 elif self.effectCutoff > 0: