first compilable version of CtVideo + prosilica module

parent 89208721
......@@ -13,3 +13,6 @@
[submodule "applications/spec"]
path = applications/spec
url = git://git.epn-campus.eu/repositories/LimaSpec
[submodule "camera/prosilica"]
path = camera/prosilica
url = git://git.epn-campus.eu/repositories/LimaCameraProsilica
......@@ -174,6 +174,38 @@ build_targets += $(maxipix-full)
endif
############################
# LIMA - PROSILICA
############################
ifneq ($(COMPILE_PROSILICA),0)
PROSILICA_LDFLAGS := -L. -L../camera/prosilica/sdk/bin/x64 -L../camera/prosilica/sdk/bin/x86
PROSILICA_LDLIBS := -lPvAPI
name := prosilica
prosilica-objs := ../camera/prosilica/src/Prosilica.o
version-file := ../camera/prosilica/VERSION
prosilica-flags := $(PROSILICA_LDFLAGS)
prosilica-deps := $(PROSILICA_LDLIBS)
full-version := $(shell cat $(version-file))
maj-version := $(shell echo $(full-version) | cut -f1 -d.)
prosilica-base := liblima$(name).so
prosilica-full := $(prosilica-base).$(full-version)
prosilica-maj := $(prosilica-base).$(maj-version)
prosilica-flags += -fPIC -Wl,-soname,$(prosilica-maj)
$(prosilica-full): $(prosilica-objs)
$(CXX) -shared -o $@ $(prosilica-flags) $+ $(prosilica-deps)
rm -f $(prosilica-maj); ln -s $(prosilica-full) $(prosilica-maj)
rm -f $(prosilica-base); ln -s $(prosilica-maj) $(prosilica-base)
build_targets += $(prosilica-full)
endif
src: $(build_targets)
test:
......
......@@ -18,4 +18,12 @@ ifneq ($(COMPILE_MAXIPIX),0)
sub-dirs += maxipix
endif
ifndef COMPILE_PROSILICA
COMPILE_PROSILICA = 0
endif
ifneq ($(COMPILE_PROSILICA),0)
sub-dirs += prosilica
endif
include ../global.inc
......@@ -18,7 +18,7 @@ class Interface(Core.HwInterface) :
self.__detInfo = DetInfoCtrlObj()
self.__detInfo.init()
self.__buffer = BufferCtrlObj(self.__comm,self.__detInfo)
self.__syncObj = SyncCtrlObj(self.__buffer,self.__comm,self.__detInfo)
self.__syncObj = SyncCtrlObj(self.__comm,self.__detInfo)
self.__acquisition_start_flag = False
self.__image_number = 0
......
......@@ -4,8 +4,8 @@ from Lima import Core
class SyncCtrlObj(Core.HwSyncCtrlObj) :
#Core.Debug.DEB_CLASS(Core.DebModCamera, "SyncCtrlObj")
def __init__(self,buffer_obj,comm_object,det_info) :
Core.HwSyncCtrlObj.__init__(self,buffer_obj)
def __init__(self,comm_object,det_info) :
Core.HwSyncCtrlObj.__init__(self)
self.__comm = weakref.ref(comm_object)
self.__det_info = weakref.ref(det_info)
......
prosilica @ cc2cd48f
Subproject commit cc2cd48f31e6dd6b8fbc8871e1ea861ce5e154e3
......@@ -83,3 +83,9 @@ enum DetStatus {
DetLatency = 0x80,
};
enum VideoMode {Y8,Y16,Y32,Y64,
RGB555,RGB565,
RGB24,RGB32,
BGR24,BGR32,
BAYER_RG8,BAYER_RG16,
I420,YUV411,YUV422,YUV444};
\ No newline at end of file
......@@ -5,8 +5,9 @@ COMPILE_ESPIA=0
COMPILE_FRELON=0
COMPILE_MAXIPIX=0
COMPILE_PILATUS=0
COMPILE_PROSILICA=0
COMPILE_CBF_SAVING=0
export COMPILE_CORE COMPILE_SPS_IMAGE COMPILE_SIMULATOR \
COMPILE_ESPIA COMPILE_FRELON COMPILE_MAXIPIX COMPILE_PILATUS \
COMPILE_CBF_SAVING
COMPILE_PROSILICA COMPILE_CBF_SAVING
......@@ -36,7 +36,7 @@ sipRes = str.str().c_str();
};
HwSyncCtrlObj(HwBufferCtrlObj& buffer_ctrl);
HwSyncCtrlObj();
virtual ~HwSyncCtrlObj();
virtual bool checkTrigMode(TrigMode trig_mode) = 0;
......
......@@ -118,3 +118,10 @@ ifneq ($(COMPILE_PILATUS), 0)
cp camera/pilatus/python/__init__.py $(INSTALL_PILATUS_DIR)
cp camera/pilatus/python/*.py $(INSTALL_PILATUS_VDIR)
endif
ifneq ($(COMPILE_PROSILICA), 0)
INSTALL_PROSILICA_DIR = $(INSTALL_PLAT_DIR)/Prosilica
PROSILICA_FULL_VERSION = $(shell cat camera/prosilica/VERSION)
PROSILICA_MAJ_VERSION = $(shell echo $(PROSILICA_FULL_VERSION) | cut -d. -f1)
INSTALL_PROSILICA_VDIR = $(INSTALL_PROSILICA_DIR)/v$(PROSILICA_FULL_VERSION)
endif
......@@ -10,3 +10,4 @@ espia
frelon
maxipix
simulator
prosilica
......@@ -8,7 +8,8 @@ modules = [('core', ['common', 'hardware', 'control']),
('simulator', [os.path.join('camera','simulator')]),
('espia', [os.path.join('camera','common','espia')]),
('frelon', [os.path.join('camera','frelon')]),
('maxipix', [os.path.join('camera','maxipix')])]
('maxipix', [os.path.join('camera','maxipix')]),
('prosilica', [os.path.join('camera','prosilica')])]
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