From 29960cf233c3ccf8c938764052feddfdac113d1d Mon Sep 17 00:00:00 2001
From: Mike Fiore <mfiore@multitech.com>
Date: Wed, 2 Dec 2015 16:50:07 -0600
Subject: implement AT command to delete survey data file

---
 Mode/Mode.cpp       | 10 ++++------
 Mode/Mode.h         |  2 +-
 Mode/ModeSingle.cpp |  4 ++--
 Mode/ModeSweep.cpp  |  4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'Mode')

diff --git a/Mode/Mode.cpp b/Mode/Mode.cpp
index 68a1d0e..f6223d8 100644
--- a/Mode/Mode.cpp
+++ b/Mode/Mode.cpp
@@ -1,8 +1,6 @@
 #include "Mode.h"
 #include "MTSLog.h"
 
-const char* Mode::_file_name = "SurveyData.txt";
-
 /*
  * union for converting from 16- bit to 2 8-bit values
  */
@@ -38,8 +36,8 @@ bool Mode::deleteDataFile() {
     // if survey data file exists, attempt to delete it
     std::vector<mDot::mdot_file> files = _dot->listUserFiles();
     for (std::vector<mDot::mdot_file>::iterator it = files.begin(); it != files.end(); it++)
-        if (it->name == _file_name) {
-            if (! _dot->deleteUserFile(_file_name))
+        if (it->name == file_name) {
+            if (! _dot->deleteUserFile(file_name))
                 ret = false;
             break;
         }
@@ -120,7 +118,7 @@ bool Mode::appendDataFile(const DataItem& data) {
         return false;
     }
 
-    if (! _dot->appendUserFile(_file_name, (void*)main_buf, size)) {
+    if (! _dot->appendUserFile(file_name, (void*)main_buf, size)) {
         logError("failed to write survey data to file");
         return false;
     } else {
@@ -165,7 +163,7 @@ uint32_t Mode::getIndex(DataType type) {
     else
         search = 'S';
 
-    file = _dot->openUserFile(_file_name, mDot::FM_RDONLY);
+    file = _dot->openUserFile(file_name, mDot::FM_RDONLY);
     if (file.fd < 0) {
         logError("failed to open survey data file");
     } else {
diff --git a/Mode/Mode.h b/Mode/Mode.h
index ce4890f..61687f1 100644
--- a/Mode/Mode.h
+++ b/Mode/Mode.h
@@ -9,6 +9,7 @@
 #include "ISL29011.h"
 #include "MMA845x.h"
 #include "MPL3115A2.h"
+#include "FileName.h"
 
 class Mode {
     public:
@@ -59,7 +60,6 @@ class Mode {
         LoRaHandler* _lora;
 	GPSPARSER* _gps;
         osThreadId _main_id;
-        static const char* _file_name;
         uint32_t _index;
         uint8_t _band;
         uint8_t _sub_band;
diff --git a/Mode/ModeSingle.cpp b/Mode/ModeSingle.cpp
index bc2cb4f..326ba1d 100644
--- a/Mode/ModeSingle.cpp
+++ b/Mode/ModeSingle.cpp
@@ -30,7 +30,7 @@ bool ModeSingle::start() {
     // see if survey data file exists
     std::vector<mDot::mdot_file> files = _dot->listUserFiles();
     for (std::vector<mDot::mdot_file>::iterator it = files.begin(); it != files.end(); it++) {
-        if (strcmp(it->name, _file_name) == 0) {
+        if (strcmp(it->name, file_name) == 0) {
             logInfo("found survey data file");
             data_file = true;
             break;
@@ -95,7 +95,7 @@ bool ModeSingle::start() {
                             case confirm:
                                 _state = show_help;
                                 logInfo("deleting survey data file");
-                                _dot->deleteUserFile(_file_name);
+                                _dot->deleteUserFile(file_name);
                                 _index = 0;
                                 displayHelp();
                                 break;
diff --git a/Mode/ModeSweep.cpp b/Mode/ModeSweep.cpp
index 2ac495f..12dbd1e 100644
--- a/Mode/ModeSweep.cpp
+++ b/Mode/ModeSweep.cpp
@@ -54,7 +54,7 @@ bool ModeSweep::start() {
     // see if survey data file exists
     std::vector<mDot::mdot_file> files = _dot->listUserFiles();
     for (std::vector<mDot::mdot_file>::iterator it = files.begin(); it != files.end(); it++) {
-        if (strcmp(it->name, _file_name) == 0) {
+        if (strcmp(it->name, file_name) == 0) {
             logInfo("found survey data file");
             data_file = true;
             break;
@@ -133,7 +133,7 @@ bool ModeSweep::start() {
                             case confirm:
                                 _state = show_help;
                                 logInfo("deleting survey data file");
-                                _dot->deleteUserFile(_file_name);
+                                _dot->deleteUserFile(file_name);
                                 _index = 1;
                                 displayHelp();
                                 break;
-- 
cgit v1.2.3