Commit fe27cd47 authored by Roberto Arturo Homs-Regojo's avatar Roberto Arturo Homs-Regojo
Browse files

Merge branch 'wip-stop-rec' into 'master'

parents f0234126 fefc6504
2018/05/22 18:55:50 ==========================================
2018/06/19 09:52:35 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-05-22_185544]
to: [/t/rhoms1/install-2018-05-22_185544]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-06-19_095229]
to: [/t/rhoms1/install-2018-06-19_095229]
to: [/t/rhoms1/install-beta]
2018/05/22 17:51:04 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-05-22_175057]
to: [/t/rhoms1/install-2018-05-22_175057]
to: [/t/rhoms1/install-beta]
2018/05/22 14:42:50 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-05-22_144244]
to: [/t/rhoms1/install-2018-05-22_144244]
to: [/t/rhoms1/install-beta]
2018/06/18 15:32:33 ==========================================
#define PCO_SDK_LIN_VERSION "$Id: PCOSDK_LIN [pcoDev.1.1.14] $"
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.20] $"
#define PCO_LIMA_VERSION "$Id: PCOLIMA [1.7.7] $"
#define PCO_GIT_VERSION "$Id: PCO rev[2018-06-18 15:30:52 +0200] head[10be45b][10be45b9b0f98669c650c654d661ac306cc8cd38] ref[ (HEAD -> wip-stop-rec, gitlab/wip-stop-rec, github/wip-stop-rec)] at [2018/06/18 15:32:33] $"
#define LIMA_GIT_VERSION "$Id: LIMA rev[2018-05-23 12:18:49 +0200] head[31a027d1][31a027d1269c578dcfd371ed39fb2ab50672bd41] ref[ (HEAD -> core-1.7, tag: pco-1.7.7, gitlab/core-1.7, github/core-1.7)] at [2018/06/18 15:32:33] $"
#define PROCLIB_GIT_VERSION "$Id: PROCLIB rev[2018-01-12 12:04:00 +0100] head[8175ab6][8175ab6cef2b729d69449e2845483df01262ee04] ref[ (HEAD)] at [2018/06/18 15:32:33] $"
#define LIBCONFIG_GIT_VERSION "$Id: LIBCONFIG rev[2013-02-07 18:08:29 +0100] head[89c411a][89c411a541d4ab4d66257ccb85749853fd685cbb] ref[ (HEAD, github/master, github/HEAD, master)] at [2018/06/18 15:32:33] $"
#define TANGO_GIT_VERSION "$Id: TANGO rev[2018-05-23 11:04:34 +0200] head[c209ba6][c209ba61ce1dfa3c9038543909978fc89082d365] ref[ (HEAD -> core-1.7, gitlab/core-1.7, github/core-1.7)] at [2018/06/18 15:32:33] $"
#define SPEC_GIT_VERSION "$Id: SPEC rev[2018-02-20 19:16:00 +0100] head[043e98c][043e98cdab4c87a0e61dc0c89b46008785d13bf8] ref[ (HEAD -> master, github/master, github/HEAD)] at [2018/06/18 15:32:33] $"
2018/05/22 12:53:48 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-05-22_125342]
to: [/t/rhoms1/install-2018-05-22_125342]
to: [/t/rhoms1/install-beta]
2018/06/15 12:33:26 ==========================================
#define PCO_SDK_LIN_VERSION "$Id: PCOSDK_LIN [pcoDev.1.1.14] $"
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.20] $"
#define PCO_LIMA_VERSION "$Id: PCOLIMA [1.7.7] $"
#define PCO_GIT_VERSION "$Id: PCO rev[2018-05-28 17:48:13 +0200] head[5fcc1a2][5fcc1a2a83ccb84855a909a8a2ce8fbc336af28d] ref[ (HEAD -> wip-stop-rec, gitrh/wip-stop-rec)] at [2018/06/15 12:33:24] $"
#define LIMA_GIT_VERSION "$Id: LIMA rev[2018-05-23 12:18:49 +0200] head[31a027d1][31a027d1269c578dcfd371ed39fb2ab50672bd41] ref[ (HEAD -> core-1.7, tag: pco-1.7.7, gitlab/core-1.7, github/core-1.7)] at [2018/06/15 12:33:24] $"
#define PROCLIB_GIT_VERSION "$Id: PROCLIB rev[2018-01-12 12:04:00 +0100] head[8175ab6][8175ab6cef2b729d69449e2845483df01262ee04] ref[ (HEAD)] at [2018/06/15 12:33:24] $"
#define LIBCONFIG_GIT_VERSION "$Id: LIBCONFIG rev[2013-02-07 18:08:29 +0100] head[89c411a][89c411a541d4ab4d66257ccb85749853fd685cbb] ref[ (HEAD, github/master, github/HEAD, master)] at [2018/06/15 12:33:24] $"
#define TANGO_GIT_VERSION "$Id: TANGO rev[2018-05-23 11:04:34 +0200] head[c209ba6][c209ba61ce1dfa3c9038543909978fc89082d365] ref[ (HEAD -> core-1.7, gitlab/core-1.7, github/core-1.7)] at [2018/06/15 12:33:24] $"
#define SPEC_GIT_VERSION "$Id: SPEC rev[2018-02-20 19:16:00 +0100] head[043e98c][043e98cdab4c87a0e61dc0c89b46008785d13bf8] ref[ (HEAD -> master, github/master, github/HEAD)] at [2018/06/15 12:33:24] $"
2018/05/22 12:45:53 ==========================================
......@@ -44,8 +45,6 @@ from: [../../install/] and [./bat/]
#define SPEC_GIT_VERSION "$Id: SPEC rev[2017-07-06 16:48:28 +0200] head[ea1013d][ea1013d3628c9cba1fd2491ebb4ed834e42eac24] ref[ (HEAD)] at [2018/05/22 12:45:52] $"
2018/05/03 17:15:49 ==========================================
#define PCO_SDK_LIN_VERSION "$Id: PCOSDK_LIN [pcoDev.1.1.14] $"
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.20] $"
......@@ -57,9 +56,6 @@ from: [../../install/] and [./bat/]
#define TANGO_GIT_VERSION "$Id: TANGO rev[2017-11-29 15:42:18 +0100] head[de8c345][de8c345f0880619950b5e2892ac2bd9b08e2fe2a] ref[ (HEAD -> master)] at [2018/05/03 17:15:48] $"
#define SPEC_GIT_VERSION "$Id: SPEC rev[2017-07-06 16:48:28 +0200] head[ea1013d][ea1013d3628c9cba1fd2491ebb4ed834e42eac24] ref[ (HEAD)] at [2018/05/03 17:15:48] $"
2018/05/03 17:14:38 ==========================================
#define PCO_SDK_LIN_VERSION "$Id: PCOSDK_LIN [pcoDev.1.1.14] $"
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.20] $"
......@@ -71,9 +67,6 @@ from: [../../install/] and [./bat/]
#define TANGO_GIT_VERSION "$Id: TANGO rev[2017-11-29 15:42:18 +0100] head[de8c345][de8c345f0880619950b5e2892ac2bd9b08e2fe2a] ref[ (HEAD -> master)] at [2018/05/03 17:14:37] $"
#define SPEC_GIT_VERSION "$Id: SPEC rev[2017-07-06 16:48:28 +0200] head[ea1013d][ea1013d3628c9cba1fd2491ebb4ed834e42eac24] ref[ (HEAD)] at [2018/05/03 17:14:37] $"
2018/05/03 16:32:40 ==========================================
#define PCO_SDK_LIN_VERSION "$Id: PCOSDK_LIN [pcoDev.1.1.14] $"
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.20] $"
......@@ -84,8 +77,6 @@ from: [../../install/] and [./bat/]
#define TANGO_GIT_VERSION "$Id: TANGO rev[2017-11-29 15:42:18 +0100] head[de8c345][de8c345f0880619950b5e2892ac2bd9b08e2fe2a] ref[ (HEAD -> master)] at [2018/05/03 16:32:39] $"
#define SPEC_GIT_VERSION "$Id: SPEC rev[2017-07-06 16:48:28 +0200] head[ea1013d][ea1013d3628c9cba1fd2491ebb4ed834e42eac24] ref[ (HEAD)] at [2018/05/03 16:32:39] $"
2018/04/27 15:13:12 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
......@@ -93,8 +84,6 @@ from: [../../install/] and [./bat/]
to: [/t/rhoms1/install-2018-04-27_151306]
to: [/t/rhoms1/install-beta]
2018/04/27 15:10:20 ==========================================
#define PCO_SDK_LIN_VERSION "$Id: PCOSDK_LIN [pcoDev.1.1.14] $"
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.20] $"
......@@ -105,113 +94,6 @@ from: [../../install/] and [./bat/]
#define TANGO_GIT_VERSION "$Id: TANGO rev[2017-11-29 15:42:18 +0100] head[de8c345][de8c345f0880619950b5e2892ac2bd9b08e2fe2a] ref[ (HEAD -> master)] at [2018/04/27 15:10:19] $"
#define SPEC_GIT_VERSION "$Id: SPEC rev[2017-07-06 16:48:28 +0200] head[ea1013d][ea1013d3628c9cba1fd2491ebb4ed834e42eac24] ref[ (HEAD)] at [2018/04/27 15:10:19] $"
2018/04/27 14:51:05 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-04-27_145059]
to: [/t/rhoms1/install-2018-04-27_145059]
to: [/t/rhoms1/install-beta]
2018/04/27 14:49:32 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-04-27_144926]
to: [/t/rhoms1/install-2018-04-27_144926]
to: [/t/rhoms1/install-beta]
2018/04/27 10:06:34 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-04-27_100628]
to: [/t/rhoms1/install-2018-04-27_100628]
to: [/t/rhoms1/install-beta]
2018/04/27 09:44:27 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-04-27_094422]
to: [/t/rhoms1/install-2018-04-27_094422]
to: [/t/rhoms1/install-beta]
2018/04/26 18:05:11 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-04-26_180505]
to: [/t/rhoms1/install-2018-04-26_180505]
to: [/t/rhoms1/install-beta]
2018/04/26 12:14:55 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-04-26_121449]
to: [/t/rhoms1/install-2018-04-26_121449]
to: [/t/rhoms1/install-beta]
2018/04/26 11:08:56 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-04-26_110849]
to: [/t/rhoms1/install-2018-04-26_110849]
to: [/t/rhoms1/install-beta]
2018/04/26 08:59:32 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-04-26_085926]
to: [/t/rhoms1/install-2018-04-26_085926]
to: [/t/rhoms1/install-beta]
2018/04/25 17:46:20 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-04-25_174614]
to: [/t/rhoms1/install-2018-04-25_174614]
to: [/t/rhoms1/install-beta]
2018/04/25 15:37:16 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-04-25_153709]
to: [/t/rhoms1/install-2018-04-25_153709]
to: [/t/rhoms1/install-beta]
2018/04/25 11:14:03 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-04-25_111358]
to: [/t/rhoms1/install-2018-04-25_111358]
to: [/t/rhoms1/install-beta]
2018/04/25 11:03:04 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-04-25_110258]
to: [/t/rhoms1/install-2018-04-25_110258]
to: [/t/rhoms1/install-beta]
2018/04/23 19:43:26 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
to: [blissadm@lid00a:/segfs/bliss/projects/LIMA/build/depot_win/win_vc9/pco/install-2018-04-23_194319]
to: [/t/rhoms1/install-2018-04-23_194319]
to: [/t/rhoms1/install-beta]
2018/04/20 10:14:12 ==========================================
#define PCO_SDK_LIN_VERSION "$Id: PCOSDK_LIN [pcoDev.1.1.14] $"
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.20] $"
......@@ -222,8 +104,6 @@ from: [../../install/] and [./bat/]
#define TANGO_GIT_VERSION "$Id: TANGO rev[2017-11-29 15:42:18 +0100] head[de8c345][de8c345f0880619950b5e2892ac2bd9b08e2fe2a] ref[ (HEAD -> master)] at [2018/04/20 10:14:10] $"
#define SPEC_GIT_VERSION "$Id: SPEC rev[2017-07-06 16:48:28 +0200] head[ea1013d][ea1013d3628c9cba1fd2491ebb4ed834e42eac24] ref[ (HEAD)] at [2018/04/20 10:14:10] $"
2018/04/18 18:34:59 ==========================================
#define PCO_SDK_LIN_VERSION "$Id: PCOSDK_LIN [pcoDev.1.1.14] $"
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.20] $"
......
......@@ -274,7 +274,7 @@ the preprocessor change these values to strings:
then we can use in:
sprintf_s(infoBuff, bufCharCount, "platform[%s] configuration[%s]",
__sprintfSExt(infoBuff, bufCharCount, "platform[%s] configuration[%s]",
VS_PLATFORM,
VS_CONFIGURATION);
......
......@@ -307,6 +307,7 @@ struct stcLongLongStr
typedef struct {
DWORD nrImgRecorded;
DWORD maxImgCount;
int lastImgFifo;
int nrImgRequested;
int nrImgRequested0;
int nrImgAcquired;
......@@ -351,177 +352,26 @@ typedef struct {
} STC_traceAcq;
//================================================================
//================================================================
#define SIZEARR_stcPcoHWIOSignal 10
#define SIZESTR_PcoHWIOSignal 1024
struct stcPcoData
{
PCO_General stcPcoGeneral;
PCO_CameraType stcPcoCamType;
PCO_Sensor stcPcoSensor;
//================================================================
// LINUX / WIN
//================================================================
#ifndef __linux__
PCO_Description stcPcoDescription; /* camera description structure */
PCO_Signal stcPcoHWIOSignal[SIZEARR_stcPcoHWIOSignal];
PCO_Single_Signal_Desc stcPcoHWIOSignalDesc[SIZEARR_stcPcoHWIOSignal];
#else
PCO_Description stcPcoDescriptionWin; /* camera description structure */
SC2_Camera_Description_Response stcPcoDescription; /* camera description structure */
SC2_Camera_Description_Response stcPcoDesc1;
SC2_Camera_Description_2_Response stcPcoDesc2;
PCO_SignalLinux stcPcoHWIOSignal[SIZEARR_stcPcoHWIOSignal];
SC2_Get_HW_IO_Signal_Descriptor_Response stcPcoHWIOSignalDesc[SIZEARR_stcPcoHWIOSignal];
char sPcoHWIOSignalDesc[SIZEARR_stcPcoHWIOSignal][SIZESTR_PcoHWIOSignal+1];
#endif
//================================================================
//================================================================
const char *sClTransferParameterSettings;
PCO_Timing stcPcoTiming;
PCO_Storage stcPcoStorage;
PCO_Recording stcPcoRecording;
WORD wNrPcoHWIOSignal0;
WORD wNrPcoHWIOSignal;
unsigned long long debugLevel;
unsigned long long testCmdMode;
BYTE ipField[4];
#define PARAMS_NR 20
#define PARAMS_LEN_TOKEN (31)
#define PARAMS_LEN_BUFF (PARAMS_NR * (PARAMS_LEN_TOKEN +1))
struct stcParams {
char *ptrKey[PARAMS_NR];
char *ptrValue[PARAMS_NR];
int nr;
char buff[PARAMS_LEN_BUFF+1];
} params;
DWORD dwPixelRateMax;
char model[MODEL_TYPE_SIZE+1];
char modelSubType[MODEL_TYPE_SIZE+1];
char iface[INTERFACE_TYPE_SIZE+1];
char nameCamIf[LEN_DESCRIPTION_NAME];
char nameCam[LEN_DESCRIPTION_NAME];
char nameSensor[LEN_DESCRIPTION_NAME];
//int interface_type;
PCO_SC2_CL_TRANSFER_PARAM clTransferParam;
int pcoError;
char pcoErrorMsg[ERR_SIZE+1];
double cocRunTime; /* cam operation code - delay & exposure time & readout in s*/
double frameRate;
WORD wActiveRamSegment; /* active ram segment */
//WORD m_acq_mode;
bool bExtTrigEnabled;
WORD storage_mode;
WORD recorder_submode;
const char * storage_str;
unsigned long frames_per_buffer;
DWORD dwRamSize;
WORD wPixPerPage;
DWORD dwMaxFramesInSegment[4];
DWORD dwSegmentSize[4];
struct stcSegmentInfo m_stcSegmentInfo[PCO_MAXSEGMENTS];
DWORD dwValidImageCnt[4];
DWORD dwMaxImageCnt[4];
WORD wRoiX0Now, wRoiY0Now, wRoiX1Now, wRoiY1Now;
WORD wCamType;
DWORD dwSerialNumber;
WORD wIfType;
char camera_name0[CAMERA_NAME_SIZE];
char camera_name_if[CAMERA_NAME_SIZE];
char camera_name[CAMERA_NAME_SIZE];
char sensor_name[CAMERA_NAME_SIZE];
char sensor_type[64];
WORD wNowADC, wNumADC;
unsigned int maxwidth_step, maxheight_step;
struct stcTemp temperature;
WORD bMetaDataAllowed, wMetaDataMode, wMetaDataSize, wMetaDataVersion;
long msAcqRec, msAcqXfer, msAcqTout, msAcqTnow, msAcqAll;
time_t msAcqRecTimestamp, msAcqXferTimestamp, msAcqToutTimestamp, msAcqTnowTimestamp;
STC_traceAcq traceAcq;
DWORD dwPixelRate, dwPixelRateRequested;
double fTransferRateMHzMax;
WORD wLUT_Identifier, wLUT_Parameter;
DWORD dwAllocatedBufferSize;
int iAllocatedBufferNumber;
int iAllocatedBufferNumberLima;
bool bAllocatedBufferDone;
DWORD dwRollingShutter;
char *version;
double min_exp_time, min_exp_time_err, step_exp_time;
double max_exp_time, max_exp_time_err;
double min_lat_time, min_lat_time_err, step_lat_time;
double max_lat_time, max_lat_time_err;
WORD wBitAlignment; // 0 = MSB (left) alignment
struct
{
time_t
constructor,
startAcq,
stopAcq;
} timestamps;
struct
{
time_t ts[DIM_ACTION_TIMESTAMP];
} action_timestamp;
stcPcoData();
void traceAcqClean();
void traceMsg(char *s);
int testForceFrameFirst0;
bool pcoLogActive;
int acqTimeoutRetry; // max nr of timeout during acq (wait for mult obj)
//================================================================
//================================================================
bool params_xMinSize;
bool params_ignoreMaxImages;
char camerasFound[MSG1K];
namespace lima
{
namespace Pco
{
class Camera;
long reserved[32];
}; // struct stcPcoData
} // Pco
} // lima
......@@ -552,6 +402,7 @@ enum enumPcoFamily {
DimaxHS1 = 1<<9,
DimaxHS2 = 1<<10,
DimaxHS4 = 1<<11,
camRAM = 1<<12,
};
enum enumInterfaceTypes
......@@ -617,6 +468,12 @@ enum enumTraceAcqId
};
#define SIZEARR_stcPcoHWIOSignal 10
#define SIZESTR_PcoHWIOSignal 1024
#define PARAMS_NR 20
#define PARAMS_LEN_TOKEN (31)
#define PARAMS_LEN_BUFF (PARAMS_NR * (PARAMS_LEN_TOKEN +1))
namespace lima
{
......@@ -627,6 +484,156 @@ namespace lima
class VideoCtrlObj;
class Camera;
//--------------------------------------- stcPcoData
struct stcPcoData
{
PCO_General stcPcoGeneral;
PCO_CameraType stcPcoCamType;
PCO_Sensor stcPcoSensor;
#ifndef __linux__
PCO_Description stcPcoDescription; /* camera description structure */
PCO_Signal stcPcoHWIOSignal[SIZEARR_stcPcoHWIOSignal];
PCO_Single_Signal_Desc stcPcoHWIOSignalDesc[SIZEARR_stcPcoHWIOSignal];
#else
PCO_Description stcPcoDescriptionWin; /* camera description structure */
SC2_Camera_Description_Response stcPcoDescription; /* camera description structure */
SC2_Camera_Description_Response stcPcoDesc1;
SC2_Camera_Description_2_Response stcPcoDesc2;
PCO_SignalLinux stcPcoHWIOSignal[SIZEARR_stcPcoHWIOSignal];
SC2_Get_HW_IO_Signal_Descriptor_Response stcPcoHWIOSignalDesc[SIZEARR_stcPcoHWIOSignal];
char sPcoHWIOSignalDesc[SIZEARR_stcPcoHWIOSignal][SIZESTR_PcoHWIOSignal+1];
#endif
const char *sClTransferParameterSettings;
PCO_Timing stcPcoTiming;
PCO_Storage stcPcoStorage;
PCO_Recording stcPcoRecording;
WORD wNrPcoHWIOSignal0;
WORD wNrPcoHWIOSignal;
unsigned long long debugLevel;
unsigned long long testCmdMode;
BYTE ipField[4];
struct stcParams {
char *ptrKey[PARAMS_NR];
char *ptrValue[PARAMS_NR];
int nr;
char buff[PARAMS_LEN_BUFF+1];
} params;
DWORD dwPixelRateMax;
char model[MODEL_TYPE_SIZE+1];
char modelSubType[MODEL_TYPE_SIZE+1];
char iface[INTERFACE_TYPE_SIZE+1];
char nameCamIf[LEN_DESCRIPTION_NAME];
char nameCam[LEN_DESCRIPTION_NAME];
char nameSensor[LEN_DESCRIPTION_NAME];
PCO_SC2_CL_TRANSFER_PARAM clTransferParam;
int pcoError;
char pcoErrorMsg[ERR_SIZE+1];
double cocRunTime; /* cam operation code - delay & exposure time & readout in s*/
double frameRate;
WORD wActiveRamSegment; /* active ram segment */
bool bExtTrigEnabled;
WORD storage_mode;
WORD recorder_submode;
const char * storage_str;
unsigned long frames_per_buffer;
DWORD dwRamSize;
WORD wPixPerPage;
DWORD dwMaxFramesInSegment[4];
DWORD dwSegmentSize[4];
struct stcSegmentInfo m_stcSegmentInfo[PCO_MAXSEGMENTS];
DWORD dwValidImageCnt[4];
DWORD dwMaxImageCnt[4];
WORD wRoiX0Now, wRoiY0Now, wRoiX1Now, wRoiY1Now;
WORD wCamType;
DWORD dwSerialNumber;
WORD wIfType;
char camera_name0[CAMERA_NAME_SIZE];
char camera_name_if[CAMERA_NAME_SIZE];
char camera_name[CAMERA_NAME_SIZE];
char sensor_name[CAMERA_NAME_SIZE];
char sensor_type[64];
WORD wNowADC, wNumADC;
unsigned int maxwidth_step, maxheight_step;
struct stcTemp temperature;
WORD bMetaDataAllowed, wMetaDataMode, wMetaDataSize, wMetaDataVersion;
long msAcqRec, msAcqXfer, msAcqTout, msAcqTnow, msAcqAll;
time_t msAcqRecTimestamp, msAcqXferTimestamp, msAcqToutTimestamp, msAcqTnowTimestamp;
STC_traceAcq traceAcq;
DWORD dwPixelRate, dwPixelRateRequested;
double fTransferRateMHzMax;
WORD wLUT_Identifier, wLUT_Parameter;
DWORD dwAllocatedBufferSize;
int iAllocatedBufferNumber;
int iAllocatedBufferNumberLima;
bool bAllocatedBufferDone;
DWORD dwRollingShutter;
char *version;
double min_exp_time, min_exp_time_err, step_exp_time;
double max_exp_time, max_exp_time_err;
double min_lat_time, min_lat_time_err, step_lat_time;
double max_lat_time, max_lat_time_err;
WORD wBitAlignment; // 0 = MSB (left) alignment
struct
{
time_t
constructor,
startAcq,
stopAcq;
} timestamps;
struct
{
time_t ts[DIM_ACTION_TIMESTAMP];
} action_timestamp;
stcPcoData();
void traceAcqClean();
void traceMsg(char *s);
int testForceFrameFirst0;
bool pcoLogActive;
int acqTimeoutRetry; // max nr of timeout during acq (wait for mult obj)
bool params_xMinSize;
bool params_ignoreMaxImages;
char camerasFound[MSG1K];
long reserved[32];
}; // struct stcPcoData
//--------------------------------------- class CehckImgNr
class CheckImgNr
{
......@@ -645,7 +652,7 @@ namespace lima
int pcoImgNrOrder;
int pcoImgNrLast;
int alignmentShift;
};
}; // class CheckImgNr
//--------------------------------------- class Camera
......@@ -670,19 +677,14 @@ namespace lima
void startAcq();
void reset(int reset_level);
//================================================================
// LINUX
//================================================================
#ifdef __linux__
CPco_com *camera;
CPco_grab_cl_me4* grabber;
CPco_Log *mylog;
CPco_com *camera;
CPco_grab_cl_me4* grabber;
CPco_Log *mylog;
void stopAcq();
void _stopAcq(bool waitForThread);
#endif
//================================================================
//================================================================
// ----- BIN
void setBin(const Bin& aBin);
......@@ -690,7 +692,6 @@ namespace lima
void checkBin(Bin& aBin);
// -----
HANDLE& getHandle() {return m_handle;}
//void getMaxWidthHeight(DWORD &xMax, DWORD &yMax);
......@@ -714,7 +715,6 @@ namespace lima