Diff: main.h

Revision:

11:60eb0ff945f2

Parent:

7:e9a19750700d

Child:

13:29f67f256709

diff -r c8798fd9773b -r 60eb0ff945f2 main.h
--- a/main.h	Sat Dec 15 14:33:59 2018 +0000
+++ b/main.h	Sat Dec 15 20:09:19 2018 +0000
@@ -22,6 +22,7 @@
 #include "board.h"
 #include "WatchdogTimer.h"
 #include "ble/BLE.h"
+
 //#include "nvstore.h"
 
 
@@ -29,7 +30,7 @@
 //peripheral Libraries
 //------------------------------------------------------------------------------
 #include "LIS3DH.h"
-
+#include "SI7060.h"
 
 //------------------------------------------------------------------------------
 //C Standard Libraries
@@ -57,6 +58,7 @@
 #include "common.h"
 #include "sensors.h"
 #include "modem.h"
+#include "filesystem.h"
 
 //------------------------------------------------------------------------------
 //Global macros
@@ -64,12 +66,12 @@
 #define lowByte(w) ((uint8_t) ((w) & 0xff))
 #define highByte(w) ((uint8_t) ((w) >> 8))
 
-#define NEED_CONSOLE_OUTPUT 0 /* Set this if you need debug messages on the console; * it will have an impact on code-size and power consumption. */
-#if NEED_CONSOLE_OUTPUT
+#define CONSOLE_DEBUG 1 /* Set this if you need debug messages on the console; * it will have an impact on code-size and power consumption. */
+#if CONSOLE_DEBUG
 #define DEBUG(...) { uart.printf(__VA_ARGS__); }
 #else
 #define DEBUG(...) /* nothing */
-#endif /* #if NEED_CONSOLE_OUTPUT */
+#endif /* #if CONSOLE_DEBUG */
 
 //------------------------------------------------------------------------------
 //Global data structures
@@ -77,5 +79,5 @@
 
 //VARS
 extern bool requireSoftReset;
-
+extern Serial uart;
 #endif