added probe, optimization on analogin is required

Author: gbr1

examples/ScienceJournal/ScienceJournal.ino

@@ -1,5 +1,5 @@
 /*
-  This file is part of the Arduino_GroveI2C_Ultrasonic library.
+  This file is part of the Arduino_ScienceKitCarrier library.
   Copyright (c) 2023 Arduino SA. All rights reserved.
 
   This library is free software; you can redistribute it and/or
@@ -76,7 +76,7 @@ void setup() {
   BLE.addService(service);
   BLE.advertise();
   science_kit.startAuxiliaryThreads(); // start the BME688 thread
-  _t.start(loop_data);
+  //_t.start(loop_data);
   _tu.start(update);
 }
 
@@ -112,7 +112,6 @@ void loop() {
         updateSubscribedCharacteristics();
         lastNotify=millis();
       }
-
     }
   } else {
     delay(100);
@@ -195,6 +194,6 @@ void updateSubscribedCharacteristics() {
   }
 
   if (inputBCharacteristic.subscribed()){
-    inputBCharacteristic.writeValue(science_kit.getInputB());
+    inputBCharacteristic.writeValue(science_kit.getExternalTemperature());
   }
 }

examples/ScienceJournal/ble_config.h

@@ -1,3 +1,22 @@
+/*
+  This file is part of the Arduino_ScienceKitCarrier library.
+  Copyright (c) 2023 Arduino SA. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
 #ifndef __BLE_CONFIG_H__
 #define __BLE_CONFIG_H__
 

src/Arduino_ScienceKitCarrier.cpp

@@ -27,6 +27,7 @@ ScienceKitCarrier::ScienceKitCarrier(){
   inputB_pin = INPUTB_PIN;
   inputA=0;
   inputB=0;
+  timer_inputA = 0;
 
   apds9960 = new APDS9960(Wire,INT_APDS9960);
   proximity=0;
@@ -73,9 +74,14 @@ ScienceKitCarrier::ScienceKitCarrier(){
   travel_time=0.0;
   ultrasonic_is_connected=false;
 
+  external_temperature=EXTERNAL_TEMPERATURE_DISABLED;
+  external_temperature_is_connected=false;
+
+  round_robin_index = 0;
 
   thread_activity_led = new rtos::Thread();
   thread_update_bme = new rtos::Thread();
+  thread_external_temperature = new rtos::Thread();
 
   activity_led_state = ACTIVITY_LED_OFF;
 }
@@ -84,6 +90,10 @@ ScienceKitCarrier::ScienceKitCarrier(){
 
 
 
+/********************************************************************/
+/*                              Begin                               */
+/********************************************************************/
+
 int ScienceKitCarrier::begin(const bool auxiliary_threads){
   pinMode(LEDR,OUTPUT);
   digitalWrite(LEDR,LOW);
@@ -97,7 +107,7 @@ int ScienceKitCarrier::begin(const bool auxiliary_threads){
 
   // most of begin functions return always 0, it is a code-style or future implementation
 
-  // let's start apds89960
+  // let's start apds9960
   if (beginAPDS()!=0){
     return ERR_BEGIN_APDS;
   }
@@ -128,7 +138,7 @@ int ScienceKitCarrier::begin(const bool auxiliary_threads){
   }
 
 
-  // let's start activity led and bme688
+  // let's start bme688 and external ds18b20 probe
   if (auxiliary_threads){
     startAuxiliaryThreads();
   }
@@ -149,27 +159,29 @@ void ScienceKitCarrier::update(const bool roundrobin){
     updateINA();
     updateResistance();
     updateIMU();
+    updateFrequencyGeneratorData();
 
     // update external
     updateUltrasonic();
   }
   else{
     switch (round_robin_index){
       case 0: 
-        updateAnalogInput();    // it is very fast (about 2ms)
-        updateUltrasonic();     // requires about 5ms when not connected
+        //updateAnalogInput();               // it is very fast (about 1ms)
+        updateFrequencyGeneratorData();    // less than 1ms
         break;
       case 1:
-        updateAPDS();
+        updateAPDS();                      // about 5ms
         break;
       case 2:
-        updateINA();
+        updateINA();                       // about 3ms
         break;
       case 3:
-        updateResistance();
+        updateResistance();                // about 1ms
+        updateUltrasonic();                // requires about 5ms when not connected
         break;
       case 4:
-        updateIMU();
+        updateIMU();                       // heavy task, 13ms
         break;
       default:
         break;
@@ -189,13 +201,20 @@ void ScienceKitCarrier::update(const bool roundrobin){
 /********************************************************************/
 
 int ScienceKitCarrier::beginAnalogInput(){
+  /*
   pinMode(inputA_pin, INPUT);
   pinMode(inputB_pin, INPUT);
+  */
   return 0;
 }
 
 void ScienceKitCarrier::updateAnalogInput(){
-  inputA=analogRead(inputA_pin);
+  if (!getExternalTemperatureIsConnected()){
+    inputA=analogRead(inputA_pin);
+  }
+  else{
+    inputA=ANALOGIN_DISABLED;
+  }
   inputB=analogRead(inputB_pin);
 }
 
@@ -397,7 +416,7 @@ float ScienceKitCarrier::getAirQuality(){
 
 void ScienceKitCarrier::threadBME688(){
   beginBME688();
-  while(true){
+  while(1){
     updateBME688();
     rtos::ThisThread::sleep_for(1000);
   }
@@ -656,7 +675,9 @@ bool ScienceKitCarrier::getUltrasonicIsConnected(){
 /********************************************************************/
 
 int ScienceKitCarrier::beginExternalTemperature(){
-
+  new (&ow) OneWireNg_CurrentPlatform(OW_PIN, false);
+  DSTherm drv(ow);
+  return 0;
 }
 
 void ScienceKitCarrier::updateExternalTemperature(){
@@ -670,8 +691,10 @@ void ScienceKitCarrier::updateExternalTemperature(){
   if (ec == OneWireNg::EC_SUCCESS) {
     if (scrpd->getAddr()!=15){
       external_temperature_is_connected=false;
+      external_temperature = EXTERNAL_TEMPERATURE_DISABLED;
     }
     else{
+      external_temperature_is_connected=true;
       long temp = scrpd->getTemp();
       int sign=1;
       if (temp < 0) {
@@ -680,21 +703,27 @@ void ScienceKitCarrier::updateExternalTemperature(){
       }
       temperature = (temp/1000)+(temp%1000)*0.001;
       external_temperature = sign*temperature;
-      external_temperature_is_connected=true;
     }   
   }
 }
 
 float ScienceKitCarrier::getExternalTemperature(){
-
+  return external_temperature;
 }
 
 bool ScienceKitCarrier::getExternalTemperatureIsConnected(){
-
+  return external_temperature_is_connected;
 }
 
 void ScienceKitCarrier::threadExternalTemperature(){
-
+  beginExternalTemperature();
+  while(1){
+    updateAnalogInput();
+    digitalWrite(2,HIGH);
+    updateExternalTemperature();
+    digitalWrite(2,LOW);
+    rtos::ThisThread::sleep_for(1000);
+  }
 }
 
 
@@ -708,4 +737,5 @@ void ScienceKitCarrier::threadExternalTemperature(){
 void ScienceKitCarrier::startAuxiliaryThreads(){
   //thread_activity_led->start(mbed::callback(this, &ScienceKitCarrier::threadActivityLed));
   thread_update_bme->start(mbed::callback(this, &ScienceKitCarrier::threadBME688)); 
+  thread_external_temperature->start(mbed::callback(this, &ScienceKitCarrier::threadExternalTemperature));
 }

src/Arduino_ScienceKitCarrier.h

@@ -39,14 +39,17 @@
 #include "./utils/function_generator_controller.h"
 #include "./utils/Arduino_ScienceKitCarrier_definitions.h"
 
+static  Placeholder<OneWireNg_CurrentPlatform> ow;
+
 
 
 class ScienceKitCarrier{
   private:
-    uint8_t round_robin_index = 0;
+    uint8_t round_robin_index;
 
     uint8_t inputA_pin, inputB_pin;
     int inputA, inputB;
+    uint8_t timer_inputA;
 
     APDS9960 * apds9960;
     int r,g,b,c, proximity;
@@ -77,6 +80,8 @@ class ScienceKitCarrier{
     bool external_temperature_is_connected;
     float external_temperature;
 
+
+
     rtos::Thread * thread_activity_led;
     rtos::Thread * thread_update_bme;
     rtos::Thread * thread_external_temperature;
@@ -192,7 +197,7 @@ class ScienceKitCarrier{
 
 
 
-    /* External temperature probe - dallas */
+    /* External temperature probe - Dallas DS18B20 */
     int beginExternalTemperature();
     void updateExternalTemperature();
     float getExternalTemperature();     // celsius

src/utils/Arduino_ScienceKitCarrier_definitions.h

@@ -23,6 +23,7 @@
 // Grove pads
 #define INPUTA_PIN A0
 #define INPUTB_PIN A1
+#define ANALOGIN_DISABLED 0
 
 // APDS9960
 #define INT_APDS9960 9
@@ -44,8 +45,10 @@ const uint16_t MAXIMUM_AMPS{1};            // 1A
 // Bme688
 #define BME688_CS 10
 
-// External temperature
-#define OW_PIN         p26
+// External temperature connected on input A
+#define OW_PIN         p26 //digitalPinToPinName(INPUTA_PIN)
+#define EXTERNAL_TEMPERATURE_DISABLED -273.0; // absolute zero xD
+
 
 // Errors
 #define ERR_BEGIN_APDS -3
@@ -55,6 +58,7 @@ const uint16_t MAXIMUM_AMPS{1};            // 1A
 #define ERR_BEGIN_RESISTANCE -7
 #define ERR_BEGIN_FUNCTION_GENERATOR_CONTROLLER -8
 #define ERR_BEGIN_ULTRASONIC -9
+#define ERR_BEGIN_EXTERNAL_TEMPERATURE -10