Fixed IPP-32, IPP-33, IPP-34, IPP-35, IPP-36, IPP-37

Controller/Controller/LogicalValues.csv

@@ -50,6 +50,7 @@ Controller.Micro820.Micro820.cfg_C_FLASetting	10.0
 Controller.Micro820.Micro820.cfg_C_TripEnableControl	8393
 Controller.Micro820.Micro820.cfg_C_WarningEnableControl	0
 Controller.Micro820.Micro820.cfg_ClearTripCountAfter	
+Controller.Micro820.Micro820.cfg_DHSensorDistToIntake	
 Controller.Micro820.Micro820.cfg_GF_GroundFaultInhibitTime	10
 Controller.Micro820.Micro820.cfg_GF_GroundFaultTripDelay	0.5
 Controller.Micro820.Micro820.cfg_GF_GroundFaultTripLevel	2.5
@@ -6180,10 +6181,14 @@ Controller.Micro820.Micro820.Temp_Startup	75.0
 Controller.Micro820.Micro820.Temp_Startup_Enabled	FALSE
 Controller.Micro820.Micro820.Test_Mode	FALSE
 Controller.Micro820.Micro820.time_CurrentTime	
+Controller.Micro820.Micro820.time_RunTimeLeftMin	
+Controller.Micro820.Micro820.time_RunTimeLeftSec	
 Controller.Micro820.Micro820.time_TimerRunTime	
 Controller.Micro820.Micro820.time_TimerWaitTime	
 Controller.Micro820.Micro820.Time_Until_Startup	
 Controller.Micro820.Micro820.Time_Until_Startup_String	
+Controller.Micro820.Micro820.time_WaitTimeLeftMin	
+Controller.Micro820.Micro820.time_WaitTimeLeftSec	
 Controller.Micro820.Micro820.timer_RunTimeLeft	
 Controller.Micro820.Micro820.timer_WaitTimeLeft	
 Controller.Micro820.Micro820.TripEnable_V_Overfrequency	FALSE

Controller/Controller/Micro820/Micro820/CONTROL.ic

@@ -69,6 +69,7 @@ __TMPR6 := __TMPR4 / __TMPR5
 __TMPR1 := __TMPR1 * __TMPR6 
 __TMPR7 := __TMPR4 / CFG_SPECIFICGRAVITY 
 __TMPR1 := __TMPR1 * __TMPR7 
+__TMPR1 := __TMPR1 + CFG_DHSENSORDISTTOINTAKE 
 DH_FLUID_LEVEL := __TMPR1 
 __TMPI1 := __CDINT00000063 - __CDINT00000001 
 __TMPI1 := __TMPI1 * __CDINT00000002 
@@ -311,11 +312,22 @@ __TMPB5 := _NOT RESTART_COMMAND
 _IF _NOT __TMPB5 _GOTO __LAB2a 
 TRIPRESETCMD := TRUE 
 RESTART_COMMAND := TRUE 
-_GOTO __LAB2b 
-__LAB2a : 
-__LAB2b : 
+_IF _NOT CFG_TIMERMODEENABLED _GOTO __LAB2b 
+CMD_TIMERRUN := TRUE 
 _GOTO __LAB2c 
+__LAB2b : 
+__LAB2c : 
+_GOTO __LAB2d 
+__LAB2a : 
+__LAB2d : 
+_GOTO __LAB2e 
 __LAB29 : 
+_IF _NOT CFG_TIMERMODEENABLED _GOTO __LAB2f 
+CMD_TIMERRUN := FALSE 
+_GOTO __LAB30 
+__LAB2f : 
+__LAB30 : 
+STS_TIMERCYCLEACTIVE := FALSE 
 RESTART_COMMAND := FALSE 
 __TMPI1 := TIME_CURRENTTIME - SHUTDOWN_TIME 
 __TMPI2 := DOWNTIME_TIME_PARAMETER - __TMPI1 
@@ -323,32 +335,43 @@ TIME_UNTIL_STARTUP := __TMPI2
 _PUSH_PAR TIME_UNTIL_STARTUP 
 __TMPM14 := _CALL ANY_TO_DINT 
 TIME_UNTIL_STARTUP_STRING := __TMPM14 
-_IF _NOT AUTO_MODE _GOTO __LAB2d 
+_IF _NOT AUTO_MODE _GOTO __LAB31 
 __TMPM14 := __TMPM15 + TIME_UNTIL_STARTUP_STRING 
 __TMPM14 := __TMPM14 + __TMPM16 
 DEVICE_STATUS := __TMPM14 
