Add ability to clear being locked out after faults, stop command or turning HOA to off

Controller/Controller/Micro820/Micro820/CONTROL.ic

@@ -14,6 +14,8 @@ STS_TIMERRUNTIMESET := FALSE
 STS_TIMERWAITTIMESET := FALSE 
 STS_TIMERCYCLEACTIVE := FALSE 
 STS_TRIPCOUNTINCREASED := FALSE 
+VAL_OVERLOADTRIPCOUNT := __DINT_NULL 
+VAL_TRIPCOUNT := __DINT_NULL 
 _GOTO __LAB2 
 __LAB1 : 
 __LAB2 : 
@@ -429,65 +431,76 @@ _IF _NOT STOP_COMMAND _GOTO __LAB47
 RESTART_ALLOWED := FALSE 
 DEVICE_STATUS := __TMPM18 
 STS_TIMERCYCLEACTIVE := FALSE 
+VAL_OVERLOADTRIPCOUNT := __DINT_NULL 
+VAL_TRIPCOUNT := __DINT_NULL 
 _GOTO __LAB48 
 __LAB47 : 
 __LAB48 : 
-__TMPB1 := _NOT CONTACTOR_STATUS 
+__TMPB1 := _NOT HAND_MODE 
+__TMPB2 := _NOT AUTO_MODE 
+__TMPB1 := __TMPB1 _AND __TMPB2 
 _IF _NOT __TMPB1 _GOTO __LAB49 
-START_TIME_SET := FALSE 
+VAL_OVERLOADTRIPCOUNT := __DINT_NULL 
+VAL_TRIPCOUNT := __DINT_NULL 
 _GOTO __LAB4a 
 __LAB49 : 
 __LAB4a : 
-__TMPB1 := CFG_TIMERMODEENABLED _AND STS_TIMERCYCLEACTIVE 
+__TMPB1 := _NOT CONTACTOR_STATUS 
 _IF _NOT __TMPB1 _GOTO __LAB4b 
-_IF _NOT CMD_TIMERRUN _GOTO __LAB4c 
+START_TIME_SET := FALSE 
+_GOTO __LAB4c 
+__LAB4b : 
+__LAB4c : 
+__TMPB1 := CFG_TIMERMODEENABLED _AND STS_TIMERCYCLEACTIVE 
+_IF _NOT __TMPB1 _GOTO __LAB4d 
+_IF _NOT CMD_TIMERRUN _GOTO __LAB4e 
 __TMPB2 := _NOT STS_TIMERRUNTIMESET 
-_IF _NOT __TMPB2 _GOTO __LAB4d 
+_IF _NOT __TMPB2 _GOTO __LAB4f 
 STS_TIMERRUNTIMESET := TRUE 
 TIME_TIMERRUNTIME := TIME_CURRENTTIME 
-_GOTO __LAB4e 
-__LAB4d : 
-__LAB4e : 
+_GOTO __LAB50 
+__LAB4f : 
+__LAB50 : 
 __TMPI1 := CFG_TIMERRUNTIME * __CDINT0000003C 
 __TMPI2 := TIME_CURRENTTIME - TIME_TIMERRUNTIME 
 __TMPI1 := __TMPI1 - __TMPI2 
 TIMER_RUNTIMELEFT := __TMPI1 
 __TMPB1 := TIMER_RUNTIMELEFT <= __DINT_NULL 
-_IF _NOT __TMPB1 _GOTO __LAB4f 
+_IF _NOT __TMPB1 _GOTO __LAB51 
 CMD_TIMERRUN := FALSE 
 STS_TIMERRUNTIMESET := FALSE 
-_GOTO __LAB50 
-__LAB4f : 
-__LAB50 : 
-_GOTO __LAB51 
-__LAB4c : 
+_GOTO __LAB52 
+__LAB51 : 
+__LAB52 : 
+_GOTO __LAB53 
+__LAB4e : 
 __TMPB1 := _NOT STS_TIMERWAITTIMESET 
