mod: unique sketch for SJ app

Author: gbr1

examples/ScienceJournal/ScienceJournal.ino

@@ -23,11 +23,19 @@
 String name;
 unsigned long lastNotify = 0;
 ScienceKitCarrier science_kit;
+
+#ifdef ARDUINO_NANO_RP2040_CONNECT
 rtos::Thread thread_update_sensors;
+#endif
+
+#ifdef ESP32
+TaskHandle_t update_base;
+#endif
 
 bool ble_is_connected = false;
 
 
+
 void setup(){
   science_kit.begin(NO_AUXILIARY_THREADS); // Doesn't start the BME688 and external temperature threads for the moment
 
@@ -76,10 +84,14 @@ void setup(){
   service.addCharacteristic(humidityCharacteristic);
   /* _____________________________________________________________AIR_QUALITY */
   service.addCharacteristic(airQualityCharacteristic);
+
+  #ifdef ARDUINO_NANO_RP2040_CONNECT
   /* _________________________________________________________SOUND_INTENSITY */
   service.addCharacteristic(sndIntensityCharacteristic);
   /* _____________________________________________________________SOUND_PITCH */
   service.addCharacteristic(sndPitchCharacteristic);
+  #endif
+
   /* _________________________________________________________________INPUT_A */
   service.addCharacteristic(inputACharacteristic);
   /* _________________________________________________________________INPUT_B */
@@ -101,24 +113,39 @@ void setup(){
 
   BLE.addService(service);
   BLE.advertise();
-
+  
   science_kit.startAuxiliaryThreads(); // start the BME688 and External Temperature Probe threads
 
-  thread_update_sensors.start(update); // this thread updates sensors
+  #ifdef ARDUINO_NANO_RP2040_CONNECT
+    thread_update_sensors.start(update); // this thread updates sensors
+  #endif
+  #ifdef ESP32
+    xTaskCreatePinnedToCore(&freeRTOSUpdate, "update_base", 10000, NULL, 1, &update_base, 1); // starts the update sensors thread on core 1 (user)
+  #endif
 }
 
 
 void update(void){
   while(1){
     science_kit.update(ROUND_ROBIN_ENABLED);
-    rtos::ThisThread::sleep_for(25);
+    delay(25);
   }
 }
 
+#ifdef ESP32
+static void freeRTOSUpdate(void * pvParameters){
+  update();
+}
+#endif
+
+
 void loop(){
   BLEDevice central = BLE.central();
   if (central) {
     ble_is_connected = true;
+    #ifdef ESP32
+      science_kit.setStatusLed(STATUS_LED_BLE);
+    #endif  
     lastNotify=millis();
     while (central.connected()) {
       if (millis()-lastNotify>10){
@@ -130,6 +157,9 @@ void loop(){
   else {
     delay(100);
     ble_is_connected = false;
+    #ifdef ESP32
+      science_kit.setStatusLed(STATUS_LED_PAIRING);
+    #endif  
   }
 }
 
@@ -199,7 +229,6 @@ void updateSubscribedCharacteristics(){
   /* 
    * BME688 
    */
-
   /* _____________________________________________________________TEMPERATURE */
   if(temperatureCharacteristic.subscribed()){
     temperatureCharacteristic.writeValue(science_kit.getTemperature());
@@ -219,10 +248,11 @@ void updateSubscribedCharacteristics(){
   if(airQualityCharacteristic.subscribed()){
     airQualityCharacteristic.writeValue(science_kit.getAirQuality());
   }
-  
+
   /*
    * MICROPHONE
    */
+  #ifdef ARDUINO_NANO_RP2040_CONNECT
 
   /* _________________________________________________________SOUND_INTENSITY */
   /* NOTE: raw value - value not in Db */ 
@@ -232,8 +262,9 @@ void updateSubscribedCharacteristics(){
 
   /* _____________________________________________________________SOUND_PITCH */
   if(sndPitchCharacteristic.subscribed()){
-    sndPitchCharacteristic.writeValue(science_kit.getExternalTemperature());
+    sndPitchCharacteristic.writeValue(0.0);
   }
+  #endif
 
   /* _________________________________________________________________INPUT_A */
   if (inputACharacteristic.subscribed()){
@@ -269,26 +300,16 @@ void updateSubscribedCharacteristics(){
 
   /* ________________________________________________________________DISTANCE */
   if (distanceCharacteristic.subscribed()){
-    if (science_kit.getUltrasonicIsConnected()){
-      /* NOTE: getDistance() calls getMeters() 
-         Requested value is in meters */
-      distanceCharacteristic.writeValue(science_kit.getDistance());
-    }
-    else{
-      distanceCharacteristic.writeValue(-1.0);
-    }
+    /* NOTE: getDistance() calls getMeters() */
+    /*       Requested value is in meters    */
+    distanceCharacteristic.writeValue(science_kit.getDistance());
   }
 
   /* ____________________________________________________________________PING */
   if (pingCharacteristic.subscribed()){
-     if (science_kit.getUltrasonicIsConnected()){
-      /* NOTE: getTravelTime() returns micro seconds  */
-      /* Converted to milliseconds (agreed with RF 20230719) */
-      pingCharacteristic.writeValue(science_kit.getTravelTime() * 1000.0 );
-    }
-    else{
-      pingCharacteristic.writeValue(-1.0);
-    } 
+    /* NOTE: getTravelTime() returns micro seconds               */
+    /*       Converted to milliseconds (agreed with RF 20230719) */
+    pingCharacteristic.writeValue(science_kit.getTravelTime() * 1000.0 );
   }  
 }
 

examples/ScienceJournal/ble_config.h

@@ -38,8 +38,12 @@ const int VERSION = 0x00000002;
 #define BLE_CH_TEMPERA               "1009"
 #define BLE_CH_PRESSUR               "1010"
 #define BLE_CH_HUMIDIT               "1011"
+
+#ifdef ARDUINO_NANO_RP2040_CONNECT
 #define BLE_CH_SOUNDIN               "1012"
 #define BLE_CH_SOUNDPI               "1013"
+#endif
+
 #define BLE_CH_FUNGEN1               "1014"
 #define BLE_CH_DISTANC               "1015"
 #define BLE_CH_INPUT_A               "1016"
@@ -103,11 +107,12 @@ BLEFloatCharacteristic         airQualityCharacteristic   (SCIENCE_KIT_UUID(BLE_
 /*
  * MICROPHONE
  */
-
+#ifdef ARDUINO_NANO_RP2040_CONNECT
 /* ___________________________________________________________SOUND_INTENSITY */
 BLEUnsignedIntCharacteristic   sndIntensityCharacteristic (SCIENCE_KIT_UUID(BLE_CH_SOUNDIN), BLENotify); // *** !
 /* ______!!! NOT AVAILABLE (should be delete?) !!!________________SOUND_PITCH */
 BLEUnsignedIntCharacteristic   sndPitchCharacteristic     (SCIENCE_KIT_UUID(BLE_CH_SOUNDPI), BLENotify);
+#endif
 
 /*
  * INPUT A,B