Skip to content

GitLab

L
Lima-camera-pco
Commit f63d4d4a authored by Roberto Arturo Homs-Regojo's avatar Roberto Arturo Homs-Regojo
Browse files
Options

- upgrade windows sdk 1.20 to 1.23 (fixed Pco_errt.h)

parent ae6b421d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1082 additions and 365 deletions
doc/VERSION.log
View file @ f63d4d4a
2018/09/10 15:43:44 ==========================================
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-09-10_154337]
to: [/t/rhoms1/install-2018-09-10_154337]
to: [/t/rhoms1/install-beta]
2018/09/10 11:23:19 ==========================================
scp: copied local directory to segfs and /tmp_14_days:
from: [../../install/] and [./bat/]
......
sdkPco/PcoSdkVersion.h
View file @ f63d4d4a
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.20] $"
#define PCO_SDK_WIN_RELEASE "1.20"
#define PCO_SDK_WIN_VERSION "$Id: PCOSDK_WIN [1.23] $"
#define PCO_SDK_WIN_RELEASE "1.23"
sdkPco/PcoSdkVersion.log
View file @ f63d4d4a
--------------------------------- FROM [sdkPco_120]
--------------------------------- TO [sdkPco]
Tue Oct 4 12:34:00 RDT 2016
# 2018/09/13 - sdk 1.23.0001
... copying [sdkPco/PcoSdkVersion.h]
1d041a50a22aa2be8623c42e3950d636 *sdkPco/PcoSdkVersion.h
-rw-r--r-- 1 homsrego Administ 60 Oct 4 12:33 sdkPco/PcoSdkVersion.h
ce02769842505fe79aad1719aaece7bb *./bin64/SC2_Cam.dll
7e2f767684fb4ffaf5a5fac1af0c7679 *./bin64/sc2_clhs.dll
918e60ce3c4a2556e4116de39119d32b *./bin64/sc2_clhs_org.dll
7e2f767684fb4ffaf5a5fac1af0c7679 *./bin64/sc2_clhs_v1.3.32.dll
e04d4556330b30378cdeeb047501c69c *./bin64/sc2_cl_me4.dll
4426d752e0d22d236bd6925f896778ad *./include/Pco_ConvDlgExport.h
b370ef77abafdfd072574f7fb073fca6 *./include/Pco_ConvExport.h
8fdc6c067d2a238d4471f1115bd8d796 *./include/Pco_ConvStructures.h
a8602fbf0e2f4d06e108a7eb0ff41844 *./include/Pco_edge_gs_calc_Export.h
2311eb7167e79534908f7d7a65d4238b *./include/PCO_err.h
38a93f0365a1b92e7900be003e1e7827 *./include/PCO_errt.h
1f2a3c56167094883ebb96a510b47efa *./include/PCO_Structures.h
84e2cd65ae9e0fb35906a88052660c6a *./include/SC2_CamExport.h
565bfd65d93fd9c5b0ac7b521299642d *./include/sc2_common.h
76f8cdfaffef70fb1737c90d7b4f7ced *./include/sc2_defs.h
276244167010a08c38e15b2510ac4931 *./include/SC2_DialogExport.h
adcb1f9eb853406532546cda7f4dccfc *./include/SC2_SDKAddendum.h
aeeceecc107a220c26daf62e4153cc65 *./include/sc2_SDKStructures.h
2f40c2bd787abebf4cfabd2303b6eba7 *./lib64/SC2_Cam.lib
1e3d3928580955d890298a73fcba9ee6 *./PcoSdkVersion.h
05d213aa47eb3d35416162fbd659da88 *./PcoSdkVersion.log
... copying [sdkPco/bin/SC2_Cam.dll]
80351c2c99e1876d69817b8865f75dab *sdkPco/bin/SC2_Cam.dll
-rwxr-xr-x 1 homsrego Administ 402944 Sep 8 08:16 sdkPco/bin/SC2_Cam.dll
-rwxr-xr-x 1 HOMSREGO 1049089 473600 Sep 13 13:33 ./bin64/SC2_Cam.dll
-rwxr-xr-x 1 HOMSREGO 1049089 335872 Sep 13 13:33 ./bin64/sc2_cl_me4.dll
-rwxr-xr-x 1 HOMSREGO 1049089 315392 Sep 13 13:33 ./bin64/sc2_clhs.dll
-rwxr-xr-x 1 HOMSREGO 1049089 271872 Nov 15 2017 ./bin64/sc2_clhs_org.dll
-rwxr-xr-x 1 HOMSREGO 1049089 315392 Nov 15 2017 ./bin64/sc2_clhs_v1.3.32.dll
-rw-r--r-- 1 HOMSREGO 1049089 4633 Sep 13 13:20 ./include/Pco_ConvDlgExport.h
-rw-r--r-- 1 HOMSREGO 1049089 8938 Sep 13 13:20 ./include/Pco_ConvExport.h
-rw-r--r-- 1 HOMSREGO 1049089 9832 Sep 13 13:20 ./include/Pco_ConvStructures.h
-rw-r--r-- 1 HOMSREGO 1049089 18938 Sep 13 13:20 ./include/Pco_edge_gs_calc_Export.h
-rw-r--r-- 1 HOMSREGO 1049089 39926 Sep 13 13:20 ./include/PCO_err.h
-rw-r--r-- 1 HOMSREGO 1049089 38447 Sep 13 13:41 ./include/PCO_errt.h
-rw-r--r-- 1 HOMSREGO 1049089 2542 Sep 13 13:20 ./include/PCO_Structures.h
-rw-r--r-- 1 HOMSREGO 1049089 130739 Sep 13 13:20 ./include/SC2_CamExport.h
-rw-r--r-- 1 HOMSREGO 1049089 5915 Sep 13 13:20 ./include/sc2_common.h
-rw-r--r-- 1 HOMSREGO 1049089 63575 Sep 13 13:20 ./include/sc2_defs.h
-rw-r--r-- 1 HOMSREGO 1049089 10522 Sep 13 13:20 ./include/SC2_DialogExport.h
-rw-r--r-- 1 HOMSREGO 1049089 13337 Sep 13 13:20 ./include/SC2_SDKAddendum.h
-rw-r--r-- 1 HOMSREGO 1049089 52769 Sep 13 13:20 ./include/sc2_SDKStructures.h
-rw-r--r-- 1 HOMSREGO 1049089 49770 Sep 13 13:21 ./lib64/SC2_Cam.lib
-rw-r--r-- 1 HOMSREGO 1049089 102 Sep 13 13:48 ./PcoSdkVersion.h
-rw-r--r-- 1 HOMSREGO 1049089 1239 Sep 13 13:51 ./PcoSdkVersion.log
... copying [sdkPco/bin/sc2_cl_me4.dll]
4b1b94842cf84ae1c716a153310e9b4a *sdkPco/bin/sc2_cl_me4.dll
-rwxr-xr-x 1 homsrego Administ 311808 Jul 26 08:31 sdkPco/bin/sc2_cl_me4.dll
./:
total 13
drwxr-xr-x 1 HOMSREGO 1049089 0 Sep 10 15:07 bin64
drwxr-xr-x 1 HOMSREGO 1049089 0 Sep 13 13:41 include
drwxr-xr-x 1 HOMSREGO 1049089 0 Nov 15 2017 lib64
-rw-r--r-- 1 HOMSREGO 1049089 102 Sep 13 13:48 PcoSdkVersion.h
-rw-r--r-- 1 HOMSREGO 1049089 1239 Sep 13 13:51 PcoSdkVersion.log
... copying [sdkPco/lib/SC2_Cam.lib]
b0353c9102f26ff382a396847a1c6a63 *sdkPco/lib/SC2_Cam.lib
-rw-r--r-- 1 homsrego Administ 49266 Sep 8 08:16 sdkPco/lib/SC2_Cam.lib
./bin64:
total 1676
-rwxr-xr-x 1 HOMSREGO 1049089 473600 Sep 13 13:33 SC2_Cam.dll
-rwxr-xr-x 1 HOMSREGO 1049089 335872 Sep 13 13:33 sc2_cl_me4.dll
-rwxr-xr-x 1 HOMSREGO 1049089 315392 Sep 13 13:33 sc2_clhs.dll
-rwxr-xr-x 1 HOMSREGO 1049089 271872 Nov 15 2017 sc2_clhs_org.dll
-rwxr-xr-x 1 HOMSREGO 1049089 315392 Nov 15 2017 sc2_clhs_v1.3.32.dll
... copying [sdkPco/bin64/SC2_Cam.dll]
5ee6e68643a5a6f529eac32cd5671a81 *sdkPco/bin64/SC2_Cam.dll
-rwxr-xr-x 1 homsrego Administ 440832 Sep 8 08:16 sdkPco/bin64/SC2_Cam.dll
./include:
total 416
-rw-r--r-- 1 HOMSREGO 1049089 4633 Sep 13 13:20 Pco_ConvDlgExport.h
-rw-r--r-- 1 HOMSREGO 1049089 8938 Sep 13 13:20 Pco_ConvExport.h
-rw-r--r-- 1 HOMSREGO 1049089 9832 Sep 13 13:20 Pco_ConvStructures.h
-rw-r--r-- 1 HOMSREGO 1049089 18938 Sep 13 13:20 Pco_edge_gs_calc_Export.h
-rw-r--r-- 1 HOMSREGO 1049089 39926 Sep 13 13:20 PCO_err.h
-rw-r--r-- 1 HOMSREGO 1049089 38447 Sep 13 13:41 PCO_errt.h
-rw-r--r-- 1 HOMSREGO 1049089 2542 Sep 13 13:20 PCO_Structures.h
-rw-r--r-- 1 HOMSREGO 1049089 130739 Sep 13 13:20 SC2_CamExport.h
-rw-r--r-- 1 HOMSREGO 1049089 5915 Sep 13 13:20 sc2_common.h
-rw-r--r-- 1 HOMSREGO 1049089 63575 Sep 13 13:20 sc2_defs.h
-rw-r--r-- 1 HOMSREGO 1049089 10522 Sep 13 13:20 SC2_DialogExport.h
-rw-r--r-- 1 HOMSREGO 1049089 13337 Sep 13 13:20 SC2_SDKAddendum.h
-rw-r--r-- 1 HOMSREGO 1049089 52769 Sep 13 13:20 sc2_SDKStructures.h
... copying [sdkPco/bin64/sc2_cl_me4.dll]
0dde0d5ead6961b7f6e7012713051ce6 *sdkPco/bin64/sc2_cl_me4.dll
-rwxr-xr-x 1 homsrego Administ 334848 Jul 26 08:31 sdkPco/bin64/sc2_cl_me4.dll
... copying [sdkPco/lib64/SC2_Cam.lib]
0ea07f45648080b77ea6f9903706608b *sdkPco/lib64/SC2_Cam.lib
-rw-r--r-- 1 homsrego Administ 45314 Sep 8 08:16 sdkPco/lib64/SC2_Cam.lib
... copying dir [sdkPco]
total 182
-rw-r--r-- 1 homsrego Administ 2542 Aug 31 2010 PCO_Structures.h
-rw-r--r-- 1 homsrego Administ 39033 Nov 10 2015 PCO_err.h
-rw-r--r-- 1 homsrego Administ 37619 Nov 10 2015 PCO_errt.h
-rw-r--r-- 1 homsrego Administ 4633 Apr 17 2015 Pco_ConvDlgExport.h
-rw-r--r-- 1 homsrego Administ 8938 Mar 10 2015 Pco_ConvExport.h
-rw-r--r-- 1 homsrego Administ 9832 May 20 2015 Pco_ConvStructures.h
-rw-r--r-- 1 homsrego Administ 128007 Jul 25 16:24 SC2_CamExport.h
-rw-r--r-- 1 homsrego Administ 10522 Aug 29 2014 SC2_DialogExport.h
-rw-r--r-- 1 homsrego Administ 10719 Mar 19 2015 SC2_SDKAddendum.h
-rw-r--r-- 1 homsrego Administ 45231 Jul 25 16:35 sc2_SDKStructures.h
-rw-r--r-- 1 homsrego Administ 5519 Jul 15 2014 sc2_common.h
-rw-r--r-- 1 homsrego Administ 62213 Jul 25 16:21 sc2_defs.h
80351c2c99e1876d69817b8865f75dab *sdkPco/bin/SC2_Cam.dll
4b1b94842cf84ae1c716a153310e9b4a *sdkPco/bin/sc2_cl_me4.dll
5ee6e68643a5a6f529eac32cd5671a81 *sdkPco/bin64/SC2_Cam.dll
0dde0d5ead6961b7f6e7012713051ce6 *sdkPco/bin64/sc2_cl_me4.dll
4426d752e0d22d236bd6925f896778ad *sdkPco/include/Pco_ConvDlgExport.h
b370ef77abafdfd072574f7fb073fca6 *sdkPco/include/Pco_ConvExport.h
8fdc6c067d2a238d4471f1115bd8d796 *sdkPco/include/Pco_ConvStructures.h
af46d198de3037b5040aa0884b326d88 *sdkPco/include/PCO_err.h
83227d3c76a0ee80e584f5880fdf1710 *sdkPco/include/PCO_errt.h
1f2a3c56167094883ebb96a510b47efa *sdkPco/include/PCO_Structures.h
2271bcc48f01d5fbf31146411bcc8b34 *sdkPco/include/SC2_CamExport.h
4b5c251043115e18ee6af5cefb7be74f *sdkPco/include/sc2_common.h
a45ec26171fe15af653cc2a3871d5603 *sdkPco/include/sc2_defs.h
276244167010a08c38e15b2510ac4931 *sdkPco/include/SC2_DialogExport.h
019d844fb588cc7a5772a2daf5d97bf1 *sdkPco/include/SC2_SDKAddendum.h
eee455cbc44ee64272f1338c5ffe1f35 *sdkPco/include/sc2_SDKStructures.h
b0353c9102f26ff382a396847a1c6a63 *sdkPco/lib/SC2_Cam.lib
0ea07f45648080b77ea6f9903706608b *sdkPco/lib64/SC2_Cam.lib
1d041a50a22aa2be8623c42e3950d636 *sdkPco/PcoSdkVersion.h
ca42ee4ad6771b462869d6fca6eb0ce1 *sdkPco/PcoSdkVersion.log
./lib64:
total 52
-rw-r--r-- 1 HOMSREGO 1049089 49770 Sep 13 13:21 SC2_Cam.lib
sdkPco/bin64/SC2_Cam.dll
View file @ f63d4d4a
No preview for this file type
sdkPco/include/PCO_err.h
View file @ f63d4d4a
......@@ -418,6 +418,16 @@ DWORD GetErrorSource(DWORD dwerr);
// PCO_ERROR_SDKDLL_BUFFERSIZE 0x80003002 // A buffer is to small
// ------------------------------------------------------------------------------------------------------ //
// -- 4.3.1 Error codes generated by the RECORDER SDK DLL: ---------------------------------------------- //
// ------------------------------------------------------------------------------------------------------ //
#define PCO_ERROR_SDKDLL_RECORDER_RECORD_MUST_BE_OFF 0x80003021 // Record must be stopped
#define PCO_ERROR_SDKDLL_RECORDER_ACQUISITION_MUST_BE_OFF 0x80003022 // Function call not possible while running
#define PCO_ERROR_SDKDLL_RECORDER_SETTINGS_CHANGED 0x80003023 // Some camera settings have been changed outside of the recorder
#define PCO_ERROR_SDKDLL_RECORDER_NO_IMAGES_AVAILABLE 0x80003024 // No images are avaialable for readout
#define PCO_WARNING_SDKDLL_RECORDER_FILES_EXIST 0xC0003011 // Files already exist
// ------------------------------------------------------------------------------------------------------ //
// -- 4.4. Error codes generated by the Application Software: ------------------------------------------- //
......
sdkPco/include/PCO_errt.h
View file @ f63d4d4a
This diff is collapsed.
sdkPco/include/Pco_edge_gs_calc_Export.h 0 → 100644
View file @ f63d4d4a
This diff is collapsed.
sdkPco/include/SC2_CamExport.h
View file @ f63d4d4a
This diff is collapsed.
sdkPco/include/SC2_SDKAddendum.h
View file @ f63d4d4a
......@@ -11,7 +11,7 @@
//-----------------------------------------------------------------//
// Author | MBL, PCO AG //
//-----------------------------------------------------------------//
// Revision | rev. 1.06 rel. 1.06 //
// Revision | rev. 1.08 rel. 1.08 //
//-----------------------------------------------------------------//
//-----------------------------------------------------------------//
......@@ -40,6 +40,8 @@
//-----------------------------------------------------------------//
// 1.07 | 23.11.2011 | Added IMAGE_TRANSFER_MODE_PARAM, VTI //
//-----------------------------------------------------------------//
// 1.08 | 26.07.2017 | Added DISCOVERY_ACK, VTI //
//-----------------------------------------------------------------//
#if !defined SC2_SDKADDENDUM_H
#define SC2_SDKADDENDUM_H
......@@ -129,13 +131,20 @@ typedef struct _PCO_USB_TRANSFER_PARAM {
// Bit3: 1024Byte padding enabled
}PCO_USB_TRANSFER_PARAM;
typedef struct _PCO_USB3_TRANSFER_PARAM {
unsigned int uiFlags; // Bit0: 0: USB 3.0 connection is used to connect camera to the PC (recommended)
// 1: USB 2.0 connection is used to connect camera to the PC
// Bit1..31: reserved
}PCO_USB3_TRANSFER_PARAM;
#define PCO_GIGE_PAKET_RESEND 0x00000001
#define PCO_GIGE_BURST_MODE 0x00000002
#define PCO_GIGE_MAXSPEED_MODE 0x00000004
#define PCO_GIGE_DEBUG_MODE 0x00000008
#define PCO_GIGE_BW_SAME2ALL 0x00000000
#define PCO_GIGE_BW_ALL2MAX 0x00000010
#define PCO_GIGE_BW_2ACTIVE 0x00000020
//#define PCO_GIGE_BURST_MODE 0x00000002 !!! obsolete (22.06.2017) !!!
//#define PCO_GIGE_MAXSPEED_MODE 0x00000004 !!! obsolete (22.06.2017) !!!
//#define PCO_GIGE_DEBUG_MODE 0x00000008 !!! obsolete (22.06.2017) !!!
//#define PCO_GIGE_BW_SAME2ALL 0x00000000 !!! obsolete (22.06.2017) !!!
//#define PCO_GIGE_BW_ALL2MAX 0x00000010 !!! obsolete (22.06.2017) !!!
#define PCO_GIGE_CAM_SYNC 0x00000010
//#define PCO_GIGE_BW_2ACTIVE 0x00000020 !!! obsolete (22.06.2017) !!!
#define PCO_GIGE_DATAFORMAT_1x8 0x01080001
#define PCO_GIGE_DATAFORMAT_1x16 0x01100007
#define PCO_GIGE_DATAFORMAT_3x8 0x02180015
......@@ -148,17 +157,13 @@ typedef struct _PCO_GIGE_TRANSFER_PARAM
DWORD dwResendPercent; // Number of lost packets of image in percent. If more packets got lost,
// complete image will be resent or image transfer is failed (default 30).
DWORD dwFlags; // Bit 0: Set to enable packet resend
// Bit 1: Set to enable Burst_mode
// Bit 2: Set to enable Max Speed Modus
// Bit 3: Set to enable Camera Debug Mode
// Bit 4-7: Reserved
// Bit 1: !!! obsolete (22.06.2017) !!!: Set to enable Burst_mode
// Bit 2: !!! obsolete (22.06.2017) !!!: Set to enable Max Speed Modus
// Bit 3: !!! obsolete (22.06.2017) !!!: Set to enable Camera Debug Mode
// Bit 4: camera Sync Mutex
// Bit 5: Enable Jumbo Frames
// Bit 6: Enable Intermediate Driver
// Bit 8-11:0: Bandwidth is devided by number of connected cameras. PCO_GIGE_BW_SAME2ALL
// 1: Max-Speed-Mode is allways active regardless how many cameras are connected. PCO_GIGE_BW_ALL2MAX
// 2: Maximal possible Bandwidth is used for active camera. Just one active camera is allowed. PCO_GIGE_BW_2ACTIVE
// Bit 12-31: Reserved
// Bit 8-31: Reserved
// (LSB; default 0x00000001).
DWORD dwDataFormat; // DataFormat: default: 0x01100007
// supported types: Mono, 8Bit: 0x01080001
......@@ -186,6 +191,48 @@ typedef struct _IMAGE_TRANSFER_MODE_PARAM
WORD ZZwDummy[10]; // for future use, set to zero
} IMAGE_TRANSFER_MODE_PARAM;
//Gige Vision Acknowledge Message Header
typedef struct _GVCP_ACK_HEADER
{
WORD Status;
WORD Acknowledge;
WORD Length;
WORD AckID;
}GVCP_ACK_HEADER;
//Gige Vision Discovery Acknowledge Message
typedef struct _DISCOVERY_ACK
{
GVCP_ACK_HEADER AckHeader; //Gige Vision Header
WORD SpecVersionMajor; //Gige Vision Version Major
WORD SpecVersionMinor; //Gige Vision Version Minor
DWORD DeviceMode; //Gige Vision Device Mode
WORD NicId; //PCO Network Interface Card Identifier
WORD DeviceMACHigh; //Gige Vision Camera MAC Address High
DWORD DeviceMACLow; //Gige Vision Camera MAC Address Low
DWORD IPConfigOptions; //Gige Vision Ip Config Options
DWORD IPConfigCurrent; //Gige Vision Ip Config Current
DWORD ValidConnection; //PCO Connection Status: 0x0 invalid, 0x1 valid
DWORD AccessAllowed; //PCO Camera Access Status: 0x0 no access, 0x1 access allowed
DWORD NICIp; //PCO Network Interface Card Ip Address
DWORD CurrentIP; //Gige Vision Camera Ip Address
DWORD CameraType; //PCO Camera Type (available with Gige Camera IF V1.04 or higher)
DWORD CameraSubType; //PCO Camera Type (available with Gige Camera IF V1.04 or higher)
DWORD NICSubnetMask; //PCO Network Interface Card Subnet Mask
DWORD CurrentSubnetMask; //Gige Vision Camera Subnet Mask
DWORD RFU1; //changed to reserved from HWVersion @26.07.2017 VTI
DWORD RFU2; //changed to reserved from FWVersion @26.07.2017 VTI
DWORD CameraSerialNumber; //PCO Camera S/N (available with Gige Camera IF V1.04 or higher)
DWORD DefaultGateway; //Gige Vision Camera Gateway
BYTE ManufacturerName[32]; //Gige Vision Manufacturer Name in ASCII
BYTE ModelName[32]; //Gige Vision Camera Model Name in ASCII
BYTE DeviceVersion[32]; //Gige Vision Camera Version
BYTE ManufacSpecInfo[48]; //Gige Vision Manufacturer Specific Information
BYTE SerialNumber[16]; //Gige Vision Camera Interface S/N
BYTE UserDefinedName[16]; //Gige Vision User Defined Name
}DISCOVERY_ACK;
//loglevels for interface dll
#define ERROR_M 0x0001
......
sdkPco/include/sc2_SDKStructures.h
View file @ f63d4d4a
This diff is collapsed.
sdkPco/include/sc2_common.h
View file @ f63d4d4a
......@@ -68,7 +68,13 @@ typedef struct
WORD wEXPOSURE_TIME_BASE; // timebase ns/us/ms for following exposure time
DWORD dwEXPOSURE_TIME; // exposure time in ns/us/ms according to timebase
DWORD dwFRAMERATE_MILLIHZ; // framerate in mHz, 0 if unknown or not
SHORT sSENSOR_TEMPERATURE; // current sensor temperature in 0.1 centigrade, 0x8000 if not known
SHORT sSENSOR_TEMPERATURE; // current sensor temperature in centigrade, 0x8000 if not known
// Note: Description changed 27.06.2017: Now centigrades, which
// is current implementation in pco.dimax. This is
// different from the PCO_GetTemperature command which
// provides the sensor temperature in 10th of degrees!
// 30
WORD wIMAGE_SIZE_X; // actual size of image in x direction (horizontal)
WORD wIMAGE_SIZE_Y; // actual size of image in y direction (vertical)
......
sdkPco/include/sc2_defs.h
View file @ f63d4d4a
This diff is collapsed.
sdkPco/lib64/SC2_Cam.lib
View file @ f63d4d4a
No preview for this file type
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