diff --git a/EPICS_R3.13/startup.script_epicsdependent b/EPICS_R3.13/startup.script_epicsdependent index 3d553f8..b3396fd 100644 --- a/EPICS_R3.13/startup.script_epicsdependent +++ b/EPICS_R3.13/startup.script_epicsdependent @@ -31,6 +31,7 @@ require "base" require "slsDev" # setup clock +putenv("EPICS_TS_MIN_WEST=-60") 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 e3a5607..db24b7c 100644 --- a/EPICS_R3.14.8/startup.script_epicsdependent +++ b/EPICS_R3.14.8/startup.script_epicsdependent @@ -30,6 +30,10 @@ 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 47df56b..a44297e 100644 --- a/startup.script_part2 +++ b/startup.script_part2 @@ -1,15 +1,6 @@ # $Source: /cvs/A/CS/startup/startup.script_part2,v $ # 2nd part of common startup -# setup clock: -# must be done AFTER loading iocCore and BEFORE iocInit -putenv("EPICS_TS_NTP_INET=129.129.190.1") -# 2010: putenv("TIMEZONE=MET::-60:032802:103103") -# 2011: -putenv("TIMEZONE=MET::-60:032702:103003") -# 2012: putenv("TIMEZONE=MET::-60:032502:102803") -putenv("EPICS_TS_MIN_WEST=-60") - # setup logging on boot PC putenv(bootInfo("EPICS_IOC_LOG_INET=%h")) putenv("EPICS_IOC_LOG_PORT=6500")