-_GOTO __LAB2e 
-__LAB2d : 
+_GOTO __LAB32 
+__LAB31 : 
+__LAB32 : 
 __LAB2e : 
-__LAB2c : 
-_GOTO __LAB2f 
+_GOTO __LAB33 
 __LAB28 : 
 __TMPB1 := AUTO_MODE _AND OVERLOADTRIP 
 __TMPB2 := _NOT CMD_RUN 
 __TMPB1 := __TMPB1 _AND __TMPB2 
 __TMPB1 := __TMPB1 _AND RESTART_ALLOWED 
-_IF _NOT __TMPB1 _GOTO __LAB30 
+_IF _NOT __TMPB1 _GOTO __LAB34 
 __TMPI1 := TIME_CURRENTTIME - SHUTDOWN_TIME 
 __TMPB3 := __TMPI1 > DOWNTIME_TIME_PARAMETER_OL 
-_IF _NOT __TMPB3 _GOTO __LAB31 
+_IF _NOT __TMPB3 _GOTO __LAB35 
 __TMPB4 := _NOT RESTART_COMMAND 
-_IF _NOT __TMPB4 _GOTO __LAB32 
+_IF _NOT __TMPB4 _GOTO __LAB36 
 RESTART_COMMAND := TRUE 
-_GOTO __LAB33 
-__LAB32 : 
-__LAB33 : 
-_GOTO __LAB34 
-__LAB31 : 
+_IF _NOT CFG_TIMERMODEENABLED _GOTO __LAB37 
+CMD_TIMERRUN := TRUE 
+_GOTO __LAB38 
+__LAB37 : 
+__LAB38 : 
+_GOTO __LAB39 
+__LAB36 : 
+__LAB39 : 
+_GOTO __LAB3a 
+__LAB35 : 
+_IF _NOT CFG_TIMERMODEENABLED _GOTO __LAB3b 
+CMD_TIMERRUN := FALSE 
+_GOTO __LAB3c 
+__LAB3b : 
+__LAB3c : 
+STS_TIMERCYCLEACTIVE := FALSE 
 RESTART_COMMAND := FALSE 
 __TMPI1 := TIME_CURRENTTIME - SHUTDOWN_TIME 
 __TMPI2 := DOWNTIME_TIME_PARAMETER_OL - __TMPI1 
@@ -356,17 +379,17 @@ TIME_UNTIL_STARTUP := __TMPI2
 _PUSH_PAR TIME_UNTIL_STARTUP 
 __TMPM14 := _CALL ANY_TO_DINT 
 TIME_UNTIL_STARTUP_STRING := __TMPM14 
-_IF _NOT AUTO_MODE _GOTO __LAB35 
+_IF _NOT AUTO_MODE _GOTO __LAB3d 
 __TMPM14 := __TMPM17 + TIME_UNTIL_STARTUP_STRING 
 __TMPM14 := __TMPM14 + __TMPM16 
 DEVICE_STATUS := __TMPM14 
-_GOTO __LAB36 
-__LAB35 : 
-__LAB36 : 
+_GOTO __LAB3e 
+__LAB3d : 
+__LAB3e : 
+__LAB3a : 
+_GOTO __LAB33 
 __LAB34 : 
-_GOTO __LAB2f 
-__LAB30 : 
-__LAB2f : 
+__LAB33 : 
 __TMPB1 := START_BUTTON _OR START_COMMAND 
 __TMPB1 := __TMPB1 _OR CMD_TIMERRUN 
 __TMPB2 := RESTART_ALLOWED _AND RESTART_COMMAND 
@@ -379,155 +402,170 @@ __TMPB4 := _NOT CFG_TIMERMODEENABLED
 __TMPB5 := CMD_TIMERRUN _OR __TMPB4 
 __TMPB1 := __TMPB1 _AND __TMPB5 
 __TMPB1 := __TMPB1 _AND RUN_PERMISSIVE 
-_IF _NOT __TMPB1 _GOTO __LAB37 
+_IF _NOT __TMPB1 _GOTO __LAB3f 
 CMD_RUN := TRUE 
 RESTART_COMMAND := FALSE 
 START_COMMAND := FALSE 
 __TMPB1 := _NOT START_TIME_SET 
