From b5c2497e3a45f5118a7c5577b73b161b054d9fcc Mon Sep 17 00:00:00 2001
From: Alberto Nidasio <alberto.nidasio@skywarder.eu>
Date: Wed, 25 May 2022 09:32:17 +0200
Subject: [PATCH] [MAX] Changed conversion function
---
src/shared/sensors/MAX31855/MAX31855.cpp | 6 +-----
src/shared/sensors/MAX6675/MAX6675.cpp | 4 +---
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/shared/sensors/MAX31855/MAX31855.cpp b/src/shared/sensors/MAX31855/MAX31855.cpp
index 2318bd3c5..b6f820bca 100644
--- a/src/shared/sensors/MAX31855/MAX31855.cpp
+++ b/src/shared/sensors/MAX31855/MAX31855.cpp
@@ -78,12 +78,8 @@ TemperatureData MAX31855::sampleImpl()
TemperatureData result{};
result.temperatureTimestamp = TimestampTimer::getInstance().getTimestamp();
- // Extract data bits
- sample = sample >> 2;
-
// Convert the integer and decimal part separately
- result.temperature = static_cast<float>(sample >> 2);
- result.temperature += static_cast<float>(sample & 0x3) * 0.25;
+ result.temperature = static_cast<float>(sample >> 2) * 0.25;
return result;
}
diff --git a/src/shared/sensors/MAX6675/MAX6675.cpp b/src/shared/sensors/MAX6675/MAX6675.cpp
index 353db9e0f..ae7be61ba 100644
--- a/src/shared/sensors/MAX6675/MAX6675.cpp
+++ b/src/shared/sensors/MAX6675/MAX6675.cpp
@@ -79,11 +79,9 @@ TemperatureData MAX6675::sampleImpl()
// Extract bits 14-3
sample &= 0x7FF8;
- sample >>= 3;
// Convert the integer and decimal part separately
- result.temperature = static_cast<float>(sample >> 2);
- result.temperature += static_cast<float>(sample & 0x3) * 0.25;
+ result.temperature += static_cast<float>(sample >> 3) * 0.25;
return result;
}
--
GitLab