Adds Testing changes

2017-10-02 10:05:11 -05:00
parent 644d409fbc
commit f2c6ac0dea
34 changed files with 27 additions and 6 deletions
--- a/Program.pdf
+++ b/Program.pdf
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Compile.ic
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Compile.ic
@@ -1 +1 @@
-TO RELINK
+COMPILED
--- a/Remote_SCADA_skid_Testing/Controller/Controller/DevicePref.xml
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/DevicePref.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DevicePreferences xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Micro800ConnectionPath>PATRICKMCDO2139!AB_ETH-1\192.168.1.212</Micro800ConnectionPath>
+</DevicePreferences>
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile.ics
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile.ics
@@ -0,0 +1 @@
+TO RELINK
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile.ict
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile.ict
@@ -0,0 +1 @@
+COMPILED
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_DEVICESELECTION.ict
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_DEVICESELECTION.ict
@@ -0,0 +1 @@
+COMPILED
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_FLOWMETERAI.ict
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_FLOWMETERAI.ict
@@ -0,0 +1 @@
+COMPILED
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_FLOWMETERMB.ict
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_FLOWMETERMB.ict
@@ -0,0 +1 @@
+COMPILED
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict
@@ -0,0 +1 @@
+COMPILED
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_PRESSURE.ict
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_PRESSURE.ict
@@ -0,0 +1 @@
+COMPILED
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_WORDSTOREAL.ict
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Compile_WORDSTOREAL.ict
@@ -0,0 +1 @@
+COMPILED
--- 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 
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/DEVICESELECTION.rtc
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/DEVICESELECTION.rtc
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Header.rtc
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/Header.rtc
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/IDS00103
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/IDS00103
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820.icp
+++ 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):
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc
--- a/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc
--- a/Remote_SCADA_skid_Testing/Controller/Controller/PrjLibrary.mdb
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/PrjLibrary.mdb
--- 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
--- a/Remote_SCADA_skid_Testing/Controller/Controller/persist.ccwx
+++ b/Remote_SCADA_skid_Testing/Controller/Controller/persist.ccwx
--- a/Remote_SCADA_skid_Testing/Controller/Controller_Backup.zip
+++ b/Remote_SCADA_skid_Testing/Controller/Controller_Backup.zip
--- a/Remote_SCADA_skid_Testing/Remote_SCADA_skid_Testing.v12.ccwsuo
+++ b/Remote_SCADA_skid_Testing/Remote_SCADA_skid_Testing.v12.ccwsuo