Renames for more generic use

2018-03-21 16:48:13 -05:00
parent 8f45ef23f1
commit 6591b1381d
153 changed files with 6 additions and 4 deletions
--- a/GPSFlowSkid/Controller/Controller.acfproj
+++ b/GPSFlowSkid/Controller/Controller.acfproj
@@ -15,6 +15,7 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Online' ">
    <OutputPath>bin\Online\</OutputPath>
  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Simulation' " />
  <Import Project="$(DevEnvDir)\PackagesToLoad\Targets\ISaGRAF.ISaGRAF5.targets" />
  <Import Project="$(DevEnvDir)\PackagesToLoad\Targets\ISaGRAF.CCW.targets" />
 </Project>
--- a/GPSFlowSkid/Controller/Controller/Breakpoints.lst
+++ b/GPSFlowSkid/Controller/Controller/Breakpoints.lst
--- a/GPSFlowSkid/Controller/Controller/CONTROLLER.err
+++ b/GPSFlowSkid/Controller/Controller/CONTROLLER.err
--- a/GPSFlowSkid/Controller/Controller/Compile.ic
+++ b/GPSFlowSkid/Controller/Controller/Compile.ic
--- a/GPSFlowSkid/Controller/Controller/Conf.mtc
+++ b/GPSFlowSkid/Controller/Controller/Conf.mtc
--- a/GPSFlowSkid/Controller/Controller/DevicePref.xml
+++ b/GPSFlowSkid/Controller/Controller/DevicePref.xml
--- a/GPSFlowSkid/Controller/Controller/DlgCfg.xml
+++ b/GPSFlowSkid/Controller/Controller/DlgCfg.xml
--- a/GPSFlowSkid/Controller/Controller/ISaVIEW/Default/Default.HAD
+++ b/GPSFlowSkid/Controller/Controller/ISaVIEW/Default/Default.HAD
--- a/GPSFlowSkid/Controller/Controller/LogicalValues.csv
+++ b/GPSFlowSkid/Controller/Controller/LogicalValues.csv
--- a/GPSFlowSkid/Controller/Controller/MbSrvConf_target.xml
+++ b/GPSFlowSkid/Controller/Controller/MbSrvConf_target.xml
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Binding.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Binding.rtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/CnvFct.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/CnvFct.rtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile.ics
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile.ics
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile.ict
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile.ict
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_FLOWMETERMB.ict
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_FLOWMETERMB.ict
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_FLOWRATEUNITS.ict
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_FLOWRATEUNITS.ict
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_FLOWTOTALUNITS.ict
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_FLOWTOTALUNITS.ict
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_PRESSUREANALOG.ict
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_PRESSUREANALOG.ict
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_REVERSEUINT.ict
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_REVERSEUINT.ict
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_SOLARPANELMB.ict
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_SOLARPANELMB.ict
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_WATCHDOG.ict
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_WATCHDOG.ict
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_WORDSTOREAL.ict
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_WORDSTOREAL.ict
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_WORDTOFLOAT16.ict
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Compile_WORDTOFLOAT16.ict
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/DefProg.cnf
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/DefProg.cnf
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/DwlOrder.txt
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/DwlOrder.txt
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FBS_INPUTS_ASSIGNATION.ipa
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FBS_INPUTS_ASSIGNATION.ipa
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWMETERMB.dop
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWMETERMB.dop
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWMETERMB.ic
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWMETERMB.ic
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWMETERMB.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWMETERMB.rtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWRATEUNITS.ic
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWRATEUNITS.ic
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWRATEUNITS.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWRATEUNITS.rtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWTOTALUNITS.ic
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWTOTALUNITS.ic
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWTOTALUNITS.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FLOWTOTALUNITS.rtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FlowMeterMb.AcfMlge
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FlowMeterMb.AcfMlge
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FlowMeterMb.stf
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FlowMeterMb.stf
@@ -249,7 +249,7 @@ cmd_ResetTotalizer := cmd_ResetTotalizerA OR cmd_ResetTotalizerB OR cmd_ResetTot
 IF cmd_ResetTotalizerA THEN
 	mbs_ResetTotalizer_TargetCfg.Addr := cfg_ResetTotalizerA_Coil;
 ELSIF cmd_ResetTotalizerB THEN
-	mbs_ResetTotalizer_TargetCfg.Addr := cfg_ResetTotalizerA_Coil;
+	mbs_ResetTotalizer_TargetCfg.Addr := cfg_ResetTotalizerB_Coil;
 ELSIF cmd_ResetTotalizerC THEN
 	mbs_ResetTotalizer_TargetCfg.Addr := cfg_ResetTotalizerC_Coil;
 END_IF;
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FlowRateUnits.AcfMlge
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FlowRateUnits.AcfMlge
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FlowRateUnits.stf
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FlowRateUnits.stf
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FlowTotalUnits.AcfMlge
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FlowTotalUnits.AcfMlge
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FlowTotalUnits.stf
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/FlowTotalUnits.stf
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Header.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Header.rtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Hierarchy.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Hierarchy.rtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/IDS00103
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/IDS00103
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/IO.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/IO.rtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/LINEARSCALE.ic
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/LINEARSCALE.ic
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/LINEARSCALE.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/LINEARSCALE.rtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/LinearScale.AcfMlge
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/LinearScale.AcfMlge
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/LinearScale.stf
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/LinearScale.stf
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820.ain
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820.ain
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820.err
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820.err
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820.icp
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820.icp
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Dwl.txt
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Dwl.txt
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.ipa
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.ipa
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWRATEUNITS.ipa
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWRATEUNITS.ipa
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWRATEUNITS.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWRATEUNITS.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALUNITS.ipa
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALUNITS.ipa
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALUNITS.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALUNITS.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.ipa
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.ipa
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSUREANALOG.ipa
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSUREANALOG.ipa
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSUREANALOG.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSUREANALOG.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_REVERSEUINT.ipa
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_REVERSEUINT.ipa
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_REVERSEUINT.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_REVERSEUINT.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.ipa
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.ipa
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WATCHDOG.ipa
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WATCHDOG.ipa
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WATCHDOG.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WATCHDOG.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.ipa
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.ipa
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDTOFLOAT16.ipa
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDTOFLOAT16.ipa
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDTOFLOAT16.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDTOFLOAT16.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MdfConf.txt
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MdfConf.txt
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.dop
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.dop
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.ic
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.ic
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.rtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/PressureAnalog.AcfMlge
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/PressureAnalog.AcfMlge
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/PressureAnalog.stf
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/PressureAnalog.stf
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/REVERSEUINT.ic
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/REVERSEUINT.ic
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/REVERSEUINT.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/REVERSEUINT.rtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/ResPar.cnf
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/ResPar.cnf
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/ReverseUINT.AcfMlge
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/ReverseUINT.AcfMlge
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/ReverseUINT.stf
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/ReverseUINT.stf
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/SOLARPANELMB.dop
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/SOLARPANELMB.dop
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/SOLARPANELMB.ic
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/SOLARPANELMB.ic
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/SOLARPANELMB.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/SOLARPANELMB.rtc
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/SolarPanelMb.AcfMlge
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/SolarPanelMb.AcfMlge
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/SolarPanelMb.stf
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/SolarPanelMb.stf
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/WATCHDOG.ic
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/WATCHDOG.ic
--- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/WATCHDOG.rtc
+++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/WATCHDOG.rtc
--- a/Show More
+++ b/Show More