From 61195dc635e5607ca1f788d9f339ed987ff89bbd Mon Sep 17 00:00:00 2001 From: Bertrand Lemasle Date: Sun, 11 Mar 2018 17:35:21 +1300 Subject: [PATCH] Removed storage namespace --- GpsTracker/Positions.cpp | 9 ++++----- GpsTracker/Storage.cpp | 7 ------- GpsTracker/Storage.h | 15 --------------- 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 GpsTracker/Storage.cpp delete mode 100644 GpsTracker/Storage.h diff --git a/GpsTracker/Positions.cpp b/GpsTracker/Positions.cpp index 78e5412..dc37bc5 100644 --- a/GpsTracker/Positions.cpp +++ b/GpsTracker/Positions.cpp @@ -4,7 +4,6 @@ #include "Config.h" #include "Gps.h" #include "Network.h" -#include "Storage.h" #define LOGGER_NAME "Positions" @@ -27,7 +26,7 @@ namespace positions { PositionEntry entry = { battery, gpsStatus }; strlcpy(entry.position, gps::lastPosition, POSITION_SIZE); - storage::powerOn(); + hardware::i2c::powerOn(); Config config = config::get(); config.lastEntry++; @@ -41,7 +40,7 @@ namespace positions { VERBOSE_FORMAT("appendLast", "Written to EEPROM @ %X : [%d%% @ %dmV] [%d, %s]", entryAddress, battery.level, battery.voltage, gpsStatus, entry.position); config::set(config); - storage::powerOff(); + hardware::i2c::powerOff(); } bool get(uint16_t index, PositionEntry &entry) { @@ -50,9 +49,9 @@ namespace positions { VERBOSE_FORMAT("get", "Reading entry n°%d @ %X", index, entryAddress); - storage::powerOn(); + hardware::i2c::powerOn(); hardware::i2c::eeprom.readBlock(entryAddress, entry); - storage::powerOff(); + hardware::i2c::powerOff(); VERBOSE_FORMAT("get", "Read from EEPROM @ %X : [%d%% @ %dmV] [%d, %s]", entryAddress, entry.battery.level, entry.battery.voltage, entry.status, entry.position); return true; diff --git a/GpsTracker/Storage.cpp b/GpsTracker/Storage.cpp deleted file mode 100644 index dfab7b8..0000000 --- a/GpsTracker/Storage.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "Storage.h" -#include "Gps.h" - -#define LOGGER_NAME "Storage" - -namespace storage { -} \ No newline at end of file diff --git a/GpsTracker/Storage.h b/GpsTracker/Storage.h deleted file mode 100644 index 0058b23..0000000 --- a/GpsTracker/Storage.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "Hardware.h" - -namespace storage { - inline void powerOn() { - hardware::i2c::powerOn(); - } - - inline void powerOff() { - hardware::i2c::powerOff(); - } - - -} \ No newline at end of file