Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

destructor bug fix to the pull request #68 / issue #67 #69

Merged
merged 2 commits into from
Feb 11, 2022
Merged

destructor bug fix to the pull request #68 / issue #67 #69

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80880fb
destructor: delete objects only when they exist
adams13x13 Feb 11, 2022
c84fb1d
Place destructor after all constructors in .cpp
adams13x13 Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Adafruit_BMP280.cpp
View file
Open in desktop
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