Exp

arduino/gps-tracker2/config.h

@@ -1,14 +1,32 @@
-#define GSM_APN         "internet"
-#define GSM_USERNAME    ""
-#define GSM_PASSWORD    ""
+/*define mqtt brocker 
+ * https://customer.cloudmqtt.com/login
+ * register your server (for free 10 connections allowed)
+ * set direct access to server - config as standard owntrack config
+ * create user i.e. piesek
+ * create topic for user RW access owntracks/#
+ * 
+ * 
+ */
+//soft serial buffer
+#define _SS_MAX_RX_BUFF 128
+//gsm 
+#define GSM_APN "internet"
+#define GSM_USERNAME ""
+#define GSM_PASSWORD ""
 
-#define AIO_SERVER      "broker.mqttdashboard.com"
-#define AIO_SERVERPORT  1883
-// #define AIO_USERNAME    ""
-// #define AIO_PASSWORD    ""
 
-#define TOPIC           "owntracks/piesek/yasmina"
-#define TID             "yb" // "tracker-ID which is used by the auto-faces feature to display, say, initials of a user."
-#define SPEED_TR        2  // bellow that number = 0
 
-#define DELAY           10  // seconds
+//#define AIO_SERVER      "m20.cloudmqtt.com"
+//#define AIO_SERVER      "broker.mqttdashboard.com"
+//#define AIO_SERVER "broker.hivemq.com"
+#define AIO_SERVER "xxx.xxx.xxx.xxx"
+#define AIO_SERVERPORT 1883
+#define AIO_USERNAME    "piesek"
+#define AIO_PASSWORD    "xxxxxxxxx"
+#define TOPIC "owntracks/piesek/yasmina"
+#define TID "yb" // "tracker-ID which is used by the auto-faces feature to display, say, initials of a user."
+#define SPEED_TR 3  // bellow that number = 0
+#define HEARTBIT 120 // there ic multiply by DELAY and sending heartbit - set for every 30 min when movement trying is 5 sec.
+#define DELAY 10 // seconds + ~5 
+#define MOVEMENT 50.0  //metters moved to report
+//#define DEBUG

arduino/gps-tracker2/fonahelper.cpp

@@ -1,128 +1,178 @@
-#include <Adafruit_SleepyDog.h>
-#include <SoftwareSerial.h>
+#include "config.h"
 #include "Adafruit_FONA.h"
+#include <SoftwareSerial.h>
 
 
-#define halt(s) { Serial.println(F( s )); while(1);  }
+/*
+//prog mem helper - change buffer size for topic if needed 
+const char stringBuffer[30];
+const char* getString(const char* str[30]) {
+strcpy_P(stringBuffer, (const char*)str);
+delay(50);
+return stringBuffer;
+}
+*/
+
 
 extern Adafruit_FONA fona;
 extern SoftwareSerial fonaSS;
 
-char utime[14];
-int YY;
-int MM;
-int DD;
-int hh;
-int mm;
-int ss;
+//extern SoftwareSerial *fonaSerial;
+
 
 // flags
 byte gps_enabled = 0;
 
 
 boolean FONAconnect(const __FlashStringHelper *apn, const __FlashStringHelper *username, const __FlashStringHelper *password) {
-  Watchdog.reset();
+
 
-  //Serial.println(F("Initializing FONA....(May take 3 seconds)"));
-
-  //fonaSS.begin(*fonaSerial); // if you're using software serial
-  fonaSS.begin(9600);
+    while (!fonaSS);
+    fonaSS.begin(9800);
+    delay(50);
+
+
   if (! fona.begin(fonaSS)) {           // can also try fona.begin(Serial1) 
+    delay(50);
+#ifdef DEBUG
     Serial.println(F("Couldn't find FONA"));
+    delay(50);
+#endif
     return false;
+  } else {
+
+  // to test   
   }
-  fonaSS.println("AT+CMEE=2");
-  //Serial.println(F("FONA is OK"));
-  Watchdog.reset();
- // Serial.println(F("Checking for network..."));
+
+  while (!fonaSS);
+
+
+  byte net =0;
   while (fona.getNetworkStatus() != 1) {
    delay(500);
+#ifdef DEBUG
+   Serial.println(F("Waiting for network ..."));
+#endif
+   delay(15000);
+   while ( !fonaSS);
+   net++;
+   if (net == 20) {
+   fonaSS.end();
+   asm volatile ( "jmp 0");
+   }
   }
 
-  Watchdog.reset();
-  delay(5000);  // wait a few seconds to stabilize connection
-  Watchdog.reset();
+
+  //delay(20000);  // wait a few seconds to stabilize connection
 
   fona.setGPRSNetworkSettings(apn, username, password);
-
   //Serial.println(F("Disabling GPRS"));
+  while (!fonaSS);
   fona.enableGPRS(false);
-
-  Watchdog.reset();
-  delay(5000);  // wait a few seconds to stabilize connection
-  Watchdog.reset();
-
+  delay(500);  // wait a few seconds to stabilize connection
+#ifdef DEBUG
   Serial.println(F("Enabling GPRS"));
+  delay(50);
+#endif
+  while (!fonaSS);
   if (!fona.enableGPRS(true)) {
-    //Serial.println(F("Failed to turn GPRS on"));  
+#ifdef DEBUG
+    Serial.println(F("Failed to turn GPRS on")); 
+    delay(50); 
+#endif
     return false;
   }
-
-  Watchdog.reset();
+  while (!fonaSS);
+  fona.enableRTC(1);
 
   return true;
 }
 
