From 7a841e4c2fb11f5041c5371ad0578833d1823bfc Mon Sep 17 00:00:00 2001 From: maidnl Date: Thu, 5 Oct 2023 14:02:13 +0200 Subject: [PATCH] Cleaned up comments --- examples/ScienceJournal/ScienceJournal.ino | 22 +++------------------- src/Arduino_ScienceKitCarrier.cpp | 1 - 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/examples/ScienceJournal/ScienceJournal.ino b/examples/ScienceJournal/ScienceJournal.ino index 759e8b2..77419cd 100644 --- a/examples/ScienceJournal/ScienceJournal.ino +++ b/examples/ScienceJournal/ScienceJournal.ino @@ -78,7 +78,7 @@ void setup(){ service.addCharacteristic(airQualityCharacteristic); /* _________________________________________________________SOUND_INTENSITY */ service.addCharacteristic(sndIntensityCharacteristic); - /* ______!!! NOT AVAILABLE (should be delete?) !!!______________SOUND_PITCH */ + /* _____________________________________________________________SOUND_PITCH */ service.addCharacteristic(sndPitchCharacteristic); /* _________________________________________________________________INPUT_A */ service.addCharacteristic(inputACharacteristic); @@ -164,19 +164,8 @@ void updateSubscribedCharacteristics(){ /* _______________________________________________________________PROXIMITY */ - if (proximityCharacteristic.subscribed()){ // need to be fixed - + if (proximityCharacteristic.subscribed()){ proximityCharacteristic.writeValue(science_kit.getProximity()); - - - /* - if (science_kit.getUltrasonicIsConnected()){ - proximityCharacteristic.writeValue(science_kit.getDistance()*100.0); - } - else{ - proximityCharacteristic.writeValue(-1.0); - } - */ } @@ -241,8 +230,7 @@ void updateSubscribedCharacteristics(){ sndIntensityCharacteristic.writeValue(science_kit.getMicrophoneRMS()); } - /* ______!!! NOT AVAILABLE (should be delete?) !!!______________SOUND_PITCH */ - /* NOTE: pith is frequency (not available because FFT cannot be performed) */ + /* _____________________________________________________________SOUND_PITCH */ if(sndPitchCharacteristic.subscribed()){ sndPitchCharacteristic.writeValue(science_kit.getExternalTemperature()); } @@ -250,10 +238,6 @@ void updateSubscribedCharacteristics(){ /* _________________________________________________________________INPUT_A */ if (inputACharacteristic.subscribed()){ inputACharacteristic.writeValue(science_kit.getInputA()); - - /* NOTE_ OLD CODE USED FOR DEBUG - inputACharacteristic.writeValue(science_kit.getFrequency1()); - */ } /* _________________________________________________________________INPUT_B */ diff --git a/src/Arduino_ScienceKitCarrier.cpp b/src/Arduino_ScienceKitCarrier.cpp index c8bfdc5..317969c 100644 --- a/src/Arduino_ScienceKitCarrier.cpp +++ b/src/Arduino_ScienceKitCarrier.cpp @@ -19,7 +19,6 @@ #include "Arduino_ScienceKitCarrier.h" -// static members must be initialized externally the class definition short ScienceKitCarrier::sampleBuffer[MICROPHONE_BUFFER_SIZE]; volatile int ScienceKitCarrier::samplesRead;