diff --git a/src/modules/Telemetry/Sensor/BMP3XXSensor.cpp b/src/modules/Telemetry/Sensor/BMP3XXSensor.cpp index feb08d8ff..d948cfe38 100644 --- a/src/modules/Telemetry/Sensor/BMP3XXSensor.cpp +++ b/src/modules/Telemetry/Sensor/BMP3XXSensor.cpp @@ -65,21 +65,18 @@ bool BMP3XXSensor::getMetrics(meshtastic_Telemetry *measurement) // Get a singleton wrapper for an Adafruit_bmp3xx BMP3XXSingleton *BMP3XXSingleton::GetInstance() { - std::lock_guard lock(mutex_); - if (pinstance_ == nullptr) + if (pinstance == nullptr) { - pinstance_ = new BMP3XXSingleton(); + pinstance = new BMP3XXSingleton(); } - return pinstance_; + return pinstance; } BMP3XXSingleton::BMP3XXSingleton(){} BMP3XXSingleton::~BMP3XXSingleton(){} -BMP3XXSingleton* BMP3XXSingleton::pinstance_{nullptr}; - -std::mutex BMP3XXSingleton::mutex_; +BMP3XXSingleton* BMP3XXSingleton::pinstance{nullptr}; bool BMP3XXSingleton::performReading() { diff --git a/src/modules/Telemetry/Sensor/BMP3XXSensor.h b/src/modules/Telemetry/Sensor/BMP3XXSensor.h index 04e8f9783..77b434caa 100644 --- a/src/modules/Telemetry/Sensor/BMP3XXSensor.h +++ b/src/modules/Telemetry/Sensor/BMP3XXSensor.h @@ -7,7 +7,6 @@ #define SEAL_LEVEL_HPA 1013.2f -#include #include #include #include "TelemetrySensor.h" @@ -16,15 +15,14 @@ class BMP3XXSingleton : public Adafruit_BMP3XX { private: - static BMP3XXSingleton * pinstance_; - static std::mutex mutex_; + static BMP3XXSingleton * pinstance; protected: BMP3XXSingleton(); ~BMP3XXSingleton(); public: - // Create a singleton instance (with lock for thread safety) + // Create a singleton instance (not thread safe) static BMP3XXSingleton *GetInstance(); // Singletons should not be cloneable.