-_IF _NOT __TMPB1 _GOTO __LAB38 
+_IF _NOT __TMPB1 _GOTO __LAB40 
 START_TIME := TIME_CURRENTTIME 
 START_TIME_SET := TRUE 
 DEVICE_STATUS := __TMPM18 
 STS_TRIPCOUNTINCREASED := FALSE 
-_GOTO __LAB39 
-__LAB38 : 
-__LAB39 : 
-_IF _NOT CONTACTOR_STATUS _GOTO __LAB3a 
+_GOTO __LAB41 
+__LAB40 : 
+__LAB41 : 
+_IF _NOT CONTACTOR_STATUS _GOTO __LAB42 
 __TMPI1 := TIME_CURRENTTIME - START_TIME 
 RUN_TIME := __TMPI1 
-_GOTO __LAB3b 
-__LAB3a : 
-__LAB3b : 
-_GOTO __LAB3c 
-__LAB37 : 
-CMD_RUN := FALSE 
-__LAB3c : 
-__TMPB1 := _NOT CONTACTOR_STATUS 
-__TMPB2 := CMD_RUN _AND __TMPB1 
-_IF _NOT __TMPB2 _GOTO __LAB3d 
-__TMPB3 := _NOT E300_OUTPUT_ENABLE 
-_IF _NOT __TMPB3 _GOTO __LAB3e 
-_IF _NOT E300_OUTPUT_TOGGLED _GOTO __LAB3f 
-E300_OUTPUT_ENABLE := TRUE 
-_GOTO __LAB40 
-__LAB3f : 
-__LAB40 : 
-E300_OUTPUT_TOGGLED := TRUE 
-_GOTO __LAB41 
-__LAB3e : 
-__TMPB1 := _NOT E300_OUTPUT_TOGGLED 
-_IF _NOT __TMPB1 _GOTO __LAB42 
-E300_OUTPUT_ENABLE := FALSE 
 _GOTO __LAB43 
 __LAB42 : 
 __LAB43 : 
-__LAB41 : 
 _GOTO __LAB44 
-__LAB3d : 
+__LAB3f : 
+CMD_RUN := FALSE 
 __LAB44 : 
-__TMPB1 := RUN_TIME > CFG_CLEARTRIPCOUNTAFTER 
-__TMPB2 := CONTACTOR_STATUS _AND __TMPB1 
+__TMPB1 := _NOT CONTACTOR_STATUS 
+__TMPB2 := CMD_RUN _AND __TMPB1 
 _IF _NOT __TMPB2 _GOTO __LAB45 
-VAL_OVERLOADTRIPCOUNT := __DINT_NULL 
-VAL_TRIPCOUNT := __DINT_NULL 
-_GOTO __LAB46 
-__LAB45 : 
-__LAB46 : 
-__TMPB1 := _NOT AUTO_MODE 
-_IF _NOT __TMPB1 _GOTO __LAB47 
-RESTART_COMMAND := FALSE 
-RESTART_ALLOWED := FALSE 
+__TMPB3 := _NOT E300_OUTPUT_ENABLE 
+_IF _NOT __TMPB3 _GOTO __LAB46 
+_IF _NOT E300_OUTPUT_TOGGLED _GOTO __LAB47 
+E300_OUTPUT_ENABLE := TRUE 
 _GOTO __LAB48 
 __LAB47 : 
 __LAB48 : 
-_IF _NOT STOP_COMMAND _GOTO __LAB49 
+E300_OUTPUT_TOGGLED := TRUE 
+_GOTO __LAB49 
+__LAB46 : 
+__TMPB1 := _NOT E300_OUTPUT_TOGGLED 
+_IF _NOT __TMPB1 _GOTO __LAB4a 
+E300_OUTPUT_ENABLE := FALSE 
+_GOTO __LAB4b 
+__LAB4a : 
+__LAB4b : 
+__LAB49 : 
+_GOTO __LAB4c 
+__LAB45 : 
+__LAB4c : 
+__TMPB1 := RUN_TIME > CFG_CLEARTRIPCOUNTAFTER 
+__TMPB2 := CONTACTOR_STATUS _AND __TMPB1 
+_IF _NOT __TMPB2 _GOTO __LAB4d 
+VAL_OVERLOADTRIPCOUNT := __DINT_NULL 
+VAL_TRIPCOUNT := __DINT_NULL 
+_GOTO __LAB4e 
+__LAB4d : 
+__LAB4e : 
+__TMPB1 := _NOT AUTO_MODE 
+_IF _NOT __TMPB1 _GOTO __LAB4f 
+RESTART_COMMAND := FALSE 
+RESTART_ALLOWED := FALSE 
+_GOTO __LAB50 
+__LAB4f : 
+__LAB50 : 
+_IF _NOT STOP_COMMAND _GOTO __LAB51 
 RESTART_ALLOWED := FALSE 
 DEVICE_STATUS := __TMPM19 
 STS_TIMERCYCLEACTIVE := FALSE 
 VAL_OVERLOADTRIPCOUNT := __DINT_NULL 
 VAL_TRIPCOUNT := __DINT_NULL 
