diff --git a/Controller/Controller/Micro820/Micro820/CONTROL.ic b/Controller/Controller/Micro820/Micro820/CONTROL.ic index e721a17..6bbcfed 100644 --- a/Controller/Controller/Micro820/Micro820/CONTROL.ic +++ b/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 : diff --git a/Controller/Controller/Micro820/Micro820/CONTROL.rtc b/Controller/Controller/Micro820/Micro820/CONTROL.rtc index 1bdd6c8..4399307 100644 Binary files a/Controller/Controller/Micro820/Micro820/CONTROL.rtc and b/Controller/Controller/Micro820/Micro820/CONTROL.rtc differ diff --git a/Controller/Controller/Micro820/Micro820/Control.stf b/Controller/Controller/Micro820/Micro820/Control.stf index 1b8ffd1..89f1962 100644 --- a/Controller/Controller/Micro820/Micro820/Control.stf +++ b/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 diff --git a/Controller/Controller/Micro820/Micro820/Header.rtc b/Controller/Controller/Micro820/Micro820/Header.rtc index 1468733..98dfccf 100644 Binary files a/Controller/Controller/Micro820/Micro820/Header.rtc and b/Controller/Controller/Micro820/Micro820/Header.rtc differ diff --git a/Controller/Controller/Micro820/Micro820/IDS00103 b/Controller/Controller/Micro820/Micro820/IDS00103 index 97c5ab0..bd8aedc 100644 Binary files a/Controller/Controller/Micro820/Micro820/IDS00103 and b/Controller/Controller/Micro820/Micro820/IDS00103 differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc index 1575e75..bbbfb9e 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc index f45bf57..e216be0 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc index 264de42..60e62ec 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc b/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc index 946dbe3..a964d67 100644 --- a/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc +++ b/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 diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc b/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc index 4de414a..f8ac2fe 100644 --- a/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc +++ b/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 diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CONTROL.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CONTROL.xtc index c2063b8..d70ae1f 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CONTROL.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CONTROL.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DINT_TO_USINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DINT_TO_USINT.xtc index 0035ea3..26a0d80 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DINT_TO_USINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DINT_TO_USINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_E300DATA.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_E300DATA.xtc index 68ec094..3593d86 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_E300DATA.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_E300DATA.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc index a98f3f6..2de97ba 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_CIP_ELECTRICAL_ENERGY_OBJ.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_CIP_ELECTRICAL_ENERGY_OBJ.xtc index 40bec11..8e5f19a 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_CIP_ELECTRICAL_ENERGY_OBJ.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_CIP_ELECTRICAL_ENERGY_OBJ.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_E300_OUTPUT_CONTROL.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_E300_OUTPUT_CONTROL.xtc index 3a6f54f..dbc8e90 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_E300_OUTPUT_CONTROL.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_E300_OUTPUT_CONTROL.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READDOWNHOLEDATA.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READDOWNHOLEDATA.xtc index 043222f..83a17d8 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READDOWNHOLEDATA.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READDOWNHOLEDATA.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300CONFIG.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300CONFIG.xtc index 9b3b970..3ba00c5 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300CONFIG.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300CONFIG.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300IO.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300IO.xtc index a3fb443..6d317c9 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300IO.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300IO.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300PARAM.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300PARAM.xtc index 087866c..19a52c0 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300PARAM.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300PARAM.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300TRIPRESET.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300TRIPRESET.xtc index c1108f8..a9543a7 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300TRIPRESET.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300TRIPRESET.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SINT_TO_USINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SINT_TO_USINT.xtc index 587cd03..1065d4f 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SINT_TO_USINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SINT_TO_USINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UDINT_TO_USINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UDINT_TO_USINT.xtc index 9d4cb54..08a963d 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UDINT_TO_USINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UDINT_TO_USINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UINT_TO_USINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UINT_TO_USINT.xtc index 9157109..fe7a1d9 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UINT_TO_USINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UINT_TO_USINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_DINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_DINT.xtc index be491ae..32091a4 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_DINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_DINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_SINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_SINT.xtc index 3947a2d..b946241 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_SINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_SINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UDINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UDINT.xtc index dedc602..82b3cce 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UDINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UDINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UINT.xtc index 91b7746..f9b6c31 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300CONFIG.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300CONFIG.xtc index 75a9d7b..065d9d9 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300CONFIG.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300CONFIG.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300TRIPRESET.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300TRIPRESET.xtc index e8305b4..c740286 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300TRIPRESET.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300TRIPRESET.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc index 585243f..5d3af43 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc index c0a661b..6ae2b92 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc differ diff --git a/Controller/Controller/PrjLibrary.mdb b/Controller/Controller/PrjLibrary.mdb index c1289ef..8907ba6 100644 Binary files a/Controller/Controller/PrjLibrary.mdb and b/Controller/Controller/PrjLibrary.mdb differ diff --git a/Controller/Controller/persist.ccwx b/Controller/Controller/persist.ccwx index d01b3ae..e93ac30 100644 Binary files a/Controller/Controller/persist.ccwx and b/Controller/Controller/persist.ccwx differ diff --git a/WaterWellPanel.v12.ccwsuo b/WaterWellPanel.v12.ccwsuo index 16d2f70..88e4ee8 100644 Binary files a/WaterWellPanel.v12.ccwsuo and b/WaterWellPanel.v12.ccwsuo differ