fix: improvements after content testing (calibration, uuid, minor)

Author: gbr1

examples/ScienceJournal/ScienceJournal.ino

@@ -30,6 +30,7 @@ rtos::Thread thread_update_sensors;
 
 #ifdef ESP32
 TaskHandle_t update_base;
+TaskHandle_t update_ble;
 #endif
 
 bool ble_is_connected = false;
@@ -43,11 +44,17 @@ void setup(){
     while(1);
   }
 
+  //BLE.setConnectionInterval(6, 12);
+
   String address = BLE.address();
 
   address.toUpperCase();
-
-  name = "ScienceKit R3 - ";
+  #ifdef ARDUINO_NANO_RP2040_CONNECT
+    name = "ScienceKit R3 - ";
+  #endif
+  #ifdef ESP32
+    name = "ScienceKit - ";
+  #endif
   name += address[address.length() - 5];
   name += address[address.length() - 4];
   name += address[address.length() - 2];
@@ -121,6 +128,7 @@ void setup(){
   #endif
   #ifdef ESP32
     xTaskCreatePinnedToCore(&freeRTOSUpdate, "update_base", 10000, NULL, 1, &update_base, 1); // starts the update sensors thread on core 1 (user)
+    xTaskCreatePinnedToCore(&freeRTOSble, "update_ble", 10000, NULL, 1, &update_ble, 0); // starts the ble thread on core 0 (internal)
   #endif
 }
 
@@ -136,10 +144,16 @@ void update(void){
 static void freeRTOSUpdate(void * pvParameters){
   update();
 }
-#endif
 
+static void freeRTOSble(void * pvParameters){
+  while(1){
+    updateBle();
+    delay(1);
+  }
+}
+#endif
 
-void loop(){
+void updateBle(){
   BLEDevice central = BLE.central();
   if (central) {
     ble_is_connected = true;
@@ -151,6 +165,9 @@ void loop(){
       if (millis()-lastNotify>10){
         updateSubscribedCharacteristics();
         lastNotify=millis();
+        #ifdef ESP32
+          delay(1);
+        #endif
       }
     }
   }
@@ -163,6 +180,13 @@ void loop(){
   }
 }
 
+
+void loop(){
+  #ifdef ARDUINO_NANO_RP2040_CONNECT
+    updateBle();
+  #endif
+}
+
 void updateSubscribedCharacteristics(){
   /* ________________________________________________________________CURRENT  */
   if(currentCharacteristic.subscribed()){

examples/ScienceJournal/ble_config.h

@@ -53,8 +53,13 @@ const int VERSION = 0x00000002;
 #define BLE_CH____PING               "1020"
 #define BLE_CH_FUNGEN2               "1021"
 
-
+#ifdef ARDUINO_NANO_RP2040_CONNECT
 #define SCIENCE_KIT_UUID(val) ("555a0003-" val "-467a-9538-01f0652c74e8")
+#endif
+#ifdef ESP32
+#define SCIENCE_KIT_UUID(val) ("555a0004-" val "-467a-9538-01f0652c74e8")
+#endif
+
 
 /* 
  * SERVICE, VERSION 

src/Arduino_ScienceKitCarrier.cpp

@@ -276,7 +276,7 @@ int ScienceKitCarrier::getInputB(){
 
 
 /********************************************************************/
-/*                             APDS9960                             */
+/*                            APDS99xx                              */
 /********************************************************************/
 
 int ScienceKitCarrier::beginAPDS(){
@@ -291,7 +291,7 @@ int ScienceKitCarrier::beginAPDS(){
   else{
     apds9999->enableColorSensor();
     apds9999->enableProximitySensor();
-    apds9999->setGain(APDS9999_GAIN_1X);
+    apds9999->setGain(APDS9999_GAIN_3X);
     apds9999->setLSResolution(APDS9999_LS_RES_16B);
     apds9999->setLSRate(APDS9999_LS_RATE_25MS);
     color_sensor_used = APDS9999_VERSION;
@@ -813,7 +813,7 @@ void ScienceKitCarrier::retriveUltrasonicUpdate(){
 }
 
 float ScienceKitCarrier::getDistance(){
-  return distance;
+  return distance/1000.0;
 }
 
 float ScienceKitCarrier::getTravelTime(){