Binary files a/build/bike_companion.pbw and b/build/bike_companion.pbw differ

@@ -25,6 +25,7 @@

       "altitude",

       "altitude_accuracy",

       "speed",

+      "max_speed",

       "timestamp",

       "status",

       "JSReady"

@@ -9,7 +9,7 @@ const uint32_t inbox_size = 64;

 const uint32_t outbox_size = 64;

 static uint32_t size ;

-static char * msg;

+//static char * msg;

 static char s_status[3];

@@ -22,6 +22,7 @@ static char s_altitude[6];

 static char s_altitude_accuracy[4];

 static char s_timestamp[14];

 static char s_speed[6];

+static char s_max_speed[5];

 static char s_msg[50];

@@ -35,13 +36,12 @@ typedef enum {

   accuracy,

   altitude_accuracy,

   speed,

+  max_speed,

   timestamp

 } AppKey;

-

-static void prv_select_click_handler(ClickRecognizerRef recognizer, void *context) {

-  text_layer_set_text(s_other_text_layer, "Select - sending get geoloc");

+static void send_message(char * msg){

   // Declare the dictionary's iterator

   DictionaryIterator *out_iter;

@@ -50,8 +50,6 @@ static void prv_select_click_handler(ClickRecognizerRef recognizer, void *contex

   AppMessageResult result = app_message_outbox_begin(&out_iter);

   if(result == APP_MSG_OK) {

-    // Add an item to ask for geoloc

-    msg = "get";

     dict_write_cstring(out_iter, status, msg);

     // Send this message

@@ -63,8 +61,12 @@ static void prv_select_click_handler(ClickRecognizerRef recognizer, void *contex

     // The outbox cannot be used right now

     APP_LOG(APP_LOG_LEVEL_ERROR, "Error preparing the outbox: %d", (int)result);

   }

-  // Button click provider

-  // window_set_click_config_provider(s_window, click_config_provider);

+}

+

+

+static void prv_select_click_handler(ClickRecognizerRef recognizer, void *context) {

+  text_layer_set_text(s_other_text_layer, "Select - sending get geoloc");

+  send_message("get");

 }

 static void prv_up_click_handler(ClickRecognizerRef recognizer, void *context) {

@@ -223,14 +225,28 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

   if(speed_tuple) {

     memset(s_speed,'\0',sizeof(s_speed));

     strncpy(s_speed, speed_tuple->value->cstring, 5);

-

+    //uint i_speed=atoi(s_speed);

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_speed);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "speed message received : %s",s_speed);

+    APP_LOG(APP_LOG_LEVEL_DEBUG, "speed message received : %s ",s_speed);

   }else{

     //APP_LOG(APP_LOG_LEVEL_DEBUG, "not speed message... ");

   }

+  // Read max_speed returns

+  Tuple *max_speed_tuple = dict_find(iter, MESSAGE_KEY_max_speed);

+

+  if(max_speed_tuple) {

+    memset(s_max_speed,'\0',sizeof(s_max_speed));

+    strncpy(s_max_speed, max_speed_tuple->value->cstring, 5);

+    //uint i_max_speed=atoi(s_max_speed);

+    // Display in the TextLayer

+    //text_layer_set_text(s_max_speed_text_layer, lf_max_speed);

+    APP_LOG(APP_LOG_LEVEL_DEBUG, "max_speed message received : %s ",s_max_speed);

+  }else{

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "not max_speed message... ");

+  }

+

   // Read status returns

   Tuple *status_tuple = dict_find(iter, MESSAGE_KEY_status);

@@ -242,23 +258,22 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // DEBUG concatenate all data received

     memset(s_msg,'\0',sizeof(s_msg));

-    strncpy(s_msg, s_status, 2);

-    //strcat(s_msg, "Lat. ");

+    strncpy(s_msg, "Acc. ",5);

+    strcat(s_msg, s_accuracy);

+    strcat(s_msg, "    Alt. ");

+    strcat(s_msg, s_altitude);

+    strcat(s_msg, "\n Max. ");

+    strcat(s_msg, s_max_speed);

+    //strcat(s_msg, "\n Lat. ");

     //strcat(s_msg, s_latitude);

     //strcat(s_msg, "\n Long. ");

     //strcat(s_msg, s_longitude);

-    strcat(s_msg, "\n Acc. ");

-    strcat(s_msg, s_accuracy);

-    strcat(s_msg, "\n Alt. ");

-    strcat(s_msg, s_altitude);

-    //strcat(s_msg, "\n Speed. ");

-    //strcat(s_msg, s_speed);

     //strcat(s_msg, "\n Time. ");

     //strcat(s_msg, s_timestamp);

     APP_LOG(APP_LOG_LEVEL_DEBUG, "to display : %s ",s_msg);

-    // DEBUG Display in the TextLayer

-    text_layer_set_text(s_speed_text_layer, s_speed);

+

+    text_layer_set_text(s_speed_text_layer, strcat(s_speed," km/h"));

     text_layer_set_text(s_other_text_layer, s_msg);

   }else{

     //APP_LOG(APP_LOG_LEVEL_DEBUG, "not status message... ");

@@ -307,6 +322,7 @@ static void prv_init(void) {

 }

 static void prv_deinit(void) {

+  send_message("exit");

   window_destroy(s_window);

 }

@@ -5,12 +5,21 @@ var clay = new Clay(clayConfig);

 var messageKeys = require('message_keys');

 var message;

+var gpx_to_strava = false;

+var csv_to_web = true;

-//var locationInterval;

+var firstlocationInterval;

+var locationInterval;

+

+var firstlocationOptions = {

+  'enableHighAccuracy': true, // default = false (quick and dirty mode), can be true (more accurate but need more power and time)

+  'timeout': 60000, //60s timeout to get a good signal

+  'maximumAge': 5 // no cache

+};

 var locationOptions = {

   'enableHighAccuracy': true, // default = false (quick and dirty mode), can be true (more accurate but need more power and time)

-  'timeout': 5000, //2s timeout

-  'maximumAge': 0 // no cache

+  'timeout': 5000, //5s timeout to get a good signal

+  'maximumAge': 5 // no cache

 };

 var geoloc_id;

@@ -83,12 +92,28 @@ function speed_from_distance_and_time(p1, p2) {

   return speed_kph;

 }

+// Get max speed of the run

+//

+function getMaxSpeed(lastSpeed) {

+  oldmax = localStorage.getItem("maxSpeed") || -1;

+  if (oldmax < lastSpeed) {

+    maxSpeed = lastSpeed

+  } else if (oldmax > lastSpeed) {

+    maxSpeed = oldmax

+  } else {

+    maxSpeed = oldmax

+  }

+  localStorage.setItem("maxSpeed", maxSpeed);

+  return maxSpeed

+}

+

 // split float number into an array of int (null returned instead of 0 for decimal)

 //

 function splitFloatNumber(num) {

   const intStr = num.toString().split('.')[0];

   const decimalStr = num.toString().split('.')[1];

   return [Number(intStr), Number(decimalStr)];

+

 }

 // Build GPX headers

@@ -114,9 +139,99 @@ function GPXfooterBuilder() {

   var GPX = localStorage.getItem("GPX");

   var footer = '</trkseg></trk></gpx>';

   var ret = localStorage.setItem("GPX", GPX + footer);

-  return true;

+  console.log("GPX closed : " + GPX + footer);

+  return ret;

+}

+

+// Send GPX to Strava profile

+// TODO : get authentication creds from settings

+function SendToStrava() {

+  var GPX = localStorage.getItem("GPX");

+

+

+  /* -------------------- */

+  var array = [GPX]; // an array consisting of a single string

+  console.log('------array for blob: ' + array)

+  var blob = new Blob(array, { type: "application/gpx+xml" }); // the blob

+

+  // creating multipart/form-data to be sent

+  var data = new FormData();

+  data.append("file", blob, "blob.gpx");

+  data.append("name", "test");

+  data.append("description", "testdesc");

+  data.append("data_type", "gpx");

+

+  var url = "https://www.strava.com/api/v3/uploads";

+  var xhr = new XMLHttpRequest();

+  xhr.withCredentials = true;

+  xhr.timeout = 10000; // time in milliseconds

+

+  xhr.open("POST", url, false);

+  xhr.setRequestHeader("Authorization", "Bearer d8927033b3996efe1e5a4e62425bc2aff8f635b0");

+

+  console.log('------xhr opened with authorization')

+  xhr.onload = function () {

+    console.log('------xhr onload')

+    if (xhr.readyState === 4) {

+      console.log('------xhr request returned with ' + xhr.status);

+      console.log(this.responseText);

+      if (xhr.status == 200) {

+        //console.log('--> HTTP 200');

+        return true;

+      } else {

+        //console.log('--> HTTP ' + xhr.status);

+        return false;

+      }

+    }

+  };

+

+  xhr.send(data);

+  /* -------------------- */

+

 }

+

+// Build CSV

+function CSV(pos) {

+  var CSV = localStorage.getItem("CSV");

+  var datapoint = pos.timestamp + "," + pos.coords.lat + "," + pos.coords.long + "," + pos.coords.altitude + "," + pos.coords.accuracy + "," + pos.coords.altitudeAccuracy + "," + pos.coords.heading + "," + pos.coords.speed;

+

+  localStorage.setItem("CSV", CSV + datapoint);

+

+}

+// Send CSV to web server (need configuration on serverside)

+// TODO : secure it ?

+function PostToWeb() {

+  var CSV = localStorage.getItem("CSV");

+

+  var url = "https://192.168.170.33/strava/upload.php";

+  var xhr = new XMLHttpRequest();

+  xhr.timeout = 10000; // time in milliseconds

+

+  xhr.open("POST", url, false);

+

+  console.log('------xhr opened')

+  xhr.onload = function () {

+    console.log('------xhr onload')

+    if (xhr.readyState === 4) {

+      console.log('------xhr request returned with ' + xhr.status);

+      console.log(this.responseText);

+      if (xhr.status == 200) {

+        //console.log('--> HTTP 200');

+        return true;

+      } else {

+        //console.log('--> HTTP ' + xhr.status);

+        return false;

+      }

+    }

+  };

+

+  //send CSV in body

+  xhr.send(CSV);

+

+}

+

+

 // Adding leading characters to string for nice displays

 //

 function padStart(string, max_length, padding) {

@@ -141,8 +256,15 @@ function locationSuccess(new_pos) {

   storeLocation(new_pos);

   if (prev_pos === null) {

     console.log('--- start building gpx');

-    // Start the GPX file

-    GPXHeadersBuilder(new Date(new_pos.timestamp).toISOString(), "test", "18");

+

+    if (gpx_to_strava) {

+      // Start the GPX file

+      GPXHeadersBuilder(new Date(new_pos.timestamp).toISOString(), "test", "18");

+    }

+    if (csv_to_web) {

+      // Start the csv file

+      CSV(new_pos);

+    }

   } else {

     //clear watch of new position to avoid overlap

     //navigator.geolocation.clearWatch(geoloc_id);

@@ -162,16 +284,27 @@ function locationSuccess(new_pos) {

     latitudeString = new_pos.coords.latitude.toString().substring(0, 12);

     longitudeString = new_pos.coords.longitude.toString().substring(0, 12);

     accuracyString = new_pos.coords.accuracy.toString().substring(0, 4);

+    //console.log("split num : " + new_pos.coords.altitude);

     altitudeString = splitFloatNumber(new_pos.coords.altitude)[0].toString().substring(0, 5);

     timestampISO = new Date(new_pos.timestamp).toISOString();

-    speedString = speed.toString().substring(0, 5);

+    //console.log("split num : " + speed);

+    speedString = splitFloatNumber(speed)[0].toString().substring(0, 3); //+ "." + splitFloatNumber(speed)[1].toString().substring(0, 1);

+

+    //console.log("split num : " + getMaxSpeed(speed));

+    maxSpeedString = splitFloatNumber(getMaxSpeed(speed))[0].toString().substring(0, 4);

     if (speedString == "NaN") {

       speedString = "---";

     }

-    //add a new datapoint to GPX file

-    GPXtrkptBuilder(latitudeString, longitudeString, altitudeString, timestampISO);

+    if (gpx_to_strava) {

+      //add a new datapoint to GPX file

+      GPXtrkptBuilder(latitudeString, longitudeString, altitudeString, timestampISO);

+    }

+    if (csv_to_web) {

+      // Start the csv file

+      CSV(new_pos);

+    }

     console.log('GPX: ' + localStorage.getItem("GPX"));

@@ -181,6 +314,7 @@ function locationSuccess(new_pos) {

       'accuracy': accuracyString,

       'altitude': altitudeString,

       'speed': speedString,

+      'max_speed': maxSpeedString,

       'status': message

     };

@@ -201,29 +335,36 @@ function locationError(err) {

   //navigator.geolocation.clearWatch(geoloc_id);

   console.warn('location error (' + err.code + '): ' + err.message);

+  if (csv_to_web) {

+

+    var CSV = localStorage.getItem("CSV");

+    var datapoint = Date.now() + ",location error," + err.code + "," + err.message + ",,,,";

+

+    localStorage.setItem("CSV", CSV + datapoint);

+  }

   // restart the watch

   //geoloc_id = navigator.geolocation.watchPosition(locationSuccess, locationError, locationOptions);

 }

-function get_coordinate() {

-  /*console.log('---- start geoloc');

-  navigator.geolocation.getCurrentPosition(locationSuccess, locationError, locationOptions);

-  */

-}

-function init() {

-  // local storage init

-  localStorage.clear();

-  // clear any other var to do

-  //clearInterval(locationInterval);

+function get_coordinate() {

+  console.log('--- Starting regular getCurrentPosition loop using setInterval at 5 sec');

+  navigator.geolocation.getCurrentPosition(locationSuccess, locationError, firstlocationOptions);

-  console.log('--- Starting regular getCurrentPosition loop using setInterval at 5 sec');

   locationInterval = setInterval(function () {

     navigator.geolocation.getCurrentPosition(locationSuccess, locationError, locationOptions);

   }, 5000);

+}

+

+function init() {

+  // local storage init,

+  // todo : clear only temporary values, not clay config (and do it on exit ?)

+  localStorage.clear();

+  // clear any other var to do

+  clearInterval(locationInterval);

 }

@@ -245,6 +386,19 @@ Pebble.addEventListener('appmessage', function (e) {

     case 'get':

       get_coordinate();

       break;

+    case 'exit':

+      if (gpx_to_strava) {

+        //End GPX file

+        GPXfooterBuilder();

+        //send to strava through API

+        SendToStrava();

+      }

+      if (csv_to_web) {

+        //CSV(new_pos);

+        // send CSV to web server through API

+        PostToWeb();

+      }

+      break;

     default:

       console.log('Sorry. I don\'t understand your request :' + dict[0]);

   }