# HG changeset patch # User lbessard # Date 1229100857 -3600 # Node ID ff7c8eb3f36233e64aacb321dc936af2ec2ce3db # Parent 8628f3dd0979e2d2837ab18ac534100e9223de02 Adding Function Blocks in VARIABLES.csv diff -r 8628f3dd0979 -r ff7c8eb3f362 plugger.py --- a/plugger.py Wed Dec 10 17:37:21 2008 +0100 +++ b/plugger.py Fri Dec 12 17:54:17 2008 +0100 @@ -1065,7 +1065,7 @@ "extern_variables_declarations":"\n".join([ {"PT":"extern %(type)s *%(C_path)s;", "VAR":"extern %(type)s %(C_path)s;"}[v["vartype"]]%v - for v in self._VariablesList if v["C_path"].find('.')<0]), + for v in self._VariablesList if v["vartype"] != "FB" and v["C_path"].find('.')<0]), "subscription_table_count": len(self._VariablesList), "variables_pointer_type_table_count": @@ -1074,7 +1074,7 @@ {"PT":" variable_table[%(num)s].ptrvalue = (void*)(%(C_path)s);\n", "VAR":" variable_table[%(num)s].ptrvalue = (void*)(&%(C_path)s);\n"}[v["vartype"]]%v + " variable_table[%(num)s].type = %(type)s_ENUM;\n"%v - for v in self._VariablesList if v["type"] in DebugTypes ])} + for v in self._VariablesList if v["vartype"] != "FB" and v["type"] in DebugTypes ])} return debug_code