-_GOTO __LAB4a 
-__LAB49 : 
-__LAB4a : 
-__TMPB1 := _NOT HAND_MODE 
-__TMPB2 := _NOT AUTO_MODE 
-__TMPB1 := __TMPB1 _AND __TMPB2 
-_IF _NOT __TMPB1 _GOTO __LAB4b 
-VAL_OVERLOADTRIPCOUNT := __DINT_NULL 
-VAL_TRIPCOUNT := __DINT_NULL 
-_GOTO __LAB4c 
-__LAB4b : 
-__LAB4c : 
-__TMPB1 := _NOT CONTACTOR_STATUS 
-_IF _NOT __TMPB1 _GOTO __LAB4d 
-START_TIME_SET := FALSE 
-_GOTO __LAB4e 
-__LAB4d : 
-__LAB4e : 
-__TMPB1 := CFG_TIMERMODEENABLED _AND STS_TIMERCYCLEACTIVE 
-_IF _NOT __TMPB1 _GOTO __LAB4f 
-_IF _NOT CMD_TIMERRUN _GOTO __LAB50 
-__TMPB2 := _NOT STS_TIMERRUNTIMESET 
-_IF _NOT __TMPB2 _GOTO __LAB51 
-STS_TIMERRUNTIMESET := TRUE 
-TIME_TIMERRUNTIME := TIME_CURRENTTIME 
+CMD_TIMERRUN := FALSE 
+STS_TIMERRUNTIMESET := FALSE 
 _GOTO __LAB52 
 __LAB51 : 
 __LAB52 : 
+__TMPB1 := _NOT HAND_MODE 
+__TMPB2 := _NOT AUTO_MODE 
+__TMPB1 := __TMPB1 _AND __TMPB2 
+_IF _NOT __TMPB1 _GOTO __LAB53 
+VAL_OVERLOADTRIPCOUNT := __DINT_NULL 
+VAL_TRIPCOUNT := __DINT_NULL 
+CMD_TIMERRUN := FALSE 
+STS_TIMERCYCLEACTIVE := FALSE 
+STS_TIMERRUNTIMESET := FALSE 
+_GOTO __LAB54 
+__LAB53 : 
+__LAB54 : 
+__TMPB1 := _NOT CONTACTOR_STATUS 
+_IF _NOT __TMPB1 _GOTO __LAB55 
+START_TIME_SET := FALSE 
+_GOTO __LAB56 
+__LAB55 : 
+__LAB56 : 
+__TMPB1 := CFG_TIMERMODEENABLED _AND STS_TIMERCYCLEACTIVE 
+_IF _NOT __TMPB1 _GOTO __LAB57 
+_IF _NOT CMD_TIMERRUN _GOTO __LAB58 
+__TMPB2 := _NOT STS_TIMERRUNTIMESET 
+_IF _NOT __TMPB2 _GOTO __LAB59 
+STS_TIMERRUNTIMESET := TRUE 
+TIME_TIMERRUNTIME := TIME_CURRENTTIME 
+_GOTO __LAB5a 
+__LAB59 : 
+__LAB5a : 
 __TMPI1 := CFG_TIMERRUNTIME * __CDINT0000003C 
 __TMPI2 := TIME_CURRENTTIME - TIME_TIMERRUNTIME 
 __TMPI1 := __TMPI1 - __TMPI2 
 TIMER_RUNTIMELEFT := __TMPI1 
 __TMPB1 := TIMER_RUNTIMELEFT <= __DINT_NULL 
-_IF _NOT __TMPB1 _GOTO __LAB53 
+_IF _NOT __TMPB1 _GOTO __LAB5b 
 CMD_TIMERRUN := FALSE 
 STS_TIMERRUNTIMESET := FALSE 
