fix: resistance, function_generator API

Author: gbr1

library.properties

@@ -6,6 +6,6 @@ sentence=Library and firmware for Arduino Science Kit R3
 paragraph=This library can be used to flash the Arduino Science Kit R3 and hack it.
 category=Communication
 url=https://github.com/arduino-libraries/Arduino_ScienceKitCarrier
-architectures=mbed,mbed_nano
+architectures=mbed,mbed_nano,esp32
 includes=Arduino_ScienceKitCarrier.h
 depends=Arduino_APDS9960,ArduinoBLE,WiFiNINA,INA2xx,Arduino_BMI270_BMM150,BSEC Software Library,Arduino_GroveI2C_Ultrasonic,OneWireNg

src/Arduino_ScienceKitCarrier.cpp

@@ -111,11 +111,20 @@ ScienceKitCarrier::ScienceKitCarrier(){
 
 int ScienceKitCarrier::begin(const uint8_t auxiliary_threads){
   pinMode(LEDR,OUTPUT);
-  digitalWrite(LEDR,LOW);
   pinMode(LEDG,OUTPUT);
-  digitalWrite(LEDG,LOW);
   pinMode(LEDB,OUTPUT);
+
+  #ifdef ARDUINO_NANO_RP2040_CONNECT
+  digitalWrite(LEDR,LOW);
+  digitalWrite(LEDG,LOW);
   digitalWrite(LEDB,LOW);
+  #endif
+
+  #ifdef ESP32
+  digitalWrite(LEDR,HIGH);
+  digitalWrite(LEDG,HIGH);
+  digitalWrite(LEDB,HIGH);
+  #endif
 
 
   Wire.begin();
@@ -131,6 +140,7 @@ int ScienceKitCarrier::begin(const uint8_t auxiliary_threads){
   if (beginINA()!=0){
     return ERR_BEGIN_INA;
   }
+  
 
   // let's start resistance measurement
   if (beginResistance()!=0){
@@ -154,10 +164,12 @@ int ScienceKitCarrier::begin(const uint8_t auxiliary_threads){
   }
   #endif
 
-    // let's start ultrasonic and check if it is connected
+  // let's start ultrasonic and check if it is connected
+  /* WIP
   if (beginUltrasonic()!=0){
     return ERR_BEGIN_ULTRASONIC;
   }
+  */
 
   // let's start bme688 and external ds18b20 probe
   //WIP startAuxiliaryThreads(auxiliary_threads);
@@ -184,9 +196,10 @@ void ScienceKitCarrier::update(const bool roundrobin){
     updateFrequencyGeneratorData();
 
     // update external
-    updateUltrasonic();
+    //WIP updateUltrasonic();
   }
   else{
+    //WIP
     switch (round_robin_index){
       case 0: 
         if (thread_ext_temperature_is_running){
@@ -205,7 +218,7 @@ void ScienceKitCarrier::update(const bool roundrobin){
         break;
       case 3:
         updateResistance();                  // about 1ms
-        updateUltrasonic();                  // requires about 5ms when not connected
+        // WIP updateUltrasonic();                  // requires about 5ms when not connected
         break;
       case 4:
         updateIMU();                         // heavy task, 13ms
@@ -347,10 +360,10 @@ int ScienceKitCarrier::beginResistance(){
   pinMode(resistance_pin,INPUT);
   // search for minimum open circuit resistance
   for (int i=0; i<20; i++){
-    resistance=REF_VOLTAGE*analogRead(resistance_pin)/1024.0;
-    resistance=(RESISTOR_AUX*REF_VOLTAGE/resistance)-RESISTOR_AUX;
+    resistance = getResistanceMeasureVolts();
+    resistance = (RESISTOR_AUX*REF_VOLTAGE/resistance)-RESISTOR_AUX;
     if (opencircuit_resistance>resistance){
-      opencircuit_resistance=resistance;
+      opencircuit_resistance = resistance;
     }
     delay(5);
   }
@@ -360,23 +373,36 @@ int ScienceKitCarrier::beginResistance(){
 }
 
 void ScienceKitCarrier::updateResistance(){
-  resistance=REF_VOLTAGE*analogRead(resistance_pin)/1024.0;
-  if (resistance<=0){
-    resistance=-2.0;
+  resistance = getResistanceMeasureVolts();
+  if (resistance <= 0){
+    resistance = -2.0;
   }
   else{
-    resistance=(RESISTOR_AUX*REF_VOLTAGE/resistance)-RESISTOR_AUX;
-    if (resistance<=RESISTANCE_CALIBRATION_LOW){
-      resistance=0.0;
+    resistance = (RESISTOR_AUX*REF_VOLTAGE/resistance)-RESISTOR_AUX;
+    if (resistance <= RESISTANCE_CALIBRATION_LOW){
+      resistance = 0.0;
     }
     else{
       if (resistance>=opencircuit_resistance){
-        resistance=-1.0;
+        resistance = -1.0;
       }
     }
   }
 }
 
+float ScienceKitCarrier::getResistanceMeasureVolts(){
+  float value = 0.0;
+  #ifdef ARDUINO_NANO_RP2040_CONNECT
+    value = REF_VOLTAGE*analogRead(resistance_pin)/ADC_RESOLUTION;
+  #endif
+  #ifdef ESP32
+    value = analogReadMilliVolts(resistance_pin)/1000.0;
+  #endif
+  return value;
+}
+
+
+
 float ScienceKitCarrier::getResistance(){
   return resistance;
 }

src/Arduino_ScienceKitCarrier.h

@@ -161,6 +161,7 @@ class ScienceKitCarrier{
     int beginResistance();
     void updateResistance();
     float getResistance();        // Ohm
+    float getResistanceMeasureVolts();  // Volt
 
 
 

src/utils/Arduino_ScienceKitCarrier_definitions.h

@@ -38,9 +38,20 @@ const uint16_t MAXIMUM_AMPS{1};            // 1A
 // Resistance
 #define RESISTANCE_PIN A2
 #define RESISTOR_AUX  1000.0
+#ifdef ARDUINO_NANO_RP2040_CONNECT
 #define REF_VOLTAGE 3.3
+#endif 
+#ifdef ESP32
+#define REF_VOLTAGE 3.15
+#endif 
 #define RESISTANCE_CALIBRATION_HIGH 200000
 #define RESISTANCE_CALIBRATION_LOW 10
+#ifdef ARDUINO_NANO_RP2040_CONNECT
+#define ADC_RESOLUTION 1023.0
+#endif
+#ifdef ESP32
+#define ADC_RESOLUTION 4095.0
+#endif
 
 // Imu
 #define G_EARTH 9.807
@@ -53,10 +64,11 @@ const uint16_t MAXIMUM_AMPS{1};            // 1A
 #define EXTERNAL_TEMPERATURE_DISABLED -273.15; // absolute zero xD
 
 // Microphone - PDM on Arduino Nano RP2040 Connect
+#ifdef ARDUINO_NANO_RP2040_CONNECT
 #define MICROPHONE_BUFFER_SIZE 512
 #define MICROPHONE_CHANNELS 1
 #define MICROPHONE_FREQUENCY 16000
-
+#endif
 
 // Errors
 #define ERR_BEGIN_APDS -3
@@ -67,8 +79,9 @@ const uint16_t MAXIMUM_AMPS{1};            // 1A
 #define ERR_BEGIN_FUNCTION_GENERATOR_CONTROLLER -8
 #define ERR_BEGIN_ULTRASONIC -9
 #define ERR_BEGIN_EXTERNAL_TEMPERATURE -10
+#ifdef ARDUINO_NANO_RP2040_CONNECT
 #define ERR_BEGIN_MICROPHONE -11
-
+#endif
 
 
 

src/utils/function_generator_controller.h

@@ -49,7 +49,7 @@ class FunctionGeneratorController{
       wire.beginTransmission(address);
       wire.write(FG_VERSION);
       wire.endTransmission();
-      wire.requestFrom(address,2);
+      wire.requestFrom((uint8_t)address,(uint8_t)2);
       wire.readBytes(version,2);
       return String(version[0])+"."+String(version[1]);
     }
@@ -58,7 +58,7 @@ class FunctionGeneratorController{
       wire.beginTransmission(address);
       wire.write(FG_DATA);
       wire.endTransmission();
-      wire.requestFrom(address,6);
+      wire.requestFrom((uint8_t)address,(uint8_t)6);
       wire.readBytes(data,6);
     }