init
Dependencies: aconno_I2C Lis2dh12 WatchdogTimer
Revision 46:b95fe3484d88, committed 2019-01-20
- Comitter:
- pathfindr
- Date:
- Sun Jan 20 22:05:07 2019 +0000
- Parent:
- 45:6c7f5b556d74
- Child:
- 47:cc6d4d0bf897
- Commit message:
- beta 1
Changed in this revision
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
| main.h | Show annotated file Show diff for this revision Revisions of this file |
--- a/main.cpp Sun Jan 20 21:40:53 2019 +0000
+++ b/main.cpp Sun Jan 20 22:05:07 2019 +0000
@@ -498,7 +498,7 @@
if(TEMP_o != -1) { RET_setting_impact_g = TEMP_o; }
if(TEMP_p != -1) { RET_setting_impact_alert = TEMP_p; }
if(TEMP_q != -1) { RET_setting_connection_timeout = TEMP_q; }
- if(RET_setting_connection_timeout < 60 || RET_setting_connection_timeout > 240) { RET_setting_connection_timeout = DEFAULT_CONNECTION_TIMEOUT; }
+ if(RET_setting_connection_timeout < 30 || RET_setting_connection_timeout > 240) { RET_setting_connection_timeout = DEFAULT_CONNECTION_TIMEOUT; }
if(TEMP_r != -1) { RET_setting_beacon_interval_seconds = TEMP_r; }
if(TEMP_s != -1) { RET_setting_beacon_scan = TEMP_s; }
if(TEMP_t != -1) { RET_setting_activity_mode = TEMP_t; }
--- a/main.h Sun Jan 20 21:40:53 2019 +0000 +++ b/main.h Sun Jan 20 22:05:07 2019 +0000 @@ -16,8 +16,8 @@ //------------------------------------------------------------------------------ //DEFINES //------------------------------------------------------------------------------ -#define FW_VERSION 8 -#define SKU "GPSP" +#define FW_VERSION 1 +#define SKU "GPSPLUS" #define HW_MAJORREVISION "001" //MODES @@ -32,13 +32,13 @@ #define DEFAULT_LOCATION_TX_INTERVAL_MINS 1440 #define DEFAULT_LOCATION_TX_FAILSAFE_HRS 168 #define DEFAULT_LOCATION_TIMEOUT 180 -#define DEFAULT_MOTION_G 11 +#define DEFAULT_MOTION_G 10 #define DEFAULT_MOTION_START_SECONDS 120 #define DEFAULT_MOTION_STOP_SECONDS 120 #define DEFAULT_IMPACT_G 127 #define DEFAULT_CONNECTION_ATTEMPTS 1 #define DEFAULT_CONNECTION_TIMEOUT 180 -#define DEFAULT_BEACON_INTERVAL_SECONDS 10 +#define DEFAULT_BEACON_INTERVAL_SECONDS 20 //CONSTS #define ONEDAYINSECONDS 86400