From 121acb756404ebf26cd3f7b36726f4809b759ab4 Mon Sep 17 00:00:00 2001
From: Pietro Bortolus <Pietro.bortolus@skywarder.eu>
Date: Thu, 23 Jan 2025 12:44:37 +0100
Subject: [PATCH] [ND015X] changed variable declaration
the SPIDataIn and SPIDataOut varaibles are now
declared in the sampleimpl function rather than as
a member variable
---
src/shared/sensors/ND015X/ND015A.cpp | 4 ++--
src/shared/sensors/ND015X/ND015A.h | 2 --
src/shared/sensors/ND015X/ND015D.cpp | 4 ++--
src/shared/sensors/ND015X/ND015D.h | 2 --
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/shared/sensors/ND015X/ND015A.cpp b/src/shared/sensors/ND015X/ND015A.cpp
index 0b62f09df..ba332cd5a 100644
--- a/src/shared/sensors/ND015X/ND015A.cpp
+++ b/src/shared/sensors/ND015X/ND015A.cpp
@@ -88,7 +88,7 @@ void ND015A::setNotch(NotchEnable ntc)
ND015XData ND015A::sampleImpl()
{
ND015XData data;
- SPIDataOut = (modeByte << 8) | rateByte;
+ uint16_t SPIDataOut = (modeByte << 8) | rateByte;
SPITransaction spi(slave);
@@ -96,7 +96,7 @@ ND015XData ND015A::sampleImpl()
// reading the data to make sure the proper
// settings are used
- SPIDataIn = spi.transfer16(SPIDataOut);
+ uint16_t SPIDataIn = spi.transfer16(SPIDataOut);
data.pressure =
((short)SPIDataIn - 0.05 * pow(2, 16)) / (0.9 * pow(2, 16)) * 15;
diff --git a/src/shared/sensors/ND015X/ND015A.h b/src/shared/sensors/ND015X/ND015A.h
index 710dee5e6..2973205de 100644
--- a/src/shared/sensors/ND015X/ND015A.h
+++ b/src/shared/sensors/ND015X/ND015A.h
@@ -111,8 +111,6 @@ private:
SPISlave slave;
uint8_t modeByte = 0xF7; // settings for the mode control register
uint8_t rateByte = 0x1C; // settings for the rate control register
- uint16_t SPIDataIn;
- uint16_t SPIDataOut;
enum RegisterMask : uint8_t
{
diff --git a/src/shared/sensors/ND015X/ND015D.cpp b/src/shared/sensors/ND015X/ND015D.cpp
index d20d7b664..59c9349f5 100644
--- a/src/shared/sensors/ND015X/ND015D.cpp
+++ b/src/shared/sensors/ND015X/ND015D.cpp
@@ -123,7 +123,7 @@ void ND015D::setNotch(NotchEnable ntc)
ND015XData ND015D::sampleImpl()
{
ND015XData data;
- SPIDataOut = (modeByte << 8) | rateByte;
+ uint16_t SPIDataOut = (modeByte << 8) | rateByte;
SPITransaction spi(slave);
@@ -131,7 +131,7 @@ ND015XData ND015D::sampleImpl()
// reading the data to make sure the proper
// settings are used
- SPIDataIn = spi.transfer16(SPIDataOut);
+ uint16_t SPIDataIn = spi.transfer16(SPIDataOut);
data.pressure = (short)SPIDataIn / (0.9 * pow(2, 15)) * range;
data.pressureTimestamp = TimestampTimer::getTimestamp();
diff --git a/src/shared/sensors/ND015X/ND015D.h b/src/shared/sensors/ND015X/ND015D.h
index 693222009..99f70bb34 100644
--- a/src/shared/sensors/ND015X/ND015D.h
+++ b/src/shared/sensors/ND015X/ND015D.h
@@ -113,8 +113,6 @@ private:
SPISlave slave;
uint8_t modeByte = 0xF3; // settings for the mode control register
uint8_t rateByte = 0x1C; // settings for the rate control register
- uint16_t SPIDataIn;
- uint16_t SPIDataOut;
short range = 1;
enum RegisterMask : uint8_t
--
GitLab