Refactor to use subclass RTD when calculating temperature (#9)

Fixes #7.

Author: James Foster

.gitignore

@@ -15,3 +15,4 @@ vendor
 # C++ stuff
 *.bin
 *.bin.dSYM
+settings.json

scripts/install_libraries.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+
+# Remove this file when https://github.com/Arduino-CI/arduino_ci/issues/278 is fixed
+
 # arduino_ci runs this script in its GitHub Action because it is referenced by CUSTOM_INIT_SCRIPT
 # arduino_ci ensures that the script is run in the libraries directory
 

src/Adafruit_MAX31865.h

@@ -78,7 +78,7 @@ class Adafruit_MAX31865_Base {
 
   uint8_t readFault(void);
   void clearFault(void);
-  uint16_t readRTD();
+  virtual uint16_t readRTD();
 
   void setWires(max31865_numwires_t wires);
   void autoConvert(bool b);

src/Adafruit_MAX31865_CI.cpp

@@ -10,10 +10,7 @@
 
 Adafruit_MAX31865_CI::Adafruit_MAX31865_CI(int8_t spi_cs, int8_t spi_mosi,
                                            int8_t spi_miso, int8_t spi_clk)
-    : Adafruit_MAX31865_Base(spi_cs, spi_mosi, spi_miso, spi_clk) {
-  rtd = 0;
-  fault = 0;
-}
+    : Adafruit_MAX31865_Base(spi_cs, spi_mosi, spi_miso, spi_clk) {}
 
 Adafruit_MAX31865_CI::Adafruit_MAX31865_CI(int8_t spi_cs)
     : Adafruit_MAX31865_Base(spi_cs) {}
@@ -22,17 +19,9 @@ bool Adafruit_MAX31865_CI::begin(max31865_numwires_t wires) {
   return Adafruit_MAX31865_Base::begin(wires);
 }
 
-uint8_t Adafruit_MAX31865_CI::readFault(void) { return fault; }
-
-void Adafruit_MAX31865_CI::clearFault(void) { fault = 0; }
-
+// BAD: see https://github.com/Arduino-CI/Adafruit_MAX31865/issues/7
 float Adafruit_MAX31865_CI::temperature(float RTDnominal, float refResistor) {
   return Adafruit_MAX31865_Base::temperature(RTDnominal, refResistor);
 }
 
-uint16_t Adafruit_MAX31865_CI::readRTD(void) {
-  // return Adafruit_MAX31865_Base::readRTD();
-  return rtd;
-}
-
 #endif

src/Adafruit_MAX31865_CI.h

@@ -11,9 +11,9 @@ class Adafruit_MAX31865_CI : Adafruit_MAX31865_Base {
 
   bool begin(max31865_numwires_t x = MAX31865_2WIRE);
 
-  uint8_t readFault(void);
-  void clearFault(void);
-  uint16_t readRTD();
+  void clearFault(void) { fault = 0; }
+  uint8_t readFault(void) { return fault; }
+  uint16_t readRTD() { return rtd; }
 
   float temperature(float RTDnominal, float refResistor);
 
@@ -23,8 +23,8 @@ class Adafruit_MAX31865_CI : Adafruit_MAX31865_Base {
   void setFault(uint8_t newFault) { fault = newFault; }
 
 private:
-  uint16_t rtd;
-  uint8_t fault;
+  uint16_t rtd = 0;
+  uint8_t fault = 0;
 };
 
 #endif

test/Common.cpp

@@ -70,17 +70,8 @@ unittest(begin) {
 }
 
 unittest(get_temp) {
-  vector<int> expected{0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
-                       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0,
-                       0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0,
-                       2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2,
-                       2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,
-                       0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-                       2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2,
-                       2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
   Adafruit_MAX31865_Test thermo(ss, mosi, miso, sck);
   thermo.begin(MAX31865_3WIRE);
-  BitCollector pinValues(false);
-  thermo.temperature(100.0, 430.0);
-  assertTrue(pinValues.isEqualTo(expected));
+  int temp = (int)thermo.temperature(100.0, 430.0);
+  assertEqual(temp, -242);
 }