-_IF _NOT __TMPB1 _GOTO __LAB52 
+_IF _NOT __TMPB1 _GOTO __LAB54 
 STS_TIMERWAITTIMESET := TRUE 
 TIME_TIMERWAITTIME := TIME_CURRENTTIME 
 DEVICE_STATUS := __TMPM19 
-_GOTO __LAB53 
-__LAB52 : 
-__LAB53 : 
+_GOTO __LAB55 
+__LAB54 : 
+__LAB55 : 
 __TMPI1 := CFG_TIMERWAITTIME * __CDINT0000003C 
 __TMPI2 := TIME_CURRENTTIME - TIME_TIMERWAITTIME 
 __TMPI1 := __TMPI1 - __TMPI2 
 TIMER_WAITTIMELEFT := __TMPI1 
 __TMPB1 := TIMER_WAITTIMELEFT <= __DINT_NULL 
-_IF _NOT __TMPB1 _GOTO __LAB54 
+_IF _NOT __TMPB1 _GOTO __LAB56 
 CMD_TIMERRUN := TRUE 
 STS_TIMERWAITTIMESET := FALSE 
-_GOTO __LAB55 
-__LAB54 : 
-__LAB55 : 
-__LAB51 : 
-_GOTO __LAB56 
-__LAB4b : 
+_GOTO __LAB57 
 __LAB56 : 
+__LAB57 : 
+__LAB53 : 
+_GOTO __LAB58 
+__LAB4d : 
+__LAB58 : 
 __TMPB1 := _NOT CFG_TIMERMODEENABLED 
 __TMPB1 := __TMPB1 _OR STOP_COMMAND 
-_IF _NOT __TMPB1 _GOTO __LAB57 
+_IF _NOT __TMPB1 _GOTO __LAB59 
 CMD_TIMERRUN := FALSE 
-_GOTO __LAB58 
-__LAB57 : 
-__LAB58 : 
+_GOTO __LAB5a 
+__LAB59 : 
+__LAB5a : 

Controller/Controller/Micro820/Micro820/Control.stf

@@ -15,6 +15,8 @@ IF (__SYSVA_FIRST_SCAN) THEN
 	sts_TimerWaitTimeSet := FALSE;
 	sts_TimerCycleActive := FALSE;
 	sts_TripCountIncreased := FALSE;
+	val_OverloadTripCount := 0;
+	val_TripCount := 0;
 END_IF;
 
 
@@ -248,6 +250,13 @@ IF Stop_Command THEN
 	Restart_Allowed := FALSE;
 	Device_Status := 'User Stopped';
 	sts_TimerCycleActive := FALSE;
+	val_OverloadTripCount := 0;
+	val_TripCount := 0;
+END_IF;
+
+IF (NOT Hand_Mode) AND (NOT Auto_Mode) THEN
+	val_OverloadTripCount := 0;
+	val_TripCount := 0;
 END_IF;
 
 IF NOT Contactor_Status THEN

Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc

@@ -3,7 +3,7 @@ Offset0=0x4400
 Offset1=0x5400
 Offset2=0x5400
 Offset3=0x5400
-Memory Usage Estimate(Code)=0x98A4
+Memory Usage Estimate(Code)=0x98E8
 Memory Usage Estimate(Data)=0x9854
 Memory Usage Estimate(Retain)=0x4C
 Memory Usage Estimate(Temporary variables)=0x2450

Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc

@@ -8,9 +8,9 @@ CRC_OLD=
 CRC_NEW=0x380B58B8
 DAT_ORG=0
 DAT_OLD=0
-DAT_NEW=1461698991
+DAT_NEW=1461700651
 VER_ORG=0
 VER_OLD=0
-VER_NEW=41
+VER_NEW=42
 CRC_ALL_OLD=
-CRC_ALL_NEW=0x171C7017
+CRC_ALL_NEW=0x7A3DFC09