diff --git a/EPICS_R3.13/startup.script_epicsdependent b/EPICS_R3.13/startup.script_epicsdependent index e8626c9..b3396fd 100644 --- a/EPICS_R3.13/startup.script_epicsdependent +++ b/EPICS_R3.13/startup.script_epicsdependent @@ -32,7 +32,6 @@ require "slsDev" # setup clock putenv("EPICS_TS_MIN_WEST=-60") -putenv("TIMEZONE=MET::-60:032502:102803") TSconfigure(0,10,10,18323,18322,250,1) # end of R3.13 specific script diff --git a/EPICS_R3.14.8/startup.script_epicsdependent b/EPICS_R3.14.8/startup.script_epicsdependent index db24b7c..788eabd 100644 --- a/EPICS_R3.14.8/startup.script_epicsdependent +++ b/EPICS_R3.14.8/startup.script_epicsdependent @@ -29,11 +29,6 @@ require "base" require "symbDev" require "seq" -# setup clock -# TIMEZONE must be set after iocCoreLibrary.munch and before iocInit -# 2012: -putenv("TIMEZONE=MET::-60:032502:102803") - require "generalTime" #EvtTimeConfigure(master?, sync_rate_sec, clock_rate_hz, master_port, slave_port, time_out_msec) EvtTimeConfigure(0, 5, 500000, 18323, 18322, 250) diff --git a/startup.script_part2 b/startup.script_part2 index a44297e..867711f 100644 --- a/startup.script_part2 +++ b/startup.script_part2 @@ -15,6 +15,11 @@ putenv(bootInfo("EPICS_CAS_BEACON_ADDR_LIST=%B")) #Enable memory >32MB on IOC that have it. (Is a NOOP on all others) memAddToPool (sysMemTop(),EXTENDED_MEMORY) +# setup clock +# TIMEZONE must be set after iocCoreLibrary.munch and before iocInit +# 2014: +putenv("TIMEZONE=MET::-60:032902:102503") + iocInit # initialize records