# HG changeset patch # User Laurent Bessard # Date 1339679802 -7200 # Node ID e8a0af6b89d9c59193ff0162ac81721f72090de6 # Parent 0c697b8fc443e1d7c2ba88be8db9cc4e50c36b72 Adding support for LPC pous library using new Beremiz extension paradigm diff -r 0c697b8fc443 -r e8a0af6b89d9 LPCManager.py --- a/LPCManager.py Fri Jun 08 12:40:31 2012 +0200 +++ b/LPCManager.py Thu Jun 14 15:16:42 2012 +0200 @@ -70,7 +70,7 @@ import targets from LPCtarget import LPC_target targets.targets["LPC"] = {"xsd": os.path.join(_base_path, "LPCtarget", "XSD"), - "class": lambda:LPC_target, + "class": lambda: LPC_target, "code": os.path.join(_base_path,"LPCtarget","plc_LPC_main.c")} targets.toolchains["makefile"] = os.path.join(_base_path, "LPCtarget", "XSD_toolchain_makefile") @@ -79,6 +79,17 @@ misc.opjimg = lambda imgname: os.path.join(_base_folder, "beremiz", "images", imgname+".png") from Beremiz import * + +import features +from POULibrary import POULibrary + +class PLCLibrary(POULibrary): + def GetLibraryPath(self): + return os.path.join(_base_path, "pous.xml") + +features.libraries.append( + ('LPC', lambda: PLCLibrary)) + from ProjectController import ProjectController from ConfigTreeNode import ConfigTreeNode from ProjectNodeEditor import ProjectNodeEditor @@ -583,12 +594,12 @@ if self.GetChildByName("Master") is None: master = self.CTNAddChild("Master", "CanOpenNode", 0) - master.BaseParams.setEnabled(False) + #master.BaseParams.setEnabled(False) master.CTNRequestSave() if self.GetChildByName("Slave") is None: slave = self.CTNAddChild("Slave", "CanOpenSlave", 1) - slave.BaseParams.setEnabled(False) + #slave.BaseParams.setEnabled(False) slave.CTNRequestSave() @@ -603,7 +614,7 @@ @param dst: destination directory """ for i in os.listdir(src): - if not i.startswith('.') and i != "pous.xml": + if not i.startswith('.'): srcpath = os.path.join(src,i) dstpath = os.path.join(dst,i) if os.path.isdir(srcpath): @@ -686,12 +697,6 @@ infos["values"].append(resources) return infos - def ConfNodeLibraryFilePath(self): - if self.OrigBuildPath is not None: - return os.path.join(self.OrigBuildPath, "pous.xml") - else: - return ProjectController.ConfNodeLibraryFilePath(self) - def GetProjectName(self): return self.Project.getname() @@ -854,7 +859,7 @@ if havecanfestival and self.GetChildByName("CanOpen") is None: canopen = self.CTNAddChild("CanOpen", "CanOpen", 0) - canopen.BaseParams.setEnabled(False) + #canopen.BaseParams.setEnabled(False) canopen.LoadChildren() canopen.CTNRequestSave() @@ -1489,12 +1494,12 @@ leftwindowsizer = wx.BoxSizer(wx.HORIZONTAL) leftwindowvsizer.AddSizer(leftwindowsizer, 0, border=0, flag=0) - self.GenerateEnableButton(leftwindow, leftwindowsizer, confnode) + #self.GenerateEnableButton(leftwindow, leftwindowsizer, confnode) st = wx.StaticText(leftwindow, -1) st.SetFont(wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"])) st.SetLabel(confnode.GetFullIEC_Channel()) - leftwindowsizer.AddWindow(st, 0, border=5, flag=wx.RIGHT) + leftwindowsizer.AddWindow(st, 0, border=5, flag=wx.LEFT|wx.RIGHT) expandbutton_id = wx.NewId() expandbutton = wx.lib.buttons.GenBitmapToggleButton(id=expandbutton_id, bitmap=wx.Bitmap(Bpath( 'images', 'plus.png')), diff -r 0c697b8fc443 -r e8a0af6b89d9 pous.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pous.xml Thu Jun 14 15:16:42 2012 +0200 @@ -0,0 +1,551 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 100.0 then + RH := 100.0; + end_if; + DEW_POINT:=sqrt(sqrt(sqrt(RH/100.0)))*(112.0+(0.9*TEMP))+(0.1*TEMP)-112.0;]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +,WORD1,__GetRetainData(__GET_VAR(data__->READ),__GET_VAR(data__->INDEX),0)); +__SET_VAR(data__->,WORD2,__GetRetainData(__GET_VAR(data__->READ),__GET_VAR(data__->INDEX),1)); +__SET_VAR(data__->,WORD3,__GetRetainData(__GET_VAR(data__->READ),__GET_VAR(data__->INDEX),2)); +__SET_VAR(data__->,RD_OK,__GetReadStatus(0)); +}]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +,WR_OK,__SetRetainData(__GET_VAR(data__->WRITE),__GET_VAR(data__->INDEX),__GET_VAR(data__->WORD1),__GET_VAR(data__->WORD2),__GET_VAR(data__->WORD3))); +}]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +,FOUND,__FindRetainData(__GET_VAR(data__->SEARCH),__GET_VAR(data__->START_IDX),__GET_VAR(data__->END_IDX),__GET_VAR(data__->WORD1),__GET_VAR(data__->WORD2),__GET_VAR(data__->WORD3))); +__SET_VAR(data__->,INDEX,__GetFoundIndex(0)); +}]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TON_1_Q, + ET => ET1 + ); +if TON_1_Q then + if REVERSE then + Error_n := SET_POINT - ACTUAL_VALUE; + else + Error_n := ACTUAL_VALUE - SET_POINT; + end_if; + if Td_FADEOUT <= T#0.05s then + Td_FADEOUT := t#0.05s; + end_if; + CTr := TIME_TO_REAL (CYCLE_TIME); + FTr := TIME_TO_REAL (Td_FADEOUT); + power := CTr / FTr; + D_Fadeout := EXPT( 0.04979 , power ); (*time to reach 5% = e^(-3) *) + Dout := Kd_GAIN * (Error_n - 2.0 * Error_n1 + Error_n2); + Dout_n := Dout + Dout_1 * D_Fadeout; + Dout_int := Dout_int + Dout_n; + OUTchk := OUTchk + Kp_GAIN * (Error_n - Error_n1) + Ki_GAIN * Error_n * CTr; + R_chk:= bool_to_int(REVERSE) + bool_to_int(Reverse_1); + if (Soft_t or R_chk=1) then + Dout_int := 0.0; + Dout_n := 0.0; + Dout_1:= 0.0; + Dout:= 0.0; + OUTchk:= OUT; + Error_n1:=Error_n; + Error_n2:=Error_n; + Soft_t := 0; + end_if; + if R_chk =1 then + Error_n:=0.0; + Soft_t := True; + end_if; + + if OUTchk > OUT_MAX then + OUTchk := OUT_MAX; + end_if; + + if OUTchk < OUT_MIN then + OUTchk := OUT_MIN; + end_if; + + if MANUAL then + OUT := MANUAL_REF; + OUTchk:= OUT; + Dout_int := 0.0; + Dout_n := 0.0; + Dout_1:= 0.0; + else + if abs(Error_n) < DEAD_BAND or HOLD then + OUT := OUT; + OUTchk:= OUT; + Dout_int := 0.0; + Dout_n := 0.0; + Dout_1:= 0.0; + else + OUT := OUTchk + Dout_int; + end_if; + end_if; + + if OUT > OUT_MAX then + OUT := OUT_MAX; + end_if; + + if OUT < OUT_MIN then + OUT := OUT_MIN; + end_if; + + Error_n2 := Error_n1; + Error_n1 := Error_n; + Dout_1:=Dout_n; + Reverse_1 := REVERSE; +else + OUT:=OUT; +end_if;]]> + + + + + + + + +