add: apds9999 support for new carrier revisions

Author: gbr1

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;
@@ -279,19 +280,53 @@ int ScienceKitCarrier::getInputB(){
 /********************************************************************/
 
 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_1X);
+    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;
 }

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