minor fixes

santiago · santiago · commit 20adae7313f2 · 2017-12-06T20:23:49.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 .gcc-flags.json
 .#*
 node_modules
+.piolibdeps
diff --git a/src/app.h b/src/app.h
@@ -9,7 +9,7 @@
 #include <FastLED.h>
 #include "DHT.h"
 
-const String SENSOR_ID = "estacion_floresta";
+const String SENSOR_ID = "florida_nueva";
 
 const String STR_COMMA = ",";
 const String STR_SLASH = "/";
diff --git a/src/http.cpp b/src/http.cpp
@@ -76,7 +76,7 @@ int postCsvFile(String url, String filename) {
   Serial.println(content_length);
 
   String data = "";
-  char *_data; 
+  char *_data;
   Serial.println("Reading file ...");
   while(file.available()) {
     Serial.print(".");
@@ -131,13 +131,13 @@ int post2Influx(String url, String load) {
   if(httpCode > 0) {
     String payload = http.getString();
     Serial.println(payload);
-    Serial.println("load  sent successfully!");
+    Serial.println("load sent successfully!");
   } else {
     Serial.print("[HTTP] failed, error;;;: ");
     Serial.println(http.errorToString(httpCode).c_str());
   }
-  
+
   http.end();
   return httpCode;
-  
+
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -10,11 +10,10 @@ const int SEND_RECORD = 1;
 GPSData gps;
 DHT11Data dht11;
 PlantowerData plantower;
-PlantowerData plantowerData;
 
 #include <DoubleResetDetector.h>
 
-// Number of seconds after reset during which a 
+// Number of seconds after reset during which a
 // subseqent reset will be considered a double reset.
 #define DRD_TIMEOUT 100
 
@@ -87,7 +86,7 @@ void setup() {
   setupGPS();
   setupPlantower();
   setupDHT11();
-  
+
   if (drd.detectDoubleReset()) {
     Serial.println("Connecting to network ...");
     setupWifi();
@@ -103,12 +102,9 @@ void loop() {
     plantower = getPlantowerData();
 
     if(plantower.ready) {
-      plantowerData = plantower;
-    }
-
-    if(plantowerData.ready) {
       save();
-      ledParticulateQuality(plantowerData);
+      ledParticulateQuality(plantower);
+
       String frame = influxFrame();
       post2Influx("http://aqa.unloquer.org:8086/write?db=aqa", frame);
     }
@@ -172,6 +168,7 @@ String csvFrame() {
 
   return frame;
 }
+
 String influxFrame() {
   /* CSV is ordered as:
    "id","lat","lng","date","time","altitude","course","speed","humidity",
diff --git a/src/plantower.cpp b/src/plantower.cpp
@@ -90,8 +90,7 @@ PlantowerData readPlantower(unsigned long ms) {
   Serial.print(PM10Value);
   Serial.println(" ug/m3");
   Serial.println();
-
-
+  
   return data;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,7 @@ PlantowerData readPlantower(unsigned long ms) {`
`90`	`90`	`Serial.print(PM10Value);`
`91`	`91`	`Serial.println(" ug/m3");`
`92`	`92`	`Serial.println();`
`93`		`-`
`94`		`-`
	`93`	`+`
`95`	`94`	`return data;`
`96`	`95`	`}`
`97`	`96`