Commit 048faf3b authored by Geoffrey Mant's avatar Geoffrey Mant Committed by Sebastien Petitdemange

ultra camera implementation

Conflicts:
	camera/ultra
	sip/configure.py
parent 355df25d
Subproject commit e317a9e64305c8390f57226acdba8bbe4ce9df81
Subproject commit 6c769ec320b4fbfc86bcf8586e017ed21c8b9826
......@@ -459,6 +459,38 @@ build_targets += $(call lib-full,$(xspress3-name),$(xspress3-ver))
endif
############################
# LIMA - ULTRA
############################
ifneq ($(COMPILE_ULTRA),0)
PROCESSOR_TYPE := $(shell uname -m)
#ifeq ($(PROCESSOR_TYPE),x86_64)
#ULTRA_LDFLAGS := -L../camera/ultra/sdk/libs/linux.x86_64
#ULTRA_LDFLAGS :=
#else
#ULTRA_LDFLAGS := -L../camera/ultra/sdk/libs/linux.x86_64
ULTRA_LDFLAGS :=
#endif
#ULTRA_LDLIBS := -lultra -limg_mod
ULTRA_LDLIBS :=
ultra-name := ultra
ultra-objs := ../camera/ultra/src/Ultra.o
ultra-ver := ../camera/ultra/VERSION
ultra-flags := $(ULTRA_LDFLAGS) $(LDFLAGS)
ultra-deps := $(ULTRA_LDLIBS) $(LDLIBS)
$(call lib-full,$(ultra-name),$(ultra-ver)): $(ultra-objs)
$(call compile-lib,$(ultra-name),$(ultra-ver),\
$(ultra-flags),$(ultra-deps),$@,$+)
$(call create-links,$(ultra-name),$(ultra-ver))
build_targets += $(call lib-full,$(ultra-name),$(ultra-ver))
endif
############################
# LIMA - XPAD
############################
......
......@@ -120,6 +120,14 @@ ifneq ($(COMPILE_XSPRESS3),0)
sub-dirs += xspress3
endif
ifndef COMPILE_ULTRA
COMPILE_ULTRA = 0
endif
ifneq ($(COMPILE_ULTRA),0)
sub-dirs += ultra
endif
ifndef COMPILE_XPAD
COMPILE_XPAD = 0
endif
......
Subproject commit 9df6282e67c7925458c653be14685909cb6ad987
Subproject commit 6af472d85e2eb5ce3f8eaf823b1b7b5deb9430e0
......@@ -35,6 +35,7 @@ COMPILE_ADSC=0
COMPILE_UEYE=0
COMPILE_XH=0
COMPILE_XSPRESS3=0
COMPILE_ULTRA=0
COMPILE_XPAD=0
COMPILE_PERKINELMER=0
COMPILE_ANDOR=0
......@@ -55,7 +56,7 @@ LINK_STRICT_VERSION=0
export COMPILE_CORE COMPILE_SPS_IMAGE COMPILE_SIMULATOR \
COMPILE_ESPIA COMPILE_FRELON COMPILE_MAXIPIX COMPILE_PILATUS \
COMPILE_BASLER COMPILE_PROSILICA COMPILE_ROPERSCIENTIFIC COMPILE_ADSC \
COMPILE_MYTHEN COMPILE_UEYE COMPILE_XH COMPILE_XSPRESS3 COMPILE_XPAD COMPILE_PERKINELMER \
COMPILE_MYTHEN COMPILE_UEYE COMPILE_XH COMPILE_XSPRESS3 COMPILE_ULTRA COMPILE_XPAD COMPILE_PERKINELMER \
COMPILE_ANDOR COMPILE_PHOTONICSCIENCE COMPILE_PCO COMPILE_MARCCD COMPILE_DEXELA\
COMPILE_POINTGREY COMPILE_IMXPAD COMPILE_RAYONIXHS COMPILE_CBF_SAVING COMPILE_NXS_SAVING \
COMPILE_FITS_SAVING COMPILE_EDFGZ_SAVING COMPILE_TIFF_SAVING COMPILE_CONFIG\
......
......@@ -157,6 +157,12 @@ XSPRESS3_FULL_VERSION = $(shell cat camera/xspress3/VERSION)
INSTALL_XSPRESS3_VDIR = $(INSTALL_XSPRESS3_DIR)/v$(XSPRESS3_FULL_VERSION)
endif
ifneq ($(COMPILE_ULTRA), 0)
INSTALL_ULTRA_DIR = $(INSTALL_PLAT_DIR)/Ultra
ULTRA_FULL_VERSION = $(shell cat camera/ultra/VERSION)
INSTALL_ULTRA_VDIR = $(INSTALL_ULTRA_DIR)/v$(ULTRA_FULL_VERSION)
endif
ifneq ($(COMPILE_XPAD), 0)
INSTALL_XPAD_DIR = $(INSTALL_PLAT_DIR)/Xpad
XPAD_FULL_VERSION = $(shell cat camera/xpad/VERSION)
......@@ -420,6 +426,16 @@ ifneq ($(COMPILE_XSPRESS3), 0)
cp camera/xspress3/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_ULTRA), 0)
mkdir -p $(INSTALL_ULTRA_VDIR)
cp camera/ultra/python/__init__.py $(INSTALL_ULTRA_DIR)
$(call install_core_dep,$(INSTALL_ULTRA_VDIR))
rm -rf $(INSTALL_LIB_DIR)/liblimaultra.so*
cp -d build/liblimaultra.so* $(INSTALL_LIB_DIR)
cp sip/ultra/limaultra.so $(INSTALL_ULTRA_VDIR)
cp camera/ultra/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_XPAD), 0)
mkdir -p $(INSTALL_XPAD_VDIR)
cp camera/xpad/python/__init__.py $(INSTALL_XPAD_DIR)
......
......@@ -85,6 +85,10 @@ ifneq ($(COMPILE_XSPRESS3), 0)
sip-modules += xspress3
endif
ifneq ($(COMPILE_ULTRA), 0)
sip-modules += ultra
endif
ifneq ($(COMPILE_XPAD), 0)
sip-modules += xpad
endif
......
......@@ -56,6 +56,7 @@ modules = [('core', ['common', 'hardware', 'control']),
('dexela', [os.path.join('camera','dexela')]),
('xspress3', [os.path.join('camera','xspress3')]),
('rayonixhs', [os.path.join('camera','rayonixhs')]),
('ultra', [os.path.join('camera','ultra')]),
]
espiaModules = ['espia', 'frelon', 'maxipix']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment