@@ -78,7 +78,7 @@ void setup(){
7878 service.addCharacteristic (airQualityCharacteristic);
7979 /* _________________________________________________________SOUND_INTENSITY */
8080 service.addCharacteristic (sndIntensityCharacteristic);
81- /* ______!!! NOT AVAILABLE (should be delete?) !!!______________SOUND_PITCH */
81+ /* _____________________________________________________________SOUND_PITCH */
8282 service.addCharacteristic (sndPitchCharacteristic);
8383 /* _________________________________________________________________INPUT_A */
8484 service.addCharacteristic (inputACharacteristic);
@@ -164,19 +164,8 @@ void updateSubscribedCharacteristics(){
164164
165165
166166 /* _______________________________________________________________PROXIMITY */
167- if (proximityCharacteristic.subscribed ()){ // need to be fixed
168-
167+ if (proximityCharacteristic.subscribed ()){
169168 proximityCharacteristic.writeValue (science_kit.getProximity ());
170-
171-
172- /*
173- if (science_kit.getUltrasonicIsConnected()){
174- proximityCharacteristic.writeValue(science_kit.getDistance()*100.0);
175- }
176- else{
177- proximityCharacteristic.writeValue(-1.0);
178- }
179- */
180169 }
181170
182171
@@ -241,19 +230,14 @@ void updateSubscribedCharacteristics(){
241230 sndIntensityCharacteristic.writeValue (science_kit.getMicrophoneRMS ());
242231 }
243232
244- /* ______!!! NOT AVAILABLE (should be delete?) !!!______________SOUND_PITCH */
245- /* NOTE: pith is frequency (not available because FFT cannot be performed) */
233+ /* _____________________________________________________________SOUND_PITCH */
246234 if (sndPitchCharacteristic.subscribed ()){
247235 sndPitchCharacteristic.writeValue (science_kit.getExternalTemperature ());
248236 }
249237
250238 /* _________________________________________________________________INPUT_A */
251239 if (inputACharacteristic.subscribed ()){
252240 inputACharacteristic.writeValue (science_kit.getInputA ());
253-
254- /* NOTE_ OLD CODE USED FOR DEBUG
255- inputACharacteristic.writeValue(science_kit.getFrequency1());
256- */
257241 }
258242
259243 /* _________________________________________________________________INPUT_B */
0 commit comments