Fixed _DEBUG vs !_DEBUG. Fixed code delcarations when network backup is disabled

GpsTracker/Config.h

@@ -9,13 +9,13 @@
 #include "NetworkPositionsConfig.h"
 #endif
 
+#define SIM808_BAUDRATE 4800
+
 #define CONFIG_ADDR 0
 #define CONFIG_RESERVED_SIZE 128
 #define CONFIG_SEED 13
 #define VERSION "1.00"
 
-#define SIM808_BAUDRATE 4800
-
 #pragma region Default configuration values
 
 #define MENU_TIMEOUT	10000

GpsTracker/Debug.h

@@ -1,36 +1,13 @@
 #pragma once
 
 #include <Arduino.h>
-#include <ArduinoLog.h>
 
+#include "Log.h"
 #include "Config.h"
 #include "Hardware.h"
 #include "Gps.h"
 #include "Rtc.h"
 
-#define LOG(level, f) Log.level(F("[" LOGGER_NAME "::" f "]\n"))
-#define LOG_MSG(level, f, msg) Log.level(F("[" LOGGER_NAME "::" f "] " msg "\n"))
-#define LOG_FORMAT(level, f, msg, ...) Log.level(F("[" LOGGER_NAME "::" f "] " msg "\n"), __VA_ARGS__)
-
-#ifdef _DEBUG
-
-#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__)
-#else
-
-#define DISABLE_LOGGING 1 //TODO : does nothing if not included before ArduinoLog.h
-
-#define VERBOSE(f)
-#define VERBOSE_MSG(f, msg)
-#define VERBOSE_FORMAT(f, msg, ...)
-
-#endif
-
-#define NOTICE(f) LOG(notice, f)
-#define NOTICE_MSG(f, msg) LOG_MSG(notice, f, msg)
-#define NOTICE_FORMAT(f, msg, ...) LOG_FORMAT(notice, f, msg, __VA_ARGS__)
-
 #define DEBUG_SERIAL_SPEED 115200
 
 namespace debug {

GpsTracker/GpsTracker.ino

@@ -4,11 +4,14 @@
 bool bypassMenu = false;
 
 void setup() {
-#ifdef _DEBUG
+#if _DEBUG
 	debug::waitForSerial();
 	Log.begin(LOG_LEVEL_VERBOSE, &Serial);	
 #else
-	if(Serial) Log.begin(LOG_LEVEL_NOTICE, &Serial);
+	if (Serial) {
+		Serial.begin(DEBUG_SERIAL_SPEED);
+		Log.begin(LOG_LEVEL_NOTICE, &Serial);
+	}
 #endif
 
 	if (Serial) Serial.println(F("============================="));

GpsTracker/Log.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#define DISABLE_LOGGING 1
+#include <ArduinoLog.h>
+
+#define LOG(level, f) Log.level(F("[" LOGGER_NAME "::" f "]\n"))
+#define LOG_MSG(level, f, msg) Log.level(F("[" LOGGER_NAME "::" f "] " msg "\n"))
+#define LOG_FORMAT(level, f, msg, ...) Log.level(F("[" LOGGER_NAME "::" f "] " msg "\n"), __VA_ARGS__)
+
+#if _DEBUG
+#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__)
+#else
+#define VERBOSE(f)
+#define VERBOSE_MSG(f, msg)
+#define VERBOSE_FORMAT(f, msg, ...)
+#endif
+
+#define NOTICE(f) LOG(notice, f)
+#define NOTICE_MSG(f, msg) LOG_MSG(notice, f, msg)
+#define NOTICE_FORMAT(f, msg, ...) LOG_FORMAT(notice, f, msg, __VA_ARGS__)

GpsTracker/Network.cpp

@@ -1,4 +1,6 @@
 #include "Config.h"
+
+#if BACKUP_ENABLE_NETWORK
 #include "Debug.h"
 #include "Network.h"
 #include "Hardware.h"
@@ -34,4 +36,5 @@ namespace network {
 	}
 	
 	
-}
+}
+#endif

GpsTracker/NetworkPositionsBackup.cpp

@@ -1,9 +1,11 @@
 #pragma once
 
+#include "Config.h"
+
+#if BACKUP_ENABLE_NETWORK
 #include "NetworkPositionsBackup.h"
 #include "Debug.h"
 #include "Positions.h"
-#include "Config.h"
 #include "Hardware.h"
 #include "Network.h"
 
@@ -96,3 +98,4 @@ namespace positions {
 		}
 	}
 }
+#endif

GpsTracker/Positions.cpp

@@ -143,7 +143,7 @@ namespace positions {
 #ifdef BACKUPS_ENABLED
 		debug::displayFreeRam();
 		VERBOSE_FORMAT("doBackup", "%d backups enabled", BACKUPS_ENABLED);
-		_backups[0]->backup();
+		//_backups[0]->backup(); //disabled for first real running test
 		debug::displayFreeRam();
 		/*for (int i = 0; i < BACKUPS_ENABLED; i++) {
 			VERBOSE_FORMAT("doBackup", "calling backup %d", i);