diff --git a/Controller/Controller.acfproj b/Controller/Controller.acfproj index 420abb9..898ee38 100644 --- a/Controller/Controller.acfproj +++ b/Controller/Controller.acfproj @@ -9,7 +9,7 @@ MyAssemblyName false Controller\PrjLibrary.mdb - 5.50.3 + 5.50.5 {e5639d1c-04ee-4d2b-abb0-95beea2e6eac} diff --git a/Controller/Controller/2080LC2020QBBI.target b/Controller/Controller/2080LC2020QBBI.target new file mode 100644 index 0000000..ba0e32d --- /dev/null +++ b/Controller/Controller/2080LC2020QBBI.target @@ -0,0 +1,1148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Controller/Controller/CONTROLLER.err b/Controller/Controller/CONTROLLER.err index e2b427b..e69de29 100644 --- a/Controller/Controller/CONTROLLER.err +++ b/Controller/Controller/CONTROLLER.err @@ -1,6 +0,0 @@ -0::0021-0003::Checking database... -0::0047-0003::-------------------- Check project for resource(s) to pre-build: CONTROLLER -------------------- -1::0002-0003::CONTROLLER: 0 error(s), 0 warning(s) -0::0021-0003::Checking database... -0::0007-0003::-------------------- Build project: CONTROLLER -------------------- -1::0002-0003::CONTROLLER: 0 error(s), 0 warning(s) diff --git a/Controller/Controller/Controller.isaxml b/Controller/Controller/Controller.isaxml new file mode 100644 index 0000000..b0863d6 --- /dev/null +++ b/Controller/Controller/Controller.isaxml @@ -0,0 +1,346 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Controller/Controller/DevicePref.xml b/Controller/Controller/DevicePref.xml index 8dc265d..55f1ca8 100644 --- a/Controller/Controller/DevicePref.xml +++ b/Controller/Controller/DevicePref.xml @@ -1,4 +1,4 @@ - SHOPPC!AB_ETHIP-1\192.168.1.81 + WINDOWS10VMPJM!Henry_Pump\10.20.4.103 \ No newline at end of file diff --git a/Controller/Controller/LogicalValues.csv b/Controller/Controller/LogicalValues.csv index 3010e27..cb306f5 100644 --- a/Controller/Controller/LogicalValues.csv +++ b/Controller/Controller/LogicalValues.csv @@ -47,6 +47,7 @@ Controller.Micro820.Micro820._IO_P1_AI_00 Controller.Micro820.Micro820._IO_P1_AI_01 Controller.Micro820.Micro820.alarm_Hi Controller.Micro820.Micro820.alarm_Lo +Controller.Micro820.Micro820.cfg_5MeterSensor Controller.Micro820.Micro820.cfg_HighAlarm Controller.Micro820.Micro820.cfg_LowAlarm Controller.Micro820.Micro820.cfg_MaxScaled diff --git a/Controller/Controller/Micro820/Micro820.isaxml b/Controller/Controller/Micro820/Micro820.isaxml new file mode 100644 index 0000000..7845252 --- /dev/null +++ b/Controller/Controller/Micro820/Micro820.isaxml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Controller/Controller/Micro820/Micro820/FBS_INPUTS_ASSIGNATION.ipa b/Controller/Controller/Micro820/Micro820/FBS_INPUTS_ASSIGNATION.ipa index 6669fe5..1f48349 100644 --- a/Controller/Controller/Micro820/Micro820/FBS_INPUTS_ASSIGNATION.ipa +++ b/Controller/Controller/Micro820/Micro820/FBS_INPUTS_ASSIGNATION.ipa @@ -1,5 +1,5 @@ AIN_1_SCALER.INPUT@PROG1,__TMPR__SCALER__INPUT,REAL -AIN_1_SCALER.INPUTMIN@PROG1,__TMPR2@PROG1,REAL -AIN_1_SCALER.INPUTMAX@PROG1,__TMPR3@PROG1,REAL +AIN_1_SCALER.INPUTMIN@PROG1,__TMPR5@PROG1,REAL +AIN_1_SCALER.INPUTMAX@PROG1,__TMPR6@PROG1,REAL AIN_1_SCALER.OUTPUTMIN@PROG1,CFG_MINSCALED,REAL AIN_1_SCALER.OUTPUTMAX@PROG1,CFG_MAXSCALED,REAL diff --git a/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc b/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc index 7a8ffbf..85fcc71 100644 Binary files a/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc and b/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc differ diff --git a/Controller/Controller/Micro820/Micro820/Header.rtc b/Controller/Controller/Micro820/Micro820/Header.rtc index 89d5063..45d9b9e 100644 Binary files a/Controller/Controller/Micro820/Micro820/Header.rtc and b/Controller/Controller/Micro820/Micro820/Header.rtc differ diff --git a/Controller/Controller/Micro820/Micro820/IDS00103 b/Controller/Controller/Micro820/Micro820/IDS00103 index 55cecad..96483d3 100644 Binary files a/Controller/Controller/Micro820/Micro820/IDS00103 and b/Controller/Controller/Micro820/Micro820/IDS00103 differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820.err b/Controller/Controller/Micro820/Micro820/MICRO820.err index 936ab87..e69de29 100644 --- a/Controller/Controller/Micro820/Micro820/MICRO820.err +++ b/Controller/Controller/Micro820/Micro820/MICRO820.err @@ -1,9 +0,0 @@ -0::0046-0003::-------------------- Pre-build resource: MICRO820 Configuration: MICRO820 -------------- -0::0044-0003::Pre-compiling for 2080LC2020QBBI -0::0000-0003::PROG1 -0:C:\USERS\SHOP\DROPBOX (HENRY PUMP)\PATRICK_MCDONAGH\CUSTOMERS\PIONEER NATURAL RESOURCES\LEVELSENSOR\CONTROLLER\CONTROLLER\MICRO820\MICRO820\PROG1:0002-0003::MICRO820: 0 error(s), 0 warning(s) -0::0006-0003::-------------------- Build resource: MICRO820 Configuration: MICRO820 -------------- -0::0001-0003::Compiling for 2080LC2020QBBI -0::0000-0003::PROG1 -0:C:\USERS\SHOP\DROPBOX (HENRY PUMP)\PATRICK_MCDONAGH\CUSTOMERS\PIONEER NATURAL RESOURCES\LEVELSENSOR\CONTROLLER\CONTROLLER\MICRO820\MICRO820\PROG1:0003-0003::Linking for 2080LC2020QBBI -0:C:\USERS\SHOP\DROPBOX (HENRY PUMP)\PATRICK_MCDONAGH\CUSTOMERS\PIONEER NATURAL RESOURCES\LEVELSENSOR\CONTROLLER\CONTROLLER\MICRO820\MICRO820\PROG1:0002-0003::MICRO820: 0 error(s), 0 warning(s) diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc index 0051996..426fee1 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc index 944b3db..41d8b9e 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc index b50de61..5ffc8e5 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc b/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc index 940db74..50e01f7 100644 --- a/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc +++ b/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc @@ -3,8 +3,8 @@ Offset0=0xB98 Offset1=0x1398 Offset2=0x1398 Offset3=0x1398 -Memory Usage Estimate(Code)=0xE8 -Memory Usage Estimate(Data)=0x33B8 -Memory Usage Estimate(Retain)=0x10 -Memory Usage Estimate(Temporary variables)=0x1C +Memory Usage Estimate(Code)=0x11C +Memory Usage Estimate(Data)=0x33C4 +Memory Usage Estimate(Retain)=0x11 +Memory Usage Estimate(Temporary variables)=0x28 Offset4=0x414 diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc b/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc index 940db74..50e01f7 100644 --- a/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc +++ b/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc @@ -3,8 +3,8 @@ Offset0=0xB98 Offset1=0x1398 Offset2=0x1398 Offset3=0x1398 -Memory Usage Estimate(Code)=0xE8 -Memory Usage Estimate(Data)=0x33B8 -Memory Usage Estimate(Retain)=0x10 -Memory Usage Estimate(Temporary variables)=0x1C +Memory Usage Estimate(Code)=0x11C +Memory Usage Estimate(Data)=0x33C4 +Memory Usage Estimate(Retain)=0x11 +Memory Usage Estimate(Temporary variables)=0x28 Offset4=0x414 diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc b/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc index f62a6df..bacee09 100644 --- a/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc +++ b/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc @@ -1,16 +1,28 @@ [MODIF] +POU=Y +TYPE=Y +LEVEL1=Y +IO=Y +RETAIN=Y +INSTDEF=Y +VARDEF=Y +INIT_INST=Y +ADD_DEL=Y +VARSIZE=Y +IO_DEF=Y +LAST_VA=Y [RESULT] -ON_LINE=N +ON_LINE=Y TBL_CONF=Y -CRC_ORG=0x0 -CRC_OLD= -CRC_NEW=0xDA0FA50A -DAT_ORG=0 -DAT_OLD=0 -DAT_NEW=1473818639 -VER_ORG=0 -VER_OLD=0 -VER_NEW=5 -CRC_ALL_OLD= -CRC_ALL_NEW=0x6E0DCF8E +CRC_ORG=0xE77E7AB7 +CRC_OLD=0xE77E7AB7 +CRC_NEW=0xE77E7AB7 +DAT_ORG=1490796706 +DAT_OLD=1490796706 +DAT_NEW=1490797361 +VER_ORG=9 +VER_OLD=9 +VER_NEW=10 +CRC_ALL_OLD=0x69FD45CA +CRC_ALL_NEW=0xBAC1FC97 diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_MdfUpdate.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_MdfUpdate.xtc new file mode 100644 index 0000000..cf54b41 Binary files /dev/null and b/Controller/Controller/Micro820/Micro820/MICRO820_MdfUpdate.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc b/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc index e5e90ac..4a0b0af 100644 --- a/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc +++ b/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc @@ -1,9 +1,9 @@ [MEMORY] -Memory Usage Estimate(Temporary variables)=0x1C +Memory Usage Estimate(Temporary variables)=0x28 Biggest online change user variable memory block size=0x800 Currently added user variables=0x0 -Total data size=0xBB4 +Total data size=0xBC0 User variables size=0xB98 -Maximum size for temporary variables=0x201C -Memory Usage Estimate(Data)=0x33B4 +Maximum size for temporary variables=0x2028 +Memory Usage Estimate(Data)=0x33C0 Free memory for user variables=0x800 diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc b/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc index e5e90ac..4a0b0af 100644 --- a/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc +++ b/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc @@ -1,9 +1,9 @@ [MEMORY] -Memory Usage Estimate(Temporary variables)=0x1C +Memory Usage Estimate(Temporary variables)=0x28 Biggest online change user variable memory block size=0x800 Currently added user variables=0x0 -Total data size=0xBB4 +Total data size=0xBC0 User variables size=0xB98 -Maximum size for temporary variables=0x201C -Memory Usage Estimate(Data)=0x33B4 +Maximum size for temporary variables=0x2028 +Memory Usage Estimate(Data)=0x33C0 Free memory for user variables=0x800 diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PROG1.ipa b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PROG1.ipa index 5930f92..4583a2c 100644 --- a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PROG1.ipa +++ b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PROG1.ipa @@ -1 +1 @@ -,AIN_1_SCALER@PROG1,SCALER,INPUT,__TMPR__SCALER__INPUT,REAL,INPUTMIN,__TMPR2@PROG1,REAL,INPUTMAX,__TMPR3@PROG1,REAL,OUTPUTMIN,CFG_MINSCALED,REAL,OUTPUTMAX,CFG_MAXSCALED,REAL +,AIN_1_SCALER@PROG1,SCALER,INPUT,__TMPR__SCALER__INPUT,REAL,INPUTMIN,__TMPR5@PROG1,REAL,INPUTMAX,__TMPR6@PROG1,REAL,OUTPUTMIN,CFG_MINSCALED,REAL,OUTPUTMAX,CFG_MAXSCALED,REAL diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PROG1.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PROG1.xtc index e98454f..d2c1fe4 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PROG1.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PROG1.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc index 3c09b95..d589375 100644 --- a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc +++ b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc @@ -1,5 +1,5 @@ [BEGIN FB INPUTS] -I1=micro820.micro820.prog1/ain_1_scaler.input,0x13A8,REAL +I1=micro820.micro820.prog1/ain_1_scaler.input,0x13B4,REAL I2=micro820.micro820.prog1/ain_1_scaler.inputmin,0x13A0,REAL I3=micro820.micro820.prog1/ain_1_scaler.inputmax,0x139C,REAL I4=micro820.micro820.prog1/ain_1_scaler.outputmin,0x464,REAL diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc index 00444db..27e2c72 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc index 00444db..27e2c72 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc index 00444db..27e2c72 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc index b287f88..4374233 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc index b287f88..4374233 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/Micro820.isaxml b/Controller/Controller/Micro820/Micro820/Micro820.isaxml new file mode 100644 index 0000000..f30fb29 --- /dev/null +++ b/Controller/Controller/Micro820/Micro820/Micro820.isaxml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Controller/Controller/Micro820/Micro820/Micro820_MiscLinkInfoOlc.mtc b/Controller/Controller/Micro820/Micro820/Micro820_MiscLinkInfoOlc.mtc new file mode 100644 index 0000000..10aabd7 --- /dev/null +++ b/Controller/Controller/Micro820/Micro820/Micro820_MiscLinkInfoOlc.mtc @@ -0,0 +1,3 @@ +[MEMORY] +Code Space Free Memory=0x2C1BC +Code Space Requirement=0x1190 diff --git a/Controller/Controller/Micro820/Micro820/PROG1.ic b/Controller/Controller/Micro820/Micro820/PROG1.ic index ccb362d..4783f49 100644 --- a/Controller/Controller/Micro820/Micro820/PROG1.ic +++ b/Controller/Controller/Micro820/Micro820/PROG1.ic @@ -1,9 +1,19 @@ +_IO_EM_DO_01 := TRUE +CFG_5METERSENSOR := _IO_EM_DI_01 +_IF _NOT CFG_5METERSENSOR _GOTO __LAB1 +CFG_MINSCALED := __TMPR1 +CFG_MAXSCALED := __TMPR2 +_GOTO __LAB2 +__LAB1 : +CFG_MINSCALED := __TMPR1 +CFG_MAXSCALED := __TMPR3 +__LAB2 : _PUSH_PAR _IO_P1_AI_00 -__TMPR1 := _CALL ANY_TO_UINT -__TMPR__SCALER__INPUT := __TMPR1 +__TMPR4 := _CALL ANY_TO_UINT +__TMPR__SCALER__INPUT := __TMPR4 __FBL_RET := _PUSHCALLFB SCALER AIN_1_SCALER -__TMPR1 := AIN_1_SCALER [ __CDINT0000000C ] -VAL_LEVEL := __TMPR1 +__TMPR4 := AIN_1_SCALER [ __CDINT0000000C ] +VAL_LEVEL := __TMPR4 __TMPB1 := VAL_LEVEL >= CFG_HIGHALARM __TMPB1 := __TMPB1 _OR _IO_EM_DI_00 ALARM_HI := __TMPB1 diff --git a/Controller/Controller/Micro820/Micro820/PROG1.rtc b/Controller/Controller/Micro820/Micro820/PROG1.rtc index 452c931..324fd48 100644 Binary files a/Controller/Controller/Micro820/Micro820/PROG1.rtc and b/Controller/Controller/Micro820/Micro820/PROG1.rtc differ diff --git a/Controller/Controller/Micro820/Micro820/Prog1.isaxml b/Controller/Controller/Micro820/Micro820/Prog1.isaxml new file mode 100644 index 0000000..b04b209 --- /dev/null +++ b/Controller/Controller/Micro820/Micro820/Prog1.isaxml @@ -0,0 +1,21 @@ + + + + + + + = cfg_HighAlarm) OR _IO_EM_DI_00; +alarm_Lo := val_Level <= cfg_LowAlarm; + +_IO_EM_DO_00 := alarm_Hi OR alarm_Lo; +END_PROGRAM]]> + + + + + + \ No newline at end of file diff --git a/Controller/Controller/Micro820/Micro820/Prog1.stf b/Controller/Controller/Micro820/Micro820/Prog1.stf index a751841..9139671 100644 --- a/Controller/Controller/Micro820/Micro820/Prog1.stf +++ b/Controller/Controller/Micro820/Micro820/Prog1.stf @@ -1,4 +1,17 @@ PROGRAM Prog1 +(* In order to enable the 5-meter sensor, jumper Digital Output 1 to Digital Input 1 *) +_IO_EM_DO_01 := TRUE; +cfg_5MeterSensor := _IO_EM_DI_01; + +IF cfg_5MeterSensor THEN + cfg_MinScaled := 0.0; + cfg_MaxScaled := 16.4042; +ELSE + cfg_MinScaled := 0.0; + cfg_MaxScaled := 34.6; +END_IF; + + AIN_1_SCALER(ANY_TO_REAL(_IO_P1_AI_00), 13104.0, 65520.0, cfg_MinScaled, cfg_MaxScaled); val_Level := AIN_1_SCALER.Output; diff --git a/Controller/Controller/PrjLibrary.bak b/Controller/Controller/PrjLibrary.bak new file mode 100644 index 0000000..afce77d Binary files /dev/null and b/Controller/Controller/PrjLibrary.bak differ diff --git a/Controller/Controller/PrjLibrary.mdb b/Controller/Controller/PrjLibrary.mdb index f75b3d8..58031ec 100644 Binary files a/Controller/Controller/PrjLibrary.mdb and b/Controller/Controller/PrjLibrary.mdb differ diff --git a/Controller/Controller/persist.ccwx b/Controller/Controller/persist.ccwx index c8f8fad..6863e8f 100644 Binary files a/Controller/Controller/persist.ccwx and b/Controller/Controller/persist.ccwx differ diff --git a/Controller/Controller_Backup.zip b/Controller/Controller_Backup.zip index 3fa353a..efec95a 100644 Binary files a/Controller/Controller_Backup.zip and b/Controller/Controller_Backup.zip differ diff --git a/LevelSensor.ccwsln b/LevelSensor.ccwsln index 7712bd6..f7ae7bc 100644 Binary files a/LevelSensor.ccwsln and b/LevelSensor.ccwsln differ diff --git a/LevelSensor.v12.ccwsuo b/LevelSensor.v12.ccwsuo index 25d1758..11bdf5a 100644 Binary files a/LevelSensor.v12.ccwsuo and b/LevelSensor.v12.ccwsuo differ