Moving shared constants from PSMoveProtocolInterface.h to SharedConst…

…ants.h

* Updated ClientConstants.h to include SharedConstants.h
* Updated PSMoveProtocolInterface.h to use SharedConstants.h
* Fixed up cmake files to copy SharedConstants.h into install include folder

src/psmoveclient/ClientConstants.h

@@ -2,16 +2,14 @@
 #define CLIENT_CONSTANTS_H
 
 //-- includes -----
-#include "../psmoveprotocol/PSMoveProtocolInterface.h"
+#include "SharedConstants.h"
 
 /** 
 \addtogroup PSMoveClient_CAPI 
 @{ 
 */
 
 //-- constants -----
-#define PSMOVESERVICE_DEFAULT_ADDRESS   "localhost"
-#define PSMOVESERVICE_DEFAULT_PORT      "9512"
 #define PSM_DEFAULT_TIMEOUT 1000 // milliseconds
 
 // The length of a controller serial string: "xx:xx:xx:xx:xx:xx\0"
@@ -20,12 +18,6 @@
 // The max length of the service version string
 #define PSMOVESERVICE_MAX_VERSION_STRING_LEN 32
 
-// The max number of axes allowed on a virtual controller
-#define PSM_MAX_VIRTUAL_CONTROLLER_AXES  32
-
-// The max number of buttons allowed on a virtual controller
-#define PSM_MAX_VIRTUAL_CONTROLLER_BUTTONS  32
-
 // Defines a standard _PAUSE function
 #if __cplusplus >= 199711L  // if C++11
     #include <thread>

src/psmoveprotocol/CMakeLists.txt

@@ -27,9 +27,9 @@ set_target_properties(PSMoveProtocol PROPERTIES
 
 # Install
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-    install(FILES ProtocolVersion.h 
+    install(FILES ProtocolVersion.h SharedConstants.h
 	DESTINATION ${ROOT_DIR}/${PSM_PROJECT_NAME}/${ARCH_LABEL}/include)
 ELSE() #Linux/Darwin
-    install(FILES ProtocolVersion.h
+    install(FILES ProtocolVersion.h SharedConstants.h
 	DESTINATION include)
 ENDIF()

src/psmoveprotocol/PSMoveProtocolInterface.h

@@ -3,6 +3,7 @@
 
 //-- includes -----
 #include <memory>
+#include "SharedConstants.h"
 
 //-- constants -----
 #define MAX_OUTPUT_DATA_FRAME_MESSAGE_SIZE 500

src/psmoveprotocol/ProtocolVersion.h

@@ -14,7 +14,7 @@
 #define PSM_RELEASE_VERSION_PHASE   alpha
 #define PSM_RELEASE_VERSION_MINOR   8
 #define PSM_RELEASE_VERSION_RELEASE 7
-#define PSM_RELEASE_VERSION_HOTFIX  0
+#define PSM_RELEASE_VERSION_HOTFIX  1
 
 /// "Product.Major-Phase Minor.Release.Hotfix"
 #if !defined(PSM_RELEASE_VERSION_STRING)

src/psmoveprotocol/SharedConstants.h

@@ -0,0 +1,26 @@
+#ifndef SHARED_CONSTANTS_H
+#define SHARED_CONSTANTS_H
+
+#define PSMOVESERVICE_DEFAULT_ADDRESS   "localhost"
+#define PSMOVESERVICE_DEFAULT_PORT      "9512"
+
+#define MAX_OUTPUT_DATA_FRAME_MESSAGE_SIZE 500
+#define MAX_INPUT_DATA_FRAME_MESSAGE_SIZE 64
+
+// See ControllerManager.h in PSMoveService
+#define PSMOVESERVICE_MAX_CONTROLLER_COUNT  5
+
+// See TrackerManager.h in PSMoveService
+#define PSMOVESERVICE_MAX_TRACKER_COUNT  8
+
+// See HMDManager.h in PSMoveService
+#define PSMOVESERVICE_MAX_HMD_COUNT  4
+
+// The max number of axes allowed on a virtual controller
+#define PSM_MAX_VIRTUAL_CONTROLLER_AXES  32
+
+// The max number of buttons allowed on a virtual controller
+#define PSM_MAX_VIRTUAL_CONTROLLER_BUTTONS  32
+
+
+#endif  // SHARED_CONSTANTS_H

src/tests/CMakeLists.txt

@@ -38,9 +38,11 @@ ENDIF()
 # We could include the PSMoveService project but we want our test as isolated as possible.
 list(APPEND TEST_CAMERA_INCL_DIRS 
     ${ROOT_DIR}/src/psmoveclient/
+    ${ROOT_DIR}/src/psmoveprotocol/
     ${ROOT_DIR}/src/psmoveservice/PSMoveTracker/PSEye)
 list(APPEND TEST_CAMERA_SRC
     ${ROOT_DIR}/src/psmoveclient/ClientConstants.h
+    ${ROOT_DIR}/src/psmoveprotocol/SharedConstants.h
     ${ROOT_DIR}/src/psmoveservice/PSMoveTracker/PSEye/PSEyeVideoCapture.h
     ${ROOT_DIR}/src/psmoveservice/PSMoveTracker/PSEye/PSEyeVideoCapture.cpp)
 
@@ -423,7 +425,9 @@ ENDIF()
 # TEST_CONSOLE_CAPI
 #
 add_executable(test_console_CAPI test_console_CAPI.cpp)
-target_include_directories(test_console_CAPI PUBLIC ${ROOT_DIR}/src/psmoveclient/)
+target_include_directories(test_console_CAPI PUBLIC 
+    ${ROOT_DIR}/src/psmoveclient/
+    ${ROOT_DIR}/src/psmoveprotocol/)
 target_link_libraries(test_console_CAPI PSMoveClient_CAPI)
 SET_TARGET_PROPERTIES(test_console_CAPI PROPERTIES FOLDER Test)
 # Install