PR updates

usdot-fhwa-OPS · Jul 11, 2024 · ff4e4f1 · ff4e4f1
1 parent f49a8e1
commit ff4e4f1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/v2i-hub/SpatPlugin/src/NTCIP1202.cpp b/src/v2i-hub/SpatPlugin/src/NTCIP1202.cpp
@@ -482,7 +482,7 @@ int Ntcip1202::getPedestrianSignalGroupForPhase(int phase)
 	return signalGroupId;
 }
 
-long Ntcip1202::getAdjustedTime(unsigned int offset_tenthofSec, unsigned long msEpoch)
+long Ntcip1202::getAdjustedTime(unsigned int offset_tenthofSec, unsigned long msEpoch) const
 {
 	// generate J2735 TimeMark which is:
 	// Tenths of a second in the current or next hour

diff --git a/src/v2i-hub/SpatPlugin/src/NTCIP1202.h b/src/v2i-hub/SpatPlugin/src/NTCIP1202.h
@@ -68,7 +68,6 @@ struct SignalGroupMapping
 class Ntcip1202
 {
 	public:
-		inline explicit Ntcip1202() {};
 		void setSignalGroupMappingList(string json);
 
 		void copyBytesIntoNtcip1202(char* buff, int numBytes);
@@ -99,7 +98,7 @@ class Ntcip1202
 		uint16_t getOverlapMinTime(int phaseNumber);
 		uint16_t getOverlapMaxTime(int phaseNumber);
 
-		long getAdjustedTime(unsigned int offset_tenthofSec, unsigned long msEpoch);
+		long getAdjustedTime(unsigned int offset_tenthofSec, unsigned long msEpoch) const;
 
 		bool isFlashingStatus();
 		bool isPhaseFlashing();

diff --git a/src/v2i-hub/SpatPlugin/src/SpatPlugin.cpp b/src/v2i-hub/SpatPlugin/src/SpatPlugin.cpp
@@ -7,7 +7,7 @@ using namespace tmx::utils;
 
 namespace SpatPlugin {
 
-	SpatPlugin::SpatPlugin(string name) :PluginClientClockAware(name) {
+	SpatPlugin::SpatPlugin(const std::string &name) :PluginClientClockAware(name) {
 		spatReceiverThread = std::make_unique<tmx::utils::ThreadTimer>(std::chrono::milliseconds(5));
 
 		if ( PluginClientClockAware::isSimulationMode() ) {
@@ -92,7 +92,8 @@ namespace SpatPlugin {
 					spatEncodedMsg.addDsrcMetadata(tmx::messages::api::msgPSID::signalPhaseAndTimingMessage_PSID);
 
 					PLOG(tmx::utils::logDEBUG) << "Broadcasting SPAT" << std::endl;
-					BroadcastMessage(static_cast<routeable_message>(spatEncodedMsg));
+					auto rMsg = static_cast<routeable_message>(spatEncodedMsg);
+					BroadcastMessage(rMsg);
 				}
 				else if (spatMode == "J2735_HEX") {
 					auto spatEncoded_ptr = std::make_shared<tmx::messages::SpatEncodedMessage>();
@@ -109,6 +110,8 @@ namespace SpatPlugin {
 			catch (const tmx::J2735Exception &e) {
 				PLOG(tmx::utils::logERROR) << "Encountered J2735 Exception " << e.what() << " attempting to process SPAT." << std::endl
 										   << e.GetBacktrace();
+
+				SetStatus<uint>(keySkippedMessages, skippedMessages++);
 			}
 		}
 	}

diff --git a/src/v2i-hub/SpatPlugin/src/SpatPlugin.h b/src/v2i-hub/SpatPlugin/src/SpatPlugin.h
@@ -25,7 +25,7 @@ class SpatPlugin: public tmx::utils::PluginClientClockAware {
 
 public:
 
-	SpatPlugin(std::string name);
+	SpatPlugin(const std::string &name);
 	virtual ~SpatPlugin();
 
 
@@ -50,6 +50,8 @@ class SpatPlugin: public tmx::utils::PluginClientClockAware {
 	const char* keyConnectionStatus = "Connection Status";
 
 	const char* keySkippedMessages = "Skipped Messages";
+
+	uint skippedMessages = 0;
 
 	bool isConnected = false;