Mercurial Mercurial > beremiz / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
fixed typo in latest debugger changes
authoredouard
Fri, 01 Apr 2011 16:17:38 +0200
changeset 593 726f58cf97e3
parent 592 c6408f92da0a
child 594 120bc22302a1
fixed typo in latest debugger changes
connectors/LPC/LPCAppObject.py file | annotate | diff | comparison | revisions
runtime/PLCObject.py file | annotate | diff | comparison | revisions
targets/typemapping.py file | annotate | diff | comparison | revisions 
--- a/connectors/LPC/LPCAppObject.py	Thu Mar 31 19:09:49 2011 +0200
+++ b/connectors/LPC/LPCAppObject.py	Fri Apr 01 16:17:38 2011 +0200
@@ -54,35 +54,6 @@
             return data[:32] == MD5[:32]
         return False
 
-    class IEC_STRING(ctypes.Structure):
-        """
-        Must be changed according to changes in iec_types.h
-        """
-        _fields_ = [("len", ctypes.c_uint8),
-                    ("body", ctypes.c_char * 126)] 
-    
-    TypeTranslator = {"BOOL" :       (ctypes.c_uint8,  lambda x:x.value!=0,     lambda t,x:t(x)),
-                      "STEP" :       (ctypes.c_uint8,  lambda x:x.value,        lambda t,x:t(x)),
-                      "TRANSITION" : (ctypes.c_uint8,  lambda x:x.value,        lambda t,x:t(x)),
-                      "ACTION" :     (ctypes.c_uint8,  lambda x:x.value,        lambda t,x:t(x)),
-                      "SINT" :       (ctypes.c_int8,   lambda x:x.value,        lambda t,x:t(x)),
-                      "USINT" :      (ctypes.c_uint8,  lambda x:x.value,        lambda t,x:t(x)),
-                      "BYTE" :       (ctypes.c_uint8,  lambda x:x.value,        lambda t,x:t(x)),
-                      "STRING" :     (IEC_STRING,      lambda x:x.body[:x.len], lambda t,x:t(len(x),x)),
-                      "INT" :        (ctypes.c_int16,  lambda x:x.value,        lambda t,x:t(x)),
-                      "UINT" :       (ctypes.c_uint16, lambda x:x.value,        lambda t,x:t(x)),
-                      "WORD" :       (ctypes.c_uint16, lambda x:x.value,        lambda t,x:t(x)),
-                      "WSTRING" :    (None,            None,                    None),#TODO
-                      "DINT" :       (ctypes.c_int32,  lambda x:x.value,        lambda t,x:t(x)),
-                      "UDINT" :      (ctypes.c_uint32, lambda x:x.value,        lambda t,x:t(x)),
-                      "DWORD" :      (ctypes.c_uint32, lambda x:x.value,        lambda t,x:t(x)),
-                      "LINT" :       (ctypes.c_int64,  lambda x:x.value,        lambda t,x:t(x)),
-                      "ULINT" :      (ctypes.c_uint64, lambda x:x.value,        lambda t,x:t(x)),
-                      "LWORD" :      (ctypes.c_uint64, lambda x:x.value,        lambda t,x:t(x)),
-                      "REAL" :       (ctypes.c_float,  lambda x:x.value,        lambda t,x:t(x)),
-                      "LREAL" :      (ctypes.c_double, lambda x:x.value,        lambda t,x:t(x)),
-                      } 
-
     def SetTraceVariablesList(self, idxs):
         """
         Call ctype imported function to append 
@@ -97,7 +68,7 @@
                           ctypes.pointer(
                            ctypes.c_uint32(idx)),4)
                 if force !=None:
-                    c_type,unpack_func, pack_func = self.TypeTranslator.get(iectype, (None,None,None))
+                    c_type,unpack_func, pack_func = TypeTranslator.get(iectype, (None,None,None))
                     forced_type_size = ctypes.sizeof(c_type)
                     forced_type_size_str = chr(forced_type_size)
                     forcestr = ctypes.string_at(
@@ -131,7 +102,7 @@
                       ctypes.c_void_p)
             for idx, iectype, forced in self._Idxs:
                 cursor = ctypes.c_void_p(buff.value + offset)
-                c_type,unpack_func, pack_func = self.TypeTranslator.get(iectype, (None,None,None))
+                c_type,unpack_func, pack_func = TypeTranslator.get(iectype, (None,None,None))
                 if c_type is not None and offset < size:
                     res.append(unpack_func(ctypes.cast(cursor,
                                                        ctypes.POINTER(c_type)).contents))
--- a/runtime/PLCObject.py	Thu Mar 31 19:09:49 2011 +0200
+++ b/runtime/PLCObject.py	Fri Apr 01 16:17:38 2011 +0200
@@ -25,7 +25,6 @@
 import Pyro.core as pyro
 from threading import Timer, Thread, Lock
 import ctypes, os, commands, types, sys
-from datetime import timedelta as td
 from targets.typemapping import SameEndianessTypeTranslator as TypeTranslator
 
 if os.name in ("nt", "ce"):
@@ -337,7 +336,7 @@
             for idx,iectype,force in idxs:
                 if force !=None:
                     c_type,unpack_func, pack_func = \
-                        self.TypeTranslator.get(iectype,
+                        TypeTranslator.get(iectype,
                                                 (None,None,None))
                     force = ctypes.byref(pack_func(c_type,force)) 
                 self._RegisterDebugVariable(idx, force)
@@ -364,7 +363,7 @@
                     for idx, iectype, forced in self._Idxs:
                         cursor = ctypes.c_void_p(buffer.value + offset)
                         c_type,unpack_func, pack_func = \
-                            self.TypeTranslator.get(iectype,
+                            TypeTranslator.get(iectype,
                                                     (None,None,None))
                         if c_type is not None and offset < size.value:
                             res.append(unpack_func(
--- a/targets/typemapping.py	Thu Mar 31 19:09:49 2011 +0200
+++ b/targets/typemapping.py	Fri Apr 01 16:17:38 2011 +0200
@@ -20,6 +20,7 @@
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from ctypes import *
+from datetime import timedelta as td
 
 class IEC_STRING(Structure):
     """
beremiz