Driver: Servd: Toggle closing when done

* Adds the ability to set a CoreMini signal value via the live data interface
* Adds definition for the Manual Trigger and DAQ Enable signals

api/icsneocpp/event.cpp

@@ -74,6 +74,8 @@ static constexpr const char* TIMEOUT = "The timeout was reached.";
 static constexpr const char* WIVI_NOT_SUPPORTED = "Wireless neoVI functions are not supported on this device.";
 static constexpr const char* RESTRICTED_ENTRY_FLAG = "Attempted to set a restricted flag in a Root Directory entry.";
 static constexpr const char* NOT_SUPPORTED = "The requested feature is not supported.";
+static constexpr const char* FIXED_POINT_OVERFLOW = "Value is too large to convert to fixed point.";
+static constexpr const char* FIXED_POINT_PRECISION = "Value is too small for fixed point precision.";
 
 // Device Errors
 static constexpr const char* POLLING_MESSAGE_OVERFLOW = "Too many messages have been recieved for the polling message buffer, some have been lost!";
@@ -240,6 +242,10 @@ const char* APIEvent::DescriptionForType(Type type) {
 			return RESTRICTED_ENTRY_FLAG;
 		case Type::NotSupported:
 			return NOT_SUPPORTED;
+		case Type::FixedPointOverflow:
+			return FIXED_POINT_OVERFLOW;
+		case Type::FixedPointPrecision:
+			return FIXED_POINT_PRECISION;
 
 		// Device Errors
 		case Type::PollingMessageOverflow:

bindings/python/icsneopy/api/event.cpp

@@ -142,7 +142,9 @@ void init_event(pybind11::module_& m) {
 		.value("VSAOtherError", APIEvent::Type::VSAOtherError)
 		.value("NoErrorFound", APIEvent::Type::NoErrorFound)
 		.value("TooManyEvents", APIEvent::Type::TooManyEvents)
-		.value("Unknown", APIEvent::Type::Unknown);
+		.value("Unknown", APIEvent::Type::Unknown)
+		.value("FixedPointOverflow", APIEvent::Type::FixedPointOverflow)
+		.value("FixedPointPrecision", APIEvent::Type::FixedPointPrecision);
 	
 	pybind11::enum_<APIEvent::Severity>(apiEvent, "Severity")
 		.value("Any", APIEvent::Severity::Any)

communication/livedata.cpp

@@ -1,4 +1,5 @@
 #include "icsneo/communication/livedata.h"
+#include <cmath>
 namespace icsneo {
 
 namespace LiveDataUtil {
@@ -18,7 +19,7 @@ double liveDataValueToDouble(const LiveDataValue& val) {
 	return val.value * liveDataFixedPointToDouble; 
 } 
 
-int liveDataDoubleToValue(LiveDataValue& value, const double& dFloat) {
+bool liveDataDoubleToValue(const double& dFloat, LiveDataValue& value) {
 	union {
 		struct
 		{
@@ -41,13 +42,13 @@ int liveDataDoubleToValue(LiveDataValue& value, const double& dFloat) {
 
 	int32_t intPart; //creating temp variable due to static analysis warning about writing and reading to different union members
 	if(dFloat < 0.0)
-		intPart = (int32_t)floor(dFloat);
+		intPart = (int32_t)std::floor(dFloat);
 	else
 		intPart = (int32_t)dFloat;
 
 	//using temp varialbes to avoid static analysis warning about read/write to different union members
 	double frac = dFloat - (double)(intPart);
-	uint32_t fracPart = (uint32_t)floor((frac * CM_DOUBLEVALUE_TO_FIXED_POINT) + 0.5);
+	uint32_t fracPart = (uint32_t)std::floor((frac * CM_DOUBLEVALUE_TO_FIXED_POINT) + 0.5);
 
 	//write temp vars back into the union
 	CminiFixedPt.parts.ValueInt32 = intPart;
@@ -55,21 +56,23 @@ int liveDataDoubleToValue(LiveDataValue& value, const double& dFloat) {
 	value.value = CminiFixedPt.ValueLarge;
 
 	if(dFloat == (double)0.0)
-		return 0;
+		return true;
 
 	//check if double can be stored as 32.32
 	// 0x1 0000 0000 0000 0000 * CM_FIXED_POINT_TO_DOUBLEVALUE = 0x1 0000 0000
-	if (dFloat > INT32_MAX_DOUBLE)
+	if(dFloat > INT32_MAX_DOUBLE || dFloat < INT32_MIN_DOUBLE) {
-		return 1;
+		EventManager::GetInstance().add(APIEvent::Type::FixedPointOverflow, APIEvent::Severity::Error);
-	if (dFloat < INT32_MIN_DOUBLE)
+		return false;
-		return -1;
+	}
 
 	// Use absolute value for minimum fixed point check
 	double absFloat = (dFloat < 0.0) ? -dFloat : dFloat;
-	if (absFloat < MIN_FIXED_POINT_DOUBLE)
+	if(absFloat < MIN_FIXED_POINT_DOUBLE) {
-		return -2;
+		EventManager::GetInstance().add(APIEvent::Type::FixedPointPrecision, APIEvent::Severity::Error);
+		return false;
+	}
 
-	return 0;
+	return true;
 }
 
 } // namespace LiveDataUtil

communication/packet/livedatapacket.cpp

@@ -111,14 +111,14 @@ bool HardwareLiveDataPacket::EncodeFromMessage(LiveDataMessage& message, std::ve
 				if(!setValMsg->handle)
 					setValMsg->handle = LiveDataUtil::getNewHandle();
 				out->handle = setValMsg->handle;
-				out->numArgs = static_cast<uint32_t>(setValMsg->args.size());
+				out->numSetValues = (uint32_t)numArgs;
 				for(size_t i = 0; i < numArgs; ++i) {
 					out->values[i].arg.objectType = setValMsg->args[i]->objectType;
 					out->values[i].arg.objectIndex = setValMsg->args[i]->objectIndex;
 					out->values[i].arg.signalIndex = setValMsg->args[i]->signalIndex;
 					out->values[i].arg.valueType = setValMsg->args[i]->valueType;
 					out->values[i].value.value = setValMsg->values[i]->value;
-					out->values[i].value.header.length = sizeof(int64_t);
+					out->values[i].value.header.length = sizeof(LiveDataValue::value);
 				}
 			} else {
 				report(APIEvent::Type::LiveDataInvalidArgument, APIEvent::Severity::Error);

examples/cpp/livedata/src/LiveDataExample.cpp

@@ -80,8 +80,7 @@ int main() {
 		// Run handler for three seconds to observe the signal data
 		std::this_thread::sleep_for(std::chrono::seconds(3));
 		double val = 0;
-		for (unsigned int i = 0; i < 10; ++i)
+		for (unsigned int i = 0; i < 10; ++i) {
-		{
 			// Set the values of signals we're watching so we can see them change live
 			auto setValMsg = std::make_shared<icsneo::LiveDataSetValueMessage>();
 			setValMsg->cmd = icsneo::LiveDataCommand::SET_VALUE;
@@ -89,9 +88,8 @@ int main() {
 			// Convert the value format
 			icsneo::LiveDataValue ldValueDAQEnable;
 			icsneo::LiveDataValue ldValueManTrig;
-			if ((icsneo::LiveDataUtil::liveDataDoubleToValue(ldValueDAQEnable, val * 10) < 0) ||
+			if (!icsneo::LiveDataUtil::liveDataDoubleToValue(val / 3, ldValueDAQEnable) ||
-				(icsneo::LiveDataUtil::liveDataDoubleToValue(ldValueManTrig, val) < 0))
+				!icsneo::LiveDataUtil::liveDataDoubleToValue(val, ldValueManTrig)) {
-			{
 				break;
 			}
 			setValMsg->appendSetValue(icsneo::LiveDataValueType::DAQ_ENABLE, ldValueDAQEnable);

include/icsneo/api/event.h

@@ -51,6 +51,8 @@ public:
 		WiVINotSupported = 0x1015,
 		RestrictedEntryFlag = 0x1016,
 		NotSupported = 0x1017,
+		FixedPointOverflow = 0x1018,
+		FixedPointPrecision = 0x1019,
 
 		// Device Events
 		PollingMessageOverflow = 0x2000,

include/icsneo/communication/livedata.h

@@ -88,6 +88,7 @@ inline std::ostream& operator<<(std::ostream& os, const LiveDataValueType cmd) {
 		case LiveDataValueType::GPS_TIME_VALID: return os << "GPS Time Valid";
 		case LiveDataValueType::DAQ_ENABLE: return os << "DAQ Enable";
 		case LiveDataValueType::MANUAL_TRIGGER: return os << "Manual Trigger";
+		case LiveDataValueType::TIME_SINCE_MSG: return os << "Time Since Msg";
 	}
 	return os;
 }
@@ -141,7 +142,7 @@ struct LiveDataSetValueEntry
 };
 
 struct LiveDataSetValue : public LiveDataHeader {
-	uint32_t numArgs;
+	uint32_t numSetValues;
 	LiveDataSetValueEntry values[1];
 };
 
@@ -156,7 +157,7 @@ namespace LiveDataUtil
 
 LiveDataHandle getNewHandle();
 double liveDataValueToDouble(const LiveDataValue& val);
-int liveDataDoubleToValue(LiveDataValue& value, const double& dFloat);
+bool liveDataDoubleToValue(const double& dFloat, LiveDataValue& value);
 static constexpr uint32_t LiveDataVersion = 1;
 
 } // namespace LiveDataUtil

include/icsneo/device/idevicesettings.h

@@ -668,6 +668,37 @@ typedef struct
 } Fire3LinuxSettings;
 #define FIRE3LINUXSETTINGS_SIZE 8
 static_assert(sizeof(Fire3LinuxSettings) == FIRE3LINUXSETTINGS_SIZE, "Fire3LinuxSettings is the wrong size!");
+
+
+/* Define number of CMP streams per device*/
+#define CMP_STREAMS_FIRE3 (10)
+#define CMP_STREAMS_FIRE3FR (10)
+#define CMP_STREAMS_RED2 (10)
+#define CMP_STREAMS_A2B (3)
+#define CMP_STREAMS_GIGASTAR (10)
+
+/* CMP Network Enables */
+typedef struct
+{
+	uint8_t bStreamEnabled : 1;
+	uint8_t EthModule : 2;
+	uint8_t bControlEnabled : 1;
+	uint8_t spare : 4;
+	uint8_t streamId;
+	uint8_t dstMac[6];
+	uint64_t network_enables_1;
+	uint64_t network_enables_2;
+} CMP_NETWORK_DATA;
+
+/* Global CMP Data */
+typedef struct
+{
+	uint8_t cmp_enabled : 1;
+	uint8_t sparebits : 7;
+	uint8_t spare;
+	uint16_t cmp_device_id;
+} CMP_GLOBAL_DATA;
+
 #pragma pack(pop)
 
 #ifdef __cplusplus

include/icsneo/device/tree/neovired2/neovired2settings.h

@@ -79,7 +79,15 @@ typedef struct {
 	uint16_t digitalIoThresholdEnable;
 	uint16_t misc_io_initial_ddr;
 	uint16_t misc_io_initial_latch;
-	ETHERNET_SETTINGS2 ethernet2;
+	ETHERNET_SETTINGS2 ethernet2_1;
+	ETHERNET_SETTINGS ethernet_2;
+	ETHERNET_SETTINGS2 ethernet2_2;
+	Fire3LinuxSettings os_settings;
+	RAD_GPTP_SETTINGS gPTP;
+	uint16_t iso_tester_pullup_enable;
+	CMP_GLOBAL_DATA cmp_global_data;
+	CMP_NETWORK_DATA cmp_stream_data[CMP_STREAMS_RED2];
+	uint32_t networkTimeSync;
 } neovired2_settings_t;
 
 typedef struct {

platform/servd.cpp

@@ -1,5 +1,7 @@
 #include "icsneo/platform/servd.h"
 
+#include <string_view>
+
 using namespace icsneo;
 
 #define SERVD_VERSION 1
@@ -12,9 +14,9 @@ bool Servd::Enabled() {
 	return enabled ? enabled[0] == '1' : false;
 }
 
-std::vector<std::string_view> split(const std::string_view& str, char delim = ' ')
+std::vector<std::string> split(const std::string_view& str, char delim = ' ')
 {
-	std::vector<std::string_view> ret;
+	std::vector<std::string> ret;
 	size_t tail = 0;
 	size_t head = 0;
 	while (head < str.size()) {
@@ -114,8 +116,8 @@ bool Servd::open() {
 		return false;
 	}
 	aliveThread = std::thread(&Servd::alive, this);
-	readThread = std::thread(&Servd::read, this, Address{tokens[2].data(), (uint16_t)std::stol(tokens[3].data())});
+	readThread = std::thread(&Servd::read, this, Address{tokens[2].c_str(), (uint16_t)std::stol(tokens[3].c_str())});
-	writeThread = std::thread(&Servd::write, this, Address{tokens[0].data(), (uint16_t)std::stol(tokens[1].data())});
+	writeThread = std::thread(&Servd::write, this, Address{tokens[0].c_str(), (uint16_t)std::stol(tokens[1].c_str())});
 	opened = true;
 	return true;
 }
@@ -140,6 +142,7 @@ bool Servd::close() {
 		messageSocket.sendto(request.data(), request.size(), SERVD_ADDRESS);
 	}
 	opened = false;
+	setIsClosing(false);
 	return true;
 }