equal
deleted
inserted
replaced
116 self.DebugTicks = [] |
116 self.DebugTicks = [] |
117 self.SetAppFrame(frame, logger) |
117 self.SetAppFrame(frame, logger) |
118 |
118 |
119 self.iec2c_path = os.path.join(base_folder, "matiec", "iec2c"+(".exe" if wx.Platform == '__WXMSW__' else "")) |
119 self.iec2c_path = os.path.join(base_folder, "matiec", "iec2c"+(".exe" if wx.Platform == '__WXMSW__' else "")) |
120 self.ieclib_path = os.path.join(base_folder, "matiec", "lib") |
120 self.ieclib_path = os.path.join(base_folder, "matiec", "lib") |
|
121 self.ieclib_c_path = os.path.join(base_folder, "matiec", "lib", "C") |
121 |
122 |
122 # Setup debug information |
123 # Setup debug information |
123 self.IECdebug_datas = {} |
124 self.IECdebug_datas = {} |
124 self.IECdebug_lock = Lock() |
125 self.IECdebug_lock = Lock() |
125 |
126 |
202 |
203 |
203 def GetCTRoot(self): |
204 def GetCTRoot(self): |
204 return self |
205 return self |
205 |
206 |
206 def GetIECLibPath(self): |
207 def GetIECLibPath(self): |
207 return self.ieclib_path |
208 return self.ieclib_c_path |
208 |
209 |
209 def GetIEC2cPath(self): |
210 def GetIEC2cPath(self): |
210 return self.iec2c_path |
211 return self.iec2c_path |
211 |
212 |
212 def GetCurrentLocation(self): |
213 def GetCurrentLocation(self): |
438 |
439 |
439 def GetLibrariesCCode(self, buildpath): |
440 def GetLibrariesCCode(self, buildpath): |
440 if len(self.Libraries)==0: |
441 if len(self.Libraries)==0: |
441 return [],[],() |
442 return [],[],() |
442 self.GetIECProgramsAndVariables() |
443 self.GetIECProgramsAndVariables() |
443 LibIECCflags = '"-I%s/C" -Wno-unused-function'%os.path.abspath(self.GetIECLibPath()) |
444 LibIECCflags = '"-I%s" -Wno-unused-function'%os.path.abspath(self.GetIECLibPath()) |
444 LocatedCCodeAndFlags=[] |
445 LocatedCCodeAndFlags=[] |
445 Extras=[] |
446 Extras=[] |
446 for lib in self.Libraries: |
447 for lib in self.Libraries: |
447 res=lib.Generate_C(buildpath,self._VariablesList,LibIECCflags) |
448 res=lib.Generate_C(buildpath,self._VariablesList,LibIECCflags) |
448 LocatedCCodeAndFlags.append(res[:2]) |
449 LocatedCCodeAndFlags.append(res[:2]) |
673 # Keep track of generated located variables for later use by self._Generate_C |
674 # Keep track of generated located variables for later use by self._Generate_C |
674 self.PLCGeneratedLocatedVars = self.GetLocations() |
675 self.PLCGeneratedLocatedVars = self.GetLocations() |
675 # Keep track of generated C files for later use by self.CTNGenerate_C |
676 # Keep track of generated C files for later use by self.CTNGenerate_C |
676 self.PLCGeneratedCFiles = C_files |
677 self.PLCGeneratedCFiles = C_files |
677 # compute CFLAGS for plc |
678 # compute CFLAGS for plc |
678 self.plcCFLAGS = '"-I%s/C" -Wno-unused-function'%self.ieclib_path |
679 self.plcCFLAGS = '"-I%s" -Wno-unused-function'%self.ieclib_c_path |
679 return True |
680 return True |
680 |
681 |
681 def GetBuilder(self): |
682 def GetBuilder(self): |
682 """ |
683 """ |
683 Return a Builder (compile C code into machine code) |
684 Return a Builder (compile C code into machine code) |