Change filename once we know the time (#173)

* Change filename once we know the time (fixes #95)
* Use a different name if the file is in upload already (fixes #113)
* Do not write file already with header creation to avoid empty files (fixes #62)

Author: amandel

.idea/modules.xml

@@ -37,6 +37,7 @@ understand.
 | `DistanceSensorsUsed` | `HC-SR04/JSN-SR04T` | enum currently only one possible value |
 | `DeviceId` | `affe` | internal Id of the OBS |
 | `PresetId` | `Wade` | Id to identify the selected preset. A owner might define multiple presets |
+| `BluetoothEnabled` | `1` | 1 if bluetooth is enabled, 0 otherwise
 
 ## CSV
 

docs/software/firmware/csv_format.md

@@ -315,7 +315,7 @@ void setup() {
     }
   }
 
-  if (gps.satellites.value() == config.satsForFix) {
+  if (gps.satellites.value() >= config.satsForFix) {
     Serial.print("Got GPS Fix: ");
     Serial.println(String(gps.satellites.value()));
     displayTest->showTextOnGrid(2, 5, "Got GPS Fix");
@@ -466,7 +466,7 @@ void loop() {
     && dataBuffer.isEmpty()) {
     Serial.write("Empty Buffer, writing directly ");
     if (writer) {
-      writer->writeDataBuffered(currentSet);
+      writer->append(*currentSet);
     }
     delete currentSet;
   } else {
@@ -489,7 +489,7 @@ void loop() {
       DataSet* dataset = dataBuffer.shift();
       if (dataset->confirmedDistances.size() == 0) {
         if (writer) {
-          writer->writeDataBuffered(dataset);
+          writer->append(*dataset);
         }
       }
       // write record as many times as we have confirmed values
@@ -499,15 +499,15 @@ void loop() {
         dataset->confirmed = dataset->confirmedDistancesTimeOffset[i];
         confirmedMeasurements++;
         if (writer) {
-          writer->writeDataBuffered(dataset);
+          writer->append(*dataset);
         }
       }
       delete dataset;
     }
     if (writer) {  // "flush"
-      writer->writeDataToSD();
+      writer->flush();
     }
-    Serial.printf(">>> writeDataToSD - reset <<<");
+    Serial.printf(">>> flush - reset <<<");
     transmitConfirmedData = false;
     // back to normal display mode
     if (config.displayConfig & DisplayInvert) {
@@ -522,7 +522,7 @@ void loop() {
     DataSet* dataset = dataBuffer.shift();
     Serial.printf("data buffer full, writing set to file buffer\n");
     if (writer) {
-      writer->writeDataBuffered(dataset);
+      writer->append(*dataset);
     }
     // we are about to delete the to be confirmed dataset, so take care for this.
     if (datasetToConfirm == dataset) {

src/OpenBikeSensorFirmware.cpp

@@ -1,5 +1,5 @@
-#include "OpenBikeSensorFirmware.h"
-
+#include "VoltageMeter.h"
+#include "globals.h"
 
 /* Class to encapsulate voltage readings and smoothing thereof.
  * Still the values are not as accurate as expected, and it is not

src/VoltageMeter.cpp

@@ -708,7 +708,13 @@ void startServer() {
         if(uploader::instance()->upload(file.name())) {
 
           SDFileSystem.mkdir("/uploaded");
-          SDFileSystem.rename(file.name(),String("/uploaded")+file.name());
+          int i = 0;
+          while (!SDFileSystem.rename(file.name(), String("/uploaded") + file.name() + (i == 0 ? "" : String(i)))) {
+            i++;
+            if (i > 100) {
+              break;
+            }
+          }
           html += String(file.name());
           html += "<br>";
         }

src/configServer.cpp

@@ -23,6 +23,7 @@
 #include "config.h"
 #include "globals.h"
 #include "utils/multipart.h"
+#include "writer.h"
 
 #include <WiFi.h>
 #include <WiFiMulti.h>
@@ -101,17 +102,16 @@ uploader::uploader() {
  *
  */
 bool uploader::upload(const String& fileName) {
-  int number=0;
-  if(fileName.substring(0,7)!="/sensor") {
+  if(fileName.substring(0,7) != "/sensor"
+    && !fileName.endsWith(CSVFileWriter::EXTENSION)) {
     Serial.printf(("not sending " + fileName + "\n").c_str());
     return false;
   }
   Serial.printf(("sending " + fileName + "\n").c_str());
-  sscanf(fileName.c_str(),"/sensorData%d",&number);
-
   File csvFile = SD.open(fileName.c_str(), "r");
   if (csvFile) {
     HTTPClient https;
+    https.setTimeout(30 * 1000); // give the api some time
     https.setUserAgent(String("OBS/") + String(OBSVersion));
     boolean res = false;
 
@@ -122,7 +122,8 @@ bool uploader::upload(const String& fileName) {
 
     if (res) { // HTTPS
       MultipartStream mp(&https);
-      MultipartDataString title("title", "AutoUpload " + String(number));
+      MultipartDataString title("title",
+                                "AutoUpload " + fileName.substring(1, 25));
       mp.add(title);
       MultipartDataString description("description", "Uploaded with OpenBikeSensor " + String(OBSVersion));
       mp.add(description);
@@ -134,11 +135,15 @@ bool uploader::upload(const String& fileName) {
         Serial.printf("[HTTPS] POST... code: %d\n", httpCode);
         String payload = https.getString();
         Serial.println(payload);
+        https.end();
+        csvFile.close();
         return false;
       }
-      https.end();
+      csvFile.close();
     } else {
       Serial.printf("[HTTPS] Unable to connect\n");
+      https.end();
+      csvFile.close();
       return false;
     }
   } else {

src/uploader.cpp

@@ -0,0 +1,39 @@
+/*
+  Copyright (C) 2019 Zweirat
+  Contact: https://openbikesensor.org
+
+  This file is part of the OpenBikeSensor project.
+
+  The OpenBikeSensor sensor firmware is free software: you can redistribute
+  it and/or modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation, either version 3 of the License,
+  or (at your option) any later version.
+
+  The OpenBikeSensor sensor firmware is distributed in the hope that it will
+  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+  Public License for more details.
+
+  You should have received a copy of the GNU General Public License along with
+  the OpenBikeSensor sensor firmware.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "file.h"
+
+bool FileUtil::appendFile(fs::FS &fs, const char * path, const char * message) {
+  bool result = false;
+  Serial.printf("Appending to file: %s\n", path);
+
+  File file = fs.open(path, FILE_APPEND);
+  if (!file) {
+    Serial.println("Failed to open file for appending");
+    return false;
+  }
+  if (file.print(message)) {
+    result = true;
+    Serial.println("Message appended");
+  } else {
+    Serial.println("Append failed");
+  }
+  file.close();
+  return result;
+}

src/utils/file.cpp

@@ -0,0 +1,30 @@
+/*
+  Copyright (C) 2019 Zweirat
+  Contact: https://openbikesensor.org
+
+  This file is part of the OpenBikeSensor project.
+
+  The OpenBikeSensor sensor firmware is free software: you can redistribute
+  it and/or modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation, either version 3 of the License,
+  or (at your option) any later version.
+
+  The OpenBikeSensor sensor firmware is distributed in the hope that it will
+  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+  Public License for more details.
+
+  You should have received a copy of the GNU General Public License along with
+  the OpenBikeSensor sensor firmware.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef OPENBIKESENSORFIRMWARE_FILE_H
+#define OPENBIKESENSORFIRMWARE_FILE_H
+
+#include <FS.h>
+
+class FileUtil {
+  public:
+    static bool appendFile(fs::FS &fs, const char * path, const char * message);
+};
+
+#endif //OPENBIKESENSORFIRMWARE_FILE_H

src/utils/file.h

@@ -96,7 +96,6 @@ size_t StreamOfStreams::readBytes(char *buffer, size_t length) {
 }
 
 Stream *StreamOfStreams::getCurrent() {
-  // FIXME We assume available is 0 only at the very end!
   if (current == nullptr || current->available() == 0) {
     current = getNext();
   }
@@ -105,9 +104,8 @@ Stream *StreamOfStreams::getCurrent() {
 
 Stream *StreamOfStreams::getNext() {
   if (pos < streams.size()) {
-    // TODO: there should be a better method in this vector
-    log_d("About to switch to stream %d/%d", pos, streams.size());
     current = streams.at(pos++);
+    log_d("About to switch to stream %d/%d", pos, streams.size());
   } else {
     current = &EMPTY_STREAM;
   }