fix for L long

pimonitor/PMMain.py

@@ -12,6 +12,7 @@ import time
 import cPickle as pickle
 import platform
 import re
+import sys
 
 from pimonitor.PM import PM
 from pimonitor.PMConnection import PMConnection
@@ -31,8 +32,6 @@ def stringSplitByNumbers(x):
 
 if __name__ == '__main__':
 
-    print platform.system()
-
     if platform.system() == "Linux":
         from evdev import InputDevice, list_devices
 
@@ -66,7 +65,9 @@ if __name__ == '__main__':
         pickle.dump(defined_parameters, output, -1)
         output.close()
 
-    if platform.system() == "Linux":
+    if len(sys.argv) > 1 and sys.argv[1] == "demo":
+        connection = PMDemoConnection()
+    elif platform.system() == "Linux":
         connection = PMConnection()
     else:
         connection = PMDemoConnection()

pimonitor/cu/PMCUContext.py

@@ -34,11 +34,15 @@ class PMCUContext(object):
                   (data[PMCUContext.RESPONSE_ROM_ID_OFFSET() + 3] << 8) |
                   (data[PMCUContext.RESPONSE_ROM_ID_OFFSET() + 4])) & 0xFFFFFFFFFF
 
-        return hex(rom_id).lstrip("0x").upper()
+        rom_id = hex(rom_id).lstrip("0x").upper()
+        if rom_id[-1] == "L":
+            rom_id = rom_id[:-1]
+        return rom_id
 
     def match_parameters(self, parameters):
         matched = []
         rom_id = self.get_rom_id()
+        print 'rom id=' + rom_id
 
         for parameter in parameters:
             if parameter.get_target() not in self._targets:
@@ -51,6 +55,7 @@ class PMCUContext(object):
                     matched.append(parameter)
             elif cu_type == PMCUParameter.CU_TYPE_FIXED_ADDRESS_PARAMETER():
                 if parameter.is_supported(rom_id):
+                    print 'match=' + parameter.get_id()
                     parameter.switch_to_id(rom_id)
                     matched.append(parameter)
 
@@ -84,4 +89,4 @@ class PMCUContext(object):
                     parameter.fill_dependencies(supported_parameters)
                     matched.append(parameter)
 
-        return matched
+        return matched

pimonitor/ui/PMSingleWindow.py

@@ -68,7 +68,7 @@ class PMSingleWindow(object):
         avg_value_lbl = None
         if self._readings != 0:
             avg_value_lbl = self._unit_font.render("%.2f" % (self._sum_value / self._readings), self._font_aa, self._fg_color_dim)
-            self._surface.blit(avg_value_lbl, (self._end_x_offset, 10 + self._title_lbl.get_height() + value_lbl.get_height()))
+            self._surface.blit(avg_value_lbl, (self._x_offset + value_lbl_width/2, 10 + self._title_lbl.get_height() + value_lbl.get_height()))
 
         self._surface.blit(self._title_lbl, (2, 2))
         self._surface.blit(value_lbl, (self._x_offset, 10 + self._title_font_size))

run.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo PYTHONPATH=. python2.7 /home/pi/devel/PiMonitor/pimonitor/PMMain.py
+sudo PYTHONPATH=. python2.7 /home/pi/devel/PiMonitor/pimonitor/PMMain.py $1