From b4425d73f79f89d8f4bb69def6a518abaf22ee1a Mon Sep 17 00:00:00 2001 From: jwlodek Date: Mon, 24 Jan 2022 13:49:33 -0500 Subject: [PATCH 1/3] Add ffmpegServer req file location to req file path --- iocBoot/EXAMPLE_commonPlugins.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/iocBoot/EXAMPLE_commonPlugins.cmd b/iocBoot/EXAMPLE_commonPlugins.cmd index 8a985f4fe..2a06364df 100644 --- a/iocBoot/EXAMPLE_commonPlugins.cmd +++ b/iocBoot/EXAMPLE_commonPlugins.cmd @@ -185,6 +185,7 @@ dbLoadRecords("$(AUTOSAVE)/db/configMenu.db", "P=$(PREFIX), CONFIG=ADAutoSave") #dbLoadRecords("$(FFMPEGSERVER)/db/ffmpegStream.template", "P=$(PREFIX),R=ffmstream1:,PORT=FfmStream1,NDARRAY_PORT=$(PORT)") #ffmpegFileConfigure("FfmFile1", 16, 0, "$(PORT)", 0, -1, 0) #dbLoadRecords("$(FFMPEGSERVER)/db/ffmpegFile.template", "P=$(PREFIX),R=ffmfile1:,PORT=FfmFile1,NDARRAY_PORT=$(PORT)") +#set_requestfile_path("$(FFMPEGSERVER)/ffmpegServerApp/Db") # Optional: load NDPluginEdge plugin #NDEdgeConfigure("EDGE1", $(QSIZE), 0, "$(PORT)", 0, 0, 0, 0) From 88ba3d4825b506cebfe85a41ff282326e9c4e9d5 Mon Sep 17 00:00:00 2001 From: jwlodek Date: Mon, 24 Jan 2022 14:24:20 -0500 Subject: [PATCH 2/3] Edit request file paths for plugins to point to db/ dir instead of Db/ dir --- iocBoot/EXAMPLE_commonPlugins.cmd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iocBoot/EXAMPLE_commonPlugins.cmd b/iocBoot/EXAMPLE_commonPlugins.cmd index 2a06364df..1df69a561 100644 --- a/iocBoot/EXAMPLE_commonPlugins.cmd +++ b/iocBoot/EXAMPLE_commonPlugins.cmd @@ -185,7 +185,7 @@ dbLoadRecords("$(AUTOSAVE)/db/configMenu.db", "P=$(PREFIX), CONFIG=ADAutoSave") #dbLoadRecords("$(FFMPEGSERVER)/db/ffmpegStream.template", "P=$(PREFIX),R=ffmstream1:,PORT=FfmStream1,NDARRAY_PORT=$(PORT)") #ffmpegFileConfigure("FfmFile1", 16, 0, "$(PORT)", 0, -1, 0) #dbLoadRecords("$(FFMPEGSERVER)/db/ffmpegFile.template", "P=$(PREFIX),R=ffmfile1:,PORT=FfmFile1,NDARRAY_PORT=$(PORT)") -#set_requestfile_path("$(FFMPEGSERVER)/ffmpegServerApp/Db") +#set_requestfile_path("$(FFMPEGSERVER)/db") # Optional: load NDPluginEdge plugin #NDEdgeConfigure("EDGE1", $(QSIZE), 0, "$(PORT)", 0, 0, 0, 0) @@ -195,12 +195,12 @@ dbLoadRecords("$(AUTOSAVE)/db/configMenu.db", "P=$(PREFIX), CONFIG=ADAutoSave") # Optional: load NDPluginCV plugin #NDCVConfigure("CV1", $(QSIZE), 0, "$(PORT)", 0, 0, 0, 0, 0, $(MAX_THREADS=5)) #dbLoadRecords("$(ADCOMPVISION)/db/NDCV.template", "P=$(PREFIX),R=CV1:, PORT=CV1,ADDR=0,TIMEOUT=1,NDARRAY_PORT=$(PORT)") -#set_requestfile_path("$(ADCOMPVISION)/adcvApp/Db") +#set_requestfile_path("$(ADCOMPVISION)/db") # Optional: load NDPluginBar plugin #NDBarConfigure("BAR1", $(QSIZE), 0, "$(PORT)", 0, 0, 0, 0, 0, $(MAX_THREADS=5)) #dbLoadRecords("$(ADPLUGINBAR)/db/NDBar.template", "P=$(PREFIX),R=Bar1:, PORT=BAR1,ADDR=0,TIMEOUT=1,NDARRAY_PORT=$(PORT)") -#set_requestfile_path("$(ADPLUGINBAR)/barApp/Db") +#set_requestfile_path("$(ADPLUGINBAR)/db") # Optional: load scan records #dbLoadRecords("$(SSCAN)/sscanApp/Db/scan.db", "P=$(PREFIX),MAXPTS1=2000,MAXPTS2=200,MAXPTS3=20,MAXPTS4=10,MAXPTSH=10") From 48d22f1f54d09f95c57b18bb9132e6a4a0baea0e Mon Sep 17 00:00:00 2001 From: Antonino Miceli Date: Mon, 7 Feb 2022 09:15:59 -0600 Subject: [PATCH 3/3] Uncommented NDPluginPva plugin Uncommented NDPluginPva plugin. This is should be used routinely instead of the Image plugin. --- iocBoot/EXAMPLE_commonPlugins.cmd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/iocBoot/EXAMPLE_commonPlugins.cmd b/iocBoot/EXAMPLE_commonPlugins.cmd index 1df69a561..2cec3492e 100644 --- a/iocBoot/EXAMPLE_commonPlugins.cmd +++ b/iocBoot/EXAMPLE_commonPlugins.cmd @@ -173,11 +173,11 @@ save_restoreSet_status_prefix("$(PREFIX)") dbLoadRecords("$(AUTOSAVE)/db/save_restoreStatus.db", "P=$(PREFIX)") dbLoadRecords("$(AUTOSAVE)/db/configMenu.db", "P=$(PREFIX), CONFIG=ADAutoSave") -# Optional: load NDPluginPva plugin -#NDPvaConfigure("PVA1", $(QSIZE), 0, "$(PORT)", 0, $(PREFIX)Pva1:Image, 0, 0, 0) -#dbLoadRecords("NDPva.template", "P=$(PREFIX),R=Pva1:, PORT=PVA1,ADDR=0,TIMEOUT=1,NDARRAY_PORT=$(PORT)") -# Must start PVA server if this is enabled -#startPVAServer +# Load NDPluginPva plugin +NDPvaConfigure("PVA1", $(QSIZE), 0, "$(PORT)", 0, $(PREFIX)Pva1:Image, 0, 0, 0) +dbLoadRecords("NDPva.template", "P=$(PREFIX),R=Pva1:, PORT=PVA1,ADDR=0,TIMEOUT=1,NDARRAY_PORT=$(PORT)") +#Must start PVA server if this is enabled +startPVAServer # Optional: load ffmpegServer plugin #ffmpegServerConfigure(8081)