From e87442cd11bdf4450de97aa1946369132d5a292a Mon Sep 17 00:00:00 2001 From: Andreas Hardtung Date: Thu, 24 Sep 2020 17:43:42 +0200 Subject: [PATCH] Fix NULL-pointer assignment to object --- Adafruit_MAX31865.cpp | 13 +++++-------- Adafruit_MAX31865.h | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Adafruit_MAX31865.cpp b/Adafruit_MAX31865.cpp index 4cff1d7..1618954 100644 --- a/Adafruit_MAX31865.cpp +++ b/Adafruit_MAX31865.cpp @@ -34,10 +34,9 @@ /**************************************************************************/ // Adafruit_MAX31865::Adafruit_MAX31865(int8_t spi_cs, int8_t spi_mosi, - int8_t spi_miso, int8_t spi_clk) { - spi_dev = Adafruit_SPIDevice(spi_cs, spi_clk, spi_miso, spi_mosi, 1000000, - SPI_BITORDER_MSBFIRST, SPI_MODE1); -} + int8_t spi_miso, int8_t spi_clk) + : spi_dev(spi_cs, spi_clk, spi_miso, spi_mosi, 1000000, + SPI_BITORDER_MSBFIRST, SPI_MODE1) {} /**************************************************************************/ /*! @@ -45,10 +44,8 @@ Adafruit_MAX31865::Adafruit_MAX31865(int8_t spi_cs, int8_t spi_mosi, @param spi_cs the SPI CS pin to use along with the default SPI device */ /**************************************************************************/ -Adafruit_MAX31865::Adafruit_MAX31865(int8_t spi_cs) { - spi_dev = - Adafruit_SPIDevice(spi_cs, 1000000, SPI_BITORDER_MSBFIRST, SPI_MODE1); -} +Adafruit_MAX31865::Adafruit_MAX31865(int8_t spi_cs) + : spi_dev(spi_cs, 1000000, SPI_BITORDER_MSBFIRST, SPI_MODE1) {} /**************************************************************************/ /*! diff --git a/Adafruit_MAX31865.h b/Adafruit_MAX31865.h index 7aef820..853b9c2 100644 --- a/Adafruit_MAX31865.h +++ b/Adafruit_MAX31865.h @@ -81,7 +81,7 @@ class Adafruit_MAX31865 { float temperature(float RTDnominal, float refResistor); private: - Adafruit_SPIDevice spi_dev = NULL; + Adafruit_SPIDevice spi_dev; void readRegisterN(uint8_t addr, uint8_t buffer[], uint8_t n);