add: apds9999 support for new carrier revisions

add: new uuid for esp32

mod: sciencekit r3 to sciencekit

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 

library.properties

@@ -8,4 +8,4 @@ category=Communication
 url=https://github.com/arduino-libraries/Arduino_ScienceKitCarrier
 architectures=mbed,mbed_nano,esp32
 includes=Arduino_ScienceKitCarrier.h
-depends=Arduino_APDS9960,ArduinoBLE,WiFiNINA,INA2xx,Arduino_BMI270_BMM150,bsec2,OneWireNg
+depends=Arduino_APDS9960,ArduinoBLE,WiFiNINA,INA2xx,Arduino_BMI270_BMM150,bsec2,OneWireNg,Arduino_APDS9999

src/Arduino_ScienceKitCarrier.cpp

@@ -37,6 +37,7 @@ ScienceKitCarrier::ScienceKitCarrier(){
   board_resolution = BOARD_RESOLUTION;
 
   apds9960 = new APDS9960(Wire,INT_APDS9960);
+  apds9999 = new Arduino_APDS9999(Wire);
   proximity=0;
   r=0;
   g=0;
@@ -275,23 +276,57 @@ int ScienceKitCarrier::getInputB(){
 
 
 /********************************************************************/
-/*                             APDS9960                             */
+/*                            APDS99xx                              */
 /********************************************************************/
 
 int ScienceKitCarrier::beginAPDS(){
-  if (!apds9960->begin()) {
-    return ERR_BEGIN_APDS;
+  if (!apds9999->begin()){
+    if (!apds9960->begin()) {
+      return ERR_BEGIN_APDS;
+    }
+    else{
+      color_sensor_used = APDS9960_VERSION;
+    }
   }
+  else{
+    apds9999->enableColorSensor();
+    apds9999->enableProximitySensor();
+    apds9999->setGain(APDS9999_GAIN_3X);
+    apds9999->setLSResolution(APDS9999_LS_RES_16B);
+    apds9999->setLSRate(APDS9999_LS_RATE_25MS);
+    color_sensor_used = APDS9999_VERSION;
+  }
+  #ifdef ESP32
+    for(int i=0; i<=color_sensor_used; i++){
+      digitalWrite(LED_GREEN, LOW);
+      delay(100);
+      digitalWrite(LED_GREEN, HIGH);
+      delay(100);
+    }
+    digitalWrite(LED_GREEN, HIGH);
+  #endif
   return 0;
 }
 
 void ScienceKitCarrier::updateAPDS(){
   wire_lock;
-  if (apds9960->proximityAvailable()){
-    proximity=apds9960->readProximity();
+  if (color_sensor_used==APDS9960_VERSION){
+    if (apds9960->proximityAvailable()){
+      proximity=apds9960->readProximity();
+    }
+    if (apds9960->colorAvailable()){
+      apds9960->readColor(r,g,b,c);
+    }
   }
-  if (apds9960->colorAvailable()){
-    apds9960->readColor(r,g,b,c);
+  if (color_sensor_used==APDS9999_VERSION){
+    r = apds9999->getRed()*4097/65535.0;
+    g = apds9999->getGreen()*4097/262144.0;
+    b = apds9999->getBlue()*4097/131072.0;
+    c = apds9999->getIR()*4097/4096.0;
+    proximity = 255 - apds9999->getProximity();
+    if (proximity>255){
+      proximity = 0;
+    }
   }
   wire_unlock;
 }
@@ -778,7 +813,7 @@ void ScienceKitCarrier::retriveUltrasonicUpdate(){
 }
 
 float ScienceKitCarrier::getDistance(){
-  return distance;
+  return distance/1000.0;
 }
 
 float ScienceKitCarrier::getTravelTime(){

src/Arduino_ScienceKitCarrier.h

@@ -22,6 +22,10 @@
 
 #include <Arduino.h>
 
+#if !defined(ARDUINO_NANO_RP2040_CONNECT) && !defined(ESP32)
+#error "This product is compatible only with Arduino® Nano RP2040 Connect and Arduino® Nano ESP32
+#endif
+
 #ifdef ARDUINO_NANO_RP2040_CONNECT
 #include "WiFiNINA.h"
 #include "mbed.h"
@@ -31,6 +35,7 @@
 
 #include <Wire.h>
 #include "Arduino_APDS9960.h"
+#include "Arduino_APDS9999.h"
 #include "INA.h"
 
 #include "bsec2.h"
@@ -75,7 +80,9 @@ class ScienceKitCarrier{
     uint8_t timer_inputA;
 
     APDS9960 * apds9960;
+    Arduino_APDS9999 * apds9999;
     int r,g,b,c, proximity;
+    int color_sensor_used;
 
     INA_Class * ina;
     float voltage, current;

src/utils/Arduino_ScienceKitCarrier_definitions.h

@@ -37,6 +37,8 @@
 
 // APDS9960
 #define INT_APDS9960 9
+#define APDS9960_VERSION 0
+#define APDS9999_VERSION 1
 
 // INA
 const uint32_t SHUNT_MICRO_OHM{100000};    // check schematic R20