clean up summaries

Author: jvde-github

Source/DSP/Model.cpp

@@ -809,7 +809,15 @@ namespace AIS
 
 	std::string ModelNMEA::Get()
 	{
-		return "nmea_refresh " + Util::Convert::toString(nmea.getRegenerate()) + " uuid " + nmea.getUUID() + " ID " + std::to_string(nmea.getStation()) + " stamp " + Util::Convert::toString(nmea.getStamp()) + " crc_check " + Util::Convert::toString(nmea.getCRCcheck()) + " VDO " + Util::Convert::toString(nmea.getVDO()) + Model::Get();
+		std::string result = "nmea_refresh " + Util::Convert::toString(nmea.getRegenerate());
+		std::string uuid = nmea.getUUID();
+		if (!uuid.empty())
+			result += " uuid " + uuid;
+		int station = nmea.getStation();
+		if (station != 0)
+			result += " ID " + std::to_string(station);
+		result += " stamp " + Util::Convert::toString(nmea.getStamp()) + " crc_check " + Util::Convert::toString(nmea.getCRCcheck()) + " VDO " + Util::Convert::toString(nmea.getVDO()) + Model::Get();
+		return result;
 	}
 
 	void ModelN2K::buildModel(char CH1, char CH2, int sample_rate, bool timerOn, Device::Device *dev)

Source/Device/Device.h

@@ -119,10 +119,21 @@ namespace Device {
 
 		virtual std::string Get() {
 
-			std::string str = "rate " + std::to_string(getSampleRate() / 1000) + "K";
-			if (tuner_bandwidth) str += " bw " + std::to_string(tuner_bandwidth / 1000) + "K";
-			if (freq_offset) str += " freqoffset " + std::to_string(freq_offset);
-			str += " format " + Util::Convert::toString(format);
+			std::string str;
+			uint32_t rate = getSampleRate();
+			if (rate != 0) {
+				str = "rate " + std::to_string(rate / 1000) + "K";
+			}
+			if (tuner_bandwidth) {
+				if (!str.empty()) str += " ";
+				str += "bw " + std::to_string(tuner_bandwidth / 1000) + "K";
+			}
+			if (freq_offset) {
+				if (!str.empty()) str += " ";
+				str += "freqoffset " + std::to_string(freq_offset);
+			}
+			if (!str.empty()) str += " ";
+			str += "format " + Util::Convert::toString(format);
 
 			return str;
 		}