refinements

Author: gbr1

examples/ScienceJournal/ScienceJournal.ino

@@ -24,17 +24,17 @@ unsigned long lastNotify = 0;
 
 ScienceKitCarrier science_kit;
 
-rtos::Thread _t(osPriorityHigh);
-rtos::Thread _tu;
-
+//rtos::Thread _thread_check_connection(osPriorityHigh);
+rtos::Thread _thread_update_sensors;
 
+bool _is_connected = false;
 
 
 void setup() {
-  pinMode(8,OUTPUT);
-  pinMode(7,OUTPUT);
+  //pinMode(8,OUTPUT);
+  //pinMode(7,OUTPUT);
 
-  science_kit.begin(NO_AUXILIARY_THREADS); // Doesn't start the BME688 thread for the moment
+  science_kit.begin(NO_AUXILIARY_THREADS); // Doesn't start the BME688 and external temperature threads for the moment
 
   if (!BLE.begin()) {
     while(1);
@@ -75,13 +75,14 @@ void setup() {
 
   BLE.addService(service);
   BLE.advertise();
+
   science_kit.startAuxiliaryThreads(); // start the BME688 and External Temperature Probe threads
-  //_t.start(loop_data);
-  _tu.start(update);
-}
 
-bool _is_connected = false;
+  //_thread_check_connection.start(loop_data);
+  _thread_update_sensors.start(update); // this thread updates sensors
+}
 
+/*
 void loop_data() {
   bool last_connected_status = _is_connected;
   while (1) {
@@ -91,18 +92,18 @@ void loop_data() {
     }
   }
 }
+*/
 
 void update(void){
   while(1){
-    digitalWrite(8,HIGH);
+    //digitalWrite(8,HIGH);
     science_kit.update(ROUND_ROBIN_ENABLED);
-    digitalWrite(8,LOW);
+    //digitalWrite(8,LOW);
     rtos::ThisThread::sleep_for(20);
   }
 }
 
-void loop() {
-  
+void loop(){
   BLEDevice central = BLE.central();
   if (central) {
     _is_connected = true;
@@ -113,7 +114,8 @@ void loop() {
         lastNotify=millis();
       }
     }
-  } else {
+  }
+  else {
     delay(100);
     _is_connected = false;
   }
@@ -182,7 +184,12 @@ void updateSubscribedCharacteristics() {
   }
 
   if(sndIntensityCharacteristic.subscribed()) {
-    sndIntensityCharacteristic.writeValue(science_kit.getFrequency1());
+    if (science_kit.getUltrasonicIsConnected()){
+      sndIntensityCharacteristic.writeValue(science_kit.getDistance()*100.0);
+    }
+    else{
+      sndIntensityCharacteristic.writeValue(-1.0);
+    }
   }
 
   if(sndPitchCharacteristic.subscribed()) {

examples/simple_temperature/simple_temperature.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

keywords.txt

@@ -75,6 +75,12 @@ getDistance KEYWORD2
 getTravelTime KEYWORD2
 getUltrasonicIsConnected KEYWORD2
 
+beginExternalTemperature KEYWORD2
+updateExternalTemperature KEYWORD2
+getExternalTemperature KEYWORD2
+getExternalTemperatureIsConnected KEYWORD2
+threadExternalTemperature KEYWORD2
+
 #######################################
 # Constants
 #######################################
@@ -97,16 +103,22 @@ G_EARTH LITERAL1
 
 BME688_CS LITERAL1
 
+OW_PIN LITERAL1
+EXTERNAL_TEMPERATURE_DISABLED LITERAL1
+
 ERR_BEGIN_APDS LITERAL1
 ERR_BEGIN_INA LITERAL1
 ERR_BEGIN_IMU LITERAL1
 ERR_BEGIN_BME LITERAL1
 ERR_BEGIN_RESISTANCE LITERAL1
 ERR_BEGIN_FUNCTION_GENERATOR_CONTROLLER LITERAL1
 ERR_BEGIN_ULTRASONIC LITERAL1
+ERR_BEGIN_EXTERNAL_TEMPERATURE LITERAL1
 
 ROUND_ROBIN_DISABLED LITERAL1
 ROUND_ROBIN_ENABLED LITERAL1
 
-START_AUXILIARY_THREADS LITERAL1
 NO_AUXILIARY_THREADS LITERAL1
+START_AUXILIARY_THREADS LITERAL1
+START_INTERNAL_AMBIENT_SENSOR LITERAL1
+START_EXTERNAL_AMBIENT_SENSOR LITERAL1

library.properties

@@ -1,5 +1,5 @@
 name=Arduino_ScienceKitCarrier
-version=0.1.0
+version=0.1.8
 author=Arduino, Giovanni di Dio Bruno
 maintainer=Arduino <info@arduino.cc>
 sentence=Library and firmware for Arduino Science Kit R3 
@@ -8,4 +8,4 @@ category=Communication
 url=https://github.com/gbr1/Arduino_ScienceKitCarrier
 architectures=mbed,mbed_nano
 includes=Arduino_ScienceKitCarrier.h
-depends=Arduino_APDS9960,ArduinoBLE,WiFiNINA,INA2xx,Arduino_BMI270_BMM150,BSEC Software Library,Arduino_GroveI2C_Ultrasonic
+depends=Arduino_APDS9960,ArduinoBLE,WiFiNINA,INA2xx,Arduino_BMI270_BMM150,BSEC Software Library,Arduino_GroveI2C_Ultrasonic,OneWireNg

src/Arduino_ScienceKitCarrier.cpp

@@ -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
@@ -727,9 +727,7 @@ void ScienceKitCarrier::threadExternalTemperature(){
   beginExternalTemperature();
   while(1){
     updateAnalogInput(UPDATE_INPUT_A);
-    digitalWrite(2,HIGH);
     updateExternalTemperature();
-    digitalWrite(2,LOW);
     rtos::ThisThread::sleep_for(1000);
   }
 }

src/utils/Arduino_ScienceKitCarrier_definitions.h

@@ -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
@@ -49,7 +49,7 @@ const uint16_t MAXIMUM_AMPS{1};            // 1A
 #define BME688_CS 10
 
 // External temperature connected on input A
-#define OW_PIN         p26 //digitalPinToPinName(INPUTA_PIN)
+#define OW_PIN digitalPinToPinName(INPUTA_PIN)
 #define EXTERNAL_TEMPERATURE_DISABLED -273.0; // absolute zero xD
 
 

src/utils/function_generator_controller.h

@@ -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