Skip to content
Snippets Groups Projects
Commit b8d8a1d7 authored by Simon Rose's avatar Simon Rose
Browse files

Add precommit stage

parent 026dffc1
No related branches found
No related tags found
No related merge requests found
*~
*~
*-dev
modules.order
Module.symvers
......
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
......@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License along with
# this program. If not, see https://www.gnu.org/licenses/gpl-2.0.txt
#
#
#
# Author : Jeong Han Lee
# email : jeonghan.lee@gmail.com
# Date : Monday, October 7 12:51:08 CEST 2019
......@@ -94,7 +94,7 @@ endif # ($(SUPPORT_EXTERNAL),NO)
SCRIPTS += $(wildcard ../iocsh/*.iocsh)
.PHONY:
.PHONY:
USR_DBFLAGS += -I . -I ..
......@@ -117,6 +117,3 @@ ifeq ($(SUPPORT_EXTERNAL),NO)
endif
.PHONY: $(VENDOR_LIBS) vlibs
......@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License along with
# this program. If not, see https://www.gnu.org/licenses/gpl-2.0.txt
#
#
#
# Author : Jeong Han Lee
# email : han.lee@esss.se
# Date : 2019Sep08-2250-09CEST
......@@ -25,4 +25,3 @@ TOP:=$(CURDIR)
include $(TOP)/configure/CONFIG
include $(TOP)/configure/RULES
e3-ADSpinnaker
e3-ADSpinnaker
======
ESS Site-specific EPICS module : ADSpinnaker
......@@ -11,9 +11,9 @@ our Redhat-based e3 environments.
* With the default shared libraries within spinnakerSupport and its header files return the following error messages:
```
ADSpinnakerConfig("PG", 19299225, 0x1, 0)
terminate called after throwing an instance of 'Spinnaker::Exception'
what(): Spinnaker: System instance cannot be acquired. [-1012]
ADSpinnakerConfig("PG", 19299225, 0x1, 0)
terminate called after throwing an instance of 'Spinnaker::Exception'
what(): Spinnaker: System instance cannot be acquired. [-1012]
```
in `Ubuntu 18.04.3 LTS (GNU/Linux 5.0.0-27-generic x86_64)`
......@@ -33,7 +33,7 @@ in `Ubuntu 18.04.3 LTS (GNU/Linux 5.0.0-27-generic x86_64)`
## OS
We cannot use this on CentOS7 based system, I think, we can do in CentOS8 in near future, because of
We cannot use this on CentOS7 based system, I think, we can do in CentOS8 in near future, because of
```
/lib64/libm.so.6: version `GLIBC_2.27' not found
/lib64/libc.so.6: version `GLIBC_2.27' not found (required by libSpinnaker.so.1)
......@@ -53,6 +53,4 @@ We cannot use this on CentOS7 based system, I think, we can do in CentOS8 in nea
## Reference
[1] https://flir.app.boxcn.net/v/SpinnakerSDK/folder/74729115388
[1] https://flir.app.boxcn.net/v/SpinnakerSDK/folder/74729115388
......@@ -20,7 +20,7 @@ epicsEnvSet("EPICS_CA_MAX_ARRAY_BYTES","64000000")
### The port name for the detector
epicsEnvSet("PORT", "PG")
#-## Really large queue so we can stream to disk at full camera speed
epicsEnvSet("QSIZE", "2000")
epicsEnvSet("QSIZE", "2000")
#-## The maximim image width; used for row profiles in the NDPluginStats plugin
epicsEnvSet("XSIZE", "2448")
#-## The maximim image height; used for column profiles in the NDPluginStats plugin
......@@ -32,7 +32,7 @@ epicsEnvSet("CBUFFS", "500")
epicsEnvSet("NELEMENTS", "12592912")
# Define all requestfile paths
# Define all requestfile paths
set_requestfile_path("$(ADSpinnaker_DB)", "")
set_requestfile_path("$(ADGenICam_DB)", "")
set_requestfile_path("$(ADCore_DB)", "")
......
......@@ -27,7 +27,7 @@ epicsEnvSet("EPICS_CA_MAX_ARRAY_BYTES","64000000")
epicsEnvSet("PORT", "PG")
### Really large queue so we can stream to disk at full camera speed
epicsEnvSet("QSIZE", "2000")
epicsEnvSet("QSIZE", "2000")
### The maximim image width; used for row profiles in the NDPluginStats plugin
epicsEnvSet("XSIZE", "2448")
......@@ -85,7 +85,7 @@ dbLoadRecords("$(ADSpinnaker_DB)/spinnaker.db", "P=$(PREFIX_PV),R=cam1:,PORT=$(P
#iocshLoad("$(iocStats_DIR)/iocStats.iocsh")
iocInit()
# save things every thirty seconds
#create_monitor_set("auto_settings.req", 30,"P=$(PREFIX)")
......@@ -94,4 +94,3 @@ epicsThreadSleep(1.0)
# Wait for callbacks on the property limits (DRVL, DRVH) to complete
epicsThreadSleep(1.0)
......@@ -17,4 +17,3 @@ E3_REQUIRE_LOCATION := $(EPICS_BASE)/$(E3_REQUIRE_NAME)/$(E3_REQUIRE_VERSION)
include $(E3_REQUIRE_LOCATION)/configure/CONFIG
......@@ -23,4 +23,3 @@ E3_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile
-include $(TOP)/configure/CONFIG_OPTIONS
# The definitions shown below can also be placed in an untracked CONFIG_MODULE.local
-include $(TOP)/configure/CONFIG_MODULE.local
......@@ -11,7 +11,7 @@ ADCORE_DEP_VERSION:=3.7.0
ADGENICAM_DEP_VERSION:=1.0.0
#
#
#
#
#E3_KMOD_SRC_PATH:=$(E3_MODULE_SRC_PATH)
#
# In most case, we don't need to touch the following variables.
......@@ -26,4 +26,3 @@ E3_MODULE_DEV_GITURL:="https://github.com/jeonghanlee/ADSpinnaker.git"
# The definitions shown below can also be placed in an untracked CONFIG_MODULE_DEV.local
-include $(TOP)/configure/CONFIG_MODULE_DEV.local
......@@ -2,4 +2,3 @@ SUPPORT_EXTERNAL:=YES
# The definitions shown below can also be placed in an untracked CONFIG_OPTIONS.local
-include $(TOP)/configure/CONFIG_OPTIONS.local
......@@ -8,4 +8,3 @@ E3_REQUIRE_VERSION:=3.3.0
-include $(TOP)/../../RELEASE.local
-include $(TOP)/../RELEASE.local
-include $(TOP)/configure/RELEASE.local
......@@ -8,4 +8,3 @@ E3_REQUIRE_VERSION:=3.1.0
-include $(TOP)/../../RELEASE_DEV.local
-include $(TOP)/../RELEASE_DEV.local
-include $(TOP)/configure/RELEASE_DEV.local
......@@ -4,4 +4,3 @@ include $(E3_REQUIRE_CONFIG)/RULES_SITEMODS
include $(TOP)/configure/module/RULES_MODULE
-include $(TOP)/configure/module/RULES_DKMS_L
......@@ -35,4 +35,3 @@
# .PHONY: setup setup_clean
......@@ -14,4 +14,3 @@ hdrs:
# $(QUIET)echo "CHECK_RELEASE:=YES" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
# $(QUIET)echo "INSTALL_LOCATION:=$(M_DEVLIB2)" >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
# $(SUDOBASH) "$(MAKE) -C $(E3_MODULE_SRC_PATH)"
......@@ -19,4 +19,3 @@ The changes were tested in local environemnt, and commits to the forked reposito
```
$git diff feb8856 master --no-prefix > ../patch/Site/E3_MODULE_VERSION-what_ever_filename.p0.patch
```
......@@ -6800,4 +6800,3 @@ record(longout, "$(P)$(R)GC_TransferStop") {
field(DISA, "0")
info(autosaveFields, "DESC LOLO LOW HIGH HIHI LLSV LSV HSV HHSV EGU TSE")
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment