better reading

Author: gbr1

examples/ScienceJournal/ScienceJournal.ino

@@ -19,21 +19,20 @@
 
 #include "ble_config.h"
 #include "Arduino_ScienceKitCarrier.h"
+
 String name;
 unsigned long lastNotify = 0;
-
 ScienceKitCarrier science_kit;
+rtos::Thread thread_update_sensors;
 
-rtos::Thread _thread_update_sensors;
-
-bool _is_connected = false;
+bool ble_is_connected = false;
 
 
 void setup() {
 
   science_kit.begin(NO_AUXILIARY_THREADS); // Doesn't start the BME688 and external temperature threads for the moment
 
-  if (!BLE.begin()) {
+  if (!BLE.begin()){
     while(1);
   }
 
@@ -75,8 +74,7 @@ void setup() {
 
   science_kit.startAuxiliaryThreads(); // start the BME688 and External Temperature Probe threads
 
-  //_thread_check_connection.start(loop_data);
-  _thread_update_sensors.start(update); // this thread updates sensors
+  thread_update_sensors.start(update); // this thread updates sensors
 }
 
 
@@ -90,7 +88,7 @@ void update(void){
 void loop(){
   BLEDevice central = BLE.central();
   if (central) {
-    _is_connected = true;
+    ble_is_connected = true;
     lastNotify=millis();
     while (central.connected()) {
       if (millis()-lastNotify>10){
@@ -101,24 +99,24 @@ void loop(){
   }
   else {
     delay(100);
-    _is_connected = false;
+    ble_is_connected = false;
   }
 }
 
-void updateSubscribedCharacteristics() {
-  if(currentCharacteristic.subscribed()) {
+void updateSubscribedCharacteristics(){
+  if(currentCharacteristic.subscribed()){
     currentCharacteristic.writeValue(science_kit.getCurrent());
   }
 
-  if(voltageCharacteristic.subscribed()) {
+  if(voltageCharacteristic.subscribed()){
     voltageCharacteristic.writeValue(science_kit.getVoltage());
   }
 
-  if(resistanceCharacteristic.subscribed()) {
+  if(resistanceCharacteristic.subscribed()){
     resistanceCharacteristic.writeValue(science_kit.getResistance());  
   }
 
-  if (lightCharacteristic.subscribed()) {
+  if (lightCharacteristic.subscribed()){
     long light[4];
     light[0] = science_kit.getRed();
     light[1] = science_kit.getGreen();
@@ -127,48 +125,48 @@ void updateSubscribedCharacteristics() {
     lightCharacteristic.writeValue((byte*)light, sizeof(light));
   }
 
-  if (proximityCharacteristic.subscribed()) {
+  if (proximityCharacteristic.subscribed()){
     proximityCharacteristic.writeValue(science_kit.getProximity());
   }
 
-  if (accelerationCharacteristic.subscribed()) {
+  if (accelerationCharacteristic.subscribed()){
     float acceleration[3];
     acceleration[0] = science_kit.getAccelerationX();
     acceleration[1] = science_kit.getAccelerationY();
     acceleration[2] = science_kit.getAccelerationZ();
     accelerationCharacteristic.writeValue((byte*)acceleration, sizeof(acceleration));
   }
 
-  if (gyroscopeCharacteristic.subscribed()) {
+  if (gyroscopeCharacteristic.subscribed()){
     float gyroscope[3];
     gyroscope[0] = science_kit.getAngularVelocityX();
     gyroscope[1] = science_kit.getAngularVelocityY();
     gyroscope[2] = science_kit.getAngularVelocityZ();
     gyroscopeCharacteristic.writeValue((byte*)gyroscope, sizeof(gyroscope));
   }
 
-  if (magnetometerCharacteristic.subscribed()) {
+  if (magnetometerCharacteristic.subscribed()){
     float magnetometer[3];
     magnetometer[0] = science_kit.getMagneticFieldX();
     magnetometer[1] = science_kit.getMagneticFieldY();
     magnetometer[2] = science_kit.getMagneticFieldZ();
     magnetometerCharacteristic.writeValue((byte*)magnetometer, sizeof(magnetometer));
   }
 
-  if(temperatureCharacteristic.subscribed()) {
+  if(temperatureCharacteristic.subscribed()){
     temperatureCharacteristic.writeValue(science_kit.getTemperature());
   }
 
-  if(pressureCharacteristic.subscribed()) {
+  if(pressureCharacteristic.subscribed()){
     pressureCharacteristic.writeValue(science_kit.getPressure());
   }
 
-  if(humidityCharacteristic.subscribed()) {
+  if(humidityCharacteristic.subscribed()){
     humidityCharacteristic.writeValue(science_kit.getHumidity());
   }
 
   // need to be fix
-  if(sndIntensityCharacteristic.subscribed()) {
+  if(sndIntensityCharacteristic.subscribed()){
     if (science_kit.getUltrasonicIsConnected()){
       sndIntensityCharacteristic.writeValue(science_kit.getDistance()*100.0);
     }
@@ -178,7 +176,7 @@ void updateSubscribedCharacteristics() {
   }
 
   // need to be fix
-  if(sndPitchCharacteristic.subscribed()) {
+  if(sndPitchCharacteristic.subscribed()){
     sndPitchCharacteristic.writeValue(science_kit.getExternalTemperature());
   }