From 06c331ce417f46c11125c5ba0fb049408114a741 Mon Sep 17 00:00:00 2001
From: Bertrand Lemasle <blemasle@gmail.com>
Date: Mon, 12 Mar 2018 12:41:16 +1300
Subject: [PATCH] Code cleanup

---
 GpsTracker/Config.cpp     | 6 ++----
 GpsTracker/Core.cpp       | 1 +
 GpsTracker/Debug.cpp      | 1 +
 GpsTracker/Debug.h        | 4 ----
 GpsTracker/GpsTracker.ino | 3 +--
 GpsTracker/MainUnit.cpp   | 1 -
 GpsTracker/Rtc.cpp        | 2 ++
 GpsTracker/Rtc.h          | 2 +-
 8 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/GpsTracker/Config.cpp b/GpsTracker/Config.cpp
index f806326..02fc246 100644
--- a/GpsTracker/Config.cpp
+++ b/GpsTracker/Config.cpp
@@ -19,7 +19,7 @@ namespace config {
 		}
 
 		void write() {
-			VERBOSE_FORMAT("write", "%s, %s, %d, %d", value.seed, value.version, value.firstEntry, value.lastEntry);
+			VERBOSE_FORMAT("write", "%s, %s, %s, %d, %d", value.seed, value.version, value.apn, value.firstEntry, value.lastEntry);
 
 			hardware::i2c::powerOn();
 			int written = hardware::i2c::eeprom.writeBlock(CONFIG_ADDR, value);
@@ -30,7 +30,7 @@ namespace config {
 	Config get() {
 		if (value.seed[0] == '\0') details::read();
 
-		VERBOSE_FORMAT("get", "%s, %s, %d, %d", value.seed, value.version, value.firstEntry, value.lastEntry);
+		VERBOSE_FORMAT("get", "%s, %s, %s, %d, %d", value.seed, value.version, value.apn, value.firstEntry, value.lastEntry);
 		return value;
 	}
 
@@ -51,8 +51,6 @@ namespace config {
 
 		value = config;
 		details::write();
-
-		VERBOSE_FORMAT("reset", "value : %s, %s, %d, %d", value.seed, value.version, value.firstEntry, value.lastEntry);
 	}
 
 	
diff --git a/GpsTracker/Core.cpp b/GpsTracker/Core.cpp
index 420ca01..6a75538 100644
--- a/GpsTracker/Core.cpp
+++ b/GpsTracker/Core.cpp
@@ -23,6 +23,7 @@ namespace core {
 
 	void updateSleepTime() {
 		VERBOSE("updateSleepTime");
+
 		uint8_t velocity;
 		gps::getVelocity(velocity);
 		setSleepTime(velocity);
diff --git a/GpsTracker/Debug.cpp b/GpsTracker/Debug.cpp
index 504e8f1..f54508a 100644
--- a/GpsTracker/Debug.cpp
+++ b/GpsTracker/Debug.cpp
@@ -160,6 +160,7 @@ namespace debug {
 
 	void setFakeGpsPosition() {
 		strlcpy_P(gps::lastPosition, FAKE_GPS_ENTRY, GPS_POSITION_SIZE);
+
 		NOTICE_FORMAT("setFakeGpsPosition", "Last position set to : %s", gps::lastPosition);
 	}
 
diff --git a/GpsTracker/Debug.h b/GpsTracker/Debug.h
index 2a64eac..875593e 100644
--- a/GpsTracker/Debug.h
+++ b/GpsTracker/Debug.h
@@ -17,10 +17,6 @@
 #define VERBOSE(f) LOG(verbose, f)
 #define VERBOSE_MSG(f, msg) LOG_MSG(verbose, f, msg)
 #define VERBOSE_FORMAT(f, msg, ...) LOG_FORMAT(verbose, f, msg, __VA_ARGS__)
-//#define VERBOSE(f) Log.verbose(F("[" LOGGER_NAME "::" f "]\n"))
-//#define VERBOSE_MSG(f, msg) Log.verbose(F("[" LOGGER_NAME "::" f "] " msg "\n"))
-//#define VERBOSE_FORMAT(f, msg, ...) Log.verbose(F("[" LOGGER_NAME "::" f "] " msg "\n"), __VA_ARGS__)
-
 #else
 
 #define DISABLE_LOGGING 1
diff --git a/GpsTracker/GpsTracker.ino b/GpsTracker/GpsTracker.ino
index f2aa737..440ca89 100644
--- a/GpsTracker/GpsTracker.ino
+++ b/GpsTracker/GpsTracker.ino
@@ -1,5 +1,6 @@
 #include "GpsTracker.h"
 #include "Positions.h"
+
 bool bypassMenu = false;
 
 void setup() {
@@ -10,8 +11,6 @@ void setup() {
 	if(Serial) Log.begin(LOG_LEVEL_NOTICE, &Serial);
 #endif
 
-	Serial.println(sizeof(PositionEntry));
-	Serial.println(sizeof(PositionEntryMetadata));
 	rtc::setup();
 	hardware::sim808::setup();
 }
diff --git a/GpsTracker/MainUnit.cpp b/GpsTracker/MainUnit.cpp
index 4dbb9c7..eebcc74 100644
--- a/GpsTracker/MainUnit.cpp
+++ b/GpsTracker/MainUnit.cpp
@@ -4,7 +4,6 @@
 #include "Debug.h"
 
 #define LOGGER_NAME "MainUnit"
-const char WOKE_UP[] PROGMEM = "Woke up from sleep\n";
 
 namespace mainunit {
 
diff --git a/GpsTracker/Rtc.cpp b/GpsTracker/Rtc.cpp
index ecb400e..9c7ad98 100644
--- a/GpsTracker/Rtc.cpp
+++ b/GpsTracker/Rtc.cpp
@@ -41,6 +41,8 @@ namespace rtc {
 		RTC.control(DS3231_A1_INT_ENABLE, DS3231_OFF); //Alarm 1 OFF
 		RTC.control(DS3231_INT_ENABLE, DS3231_ON); //INTCN OFF
 		hardware::i2c::powerOff();
+
+		//TODO : check wether the osc has been halted (meaning the battery could be dead)
 	}
 
 	float getTemperature() {
diff --git a/GpsTracker/Rtc.h b/GpsTracker/Rtc.h
index 526998b..ab32750 100644
--- a/GpsTracker/Rtc.h
+++ b/GpsTracker/Rtc.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include "Time2.h"
-#include "Hardware.h"
 
 namespace rtc {
 	void setup();
 
 	float getTemperature();
+
 	timestamp_t getTime();
 	void getTime(tmElements_t &time);
 	void setTime(timestamp_t time);