Skip to content

Commit 35c0dc1

Browse files
committed
add: calibration parameters to achieve APDS9999 compatibility
1 parent d48abd7 commit 35c0dc1

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

library.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ category=Communication
88
url=https://github.com/arduino-libraries/Arduino_ScienceKitCarrier
99
architectures=mbed,mbed_nano,esp32
1010
includes=Arduino_ScienceKitCarrier.h
11-
depends=Arduino_APDS9960,ArduinoBLE,WiFiNINA,INA2xx,Arduino_BMI270_BMM150,bsec2,OneWireNg
11+
depends=Arduino_APDS9960,ArduinoBLE,WiFiNINA,INA2xx,Arduino_BMI270_BMM150,bsec2,OneWireNg,Arduino_APDS9999

src/Arduino_ScienceKitCarrier.cpp

+7-4
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,9 @@ int ScienceKitCarrier::beginAPDS(){
291291
else{
292292
apds9999->enableColorSensor();
293293
apds9999->enableProximitySensor();
294+
apds9999->setGain(APDS9999_GAIN_1X);
295+
apds9999->setLSResolution(APDS9999_LS_RES_16B);
296+
apds9999->setLSRate(APDS9999_LS_RATE_25MS);
294297
color_sensor_used = APDS9999_VERSION;
295298
}
296299
#ifdef ESP32
@@ -316,10 +319,10 @@ void ScienceKitCarrier::updateAPDS(){
316319
}
317320
}
318321
if (color_sensor_used==APDS9999_VERSION){
319-
r = apds9999->getRed();
320-
g = apds9999->getGreen();
321-
b = apds9999->getBlue();
322-
c = apds9999->getIR();
322+
r = apds9999->getRed()*4097/65535.0;
323+
g = apds9999->getGreen()*4097/262144.0;
324+
b = apds9999->getBlue()*4097/131072.0;
325+
c = apds9999->getIR()*4097/4096.0;
323326
proximity = 255 - apds9999->getProximity();
324327
if (proximity>255){
325328
proximity = 0;

src/Arduino_ScienceKitCarrier.h

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222

2323
#include <Arduino.h>
2424

25+
#if !defined(ARDUINO_NANO_RP2040_CONNECT) && !defined(ESP32)
26+
#error "This product is compatible only with Arduino® Nano RP2040 Connect and Arduino® Nano ESP32
27+
#endif
28+
2529
#ifdef ARDUINO_NANO_RP2040_CONNECT
2630
#include "WiFiNINA.h"
2731
#include "mbed.h"

0 commit comments

Comments
 (0)