Merge pull request #386 from usdot-fhwa-OPS/release_7.3

Release 7.3
usdot-fhwa-OPS · Jun 14, 2022 · 225f553 · 225f553
2 parents 2133024 + e8961eb
commit 225f553
Show file tree

Hide file tree

Showing 11 changed files with 781 additions and 96 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -281,6 +281,5 @@ workflows:
               only: /^[\.0-9]*$/
             branches:
               ignore: /.*/
-
 
 
diff --git a/configuration/amd64/docker-compose.yml b/configuration/amd64/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       - ./mysql/port_drayage.sql:/docker-entrypoint-initdb.d/port_drayage.sql
 
   php:
-    image: usdotfhwaops/php:7.2.3
+    image: usdotfhwaops/php:7.3.0
     container_name: php
     network_mode: host
     depends_on: 
@@ -29,7 +29,7 @@ services:
     tty: true
 
   v2xhub:
-    image: usdotfhwaops/v2xhubamd:7.2.3
+    image: usdotfhwaops/v2xhubamd:7.3.0
     container_name: v2xhub
     network_mode: host
     restart: always
@@ -43,7 +43,7 @@ services:
       - ./logs:/var/log/tmx
       - ./MAP:/var/www/plugins/MAP
   port_drayage_webservice:
-    image: usdotfhwaops/port-drayage-webservice:7.2.3
+    image: usdotfhwaops/port-drayage-webservice:7.3.0
     container_name: port_drayage_webservice
     network_mode: host
 secrets:

diff --git a/configuration/arm64/docker-compose.yml b/configuration/arm64/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       - ./mysql/port_drayage.sql:/docker-entrypoint-initdb.d/port_drayage.sql
 
   php:
-    image: usdotfhwaops/php_arm:7.2.3
+    image: usdotfhwaops/php_arm:7.3.0
     container_name: php
     network_mode: host
     depends_on: 
@@ -29,7 +29,7 @@ services:
     tty: true
 
   v2xhub:
-    image: usdotfhwaops/v2xhubarm:7.2.3
+    image: usdotfhwaops/v2xhubarm:7.3.0
     container_name: v2xhub
     network_mode: host
     restart: always
@@ -43,7 +43,7 @@ services:
       - ./logs:/var/log/tmx
       - ./MAP:/var/www/plugins/MAP
   port_drayage_webservice:
-    image: usdotfhwaops/port-drayage-webservice_arm:7.2.3
+    image: usdotfhwaops/port-drayage-webservice_arm:7.3.0
     container_name: port_drayage_webservice
     network_mode: host
 secrets:

diff --git a/docs/Release_notes.md b/docs/Release_notes.md
@@ -1,4 +1,12 @@
 V2X-Hub Release Notes
+---------------------------------
+Version 7.3.0, released June 14th, 2022
+--------------------------------------------------------
+**Summary:**
+V2X Hub release 7.3.0 includes added functionality for subscribing to FLIR camera for Pedestrian tracking and PSM broadcast to vehicles in the Pedestrian Plugin. The new FLIR functionality subscribes to the websocket output of the FLIR tracking feed and will generate a PSM for each new track the camera picks up. To use new FLIR websocket data, set `DataProvider` for the PedestrianPlugin to FLIR and configure the `WebSocketHost` and `WebSocketPort` for the FLIR camera. Additional you must set the `FLIRCameraRotation` in degrees, which is a measure of the camera's rotation from true north. To use the REST PedestrianPlugin functionality simply set the `DataProvider` to PSM.
+
+Enhancements in this release:
+ - Issue 345: Added Websocket client to consume FLIR data and publish PSM
 ----------------------------
 Version 7.2.3, released May 19th, 2022
 --------------------------------------------------------

