Merge pull request #184 from nlesc-recruit/fix-fw-version-read

Re-add sending newline in FW version from device; remove it on the host
nlesc-recruit · Nov 18, 2024 · 3d3e8b0 · 3d3e8b0
2 parents a6d65bf + 8b1de8e
commit 3d3e8b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/device/PowerSensor/PowerSensor.ino b/device/PowerSensor/PowerSensor.ino
@@ -278,9 +278,11 @@ void serialEvent() {
       break;
     case 'V':
       // Send firmware version in human-readable format
-      Serial.print(VERSION);
 #ifdef DEMO
-      Serial.print("-DEMO");
+      Serial.print(VERSION);
+      Serial.println("-DEMO");
+#else
+      Serial.println(VERSION);
 #endif
       break;
     case 'Z':

diff --git a/host/src/PowerSensor.cc b/host/src/PowerSensor.cc
@@ -596,6 +596,8 @@ std::string PowerSensor::getVersion() {
       c = readCharFromDevice();
       version += c;
   }
+  // remove newline from version string
+  version.pop_back();
   startIOThread();
   return version;
 }