-
 boolean GPS() {
+
   if (gps_enabled == 0 ) {
-    //Serial.println(F("Enabling GPS"));
-    if (!fona.enableGPS(true)) {
-      Serial.println(F("Failed to turn GPS on"));  
+#ifdef DEBUG
+    Serial.println(F("Enabling GPS"));
+    delay(50);
+#endif
+    while ( !fonaSS);
+    fona.enableGPS(false);
+    delay(500);
+    while ( !fonaSS);
+    if(!fona.enableGPS(true)) {
+#ifdef DEBUG
+      Serial.println(F("Failed to turn GPS on"));
+      delay(50);
+#endif  
       return false;
-    }
-    else {
+    } else {
       gps_enabled = 1;
+      delay(10000);
     }
   }
-
-  Watchdog.reset();
-  delay(5000);  // wait a few seconds to stabilize connection
-  Watchdog.reset();
-
-  Watchdog.reset();
-  //Serial.println(F("Looking for satelites"));
   byte stat;
+  while ( !fonaSS);
   stat = fona.GPSstatus();
+  delay(500);
   if (stat < 0 or stat == 0  or stat == 1) {
+#ifdef DEBUG    
     Serial.println(F("Not fixed!"));
+    delay(50);
+#endif
     return false;
-  }
-  if (stat >= 2) {
+
+   }
+   if (stat >= 2) {
+#ifdef DEBUG
     Serial.println(F("GPS Fixed"));
-  }
+    delay(50);
+#endif
+    return true;
+   } else {
+    return false;
+   }
 
-  Watchdog.reset();
-
-  return true;
+return false;
 }
 
 
 void GPS_Data(float *fdata, int *idata) {
-
-
 
-  float latitude, longitude, speed_kph, heading, altitude;
-  boolean gps_success = fona.getGPS(&latitude, &longitude, &altitude, &speed_kph, &heading, &utime[0]);
-  sscanf(utime,"%04d%02d%02d%02d%02d%02d",&YY,&MM,&DD,&hh,&mm,&ss);
-
-
-  // put data into array
-  fdata[0] = latitude;
-  fdata[1] = longitude;
-  fdata[2] = speed_kph;
-  fdata[3] = altitude;
-  fdata[4] = heading;
-  idata[0] = hh;
-  idata[1] = mm;
-  idata[2] = ss;
-  idata[3] = DD;
-  idata[4] = MM;
-  idata[5] = YY;
+  char utime[14];
+  //int YY;
+  //int MM;
+  //int DD;
+  //int hh;
+  //int mm;
+  //int ss;
+  float latitude, longitude, speed_kph,cog;
+  //, speed_kph, heading, altitude;
+  //boolean gps_success = fona.getGPS(&fdata[0], &fdata[1], &fdata[3], &fdata[2], &fdata[4], &utime[0]);
+  while (!fonaSS);
+  boolean gps_success = fona.getGPS(&latitude,&longitude, &fdata[3], &speed_kph, &cog, &utime[0]);
+  delay(50);
+  //sscanf(utime,"%04d%02d%02d%02d%02d%02d",&YY,&MM,&DD,&hh,&mm,&ss);
+  sscanf(utime,"%04d%02d%02d%02d%02d%02d",&idata[5],&idata[4],&idata[3],&idata[0],&idata[1],&idata[2]);
+  delay(50);
+  //idata[0] = hh;
+  //idata[1] = mm;
+  //idata[2] = ss;
+  //idata[3] = DD;
+  //idata[4] = MM;
+  //idata[5] = YY;
 
+
   if (&gps_success) {
-    //delete utime;
+
+      fdata[0]=latitude;
+      fdata[1]=longitude;
+      fdata[2]=speed_kph;
+      fdata[4]=cog;
+       //sendATcommand("AT+CGATT=1",1000);
+    delay(50);
+
     return &fdata;
 
   }
 }
+