diff --git a/CANLibrary/CanMessage.py b/CANLibrary/CanMessage.py index 8e3b161..a06f170 100644 --- a/CANLibrary/CanMessage.py +++ b/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 = {} diff --git a/CANLibrary/CanMessage.pyc b/CANLibrary/CanMessage.pyc index 7216d65..429405f 100644 Binary files a/CANLibrary/CanMessage.pyc and b/CANLibrary/CanMessage.pyc differ diff --git a/CANLibrary/CanSignal.py b/CANLibrary/CanSignal.py index a36f9e8..7c85077 100644 --- a/CANLibrary/CanSignal.py +++ b/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 ) \ No newline at end of file diff --git a/CANLibrary/CanSignal.pyc b/CANLibrary/CanSignal.pyc index 8c6cff1..fcfa92a 100644 Binary files a/CANLibrary/CanSignal.pyc and b/CANLibrary/CanSignal.pyc differ