-_GOTO __LAB54 
-__LAB53 : 
-__LAB54 : 
-_GOTO __LAB55 
-__LAB50 : 
+_GOTO __LAB5c 
+__LAB5b : 
+__LAB5c : 
+__TMPI1 := TIMER_RUNTIMELEFT / __CDINT0000003C 
+TIME_RUNTIMELEFTMIN := __TMPI1 
+__TMPI1 := TIME_RUNTIMELEFTMIN * __CDINT0000003C 
+__TMPI2 := TIMER_RUNTIMELEFT - __TMPI1 
+TIME_RUNTIMELEFTSEC := __TMPI2 
+_GOTO __LAB5d 
+__LAB58 : 
 __TMPB1 := _NOT STS_TIMERWAITTIMESET 
-_IF _NOT __TMPB1 _GOTO __LAB56 
+_IF _NOT __TMPB1 _GOTO __LAB5e 
 STS_TIMERWAITTIMESET := TRUE 
 TIME_TIMERWAITTIME := TIME_CURRENTTIME 
 DEVICE_STATUS := __TMPM20 
-_GOTO __LAB57 
-__LAB56 : 
-__LAB57 : 
+_GOTO __LAB5f 
+__LAB5e : 
+__LAB5f : 
 __TMPI1 := CFG_TIMERWAITTIME * __CDINT0000003C 
 __TMPI2 := TIME_CURRENTTIME - TIME_TIMERWAITTIME 
 __TMPI1 := __TMPI1 - __TMPI2 
 TIMER_WAITTIMELEFT := __TMPI1 
 __TMPB1 := TIMER_WAITTIMELEFT <= __DINT_NULL 
-_IF _NOT __TMPB1 _GOTO __LAB58 
+_IF _NOT __TMPB1 _GOTO __LAB60 
 CMD_TIMERRUN := TRUE 
 STS_TIMERWAITTIMESET := FALSE 
-_GOTO __LAB59 
-__LAB58 : 
-__LAB59 : 
-__LAB55 : 
-_GOTO __LAB5a 
-__LAB4f : 
-__LAB5a : 
+_GOTO __LAB61 
+__LAB60 : 
+__LAB61 : 
+__TMPI1 := TIMER_WAITTIMELEFT / __CDINT0000003C 
+TIME_WAITTIMELEFTMIN := __TMPI1 
+__TMPI1 := TIME_WAITTIMELEFTMIN * __CDINT0000003C 
+__TMPI2 := TIMER_WAITTIMELEFT - __TMPI1 
+TIME_WAITTIMELEFTSEC := __TMPI2 
+__LAB5d : 
+_GOTO __LAB62 
+__LAB57 : 
+__LAB62 : 
 __TMPB1 := _NOT CFG_TIMERMODEENABLED 
 __TMPB1 := __TMPB1 _OR STOP_COMMAND 
-_IF _NOT __TMPB1 _GOTO __LAB5b 
+_IF _NOT __TMPB1 _GOTO __LAB63 
 CMD_TIMERRUN := FALSE 
-_GOTO __LAB5c 
-__LAB5b : 
-__LAB5c : 
+_GOTO __LAB64 
+__LAB63 : 
+__LAB64 : 
 __TMPB1 := TRIPSTATUS _OR OVERLOADTRIP 
-_IF _NOT __TMPB1 _GOTO __LAB5d 
+_IF _NOT __TMPB1 _GOTO __LAB65 
 _PUSH_PAR TIME_CURRENTTIME 
 _PUSH_PAR CFG_RESETCYCLE 
 __TMPI1 := _CALL MOD 
 __TMPB2 := __TMPI1 = __DINT_NULL 
-_IF _NOT __TMPB2 _GOTO __LAB5e 
+_IF _NOT __TMPB2 _GOTO __LAB66 
 TRIPRESETCMD := TRUE 
-_GOTO __LAB5f 
-__LAB5e : 
-__LAB5f : 
-_GOTO __LAB60 
-__LAB5d : 
-__LAB60 : 
+_GOTO __LAB67 
+__LAB66 : 
+__LAB67 : 
+_GOTO __LAB68 
+__LAB65 : 
+__LAB68 : 

Controller/Controller/Micro820/Micro820/Control.stf

