From 7ee215cfeb7043022f6d452eefe39f6a2e29798c Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Mon, 8 Jun 2020 20:06:08 -0700 Subject: [PATCH 1/3] MNT: DB_INSTALLS is for items from other modules --- app/Db/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Db/Makefile b/app/Db/Makefile index 931c1f3..219c688 100644 --- a/app/Db/Makefile +++ b/app/Db/Makefile @@ -18,13 +18,13 @@ include $(TOP)/configure/CONFIG ARCHIVE += REQ += -DB_INSTALLS += EthercatMC.template -DB_INSTALLS += EthercatMCdebug.template -DB_INSTALLS += EthercatMChome.template -DB_INSTALLS += EthercatMCreadback.template -DB_INSTALLS += EthercatMCslitAvoidCollSoftlimits.template -DB_INSTALLS += EthercatMCslit_hard.template -DB_INSTALLS += EthercatMCslit_soft.template +DB += EthercatMC.template +DB += EthercatMCdebug.template +DB += EthercatMChome.template +DB += EthercatMCreadback.template +DB += EthercatMCslitAvoidCollSoftlimits.template +DB += EthercatMCslit_hard.template +DB += EthercatMCslit_soft.template DB_INSTALLS += $(IOCADMIN)/db/iocSoft.db DB_INSTALLS += $(IOCADMIN)/db/devIocInfo.db From 57b8fdc966c2fe835d4aaeecce37ca80ae59f3d3 Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Mon, 8 Jun 2020 20:08:55 -0700 Subject: [PATCH 2/3] MNT: add paths to all because it should not be skipped --- iocBoot/templates/Makefile.base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iocBoot/templates/Makefile.base b/iocBoot/templates/Makefile.base index e4cc90e..a99869e 100644 --- a/iocBoot/templates/Makefile.base +++ b/iocBoot/templates/Makefile.base @@ -34,7 +34,7 @@ DB_PARAMETERS ?= 'PREFIX=$(PREFIX):,IOCNAME=$$(IOCNAME)' # abspath is failing with spaces - falling back to Python here: pyabspath = $(shell python -c "import os, sys; print(os.path.abspath(os.path.expanduser(sys.argv[1])))" "$(1)" ) -all: build clean +all: build paths clean help: @echo "Available commands:" From 4d247d8aaaf06289531b86ad1439ce47aa6ad24b Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Mon, 8 Jun 2020 23:09:24 -0700 Subject: [PATCH 3/3] MNT: nonzero default so IOC doesn't ignore us --- app/Db/EthercatMC.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Db/EthercatMC.template b/app/Db/EthercatMC.template index 61a2406..c7882e9 100644 --- a/app/Db/EthercatMC.template +++ b/app/Db/EthercatMC.template @@ -24,7 +24,7 @@ record(motor,"$(PREFIX)$(MOTOR_NAME)") field(RDBD,"$(RDBD=0)") field(RMOD,"$(RMOD=3)") field(RTRY,"$(RTRY=1)") - field(SPDB,"$(SPDB=0)") + field(SPDB,"$(SPDB=0.0001)") field(TWV,"$(TWV=1)") field(VBAS,"$(VBAS=0)") field(VELO,"$(VELO=0)")