Skip to content

Commit

Permalink
destructor bug fix to the pull request #68 / issue #67 (#69)
Browse files Browse the repository at this point in the history
* destructor: delete objects only when they exist

* Place destructor after all constructors in .cpp

they have the same order in the header file
  • Loading branch information
adams13x13 authored Feb 11, 2022
1 parent bc8a6b6 commit 33ecc06
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions Adafruit_BMP280.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,6 @@ Adafruit_BMP280::Adafruit_BMP280(TwoWire *theWire) {
pressure_sensor = new Adafruit_BMP280_Pressure(this);
}

Adafruit_BMP280::~Adafruit_BMP280(void) {
if (spi_dev)
delete spi_dev;
if (i2c_dev)
delete i2c_dev;
if (temp_sensor == nullptr)
delete temp_sensor;
if (pressure_sensor == nullptr)
delete pressure_sensor;
}

/*!
* @brief BMP280 constructor using hardware SPI
* @param cspin
Expand Down Expand Up @@ -75,6 +64,17 @@ Adafruit_BMP280::Adafruit_BMP280(int8_t cspin, int8_t mosipin, int8_t misopin,
pressure_sensor = new Adafruit_BMP280_Pressure(this);
}

Adafruit_BMP280::~Adafruit_BMP280(void) {
if (spi_dev)
delete spi_dev;
if (i2c_dev)
delete i2c_dev;
if (temp_sensor)
delete temp_sensor;
if (pressure_sensor)
delete pressure_sensor;
}

/*!
* Initialises the sensor.
* @param addr
Expand Down

0 comments on commit 33ecc06

Please sign in to comment.