From cefd4ac530bddfd5bac414ee0f85142efb8c833d Mon Sep 17 00:00:00 2001 From: Michael Browne Date: Fri, 3 Apr 2020 13:04:50 -0700 Subject: [PATCH 1/3] In-progress checkin. --- configure/RELEASE | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/configure/RELEASE b/configure/RELEASE index 66a8ca1..2b42512 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -10,8 +10,8 @@ AUTOSAVE_MODULE_VERSION = R5.8-2.1.0 IOCADMIN_MODULE_VERSION = R3.1.15-1.10.0 ASYN_MODULE_VERSION = R4.35-0.0.1 MOTOR_MODULE_VERSION = R6.9-ess-0.0.1 -ETHERCATMC_MODULE_VERSION = R2.1.0-0.1.0 -ADS_MODULE_VERSION = R2.0.0-0.0.5 +#ETHERCATMC_MODULE_VERSION = R2.1.0-0.1.0 +#ADS_MODULE_VERSION = R2.0.0-0.0.5 # ============================================================ @@ -29,12 +29,14 @@ ADS_MODULE_VERSION = R2.0.0-0.0.5 # ============================================================ AUTOSAVE=$(EPICS_MODULES)/autosave/$(AUTOSAVE_MODULE_VERSION) IOCADMIN=$(EPICS_MODULES)/iocAdmin/$(IOCADMIN_MODULE_VERSION) -ETHERCATMC=$(EPICS_MODULES)/ethercatmc/$(ETHERCATMC_MODULE_VERSION) +#ETHERCATMC=$(EPICS_MODULES)/ethercatmc/$(ETHERCATMC_MODULE_VERSION) MOTOR=$(EPICS_MODULES)/motor/$(MOTOR_MODULE_VERSION) ASYN=$(EPICS_MODULES)/asyn/$(ASYN_MODULE_VERSION) -ADS=$(EPICS_MODULES)/twincat-ads/$(ADS_MODULE_VERSION) +#ADS=$(EPICS_MODULES)/twincat-ads/$(ADS_MODULE_VERSION) -#MY_MODULES=/reg/neh/home4/mcbrowne/git/modules +MCB_MODULES=/reg/neh/home4/mcbrowne/git/modules +ADS=$(MCB_MODULES)/twincat-ads +ETHERCATMC=$(MCB_MODULES)/ethercatmc # =============================================================== # Define the location and version of EPICS base From b2ededafa61e04ac7476e335082b50e638247bd6 Mon Sep 17 00:00:00 2001 From: Michael Browne Date: Mon, 20 Apr 2020 16:44:36 -0700 Subject: [PATCH 2/3] Move to latest releases. --- configure/RELEASE | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/configure/RELEASE b/configure/RELEASE index 2b42512..63cc212 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -10,9 +10,8 @@ AUTOSAVE_MODULE_VERSION = R5.8-2.1.0 IOCADMIN_MODULE_VERSION = R3.1.15-1.10.0 ASYN_MODULE_VERSION = R4.35-0.0.1 MOTOR_MODULE_VERSION = R6.9-ess-0.0.1 -#ETHERCATMC_MODULE_VERSION = R2.1.0-0.1.0 -#ADS_MODULE_VERSION = R2.0.0-0.0.5 - +ETHERCATMC_MODULE_VERSION = R2.1.0-0.1.1 +ADS_MODULE_VERSION = R2.0.0-0.0.6 # ============================================================ # External Support module path definitions @@ -29,14 +28,12 @@ MOTOR_MODULE_VERSION = R6.9-ess-0.0.1 # ============================================================ AUTOSAVE=$(EPICS_MODULES)/autosave/$(AUTOSAVE_MODULE_VERSION) IOCADMIN=$(EPICS_MODULES)/iocAdmin/$(IOCADMIN_MODULE_VERSION) -#ETHERCATMC=$(EPICS_MODULES)/ethercatmc/$(ETHERCATMC_MODULE_VERSION) +ETHERCATMC=$(EPICS_MODULES)/ethercatmc/$(ETHERCATMC_MODULE_VERSION) MOTOR=$(EPICS_MODULES)/motor/$(MOTOR_MODULE_VERSION) ASYN=$(EPICS_MODULES)/asyn/$(ASYN_MODULE_VERSION) -#ADS=$(EPICS_MODULES)/twincat-ads/$(ADS_MODULE_VERSION) +ADS=$(EPICS_MODULES)/twincat-ads/$(ADS_MODULE_VERSION) -MCB_MODULES=/reg/neh/home4/mcbrowne/git/modules -ADS=$(MCB_MODULES)/twincat-ads -ETHERCATMC=$(MCB_MODULES)/ethercatmc +#MCB_MODULES=/reg/neh/home4/mcbrowne/git/modules # =============================================================== # Define the location and version of EPICS base From 5253effb9265dd37b22ebf3ce9f03a665b660a34 Mon Sep 17 00:00:00 2001 From: Michael Browne Date: Tue, 21 Apr 2020 09:24:17 -0700 Subject: [PATCH 3/3] Damn it, update version number! --- configure/RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure/RELEASE b/configure/RELEASE index 63cc212..3a8a65b 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -10,7 +10,7 @@ AUTOSAVE_MODULE_VERSION = R5.8-2.1.0 IOCADMIN_MODULE_VERSION = R3.1.15-1.10.0 ASYN_MODULE_VERSION = R4.35-0.0.1 MOTOR_MODULE_VERSION = R6.9-ess-0.0.1 -ETHERCATMC_MODULE_VERSION = R2.1.0-0.1.1 +ETHERCATMC_MODULE_VERSION = R2.1.0-0.1.2 ADS_MODULE_VERSION = R2.0.0-0.0.6 # ============================================================