diff --git a/MOXA12XX/MOXA12XX-IOC-01App/Db/Makefile b/MOXA12XX/MOXA12XX-IOC-01App/Db/Makefile index eb5faae32..19086ab41 100644 --- a/MOXA12XX/MOXA12XX-IOC-01App/Db/Makefile +++ b/MOXA12XX/MOXA12XX-IOC-01App/Db/Makefile @@ -12,6 +12,7 @@ include $(TOP)/configure/CONFIG # databases, templates, substitutions like this #DB += xxx.db DB += moxa_e1210_PVs.db +DB += moxa_e1213_PVs.db DB += moxa_e1240_PVs.db DB += moxa_e1242_PVs.db DB += moxa_e1262_PVs.db diff --git a/MOXA12XX/MOXA12XX-IOC-01App/Db/moxa_e1213_PVs.substitutions b/MOXA12XX/MOXA12XX-IOC-01App/Db/moxa_e1213_PVs.substitutions new file mode 100644 index 000000000..a1fbb9fc1 --- /dev/null +++ b/MOXA12XX/MOXA12XX-IOC-01App/Db/moxa_e1213_PVs.substitutions @@ -0,0 +1,27 @@ +file "IBEX_PVs_counters.template" { + +pattern {NAME, P, ASYNPORT, OLDFNCTN, CHAN, NEWFNCTN} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DI", "0", "DI"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DI", "1", "DI"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DI", "2", "DI"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DI", "3", "DI"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DI", "4", "DI"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DI", "5", "DI"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DI", "6", "DI"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DI", "7", "DI"} +} + +file "IBEX_PVs_channels.template" { + +pattern {NAME, P, ASYNPORT, OLDFNCTN, CHAN, NEWFNCTN} + +# DO Mode WRITE +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DO", "0", "DO:SP"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DO", "1", "DO:SP"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DO", "2", "DO:SP"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DO", "3", "DO:SP"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DO", "4", "DO:SP"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DO", "5", "DO:SP"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DO", "6", "DO:SP"} +{"\$(NAME)", "\$(P)", "\$(ASYNPORT)", "DO", "7", "DO:SP"} +} diff --git a/MOXA12XX/iocBoot/iocMOXA12XX-IOC-01/config.xml b/MOXA12XX/iocBoot/iocMOXA12XX-IOC-01/config.xml index dddf1d4b8..3af2ff39b 100644 --- a/MOXA12XX/iocBoot/iocMOXA12XX-IOC-01/config.xml +++ b/MOXA12XX/iocBoot/iocMOXA12XX-IOC-01/config.xml @@ -6,7 +6,7 @@ - + diff --git a/MOXA12XX/iocBoot/iocMOXA12XX-IOC-01/st-common.cmd b/MOXA12XX/iocBoot/iocMOXA12XX-IOC-01/st-common.cmd index 5b811c52c..7b68130bb 100644 --- a/MOXA12XX/iocBoot/iocMOXA12XX-IOC-01/st-common.cmd +++ b/MOXA12XX/iocBoot/iocMOXA12XX-IOC-01/st-common.cmd @@ -14,11 +14,13 @@ $(IFNOTDEVSIM) $(IFNOTRECSIM) drvAsynIPPortConfigure ("$(E12XX_ASYNPORT)","$(ADD modbusInterposeConfig("$(E12XX_ASYNPORT)", 0, 2000, 0) stringiftest("MOXA1210", $(MODELNO), 5, "1210") +stringiftest("MOXA1213", $(MODELNO), 5, "1213") stringiftest("MOXA1240", $(MODELNO), 5, "1240") stringiftest("MOXA1242", $(MODELNO), 5, "1242") stringiftest("MOXA1262", $(MODELNO), 5, "1262") $(IFMOXA1210) < ${TOP}/iocBoot/iocMOXA12XX-IOC-01/st-e1210.cmd +$(IFMOXA1213) < ${TOP}/iocBoot/iocMOXA12XX-IOC-01/st-e1213.cmd $(IFMOXA1240) < ${TOP}/iocBoot/iocMOXA12XX-IOC-01/st-e1240.cmd $(IFMOXA1242) < ${TOP}/iocBoot/iocMOXA12XX-IOC-01/st-e1242.cmd $(IFMOXA1262) < ${TOP}/iocBoot/iocMOXA12XX-IOC-01/st-e1262.cmd diff --git a/MOXA12XX/iocBoot/iocMOXA12XX-IOC-01/st-e1213.cmd b/MOXA12XX/iocBoot/iocMOXA12XX-IOC-01/st-e1213.cmd new file mode 100644 index 000000000..83aff03ba --- /dev/null +++ b/MOXA12XX/iocBoot/iocMOXA12XX-IOC-01/st-e1213.cmd @@ -0,0 +1,18 @@ +# MOXA E1213 DIs: function 2 (Read Discrete Inputs), address 0x0, length 0x8, data_type = 0, # pollMsec = for read func, waits XXX msecs +drvModbusAsynConfigure("$(E12XX_ASYNPORT)_DI", "$(E12XX_ASYNPORT)", 0, 2, 0x0, 0x8, 0, 100, "ioLogik E1213") + +# MOXA E1213 DOs read back: function 1 (Read from coils), address 0x0, length 0x8, data_type = 0, # pollMsec = for read func, waits XXX msecs +drvModbusAsynConfigure("$(E12XX_ASYNPORT)_DO_RBV", "$(E12XX_ASYNPORT)", 0, 1, 0x0, 0x8, 0, 100, "ioLogik E1213") + +# MOXA E1213 DOs: function 5 (Write to coils), address 0x0, length 0x8, data_type = 0, # pollMsec = No significance +drvModbusAsynConfigure("$(E12XX_ASYNPORT)_DO", "$(E12XX_ASYNPORT)", 0, 5, 0x0, 0x8, 0, 100, "ioLogik E1213") + +##ISIS## Load common DB records +< $(IOCSTARTUP)/dbload.cmd + + +dbLoadRecords("$(MOXA12XX)/db/ioLogik_E1213.db","NAME=$(MYPVPREFIX)$(IOCNAME), ASYNPORT=$(E12XX_ASYNPORT)") + +dbLoadRecords("${TOP}/db/moxa_e1213_PVs.db","NAME=$(MYPVPREFIX)$(IOCNAME), P=$(MYPVPREFIX)$(IOCNAME), ASYNPORT=$(E12XX_ASYNPORT)") + +iocshCmdList("< ${TOP}/iocBoot/iocMOXA12XX-IOC-01/st-aliases.cmd", "CHAN=\$(I), FNCTN=DI, CHANPREFIX=DI", "I", "0;1;2;3;4;5;6;7", ";")