diff --git a/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp b/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp index 84003188e..03df57efd 100644 --- a/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp +++ b/src/modules/Telemetry/Sensor/RCWL9620Sensor.cpp @@ -11,7 +11,8 @@ int32_t RCWL9620Sensor::runOnce() if (!hasSensor()) { return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS; } - status = begin(nodeTelemetrySensorsMap[sensorType].first, nodeTelemetrySensorsMap[sensorType].second); + status = 1; + begin(nodeTelemetrySensorsMap[sensorType].second, nodeTelemetrySensorsMap[sensorType].first); return initI2CSensor(); } @@ -24,16 +25,14 @@ bool RCWL9620Sensor::getMetrics(meshtastic_Telemetry *measurement) return true; } -bool RCWL9620Sensor::begin(uint8_t addr, TwoWire *wire) +void RCWL9620Sensor::begin(TwoWire *wire, uint8_t addr, uint8_t sda, uint8_t scl, uint32_t speed) { _wire = wire; _addr = addr; - if (i2c_dev) - delete i2c_dev; - i2c_dev = new Adafruit_I2CDevice(_addr, _wire); - if (!i2c_dev->begin()) - return false; - return true; + _sda = sda; + _scl = scl; + _speed = speed; + _wire->begin(); } float RCWL9620Sensor::getDistance() diff --git a/src/modules/Telemetry/Sensor/RCWL9620Sensor.h b/src/modules/Telemetry/Sensor/RCWL9620Sensor.h index 4120e19d9..4fb2aec2d 100644 --- a/src/modules/Telemetry/Sensor/RCWL9620Sensor.h +++ b/src/modules/Telemetry/Sensor/RCWL9620Sensor.h @@ -1,17 +1,19 @@ #include "../mesh/generated/meshtastic/telemetry.pb.h" #include "TelemetrySensor.h" -#include +#include class RCWL9620Sensor : public TelemetrySensor { private: uint8_t _addr; TwoWire *_wire; + uint8_t _scl; + uint8_t _sda; + uint8_t _speed; protected: virtual void setup() override; - bool begin(uint8_t addr = 0x57, TwoWire *wire = &Wire); - Adafruit_I2CDevice *i2c_dev = NULL; + void begin(TwoWire *wire = &Wire, uint8_t addr = 0x57, uint8_t sda = -1, uint8_t scl = -1, uint32_t speed = 200000L); float getDistance(); public: