Changes for multi probe (different types) and shared library for TC and RTD

Author: JHSawatzki

src/utility/RTD/MAX31865.cpp

@@ -3,20 +3,12 @@
 MAX31865Class::MAX31865Class(PinName cs, SPIClass& spi) : _cs(cs), _spi(&spi), _spiSettings(1000000, MSBFIRST, SPI_MODE1) {
 }
 
-bool MAX31865Class::begin(int wires) {
-    _spi.begin();
+bool MAX31865Class::begin() {
     _spi->begin();
 
     pinMode(_cs, OUTPUT);
     digitalWrite(_cs, HIGH);
 
-    // sets 2 or 4 wire
-    if (wires == THREE_WIRE) {
-        writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) | MAX31856_CONFIG_3_WIRE));
-    } else {
-        writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_WIRE_MASK));
-    }
-
     // disable bias
     writeByte(MAX31856_CONFIG_REG, readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_BIAS_MASK);
 
@@ -32,6 +24,23 @@ bool MAX31865Class::begin(int wires) {
     return true;
 }
 
+bool MAX31865Class::begin(uint8_t probeType) { // Deprecate in future
+    begin();
+
+    setRTDType(probeType);
+
+    return true;
+}
+
+void MAX31865Class::setRTDType(uint8_t probeType) {
+    // sets 2 or 4 wire
+    if (probeType == PROBE_RTD_3W) {
+        writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) | MAX31856_CONFIG_3_WIRE));
+    } else {
+        writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_WIRE_MASK));
+    }
+}
+
 void MAX31865Class::clearFault(void) {
     writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_CLEAR_FAULT_CYCLE) | MAX31856_CONFIG_CLEAR_FAULT);
 }
@@ -82,7 +91,7 @@ bool MAX31865Class::getVoltageFault(uint8_t fault) {
     return false;
 }
 
-float MAX31865Class::readTemperature(float RTDnominal, float refResistor) {
+float MAX31865Class::readRTDTemperature(float RTDnominal, float refResistor) {
     float Z1, Z2, Z3, Z4, Rt, temp;
 
     Rt = readRTD();

src/utility/RTD/MAX31865.h

@@ -4,6 +4,7 @@
 #include <Arduino.h>
 #include <mbed.h>
 #include <SPI.h>
+#include "pins_mc.h"
 
 #define MAX31856_CONFIG_REG 0x00
 #define MAX31856_RTD_MSB_REG 0x01
@@ -47,17 +48,22 @@
 #define RTD_A 3.9083e-3
 #define RTD_B -5.775e-7
 
-#define TWO_WIRE 0
-#define THREE_WIRE 1
+#define PROBE_RTD_2W 3
+#define PROBE_RTD_3W 4
+
+#define TWO_WIRE PROBE_RTD_2W
+#define THREE_WIRE PROBE_RTD_3W
 
 class MAX31865Class {
 public:
     MAX31865Class(PinName cs = MC_RTD_CS_PIN, SPIClass& spi = SPI);
 
-    bool begin(int wires);
+    bool begin();
+    bool begin(uint8_t probeType); //Deprecate in future
     void end();
 
-    float readTemperature(float RTDnominal, float refResistor);
+    void setRTDType(uint8_t probeType);
+    float readRTDTemperature(float RTDnominal, float refResistor);
     uint8_t readFault(void);
     void clearFault(void);
     uint32_t readRTD();