Bugfixes

* changed signum for offset calculation
* added error handling if a non-existent signal is to be removed from a message

CANLibrary/CanMessage.py

@@ -62,7 +62,11 @@ class CanMessage(object):
         self.Signals.update({CanSignal.Label: CanSignal})
         
     def removeSignal(self, CanSignalLabel):
-        self.Signals.pop(CanSignalLabel)
+        try:
+            self.Signals.pop(CanSignalLabel)
+        except:
+            pass
+            
         
     def clearSignals(self):
         self.Signals = {}

CANLibrary/CanSignal.py

@@ -41,7 +41,7 @@ class CanSignal(object):
         '''
         #if not (len(Data) == self.Length):
         #    sys.exit('Data has invalid length')
-        tmpData = int((SignalData+self.Offset) / self.Scaling)
+        tmpData = int((SignalData-self.Offset) / self.Scaling)
         self.Data = []
         for i in range(0, int(self.Length/8)+1):
             self.Data.append ( (tmpData >> (8*i) ) & 0xff )