fix: esp32 is now ok

Author: gbr1

src/Arduino_ScienceKitCarrier.cpp

@@ -19,6 +19,7 @@
 
 #include "Arduino_ScienceKitCarrier.h"
 
+
 #ifdef ARDUINO_NANO_RP2040_CONNECT
 short ScienceKitCarrier::sampleBuffer[MICROPHONE_BUFFER_SIZE];
 volatile int ScienceKitCarrier::samplesRead;
@@ -87,8 +88,6 @@ ScienceKitCarrier::ScienceKitCarrier(){
     microphone_rms=0;
     rms=0;
   #endif
-
-  round_robin_index=0;
 
   #ifdef ARDUINO_NANO_RP2040_CONNECT
     thread_activity_led = new rtos::Thread();
@@ -97,7 +96,7 @@ ScienceKitCarrier::ScienceKitCarrier(){
     thread_ultrasonic = new rtos::Thread();
   #endif
 
-  #ifdef ARDUINO_ESP32
+  #ifdef ESP32
     wire_semaphore = xSemaphoreCreateMutex();
   #endif
 
@@ -172,6 +171,7 @@ int ScienceKitCarrier::begin(const uint8_t auxiliary_threads){
 
   // let's start bme688, external ds18b20 probe and ultrasonic sensor
   startAuxiliaryThreads(auxiliary_threads);
+  return 1;
 }
 
 
@@ -940,7 +940,7 @@ void ScienceKitCarrier::startAuxiliaryThreads(const uint8_t auxiliary_threads){
         thread_ultrasonic->start(mbed::callback(this, &ScienceKitCarrier::threadUltrasonic));
       #endif
       #ifdef ESP32
-        xTaskCreatePinnedToCore(this->freeRTOSUltrasonic, "update_ultrasonic", 1024, this, 1, &thread_ultrasonic, ULTRASONIC_CORE);
+        xTaskCreatePinnedToCore(this->freeRTOSUltrasonic, "update_ultrasonic", 10000, this, 1, &thread_ultrasonic, ULTRASONIC_CORE);
       #endif
     }
     thread_ultrasonic_is_running = true;

src/Arduino_ScienceKitCarrier.h

@@ -60,10 +60,8 @@ static  Placeholder<OneWireNg_CurrentPlatform> ow;
 #endif
 
 #ifdef ESP32
-#define wire_lock while (!xSemaphoreTake(wire_semaphore, 5)){}
+#define wire_lock while(!xSemaphoreTake(wire_semaphore, 5)){}
 #define wire_unlock xSemaphoreGive(wire_semaphore)
-//#define wire_lock delay(1) 
-//#define wire_unlock delay(1)
 #endif
 
 

src/utils/Arduino_ScienceKitCarrier_definitions.h

@@ -68,6 +68,9 @@ const uint16_t MAXIMUM_AMPS{1};            // 1A
 #endif
 #define EXTERNAL_TEMPERATURE_DISABLED -273.15; // absolute zero xD
 
+// Ultrasonic sensor
+#define ULTRASONIC_ADDRESS 0x57
+
 // Microphone - PDM on Arduino Nano RP2040 Connect
 #ifdef ARDUINO_NANO_RP2040_CONNECT
 #define MICROPHONE_BUFFER_SIZE 512
@@ -111,7 +114,6 @@ const uint16_t MAXIMUM_AMPS{1};            // 1A
 #define ULTRASONIC_CORE 1
 #endif
 
-#define ULTRASONIC_ADDRESS 0x57
 
 
 // Servos