@@ -34,7 +34,7 @@ IF Downhole_Tool_Enabled THEN
 	DH_MaxIntakeTemperature_Startup		:= ANY_TO_REAL(Modbus_Read0[40]) / 10.0;
 	DH_MaxIntakePressure_Startup		:= Modbus_Read0[41];
 	DH_DownholeStatus_INT				:= Modbus_Read0[99];
-	DH_Fluid_Level 						:= (DH_IntakePressure - 14.0) * (1.0 / 0.433) * (1.0 / cfg_SpecificGravity);
+	DH_Fluid_Level 						:= (DH_IntakePressure - 14.0) * (1.0 / 0.433) * (1.0 / cfg_SpecificGravity) + cfg_DHSensorDistToIntake;
 
 	CASE Modbus_Read0[99] OF
 		0: DH_DownholeStatus := 'OK';
@@ -170,15 +170,15 @@ IF (Auto_Mode AND (NOT OverloadTrip) AND NOT cmd_Run AND Restart_Allowed) THEN
 		IF (NOT Restart_Command) THEN
 			TripResetCmd := TRUE;
 			Restart_Command := TRUE;
+			IF cfg_TimerModeEnabled THEN
+				cmd_TimerRun := TRUE;
+			END_IF;
 		END_IF;
 	ELSE
-		(* Attempt to clear trip every 15 seconds *)
-		(*IF NOT Downtime_Timer.Q AND TripStatus THEN
-			Downtime_Timer(TRUE, Clear_Trip_Cycle);
-		ELSE
-			TripResetCmd := TRUE;
-		END_IF;*)
-		
+		IF cfg_TimerModeEnabled THEN
+			cmd_TimerRun := FALSE;
+		END_IF;
+		sts_TimerCycleActive := FALSE;
 		Restart_Command := FALSE;
 		Time_Until_Startup := Downtime_Time_Parameter - (time_CurrentTime - Shutdown_Time);
 		Time_Until_Startup_String := ANY_TO_STRING(Time_Until_Startup);
@@ -191,8 +191,15 @@ ELSIF (Auto_Mode AND OverloadTrip AND NOT cmd_Run AND Restart_Allowed) THEN
 	IF (time_CurrentTime - Shutdown_Time) > Downtime_Time_Parameter_OL THEN 
 		IF (NOT Restart_Command) THEN
 			Restart_Command := True;
+			IF cfg_TimerModeEnabled THEN
+				cmd_TimerRun := TRUE;
+			END_IF;
 		END_IF;
 	ELSE
+		IF cfg_TimerModeEnabled THEN
+			cmd_TimerRun := FALSE;
+		END_IF;
+		sts_TimerCycleActive := FALSE;
 		Restart_Command := FALSE;
 		Time_Until_Startup := Downtime_Time_Parameter_OL - (time_CurrentTime - Shutdown_Time);
 		Time_Until_Startup_String := ANY_TO_STRING(Time_Until_Startup);
@@ -255,11 +262,16 @@ IF Stop_Command THEN
 	sts_TimerCycleActive := FALSE;
 	val_OverloadTripCount := 0;
 	val_TripCount := 0;
+	cmd_TimerRun := FALSE;
+	sts_TimerRunTimeSet := FALSE;
 END_IF;
 
 IF (NOT Hand_Mode) AND (NOT Auto_Mode) THEN
 	val_OverloadTripCount := 0;
 	val_TripCount := 0;
+	cmd_TimerRun := FALSE;
+	sts_TimerCycleActive := FALSE;
+	sts_TimerRunTimeSet := FALSE;
 	(*Restart_Allowed := FALSE;*)
 END_IF;
 
@@ -280,6 +292,9 @@ IF cfg_TimerModeEnabled AND sts_TimerCycleActive THEN
 			cmd_TimerRun := FALSE;
 			sts_TimerRunTimeSet := FALSE;
 		END_IF;
+		time_RunTimeLeftMin := timer_RunTimeLeft / 60;
+		time_RunTimeLeftSec := timer_RunTimeLeft - (time_RunTimeLeftMin * 60);
+		
 	ELSE
 		IF NOT sts_TimerWaitTimeSet THEN
 			sts_TimerWaitTimeSet := TRUE;
@@ -292,6 +307,8 @@ IF cfg_TimerModeEnabled AND sts_TimerCycleActive THEN
 			cmd_TimerRun := TRUE;
 			sts_TimerWaitTimeSet := FALSE;
 		END_IF;
