diff --git a/Controller/Controller/Micro820/Micro820/CONTROL.ic b/Controller/Controller/Micro820/Micro820/CONTROL.ic index 173ba36..03f3002 100644 --- a/Controller/Controller/Micro820/Micro820/CONTROL.ic +++ b/Controller/Controller/Micro820/Micro820/CONTROL.ic @@ -326,6 +326,7 @@ TRIPRESETCMD := TRUE RESTART_COMMAND := TRUE _IF _NOT CFG_TIMERMODEENABLED _GOTO __LAB2b CMD_TIMERRUN := TRUE +STS_TIMERCYCLEACTIVE := TRUE _GOTO __LAB2c __LAB2b : __LAB2c : @@ -382,6 +383,7 @@ _IF _NOT __TMPB4 _GOTO __LAB36 RESTART_COMMAND := TRUE _IF _NOT CFG_TIMERMODEENABLED _GOTO __LAB37 CMD_TIMERRUN := TRUE +STS_TIMERCYCLEACTIVE := TRUE _GOTO __LAB38 __LAB37 : __LAB38 : diff --git a/Controller/Controller/Micro820/Micro820/CONTROL.rtc b/Controller/Controller/Micro820/Micro820/CONTROL.rtc index 8f82e56..dc1387c 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 a781d1c..2d35d58 100644 --- a/Controller/Controller/Micro820/Micro820/Control.stf +++ b/Controller/Controller/Micro820/Micro820/Control.stf @@ -185,6 +185,7 @@ IF (Auto_Mode AND Restart_Command := TRUE; IF cfg_TimerModeEnabled THEN cmd_TimerRun := TRUE; + sts_TimerCycleActive := TRUE; END_IF; END_IF; ELSE @@ -212,6 +213,7 @@ ELSIF (Auto_Mode AND Restart_Command := True; IF cfg_TimerModeEnabled THEN cmd_TimerRun := TRUE; + sts_TimerCycleActive := TRUE; END_IF; END_IF; ELSE diff --git a/Controller/Controller/Micro820/Micro820/Header.rtc b/Controller/Controller/Micro820/Micro820/Header.rtc index 61de44d..809b938 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 7e21b0f..0b6e3d3 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 dd69813..f45482b 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 7e88070..7df6c6f 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 409eb3f..137572d 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 e2590ee..60122c9 100644 --- a/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc +++ b/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc @@ -3,7 +3,7 @@ Offset0=0x4480 Offset1=0x5480 Offset2=0x5480 Offset3=0x5480 -Memory Usage Estimate(Code)=0x9B98 +Memory Usage Estimate(Code)=0x9BA4 Memory Usage Estimate(Data)=0x9CDC Memory Usage Estimate(Retain)=0x50 Memory Usage Estimate(Temporary variables)=0x2858 diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CONTROL.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CONTROL.xtc index bf9d172..fc44f37 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 7a7c206..b3cc79c 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 9c19541..579d3d9 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 c8dea73..f9f1d81 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 62ec9cb..94c0e15 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 af7bde7..d62206a 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 08bc11f..6a8571f 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 4803cee..87905df 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 2bb30e1..e3f3c2a 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 0d071c7..ab0b6a0 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 82683ac..418ea9e 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 561d2b6..4d26977 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 204876c..1138239 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 e279009..9dd3e3f 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 29101a2..c911d7c 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 672fc6d..442e810 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 705735f..2f179c6 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 8d29e67..24831dd 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 8c6000d..e0eb1a6 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 85bfe4c..9b50b41 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 78f9771..cf352fd 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 da49bf7..4abd8a0 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 a630a19..caebd07 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 fbe6922..d2a97a5 100644 Binary files a/Controller/Controller/persist.ccwx and b/Controller/Controller/persist.ccwx differ diff --git a/controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc b/controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc index d5af13f..2de888b 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=0xE605ECC DAT_ORG=0 DAT_OLD=0 -DAT_NEW=1466019304 +DAT_NEW=1466173885 VER_ORG=0 VER_OLD=0 -VER_NEW=79 +VER_NEW=80 CRC_ALL_OLD= -CRC_ALL_NEW=0x05A9F896 +CRC_ALL_NEW=0xC0AB9305