Adds per-pond offset for sensor above the bottom of the pit

PLC/Multi-Pond/Controller/Controller/Compile.ic

@@ -1 +1 @@
-TO RELINK
+COMPILED

PLC/Multi-Pond/Controller/Controller/LogicalValues.csv

@@ -80,6 +80,7 @@ Controller.Micro820.Micro820.pond1CalibrationVolume[7],
 Controller.Micro820.Micro820.pond1CalibrationVolume[8],
 Controller.Micro820.Micro820.pond1CalibrationVolume[9],
 Controller.Micro820.Micro820.pond1Height,
+Controller.Micro820.Micro820.pond1Offset,
 Controller.Micro820.Micro820.pond1Scaling.euMax,
 Controller.Micro820.Micro820.pond1Scaling.euMin,
 Controller.Micro820.Micro820.pond1Scaling.rawMax,
@@ -106,6 +107,7 @@ Controller.Micro820.Micro820.pond2CalibrationVolume[7],
 Controller.Micro820.Micro820.pond2CalibrationVolume[8],
 Controller.Micro820.Micro820.pond2CalibrationVolume[9],
 Controller.Micro820.Micro820.pond2Height,
+Controller.Micro820.Micro820.pond2Offset,
 Controller.Micro820.Micro820.pond2Scaling.euMax,
 Controller.Micro820.Micro820.pond2Scaling.euMin,
 Controller.Micro820.Micro820.pond2Scaling.rawMax,
@@ -132,6 +134,7 @@ Controller.Micro820.Micro820.pond3CalibrationVolume[7],
 Controller.Micro820.Micro820.pond3CalibrationVolume[8],
 Controller.Micro820.Micro820.pond3CalibrationVolume[9],
 Controller.Micro820.Micro820.pond3Height,
+Controller.Micro820.Micro820.pond3Offset,
 Controller.Micro820.Micro820.pond3Scaling.euMax,
 Controller.Micro820.Micro820.pond3Scaling.euMin,
 Controller.Micro820.Micro820.pond3Scaling.rawMax,
@@ -158,6 +161,7 @@ Controller.Micro820.Micro820.pond4CalibrationVolume[7],
 Controller.Micro820.Micro820.pond4CalibrationVolume[8],
 Controller.Micro820.Micro820.pond4CalibrationVolume[9],
 Controller.Micro820.Micro820.pond4Height,
+Controller.Micro820.Micro820.pond4Offset,
 Controller.Micro820.Micro820.pond4Scaling.euMax,
 Controller.Micro820.Micro820.pond4Scaling.euMin,
 Controller.Micro820.Micro820.pond4Scaling.rawMax,

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile.ics

@@ -0,0 +1 @@
+TO RELINK

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile.ict

@@ -0,0 +1 @@
+COMPILED

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_ADDCALIBRATIONPOINT.ict

@@ -0,0 +1 @@
+COMPILED

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_CALIBRATION.ict

@@ -0,0 +1 @@
+COMPILED

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_DELETECALIBRATIONPOINT.ict

@@ -0,0 +1 @@
+COMPILED

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_FINDNUMBEROFCALPOINTS.ict

@@ -0,0 +1 @@
+COMPILED

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_GETSCALINGPARAMETERS.ict

@@ -0,0 +1 @@
+COMPILED

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict

@@ -0,0 +1 @@
+COMPILED

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Compile_SCALING.ict

@@ -0,0 +1 @@
+COMPILED

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820.icp

@@ -0,0 +1,7 @@
+CALIBRATION(156):F,ADDCALIBRATIONPOINT(157);F,DELETECALIBRATIONPOINT(158);
+ADDCALIBRATIONPOINT(157):F,FINDNUMBEROFCALPOINTS(155);
+DELETECALIBRATIONPOINT(158):
+SCALING(159):F,LINEARSCALE(154);FB,GETSCALINGPARAMETERS(161);
+FINDNUMBEROFCALPOINTS(155):
+LINEARSCALE(154):
+GETSCALINGPARAMETERS(161):F,FINDNUMBEROFCALPOINTS(155);

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc

@@ -1,11 +1,11 @@
 [MEMORY]
-Offset0=0xFB4
-Offset1=0x17B4
-Offset2=0x17B4
-Offset3=0x17B4
-Memory Usage Estimate(Code)=0x2F9C
-Memory Usage Estimate(Data)=0x38F8
-Memory Usage Estimate(Retain)=0x182
-Memory Usage Estimate(RetainBlocks)=0x3
-Memory Usage Estimate(Temporary variables)=0x144
+Offset0=0xFC4
+Offset1=0x17C4
+Offset2=0x17C4
+Offset3=0x17C4
+Memory Usage Estimate(Code)=0x2FBC
+Memory Usage Estimate(Data)=0x3910
+Memory Usage Estimate(Retain)=0x172
+Memory Usage Estimate(RetainBlocks)=0x7
+Memory Usage Estimate(Temporary variables)=0x148
 Offset4=0x414

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc

