Changeset 359

Timestamp:

Jan 31, 2012, 7:33:18 AM (13 years ago)

Author:

Rick van der Zwet

Message:

Add support for npm2000 power bars

Location:

powerbar

Files:

• npm2000.py (copied) (copied from powerbar/npm4000.py ) (2 diffs)
• npm4000.py (modified) (2 diffs)

powerbar/npm2000.py

@@ -19 +19 @@
 
 MAX_BUFFER = 100
-MAX_PORTS = 24
+# NPM4000
+#MAX_PORTS = 24
+# NPM2000
+MAX_PORTS = 8
 
 # XOR all the 8bit values to get a checksum
@@ -74 +77 @@
 
 def getPortName(number):
-    name = "U3"
-    if number <= 8:
-        name = "A%i" % number
-    elif number <= 16:
-        name = "B%i" % (number - 8)
-    elif number <= 24:
-        name = "C%i" % (number - 16)
-    else:
-        raise ValueError, "Port %i not defined" % number
+    if MAX_PORTS == 8:
+       name = "%i" % number
+    else:
+      if number <= 8:
+          name = "%Ai" % number
+      elif number <= 16:
+          name = "B%i" % (number - 8)
+      elif number <= 24:
+          name = "C%i" % (number - 16)
+      else:
+          raise ValueError, "Port %i not defined" % number
     return(name)
 

powerbar/npm4000.py

@@ -19 +19 @@
 
 MAX_BUFFER = 100
+# NPM4000
 MAX_PORTS = 24
+# NPM2000
+# MAX_PORTS = 8
 
 # XOR all the 8bit values to get a checksum
@@ -74 +77 @@
 
 def getPortName(number):
-    name = "U3"
-    if number <= 8:
-        name = "A%i" % number
-    elif number <= 16:
-        name = "B%i" % (number - 8)
-    elif number <= 24:
-        name = "C%i" % (number - 16)
-    else:
-        raise ValueError, "Port %i not defined" % number
+    if MAX_PORTS == 8:
+       name = "%i" % number
+    else:
+      if number <= 8:
+          name = "%Ai" % number
+      elif number <= 16:
+          name = "B%i" % (number - 8)
+      elif number <= 24:
+          name = "C%i" % (number - 16)
+      else:
+          raise ValueError, "Port %i not defined" % number
     return(name)