From 79678ab34a8769f61c34a58ccdc82dda30e36618 Mon Sep 17 00:00:00 2001 From: Bertrand Lemasle Date: Mon, 12 Mar 2018 23:50:51 +1300 Subject: [PATCH] Removed RawSdFile --- GpsTracker/RawSdFile.cpp | 40 -------------------------------- GpsTracker/RawSdFile.h | 32 ------------------------- GpsTracker/SdPositionsBackup.h | 3 --- GpsTracker/SdPositionsConfig.cpp | 3 --- 4 files changed, 78 deletions(-) delete mode 100644 GpsTracker/RawSdFile.cpp delete mode 100644 GpsTracker/RawSdFile.h diff --git a/GpsTracker/RawSdFile.cpp b/GpsTracker/RawSdFile.cpp deleted file mode 100644 index 099d111..0000000 --- a/GpsTracker/RawSdFile.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include "RawSdFile.h" - -namespace sd { - - RawSdFile::RawSdFile(SdFat *sd, const char *filename) { - _sd = sd; - _filename = filename; - } - - RawSdFile::~RawSdFile() { - flush(); - } - - void RawSdFile::open(const uint32_t pos) { - if (!_file.isOpen()) { - _sd->chdir(); - _file = _sd->open(_filename, O_RDWR | O_CREAT); - } - - _file.seek(pos); - } - - void RawSdFile::flush() { - if (!_file.isOpen()) return; - - _file.close(); - } - - void RawSdFile::write(const uint32_t pos, const void *val, const size_t size) { - open(pos); - _file.write(val, size); - } - - void RawSdFile::read(const uint32_t pos, void *val, const size_t size) { - open(pos); - if (!_file.available()) return; - - _file.read(val, size); - } -} \ No newline at end of file diff --git a/GpsTracker/RawSdFile.h b/GpsTracker/RawSdFile.h deleted file mode 100644 index bb3bb32..0000000 --- a/GpsTracker/RawSdFile.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include - -namespace sd { - class RawSdFile { - private: - SdFat * _sd; - const char *_filename; - File _file; - - void open(const uint32_t pos); - - public: - RawSdFile(SdFat *sd, const char *filename); - ~RawSdFile(); - - void flush(); - - void write(const uint32_t pos, const void *val, const size_t size); - template void write(const uint32_t pos, const T &val) - { - write(pos, (void*)&val, sizeof(val)); - } - - void read(const uint32_t pos, void *val, const size_t size); - template void read(const uint32_t pos, const T &val) - { - read(pos, (void*)&val, sizeof(val)); - } - }; -} diff --git a/GpsTracker/SdPositionsBackup.h b/GpsTracker/SdPositionsBackup.h index 98ac21e..33cf0d3 100644 --- a/GpsTracker/SdPositionsBackup.h +++ b/GpsTracker/SdPositionsBackup.h @@ -1,15 +1,12 @@ #pragma once #include "PositionsBackup.h" -#include "RawSdFile.h" #define POSITIONS_FOLDER "positions" #define POSITIONS_FILENAME "positions-%05d.csv" #define POSITIONS_FILENAME_LENGTH 19 -using namespace sd; - namespace positions { namespace backup { namespace sd { diff --git a/GpsTracker/SdPositionsConfig.cpp b/GpsTracker/SdPositionsConfig.cpp index 6d50885..f4fb33f 100644 --- a/GpsTracker/SdPositionsConfig.cpp +++ b/GpsTracker/SdPositionsConfig.cpp @@ -1,10 +1,7 @@ #include "SdPositionsConfig.h" #include "SdCard.h" -#include "RawSdFile.h" #include "Debug.h" -using namespace sd; - #define LOGGER_NAME "Config::backup::sd" namespace config {