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

@@ -41,7 +41,30 @@ typedef enum {

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

-  text_layer_set_text(s_other_text_layer, "Select");

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

+

+  // Declare the dictionary's iterator

+  DictionaryIterator *out_iter;

+

+  // Prepare the outbox buffer for this message

+  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

+    result = app_message_outbox_send();

+    if(result != APP_MSG_OK) {

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

+    }

+  } else {

+    // 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_up_click_handler(ClickRecognizerRef recognizer, void *context) {

@@ -63,7 +86,7 @@ static void prv_window_load(Window *window) {

   GRect bounds = layer_get_bounds(window_layer);

   s_speed_text_layer = text_layer_create(GRect(0, 0, bounds.size.w, bounds.size.h/2));

-  

+

   text_layer_set_background_color(s_speed_text_layer, GColorBlack);

   text_layer_set_text_color(s_speed_text_layer, GColorWhite);

   text_layer_set_font(s_speed_text_layer, fonts_get_system_font(FONT_KEY_BITHAM_42_BOLD));

@@ -71,9 +94,9 @@ static void prv_window_load(Window *window) {

   text_layer_set_text(s_speed_text_layer, "Press a button");

   layer_add_child(window_layer, text_layer_get_layer(s_speed_text_layer));

-  

+

   s_other_text_layer = text_layer_create(GRect(0, bounds.size.h/2,bounds.size.w, bounds.size.h/2));

-  

+

   text_layer_set_background_color(s_other_text_layer, GColorClear);

   text_layer_set_text_color(s_other_text_layer, GColorBlack);

   text_layer_set_font(s_other_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_14));

@@ -91,29 +114,6 @@ void comm_is_ready() {

   // set the text

   text_layer_set_text(s_other_text_layer, "Welcome to Bike Companion ! JSready");

-  // Declare the dictionary's iterator

-  DictionaryIterator *out_iter;

-

-  // Prepare the outbox buffer for this message

-  AppMessageResult result = app_message_outbox_begin(&out_iter);

-

-  if(result == APP_MSG_OK) {

-    // Add an item to ask for weather data

-    msg = "get";

-    dict_write_cstring(out_iter, status, msg);

-

-    // Send this message

-    result = app_message_outbox_send();

-    if(result != APP_MSG_OK) {

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

-    }

-  } else {

-    // 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 inbox_received_callback(DictionaryIterator *iter, void *context) {

@@ -6,12 +6,13 @@ var messageKeys = require('message_keys');

 var message;

-var locationInterval;

+//var locationInterval;

 var locationOptions = {

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

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

-  'maximumAge': 1000 // 1s cache

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

+  'maximumAge': 0 // no cache

 };

+var geoloc_id;

 // Store location in Pebble app local storage

 //

@@ -133,23 +134,28 @@ function padStart(string, max_length, padding) {

 // called in case of successful geoloc gathering and sends the coordinate to watch

 //

 function locationSuccess(new_pos) {

+  console.log('--- locationSuccess');

+  console.log(" location is " + new_pos.coords.latitude + ',' + new_pos.coords.longitude + ' , acc. ' + new_pos.coords.accuracy);

+

   var prev_pos = getLocation();

   storeLocation(new_pos);

   if (prev_pos === null) {

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

-    return null;

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

+    // Start the GPX file

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

   } else {

+    //clear watch of new position to avoid overlap

+    //navigator.geolocation.clearWatch(geoloc_id);

+    //console.log('--- watch geoloc cleared');

     var speed = speed_from_distance_and_time(prev_pos, new_pos);

     // Prepare display on watch

     // now it's only raw data

-    //init strings

+    // init strings

     var latitudeString = "";

     var longitudeString = "";

     var accuracyString = "";

     var altitudeString = "";

-    //var altitudeAccuracyString = "";

-    //var timestampString = "";

     var speedString = "";

     //formating for precision and max size

@@ -163,12 +169,8 @@ function locationSuccess(new_pos) {

     if (speedString == "NaN") {

       speedString = "---";

     }

-    // logging

-    /*console.log('Your current position at ' + timestampString + ' is:');

-    console.log('Coordinates: ' + latitudeString+ ', ' + longitudeString+' ; with a ' + accuracyString + 'm accuracy');

-    console.log('Altitude: ' + altitudeString + 'm ; with a ' + altitudeAccuracyString + 'm accuracy');

-    console.log('Speed: ' + speedString + ' km/h.');

-    */

+

+    //add a new datapoint to GPX file

     GPXtrkptBuilder(latitudeString, longitudeString, altitudeString, timestampISO);

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

@@ -176,16 +178,11 @@ function locationSuccess(new_pos) {

     // Build message

     message = "OK";

     var dict = {

-      //'latitude': padStart(latitudeString, 12, '0'),

-      //'longitude': padStart(longitudeString, 12, '0'),

       'accuracy': accuracyString,

       'altitude': altitudeString,

-      //'altitude_accuracy': padStart(altitudeAccuracyString, 3, '0'),

-      //'timestamp': padStart(timestampString, 13, '0'),

       'speed': speedString,

       'status': message

     };

-    //console.log('Message to send: ' + JSON.stringify(dict));

     // Send the message

     Pebble.sendAppMessage(dict, function () {

@@ -194,129 +191,38 @@ function locationSuccess(new_pos) {

       console.log('Message (' + JSON.stringify(dict) + ') failed: ' + JSON.stringify(e));

     });

   }

+

+  // restart the watch

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

 }

 function locationError(err) {

+  //clear watch of new position to avoid overlap

+  //navigator.geolocation.clearWatch(geoloc_id);

+

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

-  /* // No app when no location

-       Pebble.sendAppMessage({

-           'WEATHER_CITY_KEY': 'Loc Unavailable',

-           'WEATHER_TEMPERATURE_KEY': 'N/A'

-       });*/

+

+  // restart the watch

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

 }

 function get_coordinate() {

-  console.log('---- get_coordinate');

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

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

-

+  */

 }

-/*

-function switch_home(bool) {

-  var response;

-  console.log('---- authenticate');

-  if (sid != ""){

-    status = "";

-    console.log('---- get_status');

-    if (localStorage.getItem('username')  && localStorage.getItem('password') && localStorage.getItem('server') ){

-      var username=localStorage.getItem('username');

-      var password=localStorage.getItem('password');

-      var server=localStorage.getItem('server');

-      var xhr = new XMLHttpRequest();

-

-      url = server + "/webapi/entry.cgi?api=SYNO.SurveillanceStation.HomeMode&version=1&method=GetInfo&_sid="+sid;

-

-      xhr.open("GET", url,false);

-      xhr.send();

-

-      if(xhr.status == 200) {

-        response = JSON.parse(xhr.responseText);

-        if (response.success == true){

-          status = response.data.on;

-          console.log('------ status:'+status);

-          var message;

-          var dict;

-          if ( status != bool){

-            console.log('---- switching home mode to '+ bool);

-            url = server + "/webapi/entry.cgi?api=SYNO.SurveillanceStation.HomeMode&version=1&method=Switch&on="+bool+"&_sid="+sid;

-

-            xhr.open("GET", url,false);

-            xhr.send();

-

-            if(xhr.status == 200) {

-              response = JSON.parse(xhr.responseText);

-              if (response.success == true){

-                status=bool;

-                switch (status) {

-                  case true:

-                    message = "You just set Home mode ON";

-                    break;

-                  case false:

-                    message = "You just set Home mode OFF";

-                    break;

-                  default:

-                    message = "something happened, try again !";

-                }

-                // Build message

-                dict = {

-                  'status': message,

-                };

-

-                // Send the message

-                Pebble.sendAppMessage(dict, function(e) {

-                  console.log('sent');

-                }, function() {

-                  console.log('failed');

-                });

-              }

-            }else {

-              console.log('------Request returned error code ' + xhr.status.toString());

-            }

-          }else{

-            console.log('---- nothing to do, status already '+status);

-            switch (status) {

-              case true:

-                message = "Your Home Mode is already ON";

-                break;

-              case false:

-                message = "Your Home Mode is already OFF";

-                break;

-              default:

-                message = "something happened, try again !";

-            }

-            // Build message

-            dict = {

-              'status': message,

-            };

-

-            // Send the message

-            Pebble.sendAppMessage(dict, function(e) {

-              console.log('sent');

-            }, function() {

-              console.log('failed');

-            });

-          }

-        }

-      }else {

-        console.log('------Request returned error code ' + xhr.status.toString());

-      }

-    }else{

-      Pebble.showSimpleNotificationOnPebble("DSCam H-S", "You need to set your Synology account and server.");

-    }

-   }

-

-}*/

-

 function init() {

   // local storage init

   localStorage.clear();

   // clear any other var to do

-  clearInterval(locationInterval);

+  //clearInterval(locationInterval);

+

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

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

   locationInterval = setInterval(function () {

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

-  }, 1000);

+  }, 5000);

 }

@@ -338,13 +244,7 @@ Pebble.addEventListener('appmessage', function (e) {

   switch (dict[0]) {

     case 'get':

       get_coordinate();

-      break;/*

-    case 'home_on':

-      switch_home(true);

       break;

-    case 'home_off':

-      switch_home(false);

-      break;*/

     default:

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

   }