From 28e935e93b212190b95e7249737eb7c526fdceed Mon Sep 17 00:00:00 2001
From: "J.A. de Jong - Redu-Sone B.V., ASCEE V.O.F" <j.a.dejong@ascee.nl>
Date: Fri, 14 May 2021 10:37:52 +0200
Subject: [PATCH] Bugfix: serialization of DeviceInfo contained errors

---
 lasp/device/lasp_cppdaq.h | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lasp/device/lasp_cppdaq.h b/lasp/device/lasp_cppdaq.h
index e95bda4..d0bc955 100644
--- a/lasp/device/lasp_cppdaq.h
+++ b/lasp/device/lasp_cppdaq.h
@@ -131,9 +131,9 @@ class DeviceInfo {
 
     operator string() const {
       std::stringstream str;
-      str << api.apiname + " " << api_specific_devindex
-        << " number of input channels: " << ninchannels
-        << " number of output channels: " << noutchannels;
+      str << api.apiname + " " << api_specific_devindex << endl
+        << " number of input channels: " << ninchannels << endl
+        << " number of output channels: " << noutchannels << endl;
       return str.str();
     }
 
@@ -216,13 +216,8 @@ class DeviceInfo {
         dtype.is_floating = bool(nexti());
         devinfo.availableDataTypes.push_back(dtype);
       }
-      devinfo.prefDataTypeIndex = nexti();
 
-      N = us(nexti());
-      for(us i=0;i<N; i++) {
-        devinfo.availableSampleRates.push_back(nextf());
-      }
-      devinfo.prefSampleRateIndex = nexti();
+      devinfo.prefDataTypeIndex = nexti();
 
       N = us(nexti());
       for(us i=0;i<N; i++) {
@@ -236,6 +231,12 @@ class DeviceInfo {
       }
       devinfo.prefFramesPerBlockIndex = nexti();
 
+      N = us(nexti());
+      for(us i=0;i<N; i++) {
+        devinfo.availableInputRanges.push_back(nexti());
+      }
+      devinfo.prefInputRangeIndex = nexti();
+
       devinfo.ninchannels = nexti();
       devinfo.noutchannels = nexti();
       devinfo.hasInputIEPE = bool(nexti());