@@ -1,11 +0,0 @@
-[MEMORY]
-Offset0=0xFB4
-Offset1=0x17B4
-Offset2=0x17B4
-Offset3=0x17B4
-Memory Usage Estimate(Code)=0x2F9C
-Memory Usage Estimate(Data)=0x38F8
-Memory Usage Estimate(Retain)=0x182
-Memory Usage Estimate(RetainBlocks)=0x3
-Memory Usage Estimate(Temporary variables)=0x144
-Offset4=0x414

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc

@@ -0,0 +1,16 @@
+[MODIF]
+
+[RESULT]
+ON_LINE=N
+TBL_CONF=Y
+CRC_ORG=0x0
+CRC_OLD=
+CRC_NEW=0xED808635
+DAT_ORG=0
+DAT_OLD=0
+DAT_NEW=1529599820
+VER_ORG=0
+VER_OLD=0
+VER_NEW=34
+CRC_ALL_OLD=
+CRC_ALL_NEW=0x2935BBDE

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc

@@ -1,28 +0,0 @@
-[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=Y
-TBL_CONF=Y
-CRC_ORG=0xA4C0B63E
-CRC_OLD=0xA4C0B63E
-CRC_NEW=0xA4C0B63E
-DAT_ORG=1529434199
-DAT_OLD=1529434199
-DAT_NEW=1529434367
-VER_ORG=31
-VER_OLD=31
-VER_NEW=32
-CRC_ALL_OLD=0xC26A6063
-CRC_ALL_NEW=0x20E3D9BB

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc

@@ -1,9 +1,9 @@
 [MEMORY]
-Memory Usage Estimate(Temporary variables)=0x144
+Memory Usage Estimate(Temporary variables)=0x148
 Biggest online change user variable memory block size=0x800
 Currently added user variables=0x0
-Total data size=0x10F8
-User variables size=0xFB4
-Maximum size for temporary variables=0x2140
-Memory Usage Estimate(Data)=0x38F4
+Total data size=0x110C
+User variables size=0xFC4
+Maximum size for temporary variables=0x2148
+Memory Usage Estimate(Data)=0x390C
 Free memory for user variables=0x800

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc

@@ -1,9 +0,0 @@
-[MEMORY]
-Memory Usage Estimate(Temporary variables)=0x144
-Biggest online change user variable memory block size=0x800
-Currently added user variables=0x0
-Total data size=0x10F8
-User variables size=0xFB4
-Maximum size for temporary variables=0x2140
-Memory Usage Estimate(Data)=0x38F4
-Free memory for user variables=0x800

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc

@@ -1,10 +1,10 @@
 [BEGIN FB INPUTS]
 I1=micro820.micro820.scaling/getpond1scalingparams.linppondheight,0x48C,REAL
-I2=micro820.micro820.scaling/getpond1scalingparams.linppondnumber,0x17FA,INT
+I2=micro820.micro820.scaling/getpond1scalingparams.linppondnumber,0x180A,INT
 I3=micro820.micro820.scaling/getpond2scalingparams.linppondheight,0x490,REAL
-I4=micro820.micro820.scaling/getpond2scalingparams.linppondnumber,0x17F8,INT
+I4=micro820.micro820.scaling/getpond2scalingparams.linppondnumber,0x1808,INT
 I5=micro820.micro820.scaling/getpond3scalingparams.linppondheight,0x494,REAL
-I6=micro820.micro820.scaling/getpond3scalingparams.linppondnumber,0x17F6,INT
+I6=micro820.micro820.scaling/getpond3scalingparams.linppondnumber,0x1806,INT
 I7=micro820.micro820.scaling/getpond4scalingparams.linppondheight,0x498,REAL
-I8=micro820.micro820.scaling/getpond4scalingparams.linppondnumber,0x17FC,INT
+I8=micro820.micro820.scaling/getpond4scalingparams.linppondnumber,0x180C,INT
 [END]

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/MdfConf.s.txt

@@ -1,77 +0,0 @@
-[__DEFIO_CPXDVC]
-Nb = 2
-NotMDF = 0, 1, AB_, OPTIMUS_, IO_Base
-MDF = -1
-RIdx = 0
-NotMDF = 101, 1, AB_, OPTIMUS_, IOUP_Analog
-MDF = -1
-RIdx = 0
-
-
-[__DEFIO_SPLDVC]
-Nb = 6
-NotMDF = 0, 0, 1, AB_, OPTIMUS_, digitOut_Base
-MDF = -1
-RIdx = 0, 0
-NotMDF = 0, 1, 1, AB_, OPTIMUS_, digitIn_Base
-MDF = -1
-RIdx = 0, 0
-NotMDF = 0, 2, 1, AB_, OPTIMUS_, analogIn_Base
-MDF = -1
-RIdx = 0, 0
-NotMDF = 0, 3, 1, AB_, OPTIMUS_, analogOut_Base
-MDF = -1
-RIdx = 0, 0
-NotMDF = 101, 0, 1, AB_, OPTIMUS_, analogOut_UP
-MDF = -1
-RIdx = 0, 1
-NotMDF = 101, 1, 1, AB_, OPTIMUS_, analogIn_UP
-MDF = -1
-RIdx = 0, 1
-
-
-[__DEFIO_CHAN]
-RIdx = 0, 0, 0
-Nb = 7
-MDF = 1\1, 1, 0, 0, -1, _IO_EM_DO_00
-MDF = 1\1, 1, 0, 1, -1, _IO_EM_DO_01
-MDF = 1\1, 1, 0, 2, -1, _IO_EM_DO_02
-MDF = 1\1, 1, 0, 3, -1, _IO_EM_DO_03
-MDF = 1\1, 1, 0, 4, -1, _IO_EM_DO_04
-MDF = 1\1, 1, 0, 5, -1, _IO_EM_DO_05
-MDF = 1\1, 1, 0, 6, -1, _IO_EM_DO_06
-RIdx = 0, 0, 1
-Nb = 12
-MDF = 1\1, 1, 0, 0, -1, _IO_EM_DI_00
-MDF = 1\1, 1, 0, 1, -1, _IO_EM_DI_01
-MDF = 1\1, 1, 0, 2, -1, _IO_EM_DI_02
-MDF = 1\1, 1, 0, 3, -1, _IO_EM_DI_03
-MDF = 1\1, 1, 0, 4, -1, _IO_EM_DI_04
-MDF = 1\1, 1, 0, 5, -1, _IO_EM_DI_05
-MDF = 1\1, 1, 0, 6, -1, _IO_EM_DI_06
-MDF = 1\1, 1, 0, 7, -1, _IO_EM_DI_07
-MDF = 1\1, 1, 0, 8, -1, _IO_EM_DI_08
-MDF = 1\1, 1, 0, 9, -1, _IO_EM_DI_09
-MDF = 1\1, 1, 0, 10, -1, _IO_EM_DI_10
-MDF = 1\1, 1, 0, 11, -1, _IO_EM_DI_11
-RIdx = 0, 0, 2
-Nb = 4
-MDF = 1\1, 1, 0, 0, -1, _IO_EM_AI_00
-MDF = 1\1, 1, 0, 1, -1, _IO_EM_AI_01
-MDF = 1\1, 1, 0, 2, -1, _IO_EM_AI_02
-MDF = 1\1, 1, 0, 3, -1, _IO_EM_AI_03
-RIdx = 0, 0, 3
-Nb = 1
-MDF = 1\1, 1, 0, 0, -1, _IO_EM_AO_00
-RIdx = 0, 1, 4
-Nb = 0
-RIdx = 0, 1, 5
-Nb = 4
-MDF = 1\1, 0, 0, 0, -1, _IO_P1_AI_00
-MDF = 1\1, 0, 0, 1, -1, _IO_P1_AI_01
-MDF = 1\1, 0, 0, 2, -1, _IO_P1_AI_02
-MDF = 1\1, 0, 0, 3, -1, _IO_P1_AI_03
-
-
-[__READONLY_VALUES]
-Nb = 0

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Micro820_MiscLinkInfoOlc.mtc

@@ -1,3 +0,0 @@
-[MEMORY]
-Code Space Free Memory=0x2B584
-Code Space Requirement=0x1988

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.ic

@@ -11,6 +11,7 @@ _PUSH_PAR __TMPR3
 _PUSH_PAR __TMPR4 
 _PUSH_PAR __TMPR5 
 __TMPR6 := _CALL LINEARSCALE 
+__TMPR6 := __TMPR6 + POND1OFFSET 
 POND1HEIGHT := __TMPR6 
 _STEP 2 0 7
 __TMPR1 := POND2SCALING [ __DINT_NULL ]
@@ -25,6 +26,7 @@ _PUSH_PAR __TMPR3
 _PUSH_PAR __TMPR4 
 _PUSH_PAR __TMPR5 
 __TMPR6 := _CALL LINEARSCALE 
+__TMPR6 := __TMPR6 + POND2OFFSET 
 POND2HEIGHT := __TMPR6 
 _STEP 2 0 13
 __TMPR1 := POND3SCALING [ __DINT_NULL ]
@@ -39,6 +41,7 @@ _PUSH_PAR __TMPR3
 _PUSH_PAR __TMPR4 
 _PUSH_PAR __TMPR5 
 __TMPR6 := _CALL LINEARSCALE 
+__TMPR6 := __TMPR6 + POND3OFFSET 
 POND3HEIGHT := __TMPR6 
 _STEP 2 0 19
 __TMPR1 := POND4SCALING [ __DINT_NULL ]
@@ -53,6 +56,7 @@ _PUSH_PAR __TMPR3
 _PUSH_PAR __TMPR4 
 _PUSH_PAR __TMPR5 
 __TMPR6 := _CALL LINEARSCALE 
+__TMPR6 := __TMPR6 + POND4OFFSET 
 POND4HEIGHT := __TMPR6 
 _STEP 2 0 25
 __FBL_RET := _PUSHCALLFB GETSCALINGPARAMETERS  GETPOND1SCALINGPARAMS 

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.otc

@@ -1,36 +1,36 @@
 34
 
 0, 1
-70, 7
-140, 13
-210, 19
-280, 25
-288, 26
-296, 27
-304, 28
-312, 30
-326, 31
-388, 38
-402, 39
-464, 46
-478, 47
-540, 54
-554, 55
-616, 62
-630, 63
-636, 64
-642, 65
-648, 66
-654, 67
-660, 68
-666, 69
-680, 70
-694, 71
-702, 72
-708, 73
-714, 74
-720, 75
-748, 77
-764, 78
-770, 79
-798, 81
+78, 7
+156, 13
+234, 19
+312, 25
+320, 26
+328, 27
+336, 28
+344, 30
+358, 31
+420, 38
+434, 39
+496, 46
+510, 47
+572, 54
+586, 55
+648, 62
+662, 63
+668, 64
+674, 65
+680, 66
+686, 67
+692, 68
+698, 69
+712, 70
+726, 71
+734, 72
+740, 73
+746, 74
+752, 75
+780, 77
+796, 78
+802, 79
+830, 81

PLC/Multi-Pond/Controller/Controller/Micro820/Micro820/Scaling.stf

@@ -3,25 +3,25 @@ pond1Height := LinearScale(pond1Scaling.rawMin,
 	pond1Scaling.rawMax,
 	pond1Scaling.euMin,
 	pond1Scaling.euMax,
-	ANY_TO_REAL(_IO_P1_AI_00));
+	ANY_TO_REAL(_IO_P1_AI_00)) + pond1Offset;
 
 pond2Height := LinearScale(pond2Scaling.rawMin,
 	pond2Scaling.rawMax,
 	pond2Scaling.euMin,
 	pond2Scaling.euMax,
-	ANY_TO_REAL(_IO_P1_AI_01));
+	ANY_TO_REAL(_IO_P1_AI_01)) + pond2Offset;
 	
 pond3Height := LinearScale(pond3Scaling.rawMin,
 	pond3Scaling.rawMax,
 	pond3Scaling.euMin,
 	pond3Scaling.euMax,
-	ANY_TO_REAL(_IO_P1_AI_02));
+	ANY_TO_REAL(_IO_P1_AI_02)) + pond3Offset;
 	
 pond4Height := LinearScale(pond4Scaling.rawMin,
 	pond4Scaling.rawMax,
 	pond4Scaling.euMin,
 	pond4Scaling.euMax,
-	ANY_TO_REAL(_IO_P1_AI_03));
+	ANY_TO_REAL(_IO_P1_AI_03)) + pond4Offset;
 
 GetPond1ScalingParams(pond1Height, 1);
 GetPond2ScalingParams(pond2Height, 2);

PLC/Multi-Pond/Controller/Controller/RMD.info

@@ -1,2 +1,2 @@
 [RMDManager]
-TASK=REBUILD
+TASK=BUILD

PLC/Multi-Pond/Controller/Controller/RmcVariables

@@ -0,0 +1,4 @@
+Controller.Micro820.Micro820.pond1Offset
+Controller.Micro820.Micro820.pond2Offset
+Controller.Micro820.Micro820.pond3Offset
+Controller.Micro820.Micro820.pond4Offset