diff --git a/src/shared/sensors/ND015X/ND015A.cpp b/src/shared/sensors/ND015X/ND015A.cpp index 0b62f09df2d46b3a3023d82460b3f49588c3fcaf..ba332cd5aba6f617c3d9e7617dc6be0f9b67a3f0 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 710dee5e6582011aeffc84ee903c6276419ba11d..2973205de1aae9681b505a5b53e050c9d17d0c7b 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 d20d7b66464d6167cde23d0496341dcae74facb8..59c9349f527c0b7a58282437ba9c939bf964653b 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 693222009f94d02e04f2a3ac47302b3577b19e03..99f70bb345b235294a55c53f4890f49d46476d7d 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