From c35e26f02579730222ad69ad8be9082f3993b2fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20S=FCltrop?=
 <christian.sueltrop@leb.eei.uni-erlangen.de>
Date: Thu, 26 Jul 2012 11:07:00 +0200
Subject: [PATCH] Bugfixes * changed signum for offset calculation * added
 error handling if a non-existent signal is to be removed from a message

---
 CANLibrary/CanMessage.py  |   6 +++++-
 CANLibrary/CanMessage.pyc | Bin 3499 -> 3519 bytes
 CANLibrary/CanSignal.py   |   2 +-
 CANLibrary/CanSignal.pyc  | Bin 1879 -> 1879 bytes
 4 files changed, 6 insertions(+), 2 deletions(-)

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 7216d65555e048e8efe9dfa2d293a2537245969c..429405f3839933494a686faeea2abdebe5f8f800 100644
GIT binary patch
delta 100
zcmZ22y<eJx`7<w<{a=BAjT{2(+RO|L49-AYtOO(~MHp%r7_xwfk)ei>p_!3^F+7i*
zfsv6hkC7o_vMKvCZVsR_21aH^5k}_87ucsUx^GVBxX8@tHQAEqF(dnAS>8SX!qgMW

delta 80
zcmdlly;_=s`7<w<qUB%zjT{2(vP=vN49-AYECM8I7#OmEh>@X&k)fH9fpM}k`!rUN
e3Wmu~*rzc%Z?5LJ$js<A*_Y=rBlBcK-aY`OI1#-7

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 8c6cff1a64b9de3e7bca57fcbdb9ada3b11d9b33..fcfa92a5ed3338585291627d8a838daca268b301 100644
GIT binary patch
delta 24
fcmcc4cb$)e`7<vUKZjtzMh+1cMv2X`ELO|_P)G$+

delta 24
gcmcc4cb$)e`7<w9(x+ek8#zQ+7{xcsvRE+#0By7fcK`qY