Use new average measurement API in examples, remove duplicate simple/advanced sketches

Author: thgeorgiou

examples/Ethernet-Simple/Ethernet-Simple.ino

@@ -62,35 +62,9 @@ void loop() {
   // Collect data
   struct hackAirData data;
   sensor.clearData(data);
-  sensor.refresh(data);
+  sensor.readAverageData(data, 60);
 
-  // Average readings
-  double pm25 = data.pm25;
-  double pm10 = data.pm10;
-  int error = 0;
-
-  // We will take 60 averages
-  for (int i = 0; i < 60; i++) {
-    // Read from the sensor
-    sensor.refresh(data);
-
-    // If error is not zero something went wrong with this measurment
-    // and we should not send it.
-    if (data.error == 0) {
-      // Calculate average between the new reading and the old average
-      pm25 = (pm25 + data.pm25) / 2;
-      pm10 = (pm10 + data.pm10) / 2;
-    } else {
-      error++;
-    }
-
-    delay(1000);  // Wait one second
-  }
-
-  // Send with ethernet shield
-  data.pm25 = pm25;
-  data.pm10 = pm10;
-  data.error = error;
+  // Send data to the hackAIR platform
   hackAirNet.sendData(data);
 
   // Turn off sensor while we wait the specified time

…/Ethernet-Advanced/Ethernet-Advanced.ino examples/Ethernet/Ethernet.inoexamples/Ethernet-Advanced/Ethernet-Advanced.ino renamed to examples/Ethernet/Ethernet.ino examples/Ethernet-Advanced/Ethernet-Advanced.ino renamed to examples/Ethernet/Ethernet.ino

@@ -82,40 +82,17 @@ void loop() {
 
   // Measure data
   sensor.clearData(data);
-  sensor.refresh(data);
-
-  // Average readings (60 measurments)
-  double pm25 = data.pm25;
-  double pm10 = data.pm10;
-  int error = 0;
-  for (int i = 0; i < 59; i++) {
-    // Read from the sensor
-    sensor.refresh(data);
-
-    // If error is not zero something went wrong with this measurment
-    // and we should not send it.
-    if (data.error == 0) {
-      pm25 = (pm25 + data.pm25) / 2;
-      pm10 = (pm10 + data.pm10) / 2;
-    } else {
-      error++;
-    }
-    delay(1000);  // Wait one second
-  }
-  data.pm25 = pm25;
-  data.pm10 = pm10;
-  data.error = error;
+  sensor.readAverageData(data, 60); // 60 averages
 
-  // Measure humidity and temperature
+  // Compensate for humidity
   float humidity = dht.readHumidity();
-  // Read temperature as Celsius (the default)
-  float temperature = dht.readTemperature();
+  sensor.humidityCompensation(data, humidity);
 
   // Send the data to the hackAIR server
   String dataJson = "{\"reading\":{\"PM2.5_AirPollutantValue\":\"";
-  dataJson += pm25;
+  dataJson += data.pm25;
   dataJson += "\",\"PM10_AirPollutantValue\":\"";
-  dataJson += pm10;
+  dataJson += data.pm10;
   dataJson += "\"},\"battery\":\"";
   dataJson += vdd;
   dataJson += "\",\"tamper\":\"";

…amples/Wemos-Advanced/Wemos-Advanced.ino examples/Wemos/Wemos.inoexamples/Wemos-Advanced/Wemos-Advanced.ino renamed to examples/Wemos/Wemos.ino examples/Wemos-Advanced/Wemos-Advanced.ino renamed to examples/Wemos/Wemos.ino

@@ -1,5 +1,5 @@
 /**
- * @file hackAIR WiFi Shield - Advanced Example
+ * @file hackAIR WiFi Shield - Example
  * This example reads data from a sensor and sends it to the hackAIR platform
  * using the hackAIR WiFi Shield on a configurable frequency.
  *
@@ -43,36 +43,10 @@ void loop() {
   // Wait for sensor to settle
   delay(1000 * 30);
 
-  // Refresh data
-  sensor.refresh(data);
+  // Make 60 measurements and return the mean values
+  sensor.readAverageData(data, 60);
 
-  // Average readings
-  double pm25 = data.pm25;
-  double pm10 = data.pm10;
-  int error = 0;
-
-  // We will take 60 averages
-  for (int i = 0; i < 60; i++) {
-    // Read from the sensor
-    sensor.refresh(data);
-
-    // If error is not zero something went wrong with this measurment
-    // and we should not send it.
-    if (data.error == 0) {
-      // Calculate average between the new reading and the old average
-      pm25 = (pm25 + data.pm25) / 2;
-      pm10 = (pm10 + data.pm10) / 2;
-    } else {
-      error++;
-    }
-
-    delay(1000);  // Wait one second
-  }
-
-  // Send data to the hackAIR server
-  data.pm25 = pm25;
-  data.pm10 = pm10;
-  data.error = error;
+  // Send data to the hackAIR platform
   wifi_sendData(data);
 
   // Turn off sensor while we wait the specified time