equal
deleted
inserted
replaced
1335 {"PT":" (*fp)((void*)&%(C_path)s,%(type)s_P_ENUM);\n", |
1335 {"PT":" (*fp)((void*)&%(C_path)s,%(type)s_P_ENUM);\n", |
1336 "VAR":" (*fp)((void*)&%(C_path)s,%(type)s_ENUM);\n"}[v["vartype"]]%v |
1336 "VAR":" (*fp)((void*)&%(C_path)s,%(type)s_ENUM);\n"}[v["vartype"]]%v |
1337 for v in self._VariablesList if v["vartype"] != "FB" and v["type"] in DebugTypes ]), |
1337 for v in self._VariablesList if v["vartype"] != "FB" and v["type"] in DebugTypes ]), |
1338 "find_variable_case_code":"\n".join([ |
1338 "find_variable_case_code":"\n".join([ |
1339 " case %(num)s:\n"%v+ |
1339 " case %(num)s:\n"%v+ |
1340 " varp = (void*)&%(C_path)s;\n"%v+ |
1340 " *varp = (void*)&%(C_path)s;\n"%v+ |
1341 {"PT":" return %(type)s_P_ENUM;\n", |
1341 {"PT":" return %(type)s_P_ENUM;\n", |
1342 "VAR":" return %(type)s_ENUM;\n"}[v["vartype"]]%v |
1342 "VAR":" return %(type)s_ENUM;\n"}[v["vartype"]]%v |
1343 for v in self._VariablesList if v["vartype"] != "FB" and v["type"] in DebugTypes ])} |
1343 for v in self._VariablesList if v["vartype"] != "FB" and v["type"] in DebugTypes ])} |
1344 |
1344 |
1345 return debug_code |
1345 return debug_code |
1610 self.IECdebug_datas.pop(IECPathToPop) |
1610 self.IECdebug_datas.pop(IECPathToPop) |
1611 |
1611 |
1612 if Idxs: |
1612 if Idxs: |
1613 Idxs.sort() |
1613 Idxs.sort() |
1614 self.TracedIECPath = zip(Idxs)[2] |
1614 self.TracedIECPath = zip(Idxs)[2] |
1615 self._connector.SetTraceVariablesList(zip(zip(Idxs)[0:1])) |
1615 self._connector.SetTraceVariablesList(zip(*zip(*Idxs)[0:2])) |
1616 self.IECdebug_lock.release() |
1616 self.IECdebug_lock.release() |
1617 |
1617 |
1618 #for IEC_path, IECdebug_data in self.IECdebug_datas.iteritems(): |
1618 #for IEC_path, IECdebug_data in self.IECdebug_datas.iteritems(): |
1619 # print IEC_path, IECdebug_data[0].keys() |
1619 # print IEC_path, IECdebug_data[0].keys() |
1620 |
1620 |