Diff: main.h

Revision:

58:8d4a354816b1

Parent:

57:066dfbe8b4b9

--- a/main.h	Thu Feb 13 00:57:06 2020 +0000
+++ b/main.h	Mon Feb 17 23:24:52 2020 +0000
@@ -24,7 +24,7 @@
 #define USE_NRF_TEMP_SENSOR                 false
 
 //DEFAULT VELUES
-#define DEFAULT_SLEEP_FRAME                 120000
+#define DEFAULT_SLEEP_FRAME                 360000 // 6 mins
 #define DEFAULT_MOTION_G                    7
 #define DEFAULT_MOTION_START_SECONDS        120
 #define DEFAULT_MOTION_STOP_SECONDS         120
@@ -41,16 +41,15 @@
 #define TENDAYSINSECONDS                    864000
 
 //DEFAULT EVENT TIMES IN SECONDS
-#define DEFAULT_INTERVAL_MOTIONCLEAR        120
+#define DEFAULT_INTERVAL_MOTIONCLEAR        60
+#define DEFAULT_INTERVAL_RESETACCINT        10
 #define DEFAULT_INTERVAL_BUTTONCLEAR        20
 #define DEFAULT_INTERVAL_BATTERY            ONEDAYINSECONDS
 #define DEFAULT_INTERVAL_TEMPERATURE        60
 #define DEFAULT_INTERVAL_HUMIDITY           120
-#define DEFAULT_INTERVAL_SETTINGSSCAN       60
-
+#define DEFAULT_INTERVAL_SETTINGSSCAN       0
 
 //DEFINES
-#define ACTIVITY_BUFFERSIZE                 100
 #define DEBUG_BUFFERSIZE                    200
 
 //------------------------------------------------------------------------------
@@ -66,13 +65,16 @@
 //------------------------------------------------------------------------------
 #include "WatchdogTimer.h"
 #include "acd_nrf52_saadc.h"
+#include "DW1000.h"
+#include "MM2WayRanging.h"
+#include "Lis2dh12.h"
+#include "Lis2dh12_regs.h"
 
 //------------------------------------------------------------------------------
 //Application headers
 //------------------------------------------------------------------------------
 #include "NRFuart.h"
 #include "app_data.h"
-#include "states.h"
 #include "LED.h"
 
 //BLE SERVICE IDS
@@ -91,10 +93,8 @@
 
 extern bool GLOBAL_accel_healthy;
 extern bool GLOBAL_requireSoftReset;
-extern bool GLOBAL_motionFlagTriggered;
 extern bool GLOBAL_debugLED;
 extern bool GLOBAL_needToConfigureLis3dh;
-extern bool GLOBAL_LEDSequenceinProgress;
 extern time_t GLOBAL_RTCunixtime;
 extern char GLOBAL_debug_buffer[DEBUG_BUFFERSIZE];
 //FUNCS