TempProbes class refactoring

examples/Temp_probes_RTD/Temp_probes_RTD.ino

@@ -25,121 +25,120 @@
 void setup() {
   Serial.begin(9600);
   Serial.println("MAX31865 PT100 Sensor Test!");
-  temp_probes.rtd.begin(THREE_WIRE);
-  temp_probes.enableRTD();
+  MachineControl_TempProbes.begin(TEMPPROBE_RTD, THREE_WIRE);
 }
 
 void loop() {
-  temp_probes.selectChannel(0);
+  MachineControl_TempProbes.selectChannel(0);
   Serial.println("CHANNEL 0 SELECTED");
-  uint16_t rtd = temp_probes.rtd.readRTD();
+  uint16_t rtd = MachineControl_TempProbes.RTD.readRTD();
   float ratio = rtd;
   ratio /= 32768;
 
   // Check and print any faults
-  uint8_t fault = temp_probes.rtd.readFault();
+  uint8_t fault = MachineControl_TempProbes.RTD.readFault();
   if (fault) {
     Serial.print("Fault 0x"); Serial.println(fault, HEX);
-    if (temp_probes.rtd.getHighThresholdFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getHighThresholdFault(fault)) {
       Serial.println("RTD High Threshold");
     }
-    if (temp_probes.rtd.getLowThresholdFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getLowThresholdFault(fault)) {
       Serial.println("RTD Low Threshold");
     }
-    if (temp_probes.rtd.getLowREFINFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getLowREFINFault(fault)) {
       Serial.println("REFIN- > 0.85 x Bias");
     }
-    if (temp_probes.rtd.getHighREFINFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getHighREFINFault(fault)) {
       Serial.println("REFIN- < 0.85 x Bias - FORCE- open");
     }
-    if (temp_probes.rtd.getLowRTDINFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getLowRTDINFault(fault)) {
       Serial.println("RTDIN- < 0.85 x Bias - FORCE- open");
     }
-    if (temp_probes.rtd.getVoltageFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getVoltageFault(fault)) {
       Serial.println("Under/Over voltage");
     }
-    temp_probes.rtd.clearFault();
+    MachineControl_TempProbes.RTD.clearFault();
   } else {
     Serial.print("RTD value: "); Serial.println(rtd);
     Serial.print("Ratio = "); Serial.println(ratio, 8);
     Serial.print("Resistance = "); Serial.println(RREF * ratio, 8);
-    Serial.print("Temperature = "); Serial.println(temp_probes.rtd.readTemperature(RNOMINAL, RREF));
+    Serial.print("Temperature = "); Serial.println(MachineControl_TempProbes.RTD.readTemperature(RNOMINAL, RREF));
   }
   Serial.println();
   delay(100);
 
-  temp_probes.selectChannel(1);
+  MachineControl_TempProbes.selectChannel(1);
   Serial.println("CHANNEL 1 SELECTED");
-  rtd = temp_probes.rtd.readRTD();
+  rtd = MachineControl_TempProbes.RTD.readRTD();
   ratio = rtd;
   ratio /= 32768;
 
   // Check and print any faults
-  fault = temp_probes.rtd.readFault();
+  fault = MachineControl_TempProbes.RTD.readFault();
   if (fault) {
     Serial.print("Fault 0x"); Serial.println(fault, HEX);
-    if (temp_probes.rtd.getHighThresholdFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getHighThresholdFault(fault)) {
       Serial.println("RTD High Threshold");
     }
-    if (temp_probes.rtd.getLowThresholdFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getLowThresholdFault(fault)) {
       Serial.println("RTD Low Threshold");
     }
-    if (temp_probes.rtd.getLowREFINFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getLowREFINFault(fault)) {
       Serial.println("REFIN- > 0.85 x Bias");
     }
-    if (temp_probes.rtd.getHighREFINFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getHighREFINFault(fault)) {
       Serial.println("REFIN- < 0.85 x Bias - FORCE- open");
     }
-    if (temp_probes.rtd.getLowRTDINFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getLowRTDINFault(fault)) {
       Serial.println("RTDIN- < 0.85 x Bias - FORCE- open");
     }
-    if (temp_probes.rtd.getVoltageFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getVoltageFault(fault)) {
       Serial.println("Under/Over voltage");
     }
-    temp_probes.rtd.clearFault();
+    MachineControl_TempProbes.RTD.clearFault();
   } else {
     Serial.print("RTD value: "); Serial.println(rtd);
     Serial.print("Ratio = "); Serial.println(ratio, 8);
     Serial.print("Resistance = "); Serial.println(RREF * ratio, 8);
-    Serial.print("Temperature = "); Serial.println(temp_probes.rtd.readTemperature(RNOMINAL, RREF));
+    Serial.print("Temperature = "); Serial.println(MachineControl_TempProbes.RTD.readTemperature(RNOMINAL, RREF));
   }
   Serial.println();
   delay(100);
 
-  temp_probes.selectChannel(2);
+  MachineControl_TempProbes.selectChannel(2);
   Serial.println("CHANNEL 2 SELECTED");
-  rtd = temp_probes.rtd.readRTD();
+  rtd = MachineControl_TempProbes.RTD.readRTD();
   ratio = rtd;
   ratio /= 32768;
 
   // Check and print any faults
-  fault = temp_probes.rtd.readFault();
+  fault = MachineControl_TempProbes.RTD.readFault();
   if (fault) {
     Serial.print("Fault 0x"); Serial.println(fault, HEX);
-    if (temp_probes.rtd.getHighThresholdFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getHighThresholdFault(fault)) {
       Serial.println("RTD High Threshold");
     }
-    if (temp_probes.rtd.getLowThresholdFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getLowThresholdFault(fault)) {
       Serial.println("RTD Low Threshold");
     }
-    if (temp_probes.rtd.getLowREFINFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getLowREFINFault(fault)) {
       Serial.println("REFIN- > 0.85 x Bias");
     }
-    if (temp_probes.rtd.getHighREFINFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getHighREFINFault(fault)) {
       Serial.println("REFIN- < 0.85 x Bias - FORCE- open");
     }
-    if (temp_probes.rtd.getLowRTDINFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getLowRTDINFault(fault)) {
       Serial.println("RTDIN- < 0.85 x Bias - FORCE- open");
     }
-    if (temp_probes.rtd.getVoltageFault(fault)) {
+    if (MachineControl_TempProbes.RTD.getVoltageFault(fault)) {
       Serial.println("Under/Over voltage");
     }
-    temp_probes.rtd.clearFault();
+    MachineControl_TempProbes.RTD.clearFault();
   } else {
     Serial.print("RTD value: "); Serial.println(rtd);
     Serial.print("Ratio = "); Serial.println(ratio, 8);
     Serial.print("Resistance = "); Serial.println(RREF * ratio, 8);
-    Serial.print("Temperature = "); Serial.println(temp_probes.rtd.readTemperature(RNOMINAL, RREF));
+    Serial.print("Temperature = "); Serial.println(MachineControl_TempProbes.RTD.readTemperature(RNOMINAL, RREF));
   }
   Serial.println();
   delay(1000);

examples/Temp_probes_Thermocouples/Temp_probes_Thermocouples.ino

@@ -21,34 +21,31 @@
 void setup() {
   Serial.begin(9600);
   // Initialize temperature probes
-  temp_probes.tc.begin();
+  MachineControl_TempProbes.begin(TEMPPROBE_TC);
   Serial.println("Temperature probes initialization done");
-  // Enables Thermocouples chip select
-  temp_probes.enableTC();
-  Serial.println("Thermocouples enabled");
 }
 
 void loop() {
   //Set CH0, has internal 150 ms delay
-  temp_probes.selectChannel(0);
+  MachineControl_TempProbes.selectChannel(0);
   //Take CH0 measurement
-  float temp_ch0 = temp_probes.tc.readTemperature();
+  float temp_ch0 = MachineControl_TempProbes.TC.readTemperature();
   Serial.print("Temperature CH0 [°C]: ");
   Serial.print(temp_ch0);
   Serial.println();
 
   //Set CH1, has internal 150 ms delay
-  temp_probes.selectChannel(1);
+  MachineControl_TempProbes.selectChannel(1);
   //Take CH1 measurement
-  float temp_ch1 = temp_probes.tc.readTemperature();
+  float temp_ch1 = MachineControl_TempProbes.TC.readTemperature();
   Serial.print("Temperature CH1 [°C]: ");
   Serial.print(temp_ch1);
   Serial.println();
 
   //Set CH2, has internal 150 ms delay
-  temp_probes.selectChannel(2);
+  MachineControl_TempProbes.selectChannel(2);
   //Take CH2 measurement
-  float temp_ch2 = temp_probes.tc.readTemperature();
+  float temp_ch2 = MachineControl_TempProbes.TC.readTemperature();
   Serial.print("Temperature CH2 [°C]: ");
   Serial.print(temp_ch2);
   Serial.println();

src/TempProbesClass.cpp

@@ -1,3 +1,10 @@
+/**
+ * @file TempProbesClass.cpp
+ * @author Leonardo Cavagnis
+ * @brief Source file for the Temperature Probes connector of the Portenta Machine Control. 
+ */
+
+/* Includes -----------------------------------------------------------------*/
 #include "TempProbesClass.h"
 
 #if __has_include("portenta_info.h")
@@ -7,6 +14,45 @@ uint8_t* boardInfo();
 #define PMC_R2_SKU  (24 << 8 | 3)
 #endif
 
+/* Functions -----------------------------------------------------------------*/
+TempProbesClass::TempProbesClass(PinName ch_sel0_pin, 
+                                 PinName ch_sel1_pin,
+                                 PinName ch_sel2_pin,
+                                 PinName rtd_th_pin)
+: _ch_sel0{ch_sel0_pin}, _ch_sel1{ch_sel0_pin}, _ch_sel2{ch_sel2_pin}, _rtd_th{rtd_th_pin}                     
+{ }
+
+TempProbesClass::~TempProbesClass() 
+{ }
+
+bool TempProbesClass::begin(uint8_t tempprobe_type, uint8_t io_address) {
+    bool status = true; 
+
+    switch(tempprobe_type) {
+        case TEMPPROBE_RTD:
+            TempProbesClass::RTD.begin(io_address);
+            _enableRTD();
+            break;
+        case TEMPPROBE_TC:
+            TempProbesClass::TC.begin();
+            _enableTC();
+            break;
+        default:
+            status = false;
+            break;
+    }
+
+    pinMode(_ch_sel0, OUTPUT);
+    pinMode(_ch_sel1, OUTPUT);
+    pinMode(_ch_sel2, OUTPUT);
+    pinMode(_rtd_th, OUTPUT);
+
+    pinMode(PI_0, OUTPUT);
+    pinMode(PA_6, OUTPUT);
+
+    return status;
+}
+
 void TempProbesClass::selectChannel(int channel) {
 
 #ifdef TRY_REV2_RECOGNITION
@@ -27,28 +73,53 @@ void TempProbesClass::selectChannel(int channel) {
     }
 #endif
 #undef TRY_REV2_RECOGNITION
-
-    for (int i=0; i<3; i++) {
-        ch_sel[i] = (i == channel ? 1 : 0);
+    switch(channel) {
+        case 0:
+            digitalWrite(_ch_sel0, HIGH);
+            digitalWrite(_ch_sel1, LOW);
+            digitalWrite(_ch_sel2, LOW);
+            break;
+        case 1:
+            digitalWrite(_ch_sel0, LOW);
+            digitalWrite(_ch_sel1, HIGH);
+            digitalWrite(_ch_sel2, LOW);
+            break;
+        case 2:
+            digitalWrite(_ch_sel0, LOW);
+            digitalWrite(_ch_sel1, LOW);
+            digitalWrite(_ch_sel2, HIGH);
+            break;
+        default:
+            digitalWrite(_ch_sel0, LOW);
+            digitalWrite(_ch_sel1, LOW);
+            digitalWrite(_ch_sel2, LOW);
+            break;
     }
     delay(150);
 }
 
-void TempProbesClass::enableTC() {
-    rtd_th = 0;
+void TempProbesClass::end() {
+    _disableCS();
+}
+
+void TempProbesClass::_enableTC() {
+    digitalWrite(_rtd_th, LOW);
+
     digitalWrite(PI_0, LOW);
     digitalWrite(PA_6, HIGH);
 }
 
-void TempProbesClass::enableRTD() {
-    rtd_th = 1;
+void TempProbesClass::_enableRTD() {
+    digitalWrite(_rtd_th, HIGH);
+
     digitalWrite(PI_0, HIGH);
     digitalWrite(PA_6, LOW);
 }
 
-void TempProbesClass::disableCS() {
+void TempProbesClass::_disableCS() {
     digitalWrite(PI_0, HIGH);
     digitalWrite(PA_6, HIGH);
 }
 
-TempProbesClass temp_probes;
+TempProbesClass MachineControl_TempProbes;
+/**** END OF FILE ****/