Skip to content

Commit eccabfd

Browse files
authored
Merge pull request #18 from SciKit-Surgery/master
Update with upstream changes.
2 parents e7bdf2d + 7ecbaf7 commit eccabfd

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
CMAKE_MINIMUM_REQUIRED(VERSION 4.0.0)
21
PROJECT(ndicapi)
2+
CMAKE_MINIMUM_REQUIRED(VERSION 3.22.6)
33

44
SET(ndicapi_VERSION 3.7.4)
55

ndicapi.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ ndicapiExport void ndiTimeoutSocket(ndicapi* pol, int timeoutMsec);
505505
#define ndiINIT(p) ndiCommand((p),"INIT:")
506506

507507
/*!
508-
Set the POLARIS infrared firing rate to 20 Hz = 0, 30 Hz = 1, 20 Hz = 2
508+
Set the POLARIS infrared firing rate to 20 Hz = 0, 30 Hz = 1, 60 Hz = 2
509509
*/
510510
#define ndiIRATE(p,rate) ndiCommand((p),"IRATE:%d",(rate))
511511

@@ -2068,7 +2068,7 @@ ndicapiExport void* ndiHexDecode(void* data, const char* cp, int n);
20682068
#define NDI_HANDLE_NOT_ALLOC 0x2B /*!<\brief The requested port handle has not been allocated. */
20692069
#define NDI_HANDLE_EMPTY 0x2C /*!<\brief The requested port handle has become unoccupied. */
20702070
#define NDI_HANDLES_FULL 0x2D /*!<\brief All handles have been allocated. */
2071-
#define NDI_INCOMP_FIRM_VER 0x2E /*!<\brief Incompatible firmware versions.This can occur if: • a firmware update failed • components with incompatible firmware are connected To correct the problem, update the firmware.If the Multi Firmware feature is installed, select a valid combined firmware revision.For more information, see “Multi Firmware Feature” on page 197. */
2071+
#define NDI_INCOMP_FIRM_VER 0x2E /*!<\brief Incompatible firmware versions.This can occur if: • a firmware update failed • components with incompatible firmware are connected To correct the problem, update the firmware.If the Multi Firmware feature is installed, select a valid combined firmware revision.For more information, see “Multi Firmware Feature” on page 197. */
20722072
#define NDI_INV_PORT_DESC 0x2F /*!<\brief Invalid port description. */
20732073
#define NDI_PORT_HAS_HANDLE 0x30 /*!<\brief Requested port is already assigned a port handle. */
20742074
#define NDI_RESERVED31 0x31 /*!<\brief Reserved 0x31 */
@@ -2086,8 +2086,8 @@ ndicapiExport void* ndiHexDecode(void* data, const char* cp, int n);
20862086
#define NDI_FERR_READ 0x3D /*!<\brief Error reading from file. */
20872087
#define NDI_RESERVED3E 0x3E /*!<\brief Reserved 0x3E */
20882088
#define NDI_RESERVED3F 0x3F /*!<\brief Reserved 0x3F*/
2089-
#define NDI_DEF_FILE_ERR 0x40 /*!<\brief Tool Definition File Error.This occurs if: • the CRC failed • the file format is invalid */
2090-
#define NDI_BAD_CHARACTERISTICS 0x41 /*!<\brief Tool characteristics not supported.This occurs when one of the following fields in the tool definition file is outside of the range supported by the system : • number of markers • number of faces • number of groups • number of markers per face(unique geometry tools only) */
2089+
#define NDI_DEF_FILE_ERR 0x40 /*!<\brief Tool Definition File Error.This occurs if: • the CRC failed • the file format is invalid */
2090+
#define NDI_BAD_CHARACTERISTICS 0x41 /*!<\brief Tool characteristics not supported.This occurs when one of the following fields in the tool definition file is outside of the range supported by the system : • number of markers • number of faces • number of groups • number of markers per face(unique geometry tools only) */
20912091
#define NDI_NO_DEVICE 0x42 /*!<\brief Device not present.This occurs when the command is specific to a device that is not connected to the system. */
20922092

20932093
#define NDI_ENVIRONMENT 0xf1 /*!<\brief Too much environmental infrared */
@@ -2119,12 +2119,12 @@ ndicapiExport void* ndiHexDecode(void* data, const char* cp, int n);
21192119
#define NDI_COMPONENTID_3D 0x0003
21202120
#define NDI_COMPONENTID_1D 0x0004
21212121
#define NDI_COMPONENTID_2D 0x0005
2122-
// 06 – reserved
2123-
// 07 – reserved
2122+
// 06 – reserved
2123+
// 07 – reserved
21242124
#define NDI_COMPONENTID_LINE_SEP 0x0008
21252125
#define NDI_COMPONENTID_3D_ERROR 0x0009
21262126
#define NDI_COMPONENTID_IMAGE 0x0010
2127-
// 11 to 16 – reserved
2127+
// 11 to 16 – reserved
21282128
#define NDI_COMPONENTID_UV 0x0011
21292129
#define NDI_COMPONENTID_SYS_ALERT 0x0012
21302130
/*\}*/
@@ -2391,4 +2391,4 @@ ndicapiExport void* ndiHexDecode(void* data, const char* cp, int n);
23912391
}
23922392
#endif
23932393

2394-
#endif
2394+
#endif

0 commit comments

Comments
 (0)