Usage:
Once the driver is installed, you may start the ioc by entering the IOC folder and running 'sudo ./startEPICS.sh'. Sudo access is important because access to UVC devices is limited to users with root permissions. You may then integrate ADUVC into your area detector screen setup. Below is an image of the ADUVC base control screen. It extends the standard ADBase screen with UVC controls for various camera functionality, - such as brightness, exposure, backlight compenstation, saturation, etc. Currently the driver only supports 8-bit RGB images (most UVC cameras - only allow for this anyway), but support for more formats is planned in R1-1. + such as brightness, exposure, backlight compenstation, saturation, etc. The driver supports a variety of UVC formats, though the two that are used + the most often are MJPEG and Uncompressed. Because acquisition modes are locked down in most UVC cameras, as of R1-2 there has been added a section + to the screen that allows for selecting from up to the 7 most useful acquisition modes supported by the camera. If the camera has fewer than 7 modes, + the remaining ones will show as Unused.
The ADUVC Base screen. Based on the ADBase screen with added controls specific to ADUVC.
@@ -58,6 +60,32 @@Usage:
Release Notes:
+
+
Release Notes
+R1-2 (11-June-2019)
+-
+
-
+
Key detector features implemented:
+-
+
- Camera modes now read into structs at startup +
- Valid camera mode structs selectable from dropdown in CSS - improves usability +
- Autosave functionality tested and working. +
- More extensive status messages/detector feedback +
+ -
+
Key fixes and improvements
+-
+
- Removed unused PVs (ADUVC_VendorID, ADUVC_ProductID) +
- Fixed memory leak caused by early return from frame conversion function on error +
- Added Makefiles to the support modules +
- Documentation updates +
- Added information on using camera with Virtual Box +
- Removed newlines from status messages for better readability. +
- CSS screen updated +
+
R1-1 (28-January-2019)
-
@@ -133,14 +161,13 @@
R0-1 (Beta) (5-November-2018)
- No custom screens (uses ADBase screen)
Issues and pull requests:
- To submit an issue or a pull request for ADUVC, please do so at the source fork on Github. + To submit an issue or a pull request for ADUVC, please do so at the source fork on Github.
Important links:
-
diff --git a/iocs/adUVCIOC/iocBoot/iocADUVC/ADUVC_settings.req b/iocs/adUVCIOC/iocBoot/iocADUVC/ADUVC_settings.req
deleted file mode 100755
index e69de29..0000000
diff --git a/iocs/adUVCIOC/iocBoot/iocADUVC/auto_settings.req b/iocs/adUVCIOC/iocBoot/iocADUVC/auto_settings.req
index 4ce897a..d001d6b 100755
--- a/iocs/adUVCIOC/iocBoot/iocADUVC/auto_settings.req
+++ b/iocs/adUVCIOC/iocBoot/iocADUVC/auto_settings.req
@@ -1,9 +1,3 @@
-file "ADUVC_settings.req", P=$(P), R=cam1:
-file "ADBase_settings.req", P=$(P), R=cam1:
-file "NDPluginBase_settings.req", P=$(P), R=image1:
-file "NDStdArrays_settings.req", P=$(P), R=image1:
-file "commonPlugin_settings.req", P=$(P)
-file "NDPluginFile_settings.req", P=$(P), R=PW1:
-file "NDPluginPipeWriter_settings.req", P=$(P), R=PW1:
-file "NDPluginFile_settings.req", P=$(P), R=IMM1:
-file "NDFileIMM_settings.req", P=$(P), R=IMM1:
+file "ADUVC_settings.req", P=$(P), R=cam1:
+file "NDStdArrays_settings.req", P=$(P), R=image1:
+file "commonPlugin_settings.req", P=$(P)
diff --git a/iocs/adUVCIOC/iocBoot/iocADUVC/st.cmd b/iocs/adUVCIOC/iocBoot/iocADUVC/st.cmd
index 165009d..bb95185 100755
--- a/iocs/adUVCIOC/iocBoot/iocADUVC/st.cmd
+++ b/iocs/adUVCIOC/iocBoot/iocADUVC/st.cmd
@@ -44,39 +44,30 @@ epicsEnvSet("EPICS_CA_MAX_ARRAY_BYTES", 20000000)
# */
# If searching for device by serial number, put 0 and 0 for vendor/productID
-# ADUVCConfig(const char* portName, const char* serial, int vendorID, int productID, int framerate, int xsize, int ysize, int maxBuffers, size_t maxMemory, int priority, int stackSize)
-#ADUVCConfig("$(PORT)", "10e536e9e4c4ee70", 0, "$(FRAMERATE)", "$(XSIZE)", "$(YSIZE)", 0, 0, 0, 0)
+# ADUVCConfig(const char* portName, const char* serial, int productID, int framerate, int xsize, int ysize, int maxBuffers, size_t maxMemory, int priority, int stackSize)
+#ADUVCConfig("$(PORT)", "10e536e9e4c4ee70", 0, $(FRAMERATE), $(XSIZE), $(YSIZE), 0, 0, 0, 0)
#epicsThreadSleep(2)
# If searching for device by product ID put "" or empty string for serial number
ADUVCConfig("$(PORT)", "", 25344, $(FRAMERATE), $(XSIZE), $(YSIZE), 0, 0, 0, 0)
-#ADUVCConfig("$(PORT)", "", 49490, $(FRAMERATE), $(XSIZE), $(YSIZE), 0, 0, 0, 0)
epicsThreadSleep(2)
asynSetTraceIOMask($(PORT), 0, 2)
-#asynSetTraceMask($(PORT),0,0xff)
+#asynSetTraceMask($(PORT), 0, 0xff)
dbLoadRecords("$(ADCORE)/db/ADBase.template", "P=$(PREFIX),R=cam1:,PORT=$(PORT),ADDR=0,TIMEOUT=1")
dbLoadRecords("$(ADUVC)/db/ADUVC.template","P=$(PREFIX),R=cam1:,PORT=$(PORT),ADDR=0,TIMEOUT=1")
+
#
# Create a standard arrays plugin, set it to get data from Driver.
-#int NDStdArraysConfigure(const char *portName, int queueSize, int blockingCallbacks, const char *NDArrayPort, int NDArrayAddr, int maxBuffers, size_t maxMemory,
+# int NDStdArraysConfigure(const char *portName, int queueSize, int blockingCallbacks, const char *NDArrayPort, int NDArrayAddr, int maxBuffers, size_t maxMemory,
# int priority, int stackSize, int maxThreads)
NDStdArraysConfigure("Image1", 3, 0, "$(PORT)", 0)
-#dbLoadRecords("$(ADCORE)/db/NDPluginBase.template","P=$(PREFIX),R=image1:,PORT=Image1,ADDR=0,TIMEOUT=1,NDARRAY_PORT=$(PORT),NDARRAY_ADDR=0")
-#dbLoadRecords("$(ADCORE)/db/NDStdArrays.template", "P=$(PREFIX),R=image1:,PORT=Image1,ADDR=0,TIMEOUT=1,TYPE=Int16,SIZE=16,FTVL=SHORT,NELEMENTS=802896")
dbLoadRecords("$(ADCORE)/db/NDStdArrays.template", "P=$(PREFIX),R=image1:,PORT=Image1,ADDR=0,NDARRAY_PORT=$(PORT),TIMEOUT=1,TYPE=Int16,FTVL=SHORT,NELEMENTS=6000000")
+
#
# Load all other plugins using commonPlugins.cmd
< $(ADCORE)/iocBoot/commonPlugins.cmd
-#
-#Note mpi control pipe out & in reversed. Names are from the view of the MPI program.
-#NDPipeWriterConfigure("PipeWriter1", 15000, 0, "$(PORT)", "/local/xpcscmdout", "/local/xpcscmdin", 0, 0, 0, 0,0)
-#dbLoadRecords("$(ADCORE)/db/NDPluginPipeWriter.template", "P=$(PREFIX),R=PW1:, PORT=PipeWriter1,ADDR=0,TIMEOUT=1,NDARRAY_PORT=$(PORT),CMD_IN_PORT=PW_CMD_IN,CMD_OUT_PORT=PW_CMD_OUT")
-
-#Note Local plugin to run the IMM plugin writer
-#NDFileIMMConfigure("IMM1", 15000, 0, "$(PORT)", 0, 0, 0)
-#dbLoadRecords("$(ADCORE)/db/NDFileIMM.template", "P=$(PREFIX),R=IMM1:,PORT=IMM1,ADDR=0,TIMEOUT=1,NDARRAY_PORT=$(PORT)")
set_requestfile_path("$(ADUVC)/adUVCApp/Db")