From 2e17262e45e2dc00abbc996d2020a9c046adee1e Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Tue, 22 Jul 2025 17:32:43 +0200 Subject: [PATCH] moved all functionality to main startup script --- startup.script_common | 11 +++++++++-- startup.script_part2 | 12 ------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/startup.script_common b/startup.script_common index 98a8106..f541870 100644 --- a/startup.script_common +++ b/startup.script_common @@ -35,9 +35,7 @@ execute STRINGBUFFER # Setup Time (must be set after loading EPICS core) # 2025: -putenv "EPICS_TIMEZONE=MET::-60:033102:102703" putenv "TIMEZONE=MET::-60:033102:102703" -putenv "EPICS_TS_MIN_WEST=-60" # Allow backward compatible non-monotonic breaktables dbBptNotMonotonic=1 @@ -45,6 +43,9 @@ dbBptNotMonotonic=1 # Quiet warnings about unresolved macros in comments dbQuietMacroWarnings=1 +# Some diagnostics on soft reboots, in case it hangs +atExitDebug = 1 + # Start Logging putenv getenv("EPICS_IOC_LOG_INET") ? "" : "EPICS_IOC_LOG_INET=gfa-syslog-03" putenv getenv("EPICS_IOC_LOG_PORT") ? "" : "EPICS_IOC_LOG_PORT=1514" @@ -72,6 +73,12 @@ require_registerRecordDeviceDriver pdbbase require "utilities", getenv("utilities_VERSION") require "misc", getenv("misc_VERSION") +# IOC monitoring +require "iocStats", getenv("iocStats_VERSION") + +# Database Upload +require "iocinfo", getenv("iocinfo_VERSION") + # caPutLog putenv "EPICS_CA_PUT_LOG_ADDR=gfa-syslog-03:1515" require "caPutLog", getenv("caPutLog_VERSION") ? getenv("caPutLog_VERSION") : "ifexists" diff --git a/startup.script_part2 b/startup.script_part2 index d6734c3..6c22b84 100644 --- a/startup.script_part2 +++ b/startup.script_part2 @@ -1,13 +1 @@ -# 2nd part of common vxWorks startup - -# IOC monitoring -require "iocStats", getenv("iocStats_VERSION") - -# Database Upload -require "iocinfo", getenv("iocinfo_VERSION")?getenv("iocinfo_VERSION"):"ifexists" - iocInit - -atExitDebug = 1 - -# end of startup.script_part2