+		time_WaitTimeLeftMin := timer_WaitTimeLeft / 60;
+		time_WaitTimeLeftSec := timer_WaitTimeLeft - (time_WaitTimeLeftMin * 60);
 	END_IF;
 END_IF;
 

Controller/Controller/Micro820/Micro820/E300DATA.ic

@@ -1696,6 +1696,10 @@ __TMPI1 := __CDINT000000AA - __CDINT00000001
 __TMPI1 := __TMPI1 * __CDINT00000001 
 __TMPUSI1 := E300_CONFIG_BUFFER [ __TMPI1 ]
 CFG_V_PHASEROTATIONINHIBITTIME := __TMPUSI1 
+__TMPI1 := __CDINT0000000E - __CDINT00000001 
+__TMPI1 := __TMPI1 * __CDINT00000001 
+__TMPUSI1 := E300_CONFIG_BUFFER [ __TMPI1 ]
+CFG_V_PHASEROTATIONTRIPTYPE := __TMPUSI1 
 __TMPI1 := __CDINT000000B7 - __CDINT00000001 
 __TMPI1 := __TMPI1 * __CDINT00000001 
 __TMPUSI1 := E300_CONFIG_BUFFER [ __TMPI1 ]
@@ -2936,6 +2940,9 @@ E300_CONFIG_BUFFER [ __TMPI1 ] := __TMPUSI1
 __TMPI1 := __CDINT000000AA - __CDINT00000001 
 __TMPI1 := __TMPI1 * __CDINT00000001 
 E300_CONFIG_BUFFER [ __TMPI1 ] := CFG_V_PHASEROTATIONINHIBITTIME 
+__TMPI1 := __CDINT0000000E - __CDINT00000001 
+__TMPI1 := __TMPI1 * __CDINT00000001 
+E300_CONFIG_BUFFER [ __TMPI1 ] := CFG_V_PHASEROTATIONTRIPTYPE 
 __TMPI1 := __CDINT000000B7 - __CDINT00000001 
 __TMPI1 := __TMPI1 * __CDINT00000001 
 E300_CONFIG_BUFFER [ __TMPI1 ] := CFG_V_VOLTAGEIMBALANCEINHIBITTIME 

Controller/Controller/Micro820/Micro820/E300Data.stf

@@ -882,7 +882,7 @@ IF cfg_READ THEN
 	cfg_V_PhaseRotationInhibitTime := E300_Config_Buffer[170];
 
 	(* PhaseRotationTripType P364 *)
-	(* cfg_V_PhaseRotationTripType := E300_Config_Buffer[]; *)
+	cfg_V_PhaseRotationTripType := E300_Config_Buffer[14];
 
 	(* VoltageImbalanceInhibitTime P365 *)
 	cfg_V_VoltageImbalanceInhibitTime := E300_Config_Buffer[183];
@@ -1417,7 +1417,7 @@ IF cfg_WRITE THEN
 	E300_Config_Buffer[170] := cfg_V_PhaseRotationInhibitTime;
 
 	(* PhaseRotationTripType P364 *)
-	(* E300_Config_Buffer[] := cfg_V_PhaseRotationTripType; *)
+	E300_Config_Buffer[14] := cfg_V_PhaseRotationTripType;
 
 	(* VoltageImbalanceInhibitTime P365 *)
 	E300_Config_Buffer[183] := cfg_V_VoltageImbalanceInhibitTime;

Controller/Controller/Micro820/Micro820/MICRO820.err

@@ -1,9 +1,47 @@
 0::0046-0003::-------------------- Pre-build resource: MICRO820    Configuration: MICRO820 --------------
 0::0044-0003::Pre-compiling for 2080LC2020QWBI
