beremiz: comparison LPCBeremiz.py

equal deleted inserted replaced

-:ab7916df0de7
+:d071efd2a94b
 #include "iec_types.h"
 #else
 #include "iec_std_lib.h"
 #endif
+%(declare_code)s
 /* LPCBus plugin user variables definition */
 %(var_decl)s
 /* LPCBus plugin functions */
 int __init_%(location_str)s(int argc,char **argv)
 {
-%(declare_code)s
+%(init_code)s
 return 0;
 }
 void __cleanup_%(location_str)s(void)
 {
 location_str = "_".join(map(str, current_location))
 code_str = {"location_str": location_str,
 "var_decl": "",
 "declare_code": "",
+"init_code": "",
 "retrieve_code": "",
 "publish_code": "",
 }
-for variable in _GetVariables(self):
+for module in _GetModuleChildren(self):
-if variable["declare"] != "":
+if module["init"] != "":
-code_str["declare_code"] += "  %s\n" % variable["declare"]
+code_str["init_code"] += "  %s\n" % module["init"]
 # Adding variables
 vars = []
 self.ResetUsedLocations()
 for location in locations:
 if var["Retrieve"] != "":
 code_str["retrieve_code"] += "  " + var["Retrieve"] % ("*" + var["location"]) + "\n"
 if var["Publish"] != "":
 code_str["publish_code"] += "  " + var["Publish"] % ("*" + var["location"]) + "\n"
-Gen_Module_path = os.path.join(buildpath, "Module_%s.c"%location_str)
+Gen_Module_path = os.path.join(buildpath, "Bus_%s.c"%location_str)
 module = open(Gen_Module_path,'w')
 module.write(BUS_TEXT % code_str)
 module.close()
 matiec_flags = '"-I%s"'%os.path.abspath(self.GetPlugRoot().GetIECLibPath())
 return "Error: No bus found\n"
 self.PluginRoot.RemoveProjectVariableByFilter(str(iec_channel))
 self.PluginRoot.PluggedChilds["LPCBus"].remove(bus)
 self.RestartTimer()
-def AddModule(self, parent, iec_channel, name, icon=None):
+def AddModule(self, parent, iec_channel, name, icode, icon=None):
 module = self.PluginRoot.GetChildByIECLocation(parent)
 if module is None:
 return "Error: No parent found\n"
 for child in _GetModuleChildren(module):
 if child["name"] == name:
 return "Error: A module with IEC_channel %d already exists\n" % iec_channel
 _GetLastModuleGroup(module).append({"name": name,
 "type": LOCATION_MODULE,
 "IEC_Channel": iec_channel,
 "icon": icon,
+"init": icode,
 "children": []})
 self.RestartTimer()
 def RenameModule(self, iec_location, name):
 module = self.PluginRoot.GetChildByIECLocation(iec_location)
 if child["IEC_Channel"] == new_iec_channel:
 return "Error: A module with IEC_channel %d already exists\n" % new_iec_channel
 self.PluginRoot.UpdateProjectVariableLocation(".".join(map(str, old_iec_location)), ".".join(map(str, old_iec_location[:1] + (new_iec_channel,))))
 module["IEC_Channel"] = new_iec_channel
 self.RestartTimer()
+def ChangeModuleInitCode(self, iec_location, icode):
+module = self.PluginRoot.GetChildByIECLocation(iec_location)
+if module is None:
+return "Error: No module found\n"
+module["init"] = icode
 def RemoveModule(self, parent, iec_channel):
 module = self.PluginRoot.GetChildByIECLocation(parent)
 if module is None:
 return "Error: No parent found\n"
 child = _GetModuleBySomething(module, "IEC_Channel", (iec_channel,))
 "type": LOCATION_GROUP,
 "icon": icon,
 "children": []})
 self.RestartTimer()
-def AddVariable(self, parent, location, name, direction, type, dcode, rcode, pcode, description=""):
+def AddVariable(self, parent, location, name, direction, type, rcode, pcode, description=""):
 module = self.PluginRoot.GetChildByIECLocation(parent)
 if module is None:
 return "Error: No parent found\n"
 for child in _GetModuleChildren(module):
 if child["name"] == name:
 _GetLastModuleGroup(module).append({"name": name,
 "location": location,
 "type": LOCATION_TYPES[direction],
 "IEC_type": type,
 "description": description,
-"declare": dcode,
 "retrieve": rcode,
 "publish": pcode})
 self.RestartTimer()
-def ChangeVariableParams(self, parent, location, new_name, new_direction, new_type, new_dcode, new_rcode, new_pcode, new_description=None):
+def ChangeVariableParams(self, parent, location, new_name, new_direction, new_type, new_rcode, new_pcode, new_description=None):
 module = self.PluginRoot.GetChildByIECLocation(parent)
 if module is None:
 return "Error: No parent found\n"
 variable = None
 for child in _GetModuleChildren(module):
 if variable["name"] != new_name:
 self.PluginRoot.UpdateProjectVariableName(variable["name"], new_name)
 variable["name"] = new_name
 variable["type"] = LOCATION_TYPES[new_direction]
 variable["IEC_type"] = new_type
-variable["declare"] = new_dcode
 variable["retrieve"] = new_rcode
 variable["publish"] = new_pcode
 if new_description is not None:
 variable["description"] = new_description
 self.RestartTimer()
 "SetOnlineMode": ([str, str], 1),
 "AddBus": ([int, str, str], 1),
 "RenameBus": ([int, str], 0),
 "ChangeBusIECChannel": ([int, int], 0),
 "RemoveBus": ([int], 0),
-"AddModule": ([location, int, str, str], 1),
+"AddModule": ([location, int, str, str, str], 1),
 "RenameModule": ([location, str], 0),
 "ChangeModuleIECChannel": ([location, int], 0),
+"ChangeModuleInitCode": ([location, str], 0),
 "RemoveModule": ([location, int], 0),
 "StartGroup": ([location, str, str], 1),
-"AddVariable": ([location, location, str, str, str, str, str, str, str], 1),
+"AddVariable": ([location, location, str, str, str, str, str, str], 1),
-"ChangeVariableParams": ([location, location, str, str, str, str, str, str, str], 1),
+"ChangeVariableParams": ([location, location, str, str, str, str, str, str], 1),
 "RemoveVariable": ([location, location], 0)}.iteritems():
 setattr(LPCBeremiz_Cmd, "do_%s" % function, GetCmdFunction(function, arg_types, opt))
 lpcberemiz_cmd = LPCBeremiz_Cmd(PluginRoot, Log)
 lpcberemiz_cmd.cmdloop()

changeset 553	d071efd2a94b
parent 552	ab7916df0de7
child 555	7b08cc1ea55a