diff --git a/Multi-Pond/Controller/Controller/LogicalValues.csv b/Multi-Pond/Controller/Controller/LogicalValues.csv index a8f7764..d3072c8 100644 --- a/Multi-Pond/Controller/Controller/LogicalValues.csv +++ b/Multi-Pond/Controller/Controller/LogicalValues.csv @@ -50,6 +50,8 @@ Controller.Micro820.Micro820._IO_P1_AI_00, Controller.Micro820.Micro820._IO_P1_AI_01, Controller.Micro820.Micro820._IO_P1_AI_02, Controller.Micro820.Micro820._IO_P1_AI_03, +Controller.Micro820.Micro820.addSuccess, +Controller.Micro820.Micro820.cfgNumberOfPonds, Controller.Micro820.Micro820.cmdAddCalibrationPoint, Controller.Micro820.Micro820.cmdDeleteCalibrationPoint, Controller.Micro820.Micro820.deleteSuccess, @@ -78,6 +80,10 @@ Controller.Micro820.Micro820.pond1CalibrationVolume[7], Controller.Micro820.Micro820.pond1CalibrationVolume[8], Controller.Micro820.Micro820.pond1CalibrationVolume[9], Controller.Micro820.Micro820.pond1Height, +Controller.Micro820.Micro820.pond1Scaling.euMax, +Controller.Micro820.Micro820.pond1Scaling.euMin, +Controller.Micro820.Micro820.pond1Scaling.rawMax, +Controller.Micro820.Micro820.pond1Scaling.rawMin, Controller.Micro820.Micro820.pond1Volume, Controller.Micro820.Micro820.pond2CalibrationHeight[1], Controller.Micro820.Micro820.pond2CalibrationHeight[10], @@ -100,6 +106,10 @@ Controller.Micro820.Micro820.pond2CalibrationVolume[7], Controller.Micro820.Micro820.pond2CalibrationVolume[8], Controller.Micro820.Micro820.pond2CalibrationVolume[9], Controller.Micro820.Micro820.pond2Height, +Controller.Micro820.Micro820.pond2Scaling.euMax, +Controller.Micro820.Micro820.pond2Scaling.euMin, +Controller.Micro820.Micro820.pond2Scaling.rawMax, +Controller.Micro820.Micro820.pond2Scaling.rawMin, Controller.Micro820.Micro820.pond2Volume, Controller.Micro820.Micro820.pond3CalibrationHeight[1], Controller.Micro820.Micro820.pond3CalibrationHeight[10], @@ -122,6 +132,10 @@ Controller.Micro820.Micro820.pond3CalibrationVolume[7], Controller.Micro820.Micro820.pond3CalibrationVolume[8], Controller.Micro820.Micro820.pond3CalibrationVolume[9], Controller.Micro820.Micro820.pond3Height, +Controller.Micro820.Micro820.pond3Scaling.euMax, +Controller.Micro820.Micro820.pond3Scaling.euMin, +Controller.Micro820.Micro820.pond3Scaling.rawMax, +Controller.Micro820.Micro820.pond3Scaling.rawMin, Controller.Micro820.Micro820.pond3Volume, Controller.Micro820.Micro820.pond4CalibrationHeight[1], Controller.Micro820.Micro820.pond4CalibrationHeight[10], @@ -144,6 +158,10 @@ Controller.Micro820.Micro820.pond4CalibrationVolume[7], Controller.Micro820.Micro820.pond4CalibrationVolume[8], Controller.Micro820.Micro820.pond4CalibrationVolume[9], Controller.Micro820.Micro820.pond4Height, +Controller.Micro820.Micro820.pond4Scaling.euMax, +Controller.Micro820.Micro820.pond4Scaling.euMin, +Controller.Micro820.Micro820.pond4Scaling.rawMax, +Controller.Micro820.Micro820.pond4Scaling.rawMin, Controller.Micro820.Micro820.pond4Volume, Controller.Micro820.Micro820.Scaling.GetPond1ScalingParams.calIndex, Controller.Micro820.Micro820.Scaling.GetPond1ScalingParams.highHeightScalingParam, @@ -181,5 +199,3 @@ Controller.Micro820.Micro820.Scaling.GetPond4ScalingParams.lowHeightScalingParam Controller.Micro820.Micro820.Scaling.GetPond4ScalingParams.lowVolumeScalingParam, Controller.Micro820.Micro820.Scaling.GetPond4ScalingParams.maxCalIndex, Controller.Micro820.Micro820.Scaling.GetPond4ScalingParams.success, -Controller.Micro820.Micro820.testCalPoints1, -Controller.Micro820.Micro820.testSuccess, diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/ADDCALIBRATIONPOINT.rtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/ADDCALIBRATIONPOINT.rtc index bec4c73..bbe2318 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/ADDCALIBRATIONPOINT.rtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/ADDCALIBRATIONPOINT.rtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/CALIBRATION.ic b/Multi-Pond/Controller/Controller/Micro820/Micro820/CALIBRATION.ic index e1a55b9..2f0cb80 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/CALIBRATION.ic +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/CALIBRATION.ic @@ -5,7 +5,7 @@ _PUSH_PAR INPPONDHEIGHT _PUSH_PAR INPPONDVOLUME _PUSH_PAR INPPONDNUMBER __TMPB1 := _CALL ADDCALIBRATIONPOINT -TESTSUCCESS := __TMPB1 +ADDSUCCESS := __TMPB1 _STEP 2 0 4 CMDADDCALIBRATIONPOINT := FALSE _GOTO __LAB2 diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/CALIBRATION.rtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/CALIBRATION.rtc index 91e4098..3738a03 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/CALIBRATION.rtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/CALIBRATION.rtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/Calibration.stf b/Multi-Pond/Controller/Controller/Micro820/Micro820/Calibration.stf index 6d53202..1b0595e 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/Calibration.stf +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/Calibration.stf @@ -1,7 +1,7 @@ PROGRAM Calibration IF cmdAddCalibrationPoint THEN - testSuccess := AddCalibrationPoint(inpPondHeight, inpPondVolume, inpPondNumber); + addSuccess := AddCalibrationPoint(inpPondHeight, inpPondVolume, inpPondNumber); cmdAddCalibrationPoint := FALSE; END_IF; diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/DELETECALIBRATIONPOINT.rtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/DELETECALIBRATIONPOINT.rtc index fa7069a..b663858 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/DELETECALIBRATIONPOINT.rtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/DELETECALIBRATIONPOINT.rtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/FINDNUMBEROFCALPOINTS.rtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/FINDNUMBEROFCALPOINTS.rtc index fe9232b..a1e07b4 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/FINDNUMBEROFCALPOINTS.rtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/FINDNUMBEROFCALPOINTS.rtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/GETSCALINGPARAMETERS.ic b/Multi-Pond/Controller/Controller/Micro820/Micro820/GETSCALINGPARAMETERS.ic index b3fe45d..3d929c1 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/GETSCALINGPARAMETERS.ic +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/GETSCALINGPARAMETERS.ic @@ -43,33 +43,37 @@ __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND1CALIBRATIONVOLUME [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 17 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB3 __LAB4 : -_STEP 2 0 18 +_STEP 2 0 19 __TMPV1 := __GETSCALINGPARAMETERS [ __DINT_NULL ] __TMPR3 := __TMPV1 [ __DINT_NULL ] __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND1CALIBRATIONHEIGHT [ __TMPI1 ] -__TMPB1 := __TMPR3 < __TMPR2 +__TMPB1 := __TMPR3 <= __TMPR2 _IF _NOT __TMPB1 _GOTO __LAB5 -_STEP 2 0 19 -__GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR1 _STEP 2 0 20 +__GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR1 +_STEP 2 0 21 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND1CALIBRATIONHEIGHT [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 21 -__GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR1 _STEP 2 0 22 +__GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR1 +_STEP 2 0 23 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND1CALIBRATIONVOLUME [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 24 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB6 __LAB5 : -_STEP 2 0 23 +_STEP 2 0 25 __TMPV1 := __GETSCALINGPARAMETERS [ __DINT_NULL ] __TMPR3 := __TMPV1 [ __DINT_NULL ] __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] @@ -77,9 +81,9 @@ __BOUNDCHK 10 1 __TMPI1 __TMPI2 := __TMPI1 - __CDINT00000001 __TMPI2 := __TMPI2 * __CDINT00000004 __TMPR2 := POND1CALIBRATIONHEIGHT [ __TMPI2 ] -__TMPB1 := __TMPR3 > __TMPR2 +__TMPB1 := __TMPR3 >= __TMPR2 _IF _NOT __TMPB1 _GOTO __LAB7 -_STEP 2 0 24 +_STEP 2 0 26 __TMPI3 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPI3 := __TMPI3 - __CDINT00000001 __BOUNDCHK 10 1 __TMPI3 @@ -87,14 +91,14 @@ __TMPI4 := __TMPI3 - __CDINT00000001 __TMPI4 := __TMPI4 * __CDINT00000004 __TMPR4 := POND1CALIBRATIONHEIGHT [ __TMPI4 ] __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR4 -_STEP 2 0 25 +_STEP 2 0 27 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __BOUNDCHK 10 1 __TMPI1 __TMPI2 := __TMPI1 - __CDINT00000001 __TMPI2 := __TMPI2 * __CDINT00000004 __TMPR2 := POND1CALIBRATIONHEIGHT [ __TMPI2 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 26 +_STEP 2 0 28 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPI1 := __TMPI1 - __CDINT00000001 __BOUNDCHK 10 1 __TMPI1 @@ -102,16 +106,18 @@ __TMPI2 := __TMPI1 - __CDINT00000001 __TMPI2 := __TMPI2 * __CDINT00000004 __TMPR2 := POND1CALIBRATIONVOLUME [ __TMPI2 ] __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR2 -_STEP 2 0 27 +_STEP 2 0 29 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __BOUNDCHK 10 1 __TMPI1 __TMPI2 := __TMPI1 - __CDINT00000001 __TMPI2 := __TMPI2 * __CDINT00000004 __TMPR2 := POND1CALIBRATIONVOLUME [ __TMPI2 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 30 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB6 __LAB7 : -_STEP 2 0 29 +_STEP 2 0 32 __LOOPTMPB1 := FALSE __GETSCALINGPARAMETERS [ __CDINT0000001C ] := __CDINT00000001 __LABc : @@ -129,7 +135,7 @@ __LAB9 : __TMPB2 := __TMPI2 < __TMPI1 _IF __TMPB2 _GOTO __LABb __LABa : -_STEP 2 0 30 +_STEP 2 0 33 __TMPV1 := __GETSCALINGPARAMETERS [ __DINT_NULL ] __TMPR3 := __TMPV1 [ __DINT_NULL ] __TMPI4 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] @@ -149,14 +155,14 @@ __TMPR4 := POND1CALIBRATIONHEIGHT [ __TMPI7 ] __TMPB4 := __TMPR5 < __TMPR4 __TMPB3 := __TMPB3 _AND __TMPB4 _IF _NOT __TMPB3 _GOTO __LABe -_STEP 2 0 31 +_STEP 2 0 34 __TMPI8 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __BOUNDCHK 10 1 __TMPI8 __TMPI9 := __TMPI8 - __CDINT00000001 __TMPI9 := __TMPI9 * __CDINT00000004 __TMPR6 := POND1CALIBRATIONHEIGHT [ __TMPI9 ] __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR6 -_STEP 2 0 32 +_STEP 2 0 35 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __TMPI1 := __TMPI1 + __CDINT00000001 __BOUNDCHK 10 1 __TMPI1 @@ -164,14 +170,14 @@ __TMPI4 := __TMPI1 - __CDINT00000001 __TMPI4 := __TMPI4 * __CDINT00000004 __TMPR2 := POND1CALIBRATIONHEIGHT [ __TMPI4 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 33 +_STEP 2 0 36 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __BOUNDCHK 10 1 __TMPI1 __TMPI4 := __TMPI1 - __CDINT00000001 __TMPI4 := __TMPI4 * __CDINT00000004 __TMPR2 := POND1CALIBRATIONVOLUME [ __TMPI4 ] __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR2 -_STEP 2 0 34 +_STEP 2 0 37 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __TMPI1 := __TMPI1 + __CDINT00000001 __BOUNDCHK 10 1 __TMPI1 @@ -179,10 +185,12 @@ __TMPI4 := __TMPI1 - __CDINT00000001 __TMPI4 := __TMPI4 * __CDINT00000004 __TMPR2 := POND1CALIBRATIONVOLUME [ __TMPI4 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 38 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LABf __LABe : __LABf : -_STEP 2 0 36 +_STEP 2 0 40 __LOOPTMPB1 := TRUE _GOTO __LABc __LABd : @@ -196,68 +204,72 @@ __LAB6 : __LAB3 : _GOTO __LAB10 __LAB1 : -_STEP 2 0 40 +_STEP 2 0 44 __TMPV1 := __GETSCALINGPARAMETERS [ __CDINT00000002 ] __TMPINT1 := __TMPV1 [ __DINT_NULL ] __TMPB3 := __TMPINT1 = __CINT00000002 _IF _NOT __TMPB3 _GOTO __LAB11 -_STEP 2 0 41 +_STEP 2 0 45 _PUSH_PAR __CINT00000002 __TMPI1 := _CALL FINDNUMBEROFCALPOINTS __GETSCALINGPARAMETERS [ __CDINT00000018 ] := __TMPI1 -_STEP 2 0 43 +_STEP 2 0 47 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPB3 := __TMPI1 = __DINT_NULL _IF _NOT __TMPB3 _GOTO __LAB12 -_STEP 2 0 44 +_STEP 2 0 48 __GETSCALINGPARAMETERS [ __CDINT0000000C ] := FALSE _GOTO __LAB13 __LAB12 : -_STEP 2 0 45 +_STEP 2 0 49 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPB3 := __TMPI1 = __CDINT00000001 _IF _NOT __TMPB3 _GOTO __LAB14 -_STEP 2 0 46 +_STEP 2 0 50 __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR1 -_STEP 2 0 47 +_STEP 2 0 51 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND2CALIBRATIONHEIGHT [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 48 +_STEP 2 0 52 __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR1 -_STEP 2 0 49 +_STEP 2 0 53 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND2CALIBRATIONVOLUME [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 54 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB13 __LAB14 : -_STEP 2 0 51 +_STEP 2 0 56 __TMPV1 := __GETSCALINGPARAMETERS [ __DINT_NULL ] __TMPR3 := __TMPV1 [ __DINT_NULL ] __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND2CALIBRATIONHEIGHT [ __TMPI1 ] -__TMPB3 := __TMPR3 < __TMPR2 +__TMPB3 := __TMPR3 <= __TMPR2 _IF _NOT __TMPB3 _GOTO __LAB15 -_STEP 2 0 52 +_STEP 2 0 57 __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR1 -_STEP 2 0 53 +_STEP 2 0 58 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND2CALIBRATIONHEIGHT [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 54 +_STEP 2 0 59 __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR1 -_STEP 2 0 55 +_STEP 2 0 60 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND2CALIBRATIONVOLUME [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 61 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB16 __LAB15 : -_STEP 2 0 56 +_STEP 2 0 62 __TMPV1 := __GETSCALINGPARAMETERS [ __DINT_NULL ] __TMPR3 := __TMPV1 [ __DINT_NULL ] __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] @@ -265,9 +277,9 @@ __BOUNDCHK 10 1 __TMPI1 __TMPI4 := __TMPI1 - __CDINT00000001 __TMPI4 := __TMPI4 * __CDINT00000004 __TMPR2 := POND2CALIBRATIONHEIGHT [ __TMPI4 ] -__TMPB3 := __TMPR3 > __TMPR2 +__TMPB3 := __TMPR3 >= __TMPR2 _IF _NOT __TMPB3 _GOTO __LAB17 -_STEP 2 0 57 +_STEP 2 0 63 __TMPI5 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPI5 := __TMPI5 - __CDINT00000001 __BOUNDCHK 10 1 __TMPI5 @@ -275,14 +287,14 @@ __TMPI6 := __TMPI5 - __CDINT00000001 __TMPI6 := __TMPI6 * __CDINT00000004 __TMPR4 := POND2CALIBRATIONHEIGHT [ __TMPI6 ] __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR4 -_STEP 2 0 58 +_STEP 2 0 64 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __BOUNDCHK 10 1 __TMPI1 __TMPI4 := __TMPI1 - __CDINT00000001 __TMPI4 := __TMPI4 * __CDINT00000004 __TMPR2 := POND2CALIBRATIONHEIGHT [ __TMPI4 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 59 +_STEP 2 0 65 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPI1 := __TMPI1 - __CDINT00000001 __BOUNDCHK 10 1 __TMPI1 @@ -290,16 +302,18 @@ __TMPI4 := __TMPI1 - __CDINT00000001 __TMPI4 := __TMPI4 * __CDINT00000004 __TMPR2 := POND2CALIBRATIONVOLUME [ __TMPI4 ] __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR2 -_STEP 2 0 60 +_STEP 2 0 66 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __BOUNDCHK 10 1 __TMPI1 __TMPI4 := __TMPI1 - __CDINT00000001 __TMPI4 := __TMPI4 * __CDINT00000004 __TMPR2 := POND2CALIBRATIONVOLUME [ __TMPI4 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 67 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB16 __LAB17 : -_STEP 2 0 62 +_STEP 2 0 69 __LOOPTMPB2 := FALSE __GETSCALINGPARAMETERS [ __CDINT0000001C ] := __CDINT00000001 __LAB1c : @@ -317,7 +331,7 @@ __LAB19 : __TMPB4 := __TMPI4 < __TMPI1 _IF __TMPB4 _GOTO __LAB1b __LAB1a : -_STEP 2 0 63 +_STEP 2 0 70 __TMPV1 := __GETSCALINGPARAMETERS [ __DINT_NULL ] __TMPR3 := __TMPV1 [ __DINT_NULL ] __TMPI6 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] @@ -337,14 +351,14 @@ __TMPR4 := POND2CALIBRATIONHEIGHT [ __TMPI9 ] __TMPB6 := __TMPR5 < __TMPR4 __TMPB5 := __TMPB5 _AND __TMPB6 _IF _NOT __TMPB5 _GOTO __LAB1e -_STEP 2 0 64 +_STEP 2 0 71 __TMPI10 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __BOUNDCHK 10 1 __TMPI10 __TMPI11 := __TMPI10 - __CDINT00000001 __TMPI11 := __TMPI11 * __CDINT00000004 __TMPR6 := POND2CALIBRATIONHEIGHT [ __TMPI11 ] __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR6 -_STEP 2 0 65 +_STEP 2 0 72 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __TMPI1 := __TMPI1 + __CDINT00000001 __BOUNDCHK 10 1 __TMPI1 @@ -352,14 +366,14 @@ __TMPI6 := __TMPI1 - __CDINT00000001 __TMPI6 := __TMPI6 * __CDINT00000004 __TMPR2 := POND2CALIBRATIONHEIGHT [ __TMPI6 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 66 +_STEP 2 0 73 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __BOUNDCHK 10 1 __TMPI1 __TMPI6 := __TMPI1 - __CDINT00000001 __TMPI6 := __TMPI6 * __CDINT00000004 __TMPR2 := POND2CALIBRATIONVOLUME [ __TMPI6 ] __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR2 -_STEP 2 0 67 +_STEP 2 0 74 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __TMPI1 := __TMPI1 + __CDINT00000001 __BOUNDCHK 10 1 __TMPI1 @@ -367,10 +381,12 @@ __TMPI6 := __TMPI1 - __CDINT00000001 __TMPI6 := __TMPI6 * __CDINT00000004 __TMPR2 := POND2CALIBRATIONVOLUME [ __TMPI6 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 75 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB1f __LAB1e : __LAB1f : -_STEP 2 0 69 +_STEP 2 0 77 __LOOPTMPB2 := TRUE _GOTO __LAB1c __LAB1d : @@ -388,63 +404,67 @@ __TMPV1 := __GETSCALINGPARAMETERS [ __CDINT00000002 ] __TMPINT1 := __TMPV1 [ __DINT_NULL ] __TMPB5 := __TMPINT1 = __CINT00000003 _IF _NOT __TMPB5 _GOTO __LAB20 -_STEP 2 0 74 +_STEP 2 0 82 _PUSH_PAR __CINT00000003 __TMPI1 := _CALL FINDNUMBEROFCALPOINTS __GETSCALINGPARAMETERS [ __CDINT00000018 ] := __TMPI1 -_STEP 2 0 76 +_STEP 2 0 84 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPB5 := __TMPI1 = __DINT_NULL _IF _NOT __TMPB5 _GOTO __LAB21 -_STEP 2 0 77 +_STEP 2 0 85 __GETSCALINGPARAMETERS [ __CDINT0000000C ] := FALSE _GOTO __LAB22 __LAB21 : -_STEP 2 0 78 +_STEP 2 0 86 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPB5 := __TMPI1 = __CDINT00000001 _IF _NOT __TMPB5 _GOTO __LAB23 -_STEP 2 0 79 +_STEP 2 0 87 __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR1 -_STEP 2 0 80 +_STEP 2 0 88 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND3CALIBRATIONHEIGHT [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 81 +_STEP 2 0 89 __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR1 -_STEP 2 0 82 +_STEP 2 0 90 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND3CALIBRATIONVOLUME [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 91 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB22 __LAB23 : -_STEP 2 0 84 +_STEP 2 0 93 __TMPV1 := __GETSCALINGPARAMETERS [ __DINT_NULL ] __TMPR3 := __TMPV1 [ __DINT_NULL ] __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND3CALIBRATIONHEIGHT [ __TMPI1 ] -__TMPB5 := __TMPR3 < __TMPR2 +__TMPB5 := __TMPR3 <= __TMPR2 _IF _NOT __TMPB5 _GOTO __LAB24 -_STEP 2 0 85 +_STEP 2 0 94 __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR1 -_STEP 2 0 86 +_STEP 2 0 95 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND3CALIBRATIONHEIGHT [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 87 +_STEP 2 0 96 __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR1 -_STEP 2 0 88 +_STEP 2 0 97 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND3CALIBRATIONVOLUME [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 98 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB25 __LAB24 : -_STEP 2 0 89 +_STEP 2 0 99 __TMPV1 := __GETSCALINGPARAMETERS [ __DINT_NULL ] __TMPR3 := __TMPV1 [ __DINT_NULL ] __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] @@ -452,9 +472,9 @@ __BOUNDCHK 10 1 __TMPI1 __TMPI6 := __TMPI1 - __CDINT00000001 __TMPI6 := __TMPI6 * __CDINT00000004 __TMPR2 := POND3CALIBRATIONHEIGHT [ __TMPI6 ] -__TMPB5 := __TMPR3 > __TMPR2 +__TMPB5 := __TMPR3 >= __TMPR2 _IF _NOT __TMPB5 _GOTO __LAB26 -_STEP 2 0 90 +_STEP 2 0 100 __TMPI7 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPI7 := __TMPI7 - __CDINT00000001 __BOUNDCHK 10 1 __TMPI7 @@ -462,14 +482,14 @@ __TMPI8 := __TMPI7 - __CDINT00000001 __TMPI8 := __TMPI8 * __CDINT00000004 __TMPR4 := POND3CALIBRATIONHEIGHT [ __TMPI8 ] __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR4 -_STEP 2 0 91 +_STEP 2 0 101 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __BOUNDCHK 10 1 __TMPI1 __TMPI6 := __TMPI1 - __CDINT00000001 __TMPI6 := __TMPI6 * __CDINT00000004 __TMPR2 := POND3CALIBRATIONHEIGHT [ __TMPI6 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 92 +_STEP 2 0 102 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPI1 := __TMPI1 - __CDINT00000001 __BOUNDCHK 10 1 __TMPI1 @@ -477,16 +497,18 @@ __TMPI6 := __TMPI1 - __CDINT00000001 __TMPI6 := __TMPI6 * __CDINT00000004 __TMPR2 := POND3CALIBRATIONVOLUME [ __TMPI6 ] __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR2 -_STEP 2 0 93 +_STEP 2 0 103 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __BOUNDCHK 10 1 __TMPI1 __TMPI6 := __TMPI1 - __CDINT00000001 __TMPI6 := __TMPI6 * __CDINT00000004 __TMPR2 := POND3CALIBRATIONVOLUME [ __TMPI6 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 104 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB25 __LAB26 : -_STEP 2 0 95 +_STEP 2 0 106 __LOOPTMPB3 := FALSE __GETSCALINGPARAMETERS [ __CDINT0000001C ] := __CDINT00000001 __LAB2b : @@ -504,7 +526,7 @@ __LAB28 : __TMPB6 := __TMPI6 < __TMPI1 _IF __TMPB6 _GOTO __LAB2a __LAB29 : -_STEP 2 0 96 +_STEP 2 0 107 __TMPV1 := __GETSCALINGPARAMETERS [ __DINT_NULL ] __TMPR3 := __TMPV1 [ __DINT_NULL ] __TMPI8 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] @@ -524,14 +546,14 @@ __TMPR4 := POND3CALIBRATIONHEIGHT [ __TMPI11 ] __TMPB8 := __TMPR5 < __TMPR4 __TMPB7 := __TMPB7 _AND __TMPB8 _IF _NOT __TMPB7 _GOTO __LAB2d -_STEP 2 0 97 +_STEP 2 0 108 __TMPI12 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __BOUNDCHK 10 1 __TMPI12 __TMPI13 := __TMPI12 - __CDINT00000001 __TMPI13 := __TMPI13 * __CDINT00000004 __TMPR6 := POND3CALIBRATIONHEIGHT [ __TMPI13 ] __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR6 -_STEP 2 0 98 +_STEP 2 0 109 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __TMPI1 := __TMPI1 + __CDINT00000001 __BOUNDCHK 10 1 __TMPI1 @@ -539,14 +561,14 @@ __TMPI8 := __TMPI1 - __CDINT00000001 __TMPI8 := __TMPI8 * __CDINT00000004 __TMPR2 := POND3CALIBRATIONHEIGHT [ __TMPI8 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 99 +_STEP 2 0 110 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __BOUNDCHK 10 1 __TMPI1 __TMPI8 := __TMPI1 - __CDINT00000001 __TMPI8 := __TMPI8 * __CDINT00000004 __TMPR2 := POND3CALIBRATIONVOLUME [ __TMPI8 ] __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR2 -_STEP 2 0 100 +_STEP 2 0 111 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __TMPI1 := __TMPI1 + __CDINT00000001 __BOUNDCHK 10 1 __TMPI1 @@ -554,10 +576,12 @@ __TMPI8 := __TMPI1 - __CDINT00000001 __TMPI8 := __TMPI8 * __CDINT00000004 __TMPR2 := POND3CALIBRATIONVOLUME [ __TMPI8 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 112 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB2e __LAB2d : __LAB2e : -_STEP 2 0 102 +_STEP 2 0 114 __LOOPTMPB3 := TRUE _GOTO __LAB2b __LAB2c : @@ -575,63 +599,67 @@ __TMPV1 := __GETSCALINGPARAMETERS [ __CDINT00000002 ] __TMPINT1 := __TMPV1 [ __DINT_NULL ] __TMPB7 := __TMPINT1 = __CINT00000004 _IF _NOT __TMPB7 _GOTO __LAB2f -_STEP 2 0 107 +_STEP 2 0 119 _PUSH_PAR __CINT00000004 __TMPI1 := _CALL FINDNUMBEROFCALPOINTS __GETSCALINGPARAMETERS [ __CDINT00000018 ] := __TMPI1 -_STEP 2 0 109 +_STEP 2 0 121 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPB7 := __TMPI1 = __DINT_NULL _IF _NOT __TMPB7 _GOTO __LAB30 -_STEP 2 0 110 +_STEP 2 0 122 __GETSCALINGPARAMETERS [ __CDINT0000000C ] := FALSE _GOTO __LAB31 __LAB30 : -_STEP 2 0 111 +_STEP 2 0 123 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPB7 := __TMPI1 = __CDINT00000001 _IF _NOT __TMPB7 _GOTO __LAB32 -_STEP 2 0 112 +_STEP 2 0 124 __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR1 -_STEP 2 0 113 +_STEP 2 0 125 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND4CALIBRATIONHEIGHT [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 114 +_STEP 2 0 126 __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR1 -_STEP 2 0 115 +_STEP 2 0 127 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND4CALIBRATIONVOLUME [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 128 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB31 __LAB32 : -_STEP 2 0 117 +_STEP 2 0 130 __TMPV1 := __GETSCALINGPARAMETERS [ __DINT_NULL ] __TMPR3 := __TMPV1 [ __DINT_NULL ] __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND4CALIBRATIONHEIGHT [ __TMPI1 ] -__TMPB7 := __TMPR3 < __TMPR2 +__TMPB7 := __TMPR3 <= __TMPR2 _IF _NOT __TMPB7 _GOTO __LAB33 -_STEP 2 0 118 +_STEP 2 0 131 __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR1 -_STEP 2 0 119 +_STEP 2 0 132 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND4CALIBRATIONHEIGHT [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 120 +_STEP 2 0 133 __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR1 -_STEP 2 0 121 +_STEP 2 0 134 __TMPI1 := __CDINT00000001 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000004 __TMPR2 := POND4CALIBRATIONVOLUME [ __TMPI1 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 135 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB34 __LAB33 : -_STEP 2 0 122 +_STEP 2 0 136 __TMPV1 := __GETSCALINGPARAMETERS [ __DINT_NULL ] __TMPR3 := __TMPV1 [ __DINT_NULL ] __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] @@ -639,9 +667,9 @@ __BOUNDCHK 10 1 __TMPI1 __TMPI8 := __TMPI1 - __CDINT00000001 __TMPI8 := __TMPI8 * __CDINT00000004 __TMPR2 := POND4CALIBRATIONHEIGHT [ __TMPI8 ] -__TMPB7 := __TMPR3 > __TMPR2 +__TMPB7 := __TMPR3 >= __TMPR2 _IF _NOT __TMPB7 _GOTO __LAB35 -_STEP 2 0 123 +_STEP 2 0 137 __TMPI9 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPI9 := __TMPI9 - __CDINT00000001 __BOUNDCHK 10 1 __TMPI9 @@ -649,14 +677,14 @@ __TMPI10 := __TMPI9 - __CDINT00000001 __TMPI10 := __TMPI10 * __CDINT00000004 __TMPR4 := POND4CALIBRATIONHEIGHT [ __TMPI10 ] __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR4 -_STEP 2 0 124 +_STEP 2 0 138 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __BOUNDCHK 10 1 __TMPI1 __TMPI8 := __TMPI1 - __CDINT00000001 __TMPI8 := __TMPI8 * __CDINT00000004 __TMPR2 := POND4CALIBRATIONHEIGHT [ __TMPI8 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 125 +_STEP 2 0 139 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __TMPI1 := __TMPI1 - __CDINT00000001 __BOUNDCHK 10 1 __TMPI1 @@ -664,16 +692,18 @@ __TMPI8 := __TMPI1 - __CDINT00000001 __TMPI8 := __TMPI8 * __CDINT00000004 __TMPR2 := POND4CALIBRATIONVOLUME [ __TMPI8 ] __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR2 -_STEP 2 0 126 +_STEP 2 0 140 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT00000018 ] __BOUNDCHK 10 1 __TMPI1 __TMPI8 := __TMPI1 - __CDINT00000001 __TMPI8 := __TMPI8 * __CDINT00000004 __TMPR2 := POND4CALIBRATIONVOLUME [ __TMPI8 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 141 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB34 __LAB35 : -_STEP 2 0 128 +_STEP 2 0 143 __LOOPTMPB4 := FALSE __GETSCALINGPARAMETERS [ __CDINT0000001C ] := __CDINT00000001 __LAB3a : @@ -691,7 +721,7 @@ __LAB37 : __TMPB8 := __TMPI8 < __TMPI1 _IF __TMPB8 _GOTO __LAB39 __LAB38 : -_STEP 2 0 129 +_STEP 2 0 144 __TMPV1 := __GETSCALINGPARAMETERS [ __DINT_NULL ] __TMPR3 := __TMPV1 [ __DINT_NULL ] __TMPI10 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] @@ -711,14 +741,14 @@ __TMPR4 := POND4CALIBRATIONHEIGHT [ __TMPI13 ] __TMPB10 := __TMPR5 < __TMPR4 __TMPB9 := __TMPB9 _AND __TMPB10 _IF _NOT __TMPB9 _GOTO __LAB3c -_STEP 2 0 130 +_STEP 2 0 145 __TMPI14 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __BOUNDCHK 10 1 __TMPI14 __TMPI15 := __TMPI14 - __CDINT00000001 __TMPI15 := __TMPI15 * __CDINT00000004 __TMPR6 := POND4CALIBRATIONHEIGHT [ __TMPI15 ] __GETSCALINGPARAMETERS [ __CDINT00000004 ] := __TMPR6 -_STEP 2 0 131 +_STEP 2 0 146 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __TMPI1 := __TMPI1 + __CDINT00000001 __BOUNDCHK 10 1 __TMPI1 @@ -726,14 +756,14 @@ __TMPI10 := __TMPI1 - __CDINT00000001 __TMPI10 := __TMPI10 * __CDINT00000004 __TMPR2 := POND4CALIBRATIONHEIGHT [ __TMPI10 ] __GETSCALINGPARAMETERS [ __CDINT00000008 ] := __TMPR2 -_STEP 2 0 132 +_STEP 2 0 147 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __BOUNDCHK 10 1 __TMPI1 __TMPI10 := __TMPI1 - __CDINT00000001 __TMPI10 := __TMPI10 * __CDINT00000004 __TMPR2 := POND4CALIBRATIONVOLUME [ __TMPI10 ] __GETSCALINGPARAMETERS [ __CDINT00000010 ] := __TMPR2 -_STEP 2 0 133 +_STEP 2 0 148 __TMPI1 := __GETSCALINGPARAMETERS [ __CDINT0000001C ] __TMPI1 := __TMPI1 + __CDINT00000001 __BOUNDCHK 10 1 __TMPI1 @@ -741,10 +771,12 @@ __TMPI10 := __TMPI1 - __CDINT00000001 __TMPI10 := __TMPI10 * __CDINT00000004 __TMPR2 := POND4CALIBRATIONVOLUME [ __TMPI10 ] __GETSCALINGPARAMETERS [ __CDINT00000014 ] := __TMPR2 +_STEP 2 0 149 +__GETSCALINGPARAMETERS [ __CDINT0000000C ] := TRUE _GOTO __LAB3d __LAB3c : __LAB3d : -_STEP 2 0 135 +_STEP 2 0 151 __LOOPTMPB4 := TRUE _GOTO __LAB3a __LAB3b : diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/GETSCALINGPARAMETERS.otc b/Multi-Pond/Controller/Controller/Micro820/Micro820/GETSCALINGPARAMETERS.otc index 735c3d6..de4c1b4 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/GETSCALINGPARAMETERS.otc +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/GETSCALINGPARAMETERS.otc @@ -1,4 +1,4 @@ -107 +123 6, 1 14, 2 @@ -14,96 +14,112 @@ 162, 14 178, 15 186, 16 -210, 18 -248, 19 +202, 17 +218, 19 256, 20 -272, 21 +264, 21 280, 22 -304, 23 -374, 24 -430, 25 -478, 26 -534, 27 -590, 29 -688, 30 -838, 31 -886, 32 -942, 33 -990, 34 -1050, 36 -1110, 40 -1140, 41 -1158, 43 -1180, 44 -1196, 45 -1218, 46 -1226, 47 -1242, 48 -1250, 49 -1274, 51 -1312, 52 -1320, 53 -1336, 54 -1344, 55 -1368, 56 -1438, 57 -1494, 58 -1542, 59 -1598, 60 -1654, 62 -1752, 63 -1902, 64 -1950, 65 -2006, 66 -2054, 67 -2114, 69 -2204, 74 -2222, 76 -2244, 77 -2260, 78 -2282, 79 -2290, 80 -2306, 81 -2314, 82 -2338, 84 -2376, 85 -2384, 86 -2400, 87 -2408, 88 -2432, 89 -2502, 90 -2558, 91 -2606, 92 -2662, 93 -2718, 95 -2816, 96 -2966, 97 -3014, 98 -3070, 99 -3118, 100 -3178, 102 -3268, 107 -3286, 109 -3308, 110 -3324, 111 -3346, 112 -3354, 113 -3370, 114 -3378, 115 -3402, 117 -3440, 118 -3448, 119 -3464, 120 -3472, 121 -3496, 122 -3566, 123 -3622, 124 -3670, 125 -3726, 126 -3782, 128 -3880, 129 -4030, 130 -4078, 131 -4134, 132 -4182, 133 -4242, 135 +288, 23 +304, 24 +320, 25 +390, 26 +446, 27 +494, 28 +550, 29 +598, 30 +614, 32 +712, 33 +862, 34 +910, 35 +966, 36 +1014, 37 +1070, 38 +1082, 40 +1142, 44 +1172, 45 +1190, 47 +1212, 48 +1228, 49 +1250, 50 +1258, 51 +1274, 52 +1282, 53 +1298, 54 +1314, 56 +1352, 57 +1360, 58 +1376, 59 +1384, 60 +1400, 61 +1416, 62 +1486, 63 +1542, 64 +1590, 65 +1646, 66 +1694, 67 +1710, 69 +1808, 70 +1958, 71 +2006, 72 +2062, 73 +2110, 74 +2166, 75 +2178, 77 +2268, 82 +2286, 84 +2308, 85 +2324, 86 +2346, 87 +2354, 88 +2370, 89 +2378, 90 +2394, 91 +2410, 93 +2448, 94 +2456, 95 +2472, 96 +2480, 97 +2496, 98 +2512, 99 +2582, 100 +2638, 101 +2686, 102 +2742, 103 +2790, 104 +2806, 106 +2904, 107 +3054, 108 +3102, 109 +3158, 110 +3206, 111 +3262, 112 +3274, 114 +3364, 119 +3382, 121 +3404, 122 +3420, 123 +3442, 124 +3450, 125 +3466, 126 +3474, 127 +3490, 128 +3506, 130 +3544, 131 +3552, 132 +3568, 133 +3576, 134 +3592, 135 +3608, 136 +3678, 137 +3734, 138 +3782, 139 +3838, 140 +3886, 141 +3902, 143 +4000, 144 +4150, 145 +4198, 146 +4254, 147 +4302, 148 +4358, 149 +4370, 151 diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/GETSCALINGPARAMETERS.rtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/GETSCALINGPARAMETERS.rtc index b79371c..831630c 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/GETSCALINGPARAMETERS.rtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/GETSCALINGPARAMETERS.rtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/GetScalingParameters.stf b/Multi-Pond/Controller/Controller/Micro820/Micro820/GetScalingParameters.stf index 84c7fd2..47aa833 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/GetScalingParameters.stf +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/GetScalingParameters.stf @@ -15,17 +15,20 @@ IF linpPondNumber = 1 THEN highHeightScalingParam := pond1CalibrationHeight[1]; lowVolumeScalingParam := 0.0; highVolumeScalingParam := pond1CalibrationVolume[1]; + success := TRUE; ELSE - IF linpPondHeight < pond1CalibrationHeight[1] THEN + IF linpPondHeight <= pond1CalibrationHeight[1] THEN lowHeightScalingParam := 0.0; highHeightScalingParam := pond1CalibrationHeight[1]; lowVolumeScalingParam := 0.0; highVolumeScalingParam := pond1CalibrationVolume[1]; - ELSIF linpPondHeight > pond1CalibrationHeight[maxCalIndex] THEN + success := TRUE; + ELSIF linpPondHeight >= pond1CalibrationHeight[maxCalIndex] THEN lowHeightScalingParam := pond1CalibrationHeight[maxCalIndex - 1]; highHeightScalingParam := pond1CalibrationHeight[maxCalIndex]; lowVolumeScalingParam := pond1CalibrationVolume[maxCalIndex - 1]; highVolumeScalingParam := pond1CalibrationVolume[maxCalIndex]; + success := TRUE; ELSE FOR calIndex := 1 TO maxCalIndex - 1 DO IF linpPondHeight >= pond1CalibrationHeight[calIndex] AND linpPondHeight < pond1CalibrationHeight[calIndex + 1] THEN @@ -33,6 +36,7 @@ IF linpPondNumber = 1 THEN highHeightScalingParam := pond1CalibrationHeight[calIndex + 1]; lowVolumeScalingParam := pond1CalibrationVolume[calIndex]; highVolumeScalingParam := pond1CalibrationVolume[calIndex + 1]; + success := TRUE; END_IF; END_FOR; END_IF; @@ -48,17 +52,20 @@ ELSIF linpPondNumber = 2 THEN highHeightScalingParam := pond2CalibrationHeight[1]; lowVolumeScalingParam := 0.0; highVolumeScalingParam := pond2CalibrationVolume[1]; + success := TRUE; ELSE - IF linpPondHeight < pond2CalibrationHeight[1] THEN + IF linpPondHeight <= pond2CalibrationHeight[1] THEN lowHeightScalingParam := 0.0; highHeightScalingParam := pond2CalibrationHeight[1]; lowVolumeScalingParam := 0.0; highVolumeScalingParam := pond2CalibrationVolume[1]; - ELSIF linpPondHeight > pond2CalibrationHeight[maxCalIndex] THEN + success := TRUE; + ELSIF linpPondHeight >= pond2CalibrationHeight[maxCalIndex] THEN lowHeightScalingParam := pond2CalibrationHeight[maxCalIndex - 1]; highHeightScalingParam := pond2CalibrationHeight[maxCalIndex]; lowVolumeScalingParam := pond2CalibrationVolume[maxCalIndex - 1]; highVolumeScalingParam := pond2CalibrationVolume[maxCalIndex]; + success := TRUE; ELSE FOR calIndex := 1 TO maxCalIndex - 1 DO IF linpPondHeight >= pond2CalibrationHeight[calIndex] AND linpPondHeight < pond2CalibrationHeight[calIndex + 1] THEN @@ -66,6 +73,7 @@ ELSIF linpPondNumber = 2 THEN highHeightScalingParam := pond2CalibrationHeight[calIndex + 1]; lowVolumeScalingParam := pond2CalibrationVolume[calIndex]; highVolumeScalingParam := pond2CalibrationVolume[calIndex + 1]; + success := TRUE; END_IF; END_FOR; END_IF; @@ -81,17 +89,20 @@ ELSIF linpPondNumber = 3 THEN highHeightScalingParam := pond3CalibrationHeight[1]; lowVolumeScalingParam := 0.0; highVolumeScalingParam := pond3CalibrationVolume[1]; + success := TRUE; ELSE - IF linpPondHeight < pond3CalibrationHeight[1] THEN + IF linpPondHeight <= pond3CalibrationHeight[1] THEN lowHeightScalingParam := 0.0; highHeightScalingParam := pond3CalibrationHeight[1]; lowVolumeScalingParam := 0.0; highVolumeScalingParam := pond3CalibrationVolume[1]; - ELSIF linpPondHeight > pond3CalibrationHeight[maxCalIndex] THEN + success := TRUE; + ELSIF linpPondHeight >= pond3CalibrationHeight[maxCalIndex] THEN lowHeightScalingParam := pond3CalibrationHeight[maxCalIndex - 1]; highHeightScalingParam := pond3CalibrationHeight[maxCalIndex]; lowVolumeScalingParam := pond3CalibrationVolume[maxCalIndex - 1]; highVolumeScalingParam := pond3CalibrationVolume[maxCalIndex]; + success := TRUE; ELSE FOR calIndex := 1 TO maxCalIndex - 1 DO IF linpPondHeight >= pond3CalibrationHeight[calIndex] AND linpPondHeight < pond3CalibrationHeight[calIndex + 1] THEN @@ -99,6 +110,7 @@ ELSIF linpPondNumber = 3 THEN highHeightScalingParam := pond3CalibrationHeight[calIndex + 1]; lowVolumeScalingParam := pond3CalibrationVolume[calIndex]; highVolumeScalingParam := pond3CalibrationVolume[calIndex + 1]; + success := TRUE; END_IF; END_FOR; END_IF; @@ -114,17 +126,20 @@ ELSIF linpPondNumber = 4 THEN highHeightScalingParam := pond4CalibrationHeight[1]; lowVolumeScalingParam := 0.0; highVolumeScalingParam := pond4CalibrationVolume[1]; + success := TRUE; ELSE - IF linpPondHeight < pond4CalibrationHeight[1] THEN + IF linpPondHeight <= pond4CalibrationHeight[1] THEN lowHeightScalingParam := 0.0; highHeightScalingParam := pond4CalibrationHeight[1]; lowVolumeScalingParam := 0.0; highVolumeScalingParam := pond4CalibrationVolume[1]; - ELSIF linpPondHeight > pond4CalibrationHeight[maxCalIndex] THEN + success := TRUE; + ELSIF linpPondHeight >= pond4CalibrationHeight[maxCalIndex] THEN lowHeightScalingParam := pond4CalibrationHeight[maxCalIndex - 1]; highHeightScalingParam := pond4CalibrationHeight[maxCalIndex]; lowVolumeScalingParam := pond4CalibrationVolume[maxCalIndex - 1]; highVolumeScalingParam := pond4CalibrationVolume[maxCalIndex]; + success := TRUE; ELSE FOR calIndex := 1 TO maxCalIndex - 1 DO IF linpPondHeight >= pond4CalibrationHeight[calIndex] AND linpPondHeight < pond4CalibrationHeight[calIndex + 1] THEN @@ -132,6 +147,7 @@ ELSIF linpPondNumber = 4 THEN highHeightScalingParam := pond4CalibrationHeight[calIndex + 1]; lowVolumeScalingParam := pond4CalibrationVolume[calIndex]; highVolumeScalingParam := pond4CalibrationVolume[calIndex + 1]; + success := TRUE; END_IF; END_FOR; END_IF; diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc index 1de6542..651c022 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/Header.rtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/Header.rtc index e3174d5..f491808 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/Header.rtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/Header.rtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/IDS00103 b/Multi-Pond/Controller/Controller/Micro820/Micro820/IDS00103 index 67a256c..2cc0e71 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/IDS00103 and b/Multi-Pond/Controller/Controller/Micro820/Micro820/IDS00103 differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/LINEARSCALE.rtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/LINEARSCALE.rtc index a091c67..af9716b 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/LINEARSCALE.rtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/LINEARSCALE.rtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820.icp b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820.icp index f6f0e99..9ad6f01 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820.icp +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820.icp @@ -1,7 +1,7 @@ CALIBRATION(156):F,ADDCALIBRATIONPOINT(157);F,DELETECALIBRATIONPOINT(158); ADDCALIBRATIONPOINT(157):F,FINDNUMBEROFCALPOINTS(155); DELETECALIBRATIONPOINT(158): -SCALING(159):FB,GETSCALINGPARAMETERS(161);F,LINEARSCALE(154); +SCALING(159):F,LINEARSCALE(154);FB,GETSCALINGPARAMETERS(161); FINDNUMBEROFCALPOINTS(155): LINEARSCALE(154): GETSCALINGPARAMETERS(161):F,FINDNUMBEROFCALPOINTS(155); diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc index 02b799e..01671fd 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc index eb6e6e2..715187a 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc index 7881b9d..2254f1d 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc index d26bd1a..872bd8f 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc @@ -1,11 +1,11 @@ [MEMORY] -Offset0=0xF70 -Offset1=0x1770 -Offset2=0x1770 -Offset3=0x1770 -Memory Usage Estimate(Code)=0x2D34 -Memory Usage Estimate(Data)=0x38B0 -Memory Usage Estimate(Retain)=0x140 -Memory Usage Estimate(RetainBlocks)=0x1 -Memory Usage Estimate(Temporary variables)=0x13C +Offset0=0xFB0 +Offset1=0x17B0 +Offset2=0x17B0 +Offset3=0x17B0 +Memory Usage Estimate(Code)=0x2ECC +Memory Usage Estimate(Data)=0x38F4 +Memory Usage Estimate(Retain)=0x182 +Memory Usage Estimate(RetainBlocks)=0x3 +Memory Usage Estimate(Temporary variables)=0x140 Offset4=0x414 diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc index d26bd1a..872bd8f 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc @@ -1,11 +1,11 @@ [MEMORY] -Offset0=0xF70 -Offset1=0x1770 -Offset2=0x1770 -Offset3=0x1770 -Memory Usage Estimate(Code)=0x2D34 -Memory Usage Estimate(Data)=0x38B0 -Memory Usage Estimate(Retain)=0x140 -Memory Usage Estimate(RetainBlocks)=0x1 -Memory Usage Estimate(Temporary variables)=0x13C +Offset0=0xFB0 +Offset1=0x17B0 +Offset2=0x17B0 +Offset3=0x17B0 +Memory Usage Estimate(Code)=0x2ECC +Memory Usage Estimate(Data)=0x38F4 +Memory Usage Estimate(Retain)=0x182 +Memory Usage Estimate(RetainBlocks)=0x3 +Memory Usage Estimate(Temporary variables)=0x140 Offset4=0x414 diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc index 2cf5dd1..705b30d 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc @@ -5,12 +5,12 @@ ON_LINE=N TBL_CONF=Y CRC_ORG=0x0 CRC_OLD= -CRC_NEW=0xC859F86B +CRC_NEW=0x790E125A DAT_ORG=0 DAT_OLD=0 -DAT_NEW=1528851735 +DAT_NEW=1528905825 VER_ORG=0 VER_OLD=0 -VER_NEW=20 +VER_NEW=26 CRC_ALL_OLD= -CRC_ALL_NEW=0x84ABC9B5 +CRC_ALL_NEW=0x5F8CD14F diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc index 4a5d997..f96a7f9 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc @@ -1,9 +1,9 @@ [MEMORY] -Memory Usage Estimate(Temporary variables)=0x13C +Memory Usage Estimate(Temporary variables)=0x140 Biggest online change user variable memory block size=0x800 Currently added user variables=0x0 -Total data size=0x10AC -User variables size=0xF70 -Maximum size for temporary variables=0x213C -Memory Usage Estimate(Data)=0x38AC +Total data size=0x10F0 +User variables size=0xFB0 +Maximum size for temporary variables=0x2140 +Memory Usage Estimate(Data)=0x38F0 Free memory for user variables=0x800 diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc index 4a5d997..f96a7f9 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc @@ -1,9 +1,9 @@ [MEMORY] -Memory Usage Estimate(Temporary variables)=0x13C +Memory Usage Estimate(Temporary variables)=0x140 Biggest online change user variable memory block size=0x800 Currently added user variables=0x0 -Total data size=0x10AC -User variables size=0xF70 -Maximum size for temporary variables=0x213C -Memory Usage Estimate(Data)=0x38AC +Total data size=0x10F0 +User variables size=0xFB0 +Maximum size for temporary variables=0x2140 +Memory Usage Estimate(Data)=0x38F0 Free memory for user variables=0x800 diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_ADDCALIBRATIONPOINT.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_ADDCALIBRATIONPOINT.xtc index 4d5773c..56c4c9d 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_ADDCALIBRATIONPOINT.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_ADDCALIBRATIONPOINT.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CALIBRATION.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CALIBRATION.xtc index 960d6c3..1ecd307 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CALIBRATION.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CALIBRATION.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DELETECALIBRATIONPOINT.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DELETECALIBRATIONPOINT.xtc index 96eba36..dc7bf3b 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DELETECALIBRATIONPOINT.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DELETECALIBRATIONPOINT.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FINDNUMBEROFCALPOINTS.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FINDNUMBEROFCALPOINTS.xtc index d3b32b1..ee7651a 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FINDNUMBEROFCALPOINTS.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FINDNUMBEROFCALPOINTS.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_GETSCALINGPARAMETERS.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_GETSCALINGPARAMETERS.xtc index 0d3476e..a7d8ce0 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_GETSCALINGPARAMETERS.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_GETSCALINGPARAMETERS.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc index 1fe27c6..ae17e1a 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SCALING.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SCALING.xtc index d834744..a5c754a 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SCALING.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SCALING.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc index 97bc09f..93a761e 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc @@ -1,10 +1,10 @@ [BEGIN FB INPUTS] -I1=micro820.micro820.scaling/getpond1scalingparams.linppondheight,0x488,REAL -I2=micro820.micro820.scaling/getpond1scalingparams.linppondnumber,0x17B8,INT -I3=micro820.micro820.scaling/getpond2scalingparams.linppondheight,0x48C,REAL -I4=micro820.micro820.scaling/getpond2scalingparams.linppondnumber,0x17B6,INT -I5=micro820.micro820.scaling/getpond3scalingparams.linppondheight,0x490,REAL -I6=micro820.micro820.scaling/getpond3scalingparams.linppondnumber,0x17B4,INT -I7=micro820.micro820.scaling/getpond4scalingparams.linppondheight,0x494,REAL -I8=micro820.micro820.scaling/getpond4scalingparams.linppondnumber,0x17B2,INT +I1=micro820.micro820.scaling/getpond1scalingparams.linppondheight,0x48C,REAL +I2=micro820.micro820.scaling/getpond1scalingparams.linppondnumber,0x17F6,INT +I3=micro820.micro820.scaling/getpond2scalingparams.linppondheight,0x490,REAL +I4=micro820.micro820.scaling/getpond2scalingparams.linppondnumber,0x17F4,INT +I5=micro820.micro820.scaling/getpond3scalingparams.linppondheight,0x494,REAL +I6=micro820.micro820.scaling/getpond3scalingparams.linppondnumber,0x17F2,INT +I7=micro820.micro820.scaling/getpond4scalingparams.linppondheight,0x498,REAL +I8=micro820.micro820.scaling/getpond4scalingparams.linppondnumber,0x17F8,INT [END] diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc index 645d7b4..d0cbb18 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc index 645d7b4..d0cbb18 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc index 645d7b4..d0cbb18 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc index 6619ec2..04e0bd1 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc index 6619ec2..04e0bd1 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.dop b/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.dop index ff05a85..37b55ff 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.dop +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.dop @@ -1 +1 @@ -SCALING(159):FB,GETSCALINGPARAMETERS(161);F,LINEARSCALE(154); \ No newline at end of file +SCALING(159):F,LINEARSCALE(154);FB,GETSCALINGPARAMETERS(161); \ No newline at end of file diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.ic b/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.ic index 52ad7cb..6b1e716 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.ic +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.ic @@ -1,15 +1,71 @@ -_STEP 2 0 3 +_STEP 2 0 1 +__TMPR1 := POND1SCALING [ __DINT_NULL ] +__TMPR2 := POND1SCALING [ __CDINT00000004 ] +__TMPR3 := POND1SCALING [ __CDINT00000008 ] +__TMPR4 := POND1SCALING [ __CDINT0000000C ] +_PUSH_PAR _IO_P1_AI_00 +__TMPR5 := _CALL ANY_TO_UINT +_PUSH_PAR __TMPR1 +_PUSH_PAR __TMPR2 +_PUSH_PAR __TMPR3 +_PUSH_PAR __TMPR4 +_PUSH_PAR __TMPR5 +__TMPR6 := _CALL LINEARSCALE +POND1HEIGHT := __TMPR6 +_STEP 2 0 7 +__TMPR1 := POND2SCALING [ __DINT_NULL ] +__TMPR2 := POND2SCALING [ __CDINT00000004 ] +__TMPR3 := POND2SCALING [ __CDINT00000008 ] +__TMPR4 := POND2SCALING [ __CDINT0000000C ] +_PUSH_PAR _IO_P1_AI_01 +__TMPR5 := _CALL ANY_TO_UINT +_PUSH_PAR __TMPR1 +_PUSH_PAR __TMPR2 +_PUSH_PAR __TMPR3 +_PUSH_PAR __TMPR4 +_PUSH_PAR __TMPR5 +__TMPR6 := _CALL LINEARSCALE +POND2HEIGHT := __TMPR6 +_STEP 2 0 13 +__TMPR1 := POND3SCALING [ __DINT_NULL ] +__TMPR2 := POND3SCALING [ __CDINT00000004 ] +__TMPR3 := POND3SCALING [ __CDINT00000008 ] +__TMPR4 := POND3SCALING [ __CDINT0000000C ] +_PUSH_PAR _IO_P1_AI_02 +__TMPR5 := _CALL ANY_TO_UINT +_PUSH_PAR __TMPR1 +_PUSH_PAR __TMPR2 +_PUSH_PAR __TMPR3 +_PUSH_PAR __TMPR4 +_PUSH_PAR __TMPR5 +__TMPR6 := _CALL LINEARSCALE +POND3HEIGHT := __TMPR6 +_STEP 2 0 19 +__TMPR1 := POND4SCALING [ __DINT_NULL ] +__TMPR2 := POND4SCALING [ __CDINT00000004 ] +__TMPR3 := POND4SCALING [ __CDINT00000008 ] +__TMPR4 := POND4SCALING [ __CDINT0000000C ] +_PUSH_PAR _IO_P1_AI_03 +__TMPR5 := _CALL ANY_TO_UINT +_PUSH_PAR __TMPR1 +_PUSH_PAR __TMPR2 +_PUSH_PAR __TMPR3 +_PUSH_PAR __TMPR4 +_PUSH_PAR __TMPR5 +__TMPR6 := _CALL LINEARSCALE +POND4HEIGHT := __TMPR6 +_STEP 2 0 25 __FBL_RET := _PUSHCALLFB GETSCALINGPARAMETERS GETPOND1SCALINGPARAMS -_STEP 2 0 4 +_STEP 2 0 26 __FBL_RET := _PUSHCALLFB GETSCALINGPARAMETERS GETPOND2SCALINGPARAMS -_STEP 2 0 5 +_STEP 2 0 27 __FBL_RET := _PUSHCALLFB GETSCALINGPARAMETERS GETPOND3SCALINGPARAMS -_STEP 2 0 6 +_STEP 2 0 28 __FBL_RET := _PUSHCALLFB GETSCALINGPARAMETERS GETPOND4SCALINGPARAMS -_STEP 2 0 8 +_STEP 2 0 30 __TMPB1 := GETPOND1SCALINGPARAMS [ __CDINT0000000C ] _IF _NOT __TMPB1 _GOTO __LAB1 -_STEP 2 0 9 +_STEP 2 0 31 __TMPR1 := GETPOND1SCALINGPARAMS [ __CDINT00000004 ] __TMPR2 := GETPOND1SCALINGPARAMS [ __CDINT00000008 ] __TMPR3 := GETPOND1SCALINGPARAMS [ __CDINT00000010 ] @@ -24,10 +80,10 @@ POND1VOLUME := __TMPR5 _GOTO __LAB2 __LAB1 : __LAB2 : -_STEP 2 0 16 +_STEP 2 0 38 __TMPB1 := GETPOND2SCALINGPARAMS [ __CDINT0000000C ] _IF _NOT __TMPB1 _GOTO __LAB3 -_STEP 2 0 17 +_STEP 2 0 39 __TMPR1 := GETPOND2SCALINGPARAMS [ __CDINT00000004 ] __TMPR2 := GETPOND2SCALINGPARAMS [ __CDINT00000008 ] __TMPR3 := GETPOND2SCALINGPARAMS [ __CDINT00000010 ] @@ -42,10 +98,10 @@ POND2VOLUME := __TMPR5 _GOTO __LAB4 __LAB3 : __LAB4 : -_STEP 2 0 24 +_STEP 2 0 46 __TMPB1 := GETPOND3SCALINGPARAMS [ __CDINT0000000C ] _IF _NOT __TMPB1 _GOTO __LAB5 -_STEP 2 0 25 +_STEP 2 0 47 __TMPR1 := GETPOND3SCALINGPARAMS [ __CDINT00000004 ] __TMPR2 := GETPOND3SCALINGPARAMS [ __CDINT00000008 ] __TMPR3 := GETPOND3SCALINGPARAMS [ __CDINT00000010 ] @@ -60,10 +116,10 @@ POND3VOLUME := __TMPR5 _GOTO __LAB6 __LAB5 : __LAB6 : -_STEP 2 0 32 +_STEP 2 0 54 __TMPB1 := GETPOND4SCALINGPARAMS [ __CDINT0000000C ] _IF _NOT __TMPB1 _GOTO __LAB7 -_STEP 2 0 33 +_STEP 2 0 55 __TMPR1 := GETPOND4SCALINGPARAMS [ __CDINT00000004 ] __TMPR2 := GETPOND4SCALINGPARAMS [ __CDINT00000008 ] __TMPR3 := GETPOND4SCALINGPARAMS [ __CDINT00000010 ] diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.otc b/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.otc index 45ea279..e537ebd 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.otc +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.otc @@ -1,14 +1,18 @@ -12 +16 -0, 3 -8, 4 -16, 5 -24, 6 -32, 8 -46, 9 -108, 16 -122, 17 -184, 24 -198, 25 -260, 32 -274, 33 +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 diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.rtc b/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.rtc index 13f08c0..60183f5 100644 Binary files a/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.rtc and b/Multi-Pond/Controller/Controller/Micro820/Micro820/SCALING.rtc differ diff --git a/Multi-Pond/Controller/Controller/Micro820/Micro820/Scaling.stf b/Multi-Pond/Controller/Controller/Micro820/Micro820/Scaling.stf index 91b70c7..e777cb3 100644 --- a/Multi-Pond/Controller/Controller/Micro820/Micro820/Scaling.stf +++ b/Multi-Pond/Controller/Controller/Micro820/Micro820/Scaling.stf @@ -1,5 +1,27 @@ PROGRAM Scaling +pond1Height := LinearScale(pond1Scaling.rawMin, + pond1Scaling.rawMax, + pond1Scaling.euMin, + pond1Scaling.euMax, + ANY_TO_REAL(_IO_P1_AI_00)); +pond2Height := LinearScale(pond2Scaling.rawMin, + pond2Scaling.rawMax, + pond2Scaling.euMin, + pond2Scaling.euMax, + ANY_TO_REAL(_IO_P1_AI_01)); + +pond3Height := LinearScale(pond3Scaling.rawMin, + pond3Scaling.rawMax, + pond3Scaling.euMin, + pond3Scaling.euMax, + ANY_TO_REAL(_IO_P1_AI_02)); + +pond4Height := LinearScale(pond4Scaling.rawMin, + pond4Scaling.rawMax, + pond4Scaling.euMin, + pond4Scaling.euMax, + ANY_TO_REAL(_IO_P1_AI_03)); GetPond1ScalingParams(pond1Height, 1); GetPond2ScalingParams(pond2Height, 2); diff --git a/Multi-Pond/Controller/Controller/PrjLibrary.mdb b/Multi-Pond/Controller/Controller/PrjLibrary.mdb index 5d0f8cf..b6a99c2 100644 Binary files a/Multi-Pond/Controller/Controller/PrjLibrary.mdb and b/Multi-Pond/Controller/Controller/PrjLibrary.mdb differ diff --git a/Multi-Pond/Controller/Controller/persist.ccwx b/Multi-Pond/Controller/Controller/persist.ccwx index c8bc137..c8965cd 100644 Binary files a/Multi-Pond/Controller/Controller/persist.ccwx and b/Multi-Pond/Controller/Controller/persist.ccwx differ diff --git a/Multi-Pond/Controller/Controller_Backup.zip b/Multi-Pond/Controller/Controller_Backup.zip index b236aea..e18dbf4 100644 Binary files a/Multi-Pond/Controller/Controller_Backup.zip and b/Multi-Pond/Controller/Controller_Backup.zip differ diff --git a/Multi-Pond/Controller/Embedded/ExtendedInfo.xml b/Multi-Pond/Controller/Embedded/ExtendedInfo.xml index 220fe71..fc11b3f 100644 --- a/Multi-Pond/Controller/Embedded/ExtendedInfo.xml +++ b/Multi-Pond/Controller/Embedded/ExtendedInfo.xml @@ -1,8 +1,10 @@  + + diff --git a/Multi-Pond/Multi-Pond.v12.ccwsuo b/Multi-Pond/Multi-Pond.v12.ccwsuo index f10975d..46033f2 100644 Binary files a/Multi-Pond/Multi-Pond.v12.ccwsuo and b/Multi-Pond/Multi-Pond.v12.ccwsuo differ