-0::0000-0003::CONTROL
-0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\CONTROL:0002-0003::MICRO820:    0 error(s), 0 warning(s)
+0::0000-0003::RA_CIP_ELECTRICAL_ENERGY_OBJ
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\RA_CIP_ELECTRICAL_ENERGY_OBJ:0000-0003::RA_E300_OUTPUT_CONTROL
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\RA_E300_OUTPUT_CONTROL:0000-0003::READE300IO
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300IO:0000-0003::READE300CONFIG
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300CONFIG:0000-0003::READE300TRIPRESET
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300TRIPRESET:0000-0003::READE300PARAM
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300PARAM:0000-0003::USINT_TO_UDINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_UDINT:0000-0003::USINT_TO_DINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_DINT:0000-0003::USINT_TO_UINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_UINT:0000-0003::USINT_TO_SINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_SINT:0000-0003::UDINT_TO_USINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\UDINT_TO_USINT:0000-0003::DINT_TO_USINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\DINT_TO_USINT:0000-0003::UINT_TO_USINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\UINT_TO_USINT:0000-0003::SINT_TO_USINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\SINT_TO_USINT:0000-0003::WRITEE300CONFIG
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\WRITEE300CONFIG:0000-0003::WRITEE300TRIPRESET
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\WRITEE300TRIPRESET:0000-0003::LINEARSCALE
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\LINEARSCALE:0000-0003::READDOWNHOLEDATA
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READDOWNHOLEDATA:0000-0003::CONTROL
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\CONTROL:0000-0003::E300DATA
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\E300DATA:0002-0003::MICRO820:    0 error(s), 0 warning(s)
 0::0006-0003::-------------------- Build resource: MICRO820    Configuration: MICRO820 --------------
 0::0001-0003::Compiling for 2080LC2020QWBI
-0::0000-0003::CONTROL
-0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\CONTROL:0003-0003::Linking for 2080LC2020QWBI
-0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\CONTROL:0002-0003::MICRO820:    0 error(s), 0 warning(s)
+0::0000-0003::RA_CIP_ELECTRICAL_ENERGY_OBJ
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\RA_CIP_ELECTRICAL_ENERGY_OBJ:0000-0003::RA_E300_OUTPUT_CONTROL
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\RA_E300_OUTPUT_CONTROL:0000-0003::READE300IO
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300IO:0000-0003::READE300CONFIG
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300CONFIG:0000-0003::READE300TRIPRESET
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300TRIPRESET:0000-0003::READE300PARAM
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300PARAM:0000-0003::USINT_TO_UDINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_UDINT:0000-0003::USINT_TO_DINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_DINT:0000-0003::USINT_TO_UINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_UINT:0000-0003::USINT_TO_SINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_SINT:0000-0003::UDINT_TO_USINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\UDINT_TO_USINT:0000-0003::DINT_TO_USINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\DINT_TO_USINT:0000-0003::UINT_TO_USINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\UINT_TO_USINT:0000-0003::SINT_TO_USINT
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\SINT_TO_USINT:0000-0003::WRITEE300CONFIG
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\WRITEE300CONFIG:0000-0003::WRITEE300TRIPRESET
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\WRITEE300TRIPRESET:0000-0003::LINEARSCALE
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\LINEARSCALE:0000-0003::READDOWNHOLEDATA
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READDOWNHOLEDATA:0000-0003::CONTROL
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\CONTROL:0000-0003::E300DATA
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\E300DATA:0003-0003::Linking for 2080LC2020QWBI
+0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\E300DATA:0002-0003::MICRO820:    0 error(s), 0 warning(s)

Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc

@@ -3,8 +3,8 @@ Offset0=0x4408
 Offset1=0x5408
 Offset2=0x5408
 Offset3=0x5408
-Memory Usage Estimate(Code)=0x9968
+Memory Usage Estimate(Code)=0x9A14
 Memory Usage Estimate(Data)=0x9958
-Memory Usage Estimate(Retain)=0x4C
+Memory Usage Estimate(Retain)=0x50
 Memory Usage Estimate(Temporary variables)=0x2545
 Offset4=0x414

Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc

@@ -1,9 +1,9 @@
 [MEMORY]
 Memory Usage Estimate(Temporary variables)=0x254C
 Biggest online change user variable memory block size=0x800
-Currently added user variables=0x0
-Total data size=0x6954
-User variables size=0x4408
+Currently added user variables=0x4
+Total data size=0x6968
+User variables size=0x441C
 Maximum size for temporary variables=0x454C
 Memory Usage Estimate(Data)=0x9954
-Free memory for user variables=0x1000
+Free memory for user variables=0xFEC

Controller/Controller/Micro820/Micro820/Micro820_MiscLinkInfoOlc.mtc

@@ -1,3 +1,3 @@
 [MEMORY]
-Code Space Free Memory=0x1B580
-Code Space Requirement=0x9724
+Code Space Free Memory=0x133CC
+Code Space Requirement=0x5930