diff --git a/Pioneer Flowmeter Program.pdf b/Pioneer Flowmeter Program.pdf new file mode 100644 index 0000000..a6b595c Binary files /dev/null and b/Pioneer Flowmeter Program.pdf differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Compile.ic b/Remote_SCADA_skid_Testing/Controller/Controller/Compile.ic index 4cc4d79..7e6cc76 100644 --- a/Remote_SCADA_skid_Testing/Controller/Controller/Compile.ic +++ b/Remote_SCADA_skid_Testing/Controller/Controller/Compile.ic @@ -1 +1 @@ -TO RELINK +COMPILED diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/DevicePref.xml b/Remote_SCADA_skid_Testing/Controller/Controller/DevicePref.xml new file mode 100644 index 0000000..3c0f284 --- /dev/null +++ b/Remote_SCADA_skid_Testing/Controller/Controller/DevicePref.xml @@ -0,0 +1,4 @@ + + + PATRICKMCDO2139!AB_ETH-1\192.168.1.212 + \ No newline at end of file diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile.ics b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile.ics new file mode 100644 index 0000000..679cef0 --- /dev/null +++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile.ics @@ -0,0 +1 @@ +TO RELINK diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile.ict b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile.ict new file mode 100644 index 0000000..7e6cc76 --- /dev/null +++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile.ict @@ -0,0 +1 @@ +COMPILED diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_DEVICESELECTION.ict b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_DEVICESELECTION.ict new file mode 100644 index 0000000..7e6cc76 --- /dev/null +++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_DEVICESELECTION.ict @@ -0,0 +1 @@ +COMPILED diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_FLOWMETERAI.ict b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_FLOWMETERAI.ict new file mode 100644 index 0000000..7e6cc76 --- /dev/null +++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_FLOWMETERAI.ict @@ -0,0 +1 @@ +COMPILED diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_FLOWMETERMB.ict b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_FLOWMETERMB.ict new file mode 100644 index 0000000..7e6cc76 --- /dev/null +++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_FLOWMETERMB.ict @@ -0,0 +1 @@ +COMPILED diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict new file mode 100644 index 0000000..7e6cc76 --- /dev/null +++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict @@ -0,0 +1 @@ +COMPILED diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_PRESSURE.ict b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_PRESSURE.ict new file mode 100644 index 0000000..7e6cc76 --- /dev/null +++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_PRESSURE.ict @@ -0,0 +1 @@ +COMPILED diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_WORDSTOREAL.ict b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_WORDSTOREAL.ict new file mode 100644 index 0000000..7e6cc76 --- /dev/null +++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_WORDSTOREAL.ict @@ -0,0 +1 @@ +COMPILED diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/DEVICESELECTION.ic b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/DEVICESELECTION.ic index 4c20d22..630cab7 100644 --- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/DEVICESELECTION.ic +++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/DEVICESELECTION.ic @@ -1,2 +1,5 @@ __TMPB1 := _IO_EM_DI_00 _OR SW_USEMODBUSFLOWMETER USE_MODBUSFLOWMETER := __TMPB1 +__TMPB1 := _NOT USE_MODBUSFLOWMETER +_IO_EM_DO_00 := __TMPB1 +_IO_EM_DO_01 := USE_MODBUSFLOWMETER diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/DEVICESELECTION.rtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/DEVICESELECTION.rtc index 295b2d5..74dbfd5 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/DEVICESELECTION.rtc and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/DEVICESELECTION.rtc differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Header.rtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Header.rtc index c009498..9ccfb9c 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Header.rtc and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Header.rtc differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/IDS00103 b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/IDS00103 index ebc33e8..13b75d2 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/IDS00103 and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/IDS00103 differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820.icp b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820.icp new file mode 100644 index 0000000..69e4b22 --- /dev/null +++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820.icp @@ -0,0 +1,6 @@ +WORDSTOREAL(155): +FLOWMETERAI(150):F,LINEARSCALE(153); +DEVICESELECTION(152): +FLOWMETERMB(149):F,WORDSTOREAL(155); +PRESSURE(154):F,LINEARSCALE(153); +LINEARSCALE(153): diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc index e8ffb32..304c82c 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc index cf725b2..73f65fe 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc index df4ff7e..53be531 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc index 7f47ea9..e07b310 100644 --- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc +++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc @@ -3,7 +3,7 @@ Offset0=0x1098 Offset1=0x1898 Offset2=0x1898 Offset3=0x1898 -Memory Usage Estimate(Code)=0xC90 +Memory Usage Estimate(Code)=0xC9C Memory Usage Estimate(Data)=0x3AB8 Memory Usage Estimate(Retain)=0x29 Memory Usage Estimate(Temporary variables)=0x21C diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc index e912822..1bc6b7e 100644 --- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc +++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc @@ -8,9 +8,9 @@ CRC_OLD= CRC_NEW=0x8FF17B11 DAT_ORG=0 DAT_OLD=0 -DAT_NEW=1506702661 +DAT_NEW=1506713246 VER_ORG=0 VER_OLD=0 -VER_NEW=1 +VER_NEW=2 CRC_ALL_OLD= -CRC_ALL_NEW=0xBDD37D1A +CRC_ALL_NEW=0x15484FB3 diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DEVICESELECTION.xtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DEVICESELECTION.xtc index 465dcee..92423cd 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DEVICESELECTION.xtc and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DEVICESELECTION.xtc differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERAI.xtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERAI.xtc index b816a0b..a3c63ce 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERAI.xtc and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERAI.xtc differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc index 5f0f326..c6231f9 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc index e643311..e77099c 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSURE.xtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSURE.xtc index 14c4cb5..61c0601 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSURE.xtc and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSURE.xtc differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc index 586404b..a89cf57 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc index 59017c2..6f40970 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc index 6174d4a..04162ff 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc and b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/PrjLibrary.mdb b/Remote_SCADA_skid_Testing/Controller/Controller/PrjLibrary.mdb index 717f8e9..3044c24 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/PrjLibrary.mdb and b/Remote_SCADA_skid_Testing/Controller/Controller/PrjLibrary.mdb differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/RMD.info b/Remote_SCADA_skid_Testing/Controller/Controller/RMD.info index 10b407f..d5f29ea 100644 --- a/Remote_SCADA_skid_Testing/Controller/Controller/RMD.info +++ b/Remote_SCADA_skid_Testing/Controller/Controller/RMD.info @@ -1,2 +1,2 @@ [RMDManager] -TASK=REBUILD +TASK=BUILD diff --git a/Remote_SCADA_skid_Testing/Controller/Controller/persist.ccwx b/Remote_SCADA_skid_Testing/Controller/Controller/persist.ccwx index a96297b..336757b 100644 Binary files a/Remote_SCADA_skid_Testing/Controller/Controller/persist.ccwx and b/Remote_SCADA_skid_Testing/Controller/Controller/persist.ccwx differ diff --git a/Remote_SCADA_skid_Testing/Controller/Controller_Backup.zip b/Remote_SCADA_skid_Testing/Controller/Controller_Backup.zip new file mode 100644 index 0000000..1c68be6 Binary files /dev/null and b/Remote_SCADA_skid_Testing/Controller/Controller_Backup.zip differ diff --git a/Remote_SCADA_skid_Testing/Remote_SCADA_skid_Testing.v12.ccwsuo b/Remote_SCADA_skid_Testing/Remote_SCADA_skid_Testing.v12.ccwsuo index cdf48c4..3ea4dc5 100644 Binary files a/Remote_SCADA_skid_Testing/Remote_SCADA_skid_Testing.v12.ccwsuo and b/Remote_SCADA_skid_Testing/Remote_SCADA_skid_Testing.v12.ccwsuo differ