From b2a822c3596ceef3400a522cf36675bf6546f20a Mon Sep 17 00:00:00 2001
From: Davide Basso <davide.basso@skywarder.eu>
Date: Tue, 27 Feb 2024 18:21:53 +0100
Subject: [PATCH] [Units] Fix other formats
---
src/tests/sensors/test-bme280-i2c.cpp | 2 +-
src/tests/sensors/test-bmp280-i2c.cpp | 2 +-
src/tests/sensors/test-bmx160.cpp | 10 ++++++----
src/tests/sensors/test-lis331hh.cpp | 4 ++--
src/tests/sensors/test-lps22df.cpp | 4 ++--
src/tests/sensors/test-ms5803-i2c.cpp | 2 +-
src/tests/sensors/test-ubxgps-serial.cpp | 12 ++++++------
7 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/tests/sensors/test-bme280-i2c.cpp b/src/tests/sensors/test-bme280-i2c.cpp
index f719b681e..c06071e29 100644
--- a/src/tests/sensors/test-bme280-i2c.cpp
+++ b/src/tests/sensors/test-bme280-i2c.cpp
@@ -49,7 +49,7 @@ int main()
printf("temp: %.2f DegC\tpress: %.2f hPa\thumid: %.2f %%RH\n",
bme280.getLastSample().temperature,
- bme280.getLastSample().pressure,
+ bme280.getLastSample().pressure.value(),
bme280.getLastSample().humidity);
Thread::sleep(1000);
diff --git a/src/tests/sensors/test-bmp280-i2c.cpp b/src/tests/sensors/test-bmp280-i2c.cpp
index a913521be..2f8c485dc 100644
--- a/src/tests/sensors/test-bmp280-i2c.cpp
+++ b/src/tests/sensors/test-bmp280-i2c.cpp
@@ -50,7 +50,7 @@ int main()
auto data = bmp280.getLastSample();
printf("[%.2f]: %.2fPa %.2f°\n", data.pressureTimestamp / 1e6,
- data.pressure, data.temperature);
+ data.pressure.value(), data.temperature);
Thread::sleep(50); // 25Hz
}
diff --git a/src/tests/sensors/test-bmx160.cpp b/src/tests/sensors/test-bmx160.cpp
index 43e3cc976..78a11c5b3 100644
--- a/src/tests/sensors/test-bmx160.cpp
+++ b/src/tests/sensors/test-bmx160.cpp
@@ -114,12 +114,14 @@ int main()
data.magneticFieldZ);
printf("Gyr [%.4f s]:\t%.2f\t%.2f\t%.2f\n",
- data.angularSpeedTimestamp / 1000000.0f, data.angularSpeedX,
- data.angularSpeedY, data.angularSpeedZ);
+ data.angularSpeedTimestamp / 1000000.0f,
+ data.angularSpeedX.value(), data.angularSpeedY.value(),
+ data.angularSpeedZ.value());
printf("Acc [%.4f s]:\t%.2f\t%.2f\t%.2f\n",
- data.accelerationTimestamp / 1000000.0f, data.accelerationX,
- data.accelerationY, data.accelerationZ);
+ data.accelerationTimestamp / 1000000.0f,
+ data.accelerationX.value(), data.accelerationY.value(),
+ data.accelerationZ.value());
}
}
diff --git a/src/tests/sensors/test-lis331hh.cpp b/src/tests/sensors/test-lis331hh.cpp
index 4e39e3e8e..69b13f72c 100644
--- a/src/tests/sensors/test-lis331hh.cpp
+++ b/src/tests/sensors/test-lis331hh.cpp
@@ -44,8 +44,8 @@ int main()
auto sample = lis.getLastSample();
printf("[%.2f] x: % 5.2f, y: % 5.2f, z: % 5.2f\n",
- sample.accelerationTimestamp / 1e6, sample.accelerationX,
- sample.accelerationY, sample.accelerationZ);
+ sample.accelerationTimestamp / 1e6, sample.accelerationX.value(),
+ sample.accelerationY.value(), sample.accelerationZ.value());
Thread::sleep(100);
}
diff --git a/src/tests/sensors/test-lps22df.cpp b/src/tests/sensors/test-lps22df.cpp
index c23ffc3f4..26b0b8d6b 100644
--- a/src/tests/sensors/test-lps22df.cpp
+++ b/src/tests/sensors/test-lps22df.cpp
@@ -72,7 +72,7 @@ int main()
sensor.sample();
LPS22DFData data = sensor.getLastSample();
- printf("%.2f C | %.2f Pa\n", data.temperature, data.pressure);
+ printf("%.2f C | %.2f Pa\n", data.temperature, data.pressure.value());
miosix::Thread::sleep(100);
}
@@ -84,7 +84,7 @@ int main()
sensor.sample();
LPS22DFData data = sensor.getLastSample();
- printf("%.2f C | %.2f Pa\n", data.temperature, data.pressure);
+ printf("%.2f C | %.2f Pa\n", data.temperature, data.pressure.value());
miosix::Thread::sleep(100);
}
diff --git a/src/tests/sensors/test-ms5803-i2c.cpp b/src/tests/sensors/test-ms5803-i2c.cpp
index 7a7b83ddb..d2fabbf90 100644
--- a/src/tests/sensors/test-ms5803-i2c.cpp
+++ b/src/tests/sensors/test-ms5803-i2c.cpp
@@ -49,7 +49,7 @@ int main()
auto data = ms5803.getLastSample();
printf("[%.2f]: %.2fPa %.2f°\n", data.pressureTimestamp / 1e6,
- data.pressure, data.temperature);
+ data.pressure.value(), data.temperature);
Thread::sleep(50); // 25Hz
}
diff --git a/src/tests/sensors/test-ubxgps-serial.cpp b/src/tests/sensors/test-ubxgps-serial.cpp
index 472f3dcde..e884375f2 100644
--- a/src/tests/sensors/test-ubxgps-serial.cpp
+++ b/src/tests/sensors/test-ubxgps-serial.cpp
@@ -82,11 +82,11 @@ int main()
"height: %4.1f nsat: %2d speed: %3.2f velN: % 3.2f velE: % 3.2f "
"track %3.1f utc: %04u:%02u:%02u:%02u:%02u:%02u:%09ld\n",
(float)dataGPS.gpsTimestamp / 1000000, dataGPS.fix,
- dataGPS.latitude, dataGPS.longitude, dataGPS.height,
- dataGPS.satellites, dataGPS.speed, dataGPS.velocityNorth,
- dataGPS.velocityEast, dataGPS.track, dataGPS.ubxTime.year,
- dataGPS.ubxTime.month, dataGPS.ubxTime.day, dataGPS.ubxTime.hour,
- dataGPS.ubxTime.minute, dataGPS.ubxTime.second,
- dataGPS.ubxTime.nanosecond);
+ dataGPS.latitude.value(), dataGPS.longitude.value(),
+ dataGPS.height.value(), dataGPS.satellites, dataGPS.speed.value(),
+ dataGPS.velocityNorth.value(), dataGPS.velocityEast.value(),
+ dataGPS.track.value(), dataGPS.ubxTime.year, dataGPS.ubxTime.month,
+ dataGPS.ubxTime.day, dataGPS.ubxTime.hour, dataGPS.ubxTime.minute,
+ dataGPS.ubxTime.second, dataGPS.ubxTime.nanosecond);
}
}
--
GitLab