mod: external temperature sensor and threads on ESP32

Author: gbr1

src/Arduino_ScienceKitCarrier.cpp

@@ -172,7 +172,7 @@ int ScienceKitCarrier::begin(const uint8_t auxiliary_threads){
   */
 
   // let's start bme688 and external ds18b20 probe
-  //WIP startAuxiliaryThreads(auxiliary_threads);
+  startAuxiliaryThreads(auxiliary_threads);
 }
 
 
@@ -248,14 +248,17 @@ int ScienceKitCarrier::beginAnalogInput(){
 
 void ScienceKitCarrier::updateAnalogInput(const uint8_t input_to_update){
   if ((input_to_update==UPDATE_INPUT_A)||(input_to_update==UPDATE_ALL)){
-    /*   WIP
+    
     if (!getExternalTemperatureIsConnected()){
       inputA=analogRead(inputA_pin);
+      #ifdef ESP32
+        beginExternalTemperature();
+      #endif
     }
     else{
       inputA=ANALOGIN_DISABLED;
     } 
-    */
+    
   }
   if ((input_to_update==UPDATE_INPUT_B)||(input_to_update==UPDATE_ALL)){
     inputB=analogRead(inputB_pin);
@@ -472,14 +475,23 @@ float ScienceKitCarrier::getAirQuality(){
   return airquality;
 }
 
-#ifdef ARDUINO_NANO_RP2040_CONNECT
 void ScienceKitCarrier::threadBME688(){
   beginBME688();
   while(1){
     updateBME688();
+    #ifdef ARDUINO_NANO_RP2040_CONNECT
     rtos::ThisThread::sleep_for(1000);
+    #endif
+    #ifdef ESP32
+    delay(1000);
+    #endif
   }
 }
+
+#ifdef ESP32
+void ScienceKitCarrier::freeRTOSInternalTemperature(void * pvParameters){
+  ((ScienceKitCarrier*) pvParameters)->threadBME688();
+}
 #endif
 
 
@@ -580,12 +592,11 @@ float ScienceKitCarrier::getMagneticFieldZ(){
 
 #ifdef ARDUINO_NANO_RP2040_CONNECT
 void ScienceKitCarrier::delay(unsigned long t){
-  rtos::ThisThread::sleep_for(t);
+    rtos::ThisThread::sleep_for(t);
 }
 #endif
 
 
-
 /********************************************************************/
 /*                   LEDs: errors and activity                      */
 /********************************************************************/
@@ -745,7 +756,6 @@ bool ScienceKitCarrier::getUltrasonicIsConnected(){
 /********************************************************************/
 //WIP
 
-#ifdef ARDUINO_NANO_RP2040_CONNECT
 int ScienceKitCarrier::beginExternalTemperature(){
   new (&ow) OneWireNg_CurrentPlatform(OW_PIN, false);
   DSTherm drv(ow);
@@ -754,8 +764,14 @@ int ScienceKitCarrier::beginExternalTemperature(){
 
 void ScienceKitCarrier::updateExternalTemperature(){
   float temperature;
-  pinMode(OW_PIN,INPUT);
 
+  #ifdef ARDUINO_NANO_RP2040_CONNECT
+    pinMode(OW_PIN,INPUT);
+  #endif
+  #ifdef ESP32
+    pinMode(INPUTA_PIN,INPUT);
+  #endif
+
   DSTherm drv(ow);
   drv.convertTempAll(DSTherm::MAX_CONV_TIME, false);  
 
@@ -795,11 +811,19 @@ void ScienceKitCarrier::threadExternalTemperature(){
   while(1){
     updateExternalTemperature();
     updateAnalogInput(UPDATE_INPUT_A);
-    rtos::ThisThread::sleep_for(1000);
+
+    #ifdef ARDUINO_NANO_RP2040_CONNECT
+      rtos::ThisThread::sleep_for(1000);
+    #endif
+    #ifdef ESP32
+      delay(1000);
+    #endif
   }
 }
-#endif
 
+void ScienceKitCarrier::freeRTOSExternalTemperature(void * pvParameters){
+  ((ScienceKitCarrier*) pvParameters)->threadExternalTemperature();
+}
 
 
 /********************************************************************/
@@ -845,30 +869,35 @@ uint ScienceKitCarrier::getMicrophoneRMS(){
 /********************************************************************/
 /*                              Threads                             */
 /********************************************************************/
-#ifdef ARDUINO_NANO_RP2040_CONNECT
 
 void ScienceKitCarrier::startAuxiliaryThreads(const uint8_t auxiliary_threads){
   //thread_activity_led->start(mbed::callback(this, &ScienceKitCarrier::threadActivityLed));    //left for legacy on prototypes and maybe future implementations
-
   // start bme688 thread
   if ((auxiliary_threads==START_AUXILIARY_THREADS)||(auxiliary_threads==START_INTERNAL_AMBIENT_SENSOR)){
     if (!thread_bme_is_running){
-      thread_update_bme->start(mbed::callback(this, &ScienceKitCarrier::threadBME688)); 
+      #ifdef ARDUINO_NANO_RP2040_CONNECT
+        thread_update_bme->start(mbed::callback(this, &ScienceKitCarrier::threadBME688)); 
+      #endif
+      #ifdef ESP32
+        xTaskCreatePinnedToCore(this->freeRTOSInternalTemperature, "update_internal_temperature", 10000, this, 1, &thread_internal_temperature, INTERNAL_TEMPERATURE_CORE);
+      #endif
     }
     thread_bme_is_running=true;
   }
-
   // start ds18b20 thread
   if ((auxiliary_threads==START_AUXILIARY_THREADS)||(auxiliary_threads==START_EXTERNAL_AMBIENT_SENSOR)){
     if (!thread_ext_temperature_is_running){
-      thread_external_temperature->start(mbed::callback(this, &ScienceKitCarrier::threadExternalTemperature));
+      #ifdef ARDUINO_NANO_RP2040_CONNECT
+        thread_external_temperature->start(mbed::callback(this, &ScienceKitCarrier::threadExternalTemperature));
+      #endif
+      #ifdef ESP32
+        xTaskCreatePinnedToCore(this->freeRTOSExternalTemperature, "update_external_temperature", 10000, this, 1, &thread_external_temperature, EXTERNAL_TEMPERATURE_CORE);
+      #endif
     }
     thread_ext_temperature_is_running=true;
   }
 }
 
-#endif
-
 
 /***
  *                       _       _                                    

src/Arduino_ScienceKitCarrier.h

@@ -41,17 +41,18 @@
 #ifdef ARDUINO_NANO_RP2040_CONNECT
 #include "../../OneWireNg/src/platform/OneWireNg_PicoRP2040.h"  // forces to use gpio instead PIO hw
 #define OneWireNg_CurrentPlatform OneWireNg_PicoRP2040
+#endif
+#ifdef ESP32
+#include "OneWireNg_CurrentPlatform.h"
+#endif
 #include "drivers/DSTherm.h"
 #include "utils/Placeholder.h"
-#endif
 
 
 #include "./utils/function_generator_controller.h"
 #include "./utils/Arduino_ScienceKitCarrier_definitions.h"
 
-#ifdef ARDUINO_NANO_RP2040_CONNECT
 static  Placeholder<OneWireNg_CurrentPlatform> ow;
-#endif
 
 
 class ScienceKitCarrier{
@@ -101,6 +102,11 @@ class ScienceKitCarrier{
     rtos::Thread * thread_external_temperature;
     #endif
 
+    #ifdef ESP32
+    TaskHandle_t thread_internal_temperature;
+    TaskHandle_t thread_external_temperature;
+    #endif
+
     bool thread_bme_is_running;
     bool thread_ext_temperature_is_running;
 
@@ -111,16 +117,13 @@ class ScienceKitCarrier{
 
     int begin(const uint8_t auxiliary_threads=START_AUXILIARY_THREADS);
     void update(const bool roundrobin=false);  // this makes update on: analog in, imu, apds, ina, resistance, round robin enables one sensor update
-    #ifdef ARDUINO_NANO_RP2040_CONNECT
+    
     void startAuxiliaryThreads(const uint8_t auxiliary_threads=START_AUXILIARY_THREADS);
-    #endif
-
 
     #ifdef ARDUINO_NANO_RP2040_CONNECT
     void delay(unsigned long t); // you must use this instead delay, due threads usage
     #endif
 
-
     /* Blink red alert */
     void errorTrap(const int error_code=0);
 
@@ -174,8 +177,9 @@ class ScienceKitCarrier{
     float getPressure();          // hPascal
     float getHumidity();          // Percentage
     float getAirQuality();        // index, if good it is 25.0
-    #ifdef ARDUINO_NANO_RP2040_CONNECT
     void threadBME688();          // thread used to update BME688 automatically in multithread mode
+    #ifdef ESP32
+    static void freeRTOSInternalTemperature(void * pvParameters);
     #endif
 
 
@@ -222,12 +226,13 @@ class ScienceKitCarrier{
 
 
     /* External temperature probe - Dallas DS18B20 */
-    #ifdef ARDUINO_NANO_RP2040_CONNECT
     int beginExternalTemperature();
     void updateExternalTemperature();
     float getExternalTemperature();     // celsius
     bool getExternalTemperatureIsConnected();
     void threadExternalTemperature();
+    #ifdef ESP32
+    static void freeRTOSExternalTemperature(void * pvParameters);
     #endif
 
     #ifdef ARDUINO_NANO_RP2040_CONNECT

src/utils/Arduino_ScienceKitCarrier_definitions.h

@@ -60,7 +60,12 @@ const uint16_t MAXIMUM_AMPS{1};            // 1A
 #define BME688_CS 10
 
 // External temperature connected on input A
+#ifdef ARDUINO_NANO_RP2040_CONNECT
 #define OW_PIN digitalPinToPinName(INPUTA_PIN)
+#endif
+#ifdef ESP32
+#define OW_PIN digitalPinToGPIONumber(INPUTA_PIN)
+#endif
 #define EXTERNAL_TEMPERATURE_DISABLED -273.15; // absolute zero xD
 
 // Microphone - PDM on Arduino Nano RP2040 Connect
@@ -100,6 +105,9 @@ const uint16_t MAXIMUM_AMPS{1};            // 1A
 #define START_EXTERNAL_AMBIENT_SENSOR 3     // ds18b20
 
 
+#define EXTERNAL_TEMPERATURE_CORE 1 // user
+#define INTERNAL_TEMPERATURE_CORE 0 // other
+