Merge pull request #56 from derco0n/master

Small Zonescanner improvements
trackmastersteve · Dec 9, 2018 · b9fec13 · b9fec13
2 parents b91e708 + 5176230
commit b9fec13
Show file tree

Hide file tree

Showing 12 changed files with 894 additions and 397 deletions.
diff --git a/alienfx/core/controller_m17xr4.py b/alienfx/core/controller_m17xr4.py
@@ -39,7 +39,7 @@ class AlienFXControllerM17xR4(alienfx_controller.AlienFXController):
     # Speed capabilities. The higher the number, the slower the speed of 
     # blink/morph actions. The min speed is selected by trial and error as 
     # the lowest value that will not result in strange blink/morph behaviour.
-    DEFAULT_SPEED = 200
+    DEFAULT_SPEED = 75
     MIN_SPEED = 50
 
     # Zone codes

diff --git a/alienfx/core/zonescanner.py b/alienfx/core/zonescanner.py
@@ -152,8 +152,8 @@ def scan(self):
                     zonename = self.askzonename()
                     self.zonesfound[zonename] = zone  # Store name an zone code in Dictionary
                 zone = zone*2
-
-            print("These are your zonecodes for current controller (\""+vendorstring + " / " + devicestring + "\"):")
+            print("")
+            print("These are your " + str(len(self.zonesfound.items())) + " zonecodes for the current controller (\"VID: "+vendorstring + " / DEV: " + devicestring + "\"):")
             for z in self.zonesfound.items():
                 print(z[0]+": 0x"+format(z[1], '04x'))  # Print out each zone found
             print("")

diff --git a/alienfx/data/themes/17r4_allblue.json b/alienfx/data/themes/17r4_allblue.json
@@ -395,7 +395,7 @@
       ]
     }
   ],
-  "speed": 200,
+  "speed": 75,
   "AC Charging": [
     {
       "zones": [