diff --git a/src/tmx/TmxUtils/test/J2735MessageTest.cpp b/src/tmx/TmxUtils/test/J2735MessageTest.cpp
@@ -484,7 +484,7 @@ TEST_F(J2735MessageTest, EncodeMobilityResponse)
 
 TEST_F(J2735MessageTest, EncodeBasicSafetyMessage)
 {	
-	BasicSafetyMessage_t* message = (BasicSafetyMessage_t*) malloc( sizeof(BasicSafetyMessage_t) );
+	BasicSafetyMessage_t* message = (BasicSafetyMessage_t*) calloc(1, sizeof(BasicSafetyMessage_t) );
 
 	/**
 	 * Populate BSMcoreData 
@@ -542,4 +542,17 @@ TEST_F(J2735MessageTest, EncodeBasicSafetyMessage)
 }
 
 
+TEST_F(J2735MessageTest, EncodePersonalSafetyMessage){
+	string psm="<PersonalSafetyMessage><basicType><aPEDESTRIAN/></basicType><secMark>109</secMark><msgCnt>0</msgCnt><id>115eadf0</id><position><lat>389549376</lat><long>-771491840</long></position><accuracy><semiMajor>255</semiMajor><semiMinor>255</semiMinor><orientation>65535</orientation></accuracy><speed>0</speed><heading>16010</heading><pathHistory><crumbData><PathHistoryPoint><latOffset>0</latOffset><lonOffset>0</lonOffset><elevationOffset>0</elevationOffset><timeOffset>1</timeOffset></PathHistoryPoint></crumbData></pathHistory></PersonalSafetyMessage>";
+	std::stringstream ss;
+	PsmMessage psmmessage;
+	PsmEncodedMessage psmENC;
+	tmx::message_container_type container;
+	ss<<psm;
+	container.load<XML>(ss);
+	psmmessage.set_contents(container.get_storage().get_tree());
+	psmENC.encode_j2735_message(psmmessage);
+	std::cout << psmENC.get_payload_str()<<std::endl;
+	ASSERT_EQ(32,  psmENC.get_msgId());
+}
 }
diff --git a/src/v2i-hub/PedestrianPlugin/CMakeLists.txt b/src/v2i-hub/PedestrianPlugin/CMakeLists.txt
@@ -1,54 +1,54 @@
-PROJECT ( PedestrianPlugin VERSION 5.0 LANGUAGES CXX )
-
-SET (TMX_PLUGIN_NAME "Pedestrian")
-add_compile_options(-fPIC)
-FIND_PACKAGE (XercesC REQUIRED)
-FIND_PACKAGE (NetSNMP REQUIRED)
-#FIND_PACKAGE (QHttpEngine REQUIRED)
-
-find_package(Qt5Core REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-find_package(Qt5Network REQUIRED)
-
-#set(qserverPedestrian_DIR "/usr/local/share/qserverPedestrian/cmake")
-find_package(qserverPedestrian REQUIRED)
-
-include_directories(${Qt5Widgets_INCLUDE_DIRS}) 
-
-include_directories(${EXTERNAL_INSTALL_LOCATION}/include)
-link_directories(${EXTERNAL_INSTALL_LOCATION}/lib)
-
-find_library(libasn1c .)
-
-
-
-include_directories(
-    ${Qt5Core_INCLUDE_DIRS}
-    ${Qt5Network_INCLUDE_DIRS}
-)
-
-
-BuildTmxPlugin ()
-
-
-
-TARGET_INCLUDE_DIRECTORIES ( ${PROJECT_NAME} PUBLIC ${XercesC_INCLUDE_DIRS} ${NETSNMP_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
-
-TARGET_LINK_LIBRARIES ( ${PROJECT_NAME} PUBLIC tmxutils ${XercesC_LIBRARY} ${NETSNMP_LIBRARIES} ${QHttpEngine_LIBRARY} Qt5Widgets Qt5Core Qt5Network ssl crypto qhttpengine qserverPedestrian) 
-
-
-link_directories(${CMAKE_PREFIX_PATH}/lib)
-
-# Locate GTest
-find_package(GTest REQUIRED)
-include_directories(${GTEST_INCLUDE_DIRS})
-
-set(runPedestrianTests_sources
-                test/PedestrianTest.cpp 
-                test/Main.cpp
-)
-
-# Link runTests with what we want to test and the GTest and pthread library
-add_executable(runPedestrianTests ${runPedestrianTests_sources})
-
-target_link_libraries(runPedestrianTests ${GTEST_LIBRARIES} pthread ${QHttpEngine_LIBRARY} Qt5::Widgets Qt5Core Qt5Network ssl crypto qhttpengine)
+PROJECT ( PedestrianPlugin VERSION 5.0 LANGUAGES CXX )
+
+SET (TMX_PLUGIN_NAME "Pedestrian")
+add_compile_options(-fPIC)
+FIND_PACKAGE (XercesC REQUIRED)
+FIND_PACKAGE (NetSNMP REQUIRED)
+#FIND_PACKAGE (QHttpEngine REQUIRED)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Network REQUIRED)
+
+#set(qserverPedestrian_DIR "/usr/local/share/qserverPedestrian/cmake")
+find_package(qserverPedestrian REQUIRED)
+
+include_directories(${Qt5Widgets_INCLUDE_DIRS}) 
+
+include_directories(${EXTERNAL_INSTALL_LOCATION}/include)
+link_directories(${EXTERNAL_INSTALL_LOCATION}/lib)
+
+find_library(libasn1c .)
+
+
+
+include_directories(
+    ${Qt5Core_INCLUDE_DIRS}
+    ${Qt5Network_INCLUDE_DIRS}
+)
+
+
+BuildTmxPlugin ()
+
+
+
+TARGET_INCLUDE_DIRECTORIES ( ${PROJECT_NAME} PUBLIC ${XercesC_INCLUDE_DIRS} ${NETSNMP_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
+
+TARGET_LINK_LIBRARIES ( ${PROJECT_NAME} PUBLIC tmxutils ${XercesC_LIBRARY} ${NETSNMP_LIBRARIES} ${QHttpEngine_LIBRARY} Qt5Widgets Qt5Core Qt5Network ssl crypto qhttpengine qserverPedestrian) 
+
+
+link_directories(${CMAKE_PREFIX_PATH}/lib)
+
+# Locate GTest
+find_package(GTest REQUIRED)
+include_directories(${GTEST_INCLUDE_DIRS})
+
+set(runPedestrianTests_sources
+                test/PedestrianTest.cpp 
+                test/Main.cpp
+)
+
+# Link runTests with what we want to test and the GTest and pthread library
+add_executable(runPedestrianTests ${runPedestrianTests_sources})
+
+target_link_libraries(runPedestrianTests ${GTEST_LIBRARIES} pthread ${QHttpEngine_LIBRARY} Qt5::Widgets Qt5Core Qt5Network ssl crypto qhttpengine)
diff --git a/src/v2i-hub/PedestrianPlugin/manifest.json b/src/v2i-hub/PedestrianPlugin/manifest.json
@@ -32,6 +32,32 @@
 			"key":"WebServicePort",
 			"default":"9000",
 			"description":"Port at which Web service exists"
-		}
+		},
+		{
+			"key":"DataProvider",
+			"default":"FLIR",
+			"description":"Possible data providers we handle - FLIR (websocket) or PSM (REST request)"
+		},	
+		{
+			"key":"WebSocketHost",
+			"default":"192.168.55.183",
+			"description":"IP address of the camera to connect to for data"
+
+		},
+		{
+			"key":"WebSocketPort",
+			"default":"80",
+			"description":"Extension/port for FLIR camera subscription"
+		},
+		{
+			"key":"FLIRCameraRotation",
+			"default":"16.13",
+			"description":"Measured camera rotation from true north (in degrees) used for heading conversion"
+		},
+		{
+            "key":"LogLevel",
+            "default":"DEBUG",
+            "description":"The log level for this plugin"
+        }
 	]
 }