Merge pull request #1 from gbr1/ext

added ultrasonic and external temperature

Author: gbr1

.gitignore

@@ -0,0 +1,26 @@
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

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
@@ -24,17 +24,14 @@ unsigned long lastNotify = 0;
 
 ScienceKitCarrier science_kit;
 
-rtos::Thread _t(osPriorityHigh);
-rtos::Thread _tu;
-
+rtos::Thread _thread_update_sensors;
 
+bool _is_connected = false;
 
 
 void setup() {
-  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,34 +72,22 @@ void setup() {
 
   BLE.addService(service);
   BLE.advertise();
-  science_kit.startAuxiliaryThreads(); // start the BME688 thread
-  _t.start(loop_data);
-  _tu.start(update);
-}
 
-bool _is_connected = false;
+  science_kit.startAuxiliaryThreads(); // start the BME688 and External Temperature Probe threads
 
-void loop_data() {
-  bool last_connected_status = _is_connected;
-  while (1) {
-    delay(1000);
-    if (last_connected_status != _is_connected) {
-      digitalWrite(7, _is_connected ? HIGH : LOW);
-    }
-  }
+  //_thread_check_connection.start(loop_data);
+  _thread_update_sensors.start(update); // this thread updates sensors
 }
 
+
 void update(void){
   while(1){
-    digitalWrite(8,HIGH);
     science_kit.update(ROUND_ROBIN_ENABLED);
-    digitalWrite(8,LOW);
     rtos::ThisThread::sleep_for(20);
   }
 }
 
-void loop() {
-  
+void loop(){
   BLEDevice central = BLE.central();
   if (central) {
     _is_connected = true;
@@ -112,9 +97,9 @@ void loop() {
         updateSubscribedCharacteristics();
         lastNotify=millis();
       }
-
     }
-  } else {
+  }
+  else {
     delay(100);
     _is_connected = false;
   }
@@ -182,12 +167,19 @@ void updateSubscribedCharacteristics() {
     humidityCharacteristic.writeValue(science_kit.getHumidity());
   }
 
+  // need to be fix
   if(sndIntensityCharacteristic.subscribed()) {
-    sndIntensityCharacteristic.writeValue(0);
+    if (science_kit.getUltrasonicIsConnected()){
+      sndIntensityCharacteristic.writeValue(science_kit.getDistance()*100.0);
+    }
+    else{
+      sndIntensityCharacteristic.writeValue(-1.0);
+    }
   }
 
+  // need to be fix
   if(sndPitchCharacteristic.subscribed()) {
-    sndPitchCharacteristic.writeValue(0);
+    sndPitchCharacteristic.writeValue(science_kit.getExternalTemperature());
   }
 
   if (inputACharacteristic.subscribed()){

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__
 

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

@@ -69,6 +69,18 @@ getPhase2 KEYWORD2
 getRange1 KEYWORD2
 getRange2 KEYWORD2
 
+beginUltrasonic KEYWORD2
+updateUltrasonic KEYWORD2
+getDistance KEYWORD2
+getTravelTime KEYWORD2
+getUltrasonicIsConnected KEYWORD2
+
+beginExternalTemperature KEYWORD2
+updateExternalTemperature KEYWORD2
+getExternalTemperature KEYWORD2
+getExternalTemperatureIsConnected KEYWORD2
+threadExternalTemperature KEYWORD2
+
 #######################################
 # Constants
 #######################################
@@ -91,15 +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
+depends=Arduino_APDS9960,ArduinoBLE,WiFiNINA,INA2xx,Arduino_BMI270_BMM150,BSEC Software Library,Arduino_GroveI2C_Ultrasonic,OneWireNg