example

Author: gbr1

Diff for: examples/ScienceJournal/ScienceJournal.ino

@@ -28,8 +28,7 @@ rtos::Thread thread_update_sensors;
 bool ble_is_connected = false;
 
 
-void setup() {
-
+void setup(){
   science_kit.begin(NO_AUXILIARY_THREADS); // Doesn't start the BME688 and external temperature threads for the moment
 
   if (!BLE.begin()){
@@ -81,7 +80,7 @@ void setup() {
 void update(void){
   while(1){
     science_kit.update(ROUND_ROBIN_ENABLED);
-    rtos::ThisThread::sleep_for(20);
+    rtos::ThisThread::sleep_for(25);
   }
 }
 
@@ -125,8 +124,16 @@ void updateSubscribedCharacteristics(){
     lightCharacteristic.writeValue((byte*)light, sizeof(light));
   }
 
-  if (proximityCharacteristic.subscribed()){
+  if (proximityCharacteristic.subscribed()){                                                    // need to be fixed
+    /*
     proximityCharacteristic.writeValue(science_kit.getProximity());
+    */
+    if (science_kit.getUltrasonicIsConnected()){
+      proximityCharacteristic.writeValue(science_kit.getDistance()*100.0);
+    }
+    else{
+      proximityCharacteristic.writeValue(-1.0);
+    }
   }
 
   if (accelerationCharacteristic.subscribed()){
@@ -165,26 +172,44 @@ void updateSubscribedCharacteristics(){
     humidityCharacteristic.writeValue(science_kit.getHumidity());
   }
 
-  // need to be fix
+  // need to be fixed
   if(sndIntensityCharacteristic.subscribed()){
-    if (science_kit.getUltrasonicIsConnected()){
-      sndIntensityCharacteristic.writeValue(science_kit.getDistance()*100.0);
-    }
-    else{
-      sndIntensityCharacteristic.writeValue(-1.0);
-    }
+    sndIntensityCharacteristic.writeValue(science_kit.getMicrophoneRMS());
   }
 
-  // need to be fix
+  // need to be fixed
   if(sndPitchCharacteristic.subscribed()){
     sndPitchCharacteristic.writeValue(science_kit.getExternalTemperature());
   }
 
   if (inputACharacteristic.subscribed()){
+    /*
     inputACharacteristic.writeValue(science_kit.getInputA());
+    */
+    inputACharacteristic.writeValue(science_kit.getFrequency1());
   }
 
   if (inputBCharacteristic.subscribed()){
     inputBCharacteristic.writeValue(science_kit.getInputB());
   }
-}
+}
+
+
+
+
+
+/***
+ *                       _       _                                    
+ *         /\           | |     (_)                                   
+ *        /  \   _ __ __| |_   _ _ _ __   ___                         
+ *       / /\ \ | '__/ _` | | | | | '_ \ / _ \                        
+ *      / ____ \| | | (_| | |_| | | | | | (_) |                       
+ *     /_/____\_\_| _\__,_|\__,_|_|_| |_|\___/ ___ _     _____  ____  
+ *      / ____|    (_)                     | |/ (_) |   |  __ \|___ \ 
+ *     | (___   ___ _  ___ _ __   ___ ___  | ' / _| |_  | |__) | __) |
+ *      \___ \ / __| |/ _ \ '_ \ / __/ _ \ |  < | | __| |  _  / |__ < 
+ *      ____) | (__| |  __/ | | | (_|  __/ | . \| | |_  | | \ \ ___) |
+ *     |_____/ \___|_|\___|_| |_|\___\___| |_|\_\_|\__| |_|  \_\____/ 
+ *                                                                    
+ *                                                                    
+ */

Diff for: src/Arduino_ScienceKitCarrier.cpp

@@ -142,16 +142,16 @@ int ScienceKitCarrier::begin(const uint8_t auxiliary_threads){
     return ERR_BEGIN_FUNCTION_GENERATOR_CONTROLLER;
   }
 
-  // let's start ultrasonic and check if it is connected
-  if (beginUltrasonic()!=0){
-    return ERR_BEGIN_ULTRASONIC;
-  }
-
   // let's start microphone (PDM on Arduino Nano RP2040 Connect)
   if (beginMicrophone()!=0){
     return ERR_BEGIN_MICROPHONE;
   }
 
+    // let's start ultrasonic and check if it is connected
+  if (beginUltrasonic()!=0){
+    return ERR_BEGIN_ULTRASONIC;
+  }
+
   // let's start bme688 and external ds18b20 probe
   startAuxiliaryThreads(auxiliary_threads);
 }
@@ -815,4 +815,23 @@ void ScienceKitCarrier::startAuxiliaryThreads(const uint8_t auxiliary_threads){
     }
     thread_ext_temperature_is_running=true;
   }
-}
+}
+
+
+
+
+/***
+ *                       _       _                                    
+ *         /\           | |     (_)                                   
+ *        /  \   _ __ __| |_   _ _ _ __   ___                         
+ *       / /\ \ | '__/ _` | | | | | '_ \ / _ \                        
+ *      / ____ \| | | (_| | |_| | | | | | (_) |                       
+ *     /_/____\_\_| _\__,_|\__,_|_|_| |_|\___/ ___ _     _____  ____  
+ *      / ____|    (_)                     | |/ (_) |   |  __ \|___ \ 
+ *     | (___   ___ _  ___ _ __   ___ ___  | ' / _| |_  | |__) | __) |
+ *      \___ \ / __| |/ _ \ '_ \ / __/ _ \ |  < | | __| |  _  / |__ < 
+ *      ____) | (__| |  __/ | | | (_|  __/ | . \| | |_  | | \ \ ___) |
+ *     |_____/ \___|_|\___|_| |_|\___\___| |_|\_\_|\__| |_|  \_\____/ 
+ *                                                                    
+ *                                                                    
+ */

Diff for: src/Arduino_ScienceKitCarrier.h

@@ -227,13 +227,25 @@ class ScienceKitCarrier{
 
 };
 
-/*
-// static members must be initialized externally the class definition
-short ScienceKitCarrier::sampleBuffer[MICROPHONE_BUFFER_SIZE];
-volatile int ScienceKitCarrier::samplesRead;
-*/
 
 
 
+#endif
+
+
 
-#endif
+/***
+ *                       _       _                                    
+ *         /\           | |     (_)                                   
+ *        /  \   _ __ __| |_   _ _ _ __   ___                         
+ *       / /\ \ | '__/ _` | | | | | '_ \ / _ \                        
+ *      / ____ \| | | (_| | |_| | | | | | (_) |                       
+ *     /_/____\_\_| _\__,_|\__,_|_|_| |_|\___/ ___ _     _____  ____  
+ *      / ____|    (_)                     | |/ (_) |   |  __ \|___ \ 
+ *     | (___   ___ _  ___ _ __   ___ ___  | ' / _| |_  | |__) | __) |
+ *      \___ \ / __| |/ _ \ '_ \ / __/ _ \ |  < | | __| |  _  / |__ < 
+ *      ____) | (__| |  __/ | | | (_|  __/ | . \| | |_  | | \ \ ___) |
+ *     |_____/ \___|_|\___|_| |_|\___\___| |_|\_\_|\__| |_|  \_\____/ 
+ *                                                                    
+ *                                                                    
+ */