@@ -373,13 +373,22 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     */

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

-

-    text_layer_set_text(s_upperleft_text_layer, s_altitude);

-    text_layer_set_text(s_upperright_text_layer, s_distance);

-    text_layer_set_text(s_main_text_layer, s_speed);

-    text_layer_set_text(s_lowerleft_text_layer, s_avg_speed);

-    text_layer_set_text(s_lowerright_text_layer, s_max_speed);

-    text_layer_set_text(s_lower_text_layer, s_duration);

+    if(strcmp(s_status, "L200")==0){

+      text_layer_set_text(s_upperleft_text_layer, s_altitude);

+      text_layer_set_text(s_upperright_text_layer, s_distance);

+      text_layer_set_text(s_main_text_layer, s_speed);

+      text_layer_set_text(s_lowerleft_text_layer, s_avg_speed);

+      text_layer_set_text(s_lowerright_text_layer, s_max_speed);

+      text_layer_set_text(s_lower_text_layer, s_duration);

+    }else if(strcmp(s_status, "S200")==0){

+      text_layer_set_text(s_lower_text_layer, "upload OK");

+      vibes_short_pulse();

+    }else if(strcmp(s_status, "S401")==0){

+      text_layer_set_text(s_lower_text_layer, "auth err, retrying");

+    }else{

+      text_layer_set_text(s_lower_text_layer, s_status);

+      vibes_double_pulse();

+    }

   }else{

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

   }

@@ -21,7 +21,7 @@ static char s_status[4];

 //restricting long and lat to 13 char : 0-1 for the sign, 1-3 for integer, 1 for the point, 7-10 for decimal, 1 for \0

 static char s_longitude[13];

 static char s_latitude[13];

-static char s_distance[6];

+static char s_distance[7];

 static char s_accuracy[5];

 static char s_altitude[6];

@@ -237,7 +237,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

   if(distance_tuple) {

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

-    strncpy(s_distance, distance_tuple->value->cstring, 6);

+    strncpy(s_distance, distance_tuple->value->cstring, 7);

   }else{

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

   }

@@ -77,12 +77,12 @@ static void send_message(char * msg){

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

   text_layer_set_text(s_main_text_layer, "");

-  text_layer_set_text(s_lower_text_layer, "sending get geoloc");

+  text_layer_set_text(s_lower_text_layer, "started/stopped");

   send_message("startstop");

 }

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

-  text_layer_set_text(s_lower_text_layer, "Tracking stopped, sending track...");

+  text_layer_set_text(s_lower_text_layer, "uploading...");

   send_message("send");

 }

@@ -1,11 +1,16 @@

 #include <pebble.h>

 static Window *s_window;

-static TextLayer *s_speed_text_layer;

-static TextLayer *s_other_text_layer;

+static StatusBarLayer *s_status_text_layer;

+static TextLayer *s_upperleft_text_layer;

+static TextLayer *s_upperright_text_layer;

+static TextLayer *s_main_text_layer;

+static TextLayer *s_lowerleft_text_layer;

+static TextLayer *s_lowerright_text_layer;

+static TextLayer *s_lower_text_layer;

 // Largest expected inbox and outbox message sizes

-const uint32_t inbox_size = 64;

+const uint32_t inbox_size = 150;

 const uint32_t outbox_size = 64;

 static uint32_t size ;

@@ -16,13 +21,16 @@ static char s_status[4];

 //restricting long and lat to 13 char : 0-1 for the sign, 1-3 for integer, 1 for the point, 7-10 for decimal, 1 for \0

 static char s_longitude[13];

 static char s_latitude[13];

+static char s_distance[6];

 static char s_accuracy[5];

 static char s_altitude[6];

 static char s_altitude_accuracy[4];

 static char s_timestamp[14];

+static char s_duration[9];

 static char s_speed[6];

 static char s_max_speed[5];

+static char s_avg_speed[4];

 static char s_msg[50];

@@ -32,12 +40,15 @@ typedef enum {

   status,

   latitude,

   longitude,

+  distance,

   altitude,

   accuracy,

   altitude_accuracy,

   speed,

   max_speed,

-  timestamp

+  avg_speed,

+  timestamp,

+  duration

 } AppKey;

@@ -65,25 +76,27 @@ static void send_message(char * msg){

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

-  text_layer_set_text(s_speed_text_layer, "");

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

-  send_message("get");

+  text_layer_set_text(s_main_text_layer, "");

+  text_layer_set_text(s_lower_text_layer, "sending get geoloc");

+  send_message("startstop");

 }

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

-  text_layer_set_text(s_other_text_layer, "Tracking stopped, sending...");

-  send_message("exit");

+  text_layer_set_text(s_lower_text_layer, "Tracking stopped, sending track...");

+  send_message("send");

 }

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

-  text_layer_set_text(s_other_text_layer, "Tracking stopped, sending...");

-  send_message("exit");

+  //text_layer_set_text(s_lower_text_layer, "Tracking stopped, sending track...");

+  //send_message("exit");

 }

+/*

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

   //text_layer_set_text(s_other_text_layer, "back");

   //send_message("exit");

 }

+*/

 static void prv_click_config_provider(void *context) {

   window_single_click_subscribe(BUTTON_ID_SELECT, prv_select_click_handler);

@@ -96,33 +109,82 @@ static void prv_window_load(Window *window) {

   Layer *window_layer = window_get_root_layer(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));

-  text_layer_set_text_alignment(s_speed_text_layer, GTextAlignmentCenter);

-  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));

+  // creation of all text layers

+  s_status_text_layer = status_bar_layer_create();

+  s_upperleft_text_layer = text_layer_create(GRect(0, 18, bounds.size.w/2, 34));

+  s_upperright_text_layer = text_layer_create(GRect(bounds.size.w/2, 18, bounds.size.w/2, 34));

+  s_main_text_layer = text_layer_create(GRect(0, 52, bounds.size.w, 52));

+  s_lowerleft_text_layer = text_layer_create(GRect(0, 104, bounds.size.w/2, 34));

+  s_lowerright_text_layer = text_layer_create(GRect(bounds.size.w/2, 104, bounds.size.w/2, 34));

+  s_lower_text_layer = text_layer_create(GRect(0, 138, bounds.size.w, 30));

+

+  // settings of status layer

+  status_bar_layer_set_colors(s_status_text_layer, GColorBlack, GColorWhite);

+  status_bar_layer_set_separator_mode(s_status_text_layer, StatusBarLayerSeparatorModeDotted);

+  layer_set_frame(status_bar_layer_get_layer(s_status_text_layer), GRect(0, 0, bounds.size.w, 18));

+  layer_add_child(window_layer, status_bar_layer_get_layer(s_status_text_layer));

+  /*

+  may need to add other layers to disply BT and GPS in status bar ?

+  */

+

+  // settings of upperleft layer

+  text_layer_set_background_color(s_upperleft_text_layer, GColorWhite);

+  text_layer_set_text_color(s_upperleft_text_layer, GColorBlack);

+  text_layer_set_font(s_upperleft_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

+  text_layer_set_text_alignment(s_upperleft_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(s_upperleft_text_layer));

+

+  // settings of upperright layer

+  text_layer_set_background_color(s_upperright_text_layer, GColorWhite);

+  text_layer_set_text_color(s_upperright_text_layer, GColorBlack);

+  text_layer_set_font(s_upperright_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

+  text_layer_set_text_alignment(s_upperright_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(s_upperright_text_layer));

+

+  // settings of main layer

+  text_layer_set_background_color(s_main_text_layer, GColorBlack);

+  text_layer_set_text_color(s_main_text_layer, GColorWhite);

+  text_layer_set_font(s_main_text_layer, fonts_get_system_font(FONT_KEY_BITHAM_42_BOLD));

+  text_layer_set_text_alignment(s_main_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(s_main_text_layer));

+

+  // settings of lowerleft layer

+  text_layer_set_background_color(s_lowerleft_text_layer, GColorWhite);

+  text_layer_set_text_color(s_lowerleft_text_layer, GColorBlack);

+  text_layer_set_font(s_lowerleft_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

+  text_layer_set_text_alignment(s_lowerleft_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(s_lowerleft_text_layer));

+

+  // settings of lowerright layer

+  text_layer_set_background_color(s_lowerright_text_layer, GColorWhite);

+  text_layer_set_text_color(s_lowerright_text_layer, GColorBlack);

+  text_layer_set_font(s_lowerright_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

+  text_layer_set_text_alignment(s_lowerright_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(s_lowerright_text_layer));

+

+  // settings of lower layer

+  text_layer_set_background_color(s_lower_text_layer, GColorBlack);

+  text_layer_set_text_color(s_lower_text_layer, GColorWhite);

+  text_layer_set_font(s_lower_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

+  text_layer_set_text_alignment(s_lower_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(s_lower_text_layer));

-  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_18_BOLD));

-  text_layer_set_text_alignment(s_other_text_layer, GTextAlignmentCenter);

-  layer_add_child(window_layer, text_layer_get_layer(s_other_text_layer));

 }

 static void prv_window_unload(Window *window) {

-  text_layer_destroy(s_speed_text_layer);

+  text_layer_destroy(s_main_text_layer);

 }

 void comm_is_ready() {

   // set the text

-  text_layer_set_text(s_speed_text_layer, "Press Select");

-  text_layer_set_text(s_other_text_layer, "Welcome to Bike Companion ! JS is ready");

+  //text_layer_set_text(s_status_text_layer, "0......................................");

+  text_layer_set_text(s_upperleft_text_layer, "-");

+  text_layer_set_text(s_upperleft_text_layer, "-");

+  text_layer_set_text(s_main_text_layer, "Ready");

+  text_layer_set_text(s_lowerleft_text_layer, "-");

+  text_layer_set_text(s_lowerright_text_layer, "-");

+  text_layer_set_text(s_lower_text_layer, "--:--:--");

 }

@@ -170,6 +232,16 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

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

   }

+  // Read distance returns

+  Tuple *distance_tuple = dict_find(iter, MESSAGE_KEY_distance);

+

+  if(distance_tuple) {

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

+    strncpy(s_distance, distance_tuple->value->cstring, 6);

+  }else{

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

+  }

+

   // Read accuracy returns

   Tuple *accuracy_tuple = dict_find(iter, MESSAGE_KEY_accuracy);

@@ -226,6 +298,16 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

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

   }

+  // Read duration returns

+  Tuple *duration_tuple = dict_find(iter, MESSAGE_KEY_duration);

+

+  if(duration_tuple) {

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

+    strncpy(s_duration, duration_tuple->value->cstring, 9);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "duration message received : %s",s_duration);

+  }else{

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

+  }

   // Read speed returns

   Tuple *speed_tuple = dict_find(iter, MESSAGE_KEY_speed);

@@ -255,6 +337,15 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

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

   }

+  // Read avg_speed returns

+  Tuple *avg_speed_tuple = dict_find(iter, MESSAGE_KEY_avg_speed);

+

+  if(avg_speed_tuple) {

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

+    strncpy(s_avg_speed, avg_speed_tuple->value->cstring, 4);

+  }else{

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

+  }

   // Read status returns

   Tuple *status_tuple = dict_find(iter, MESSAGE_KEY_status);

@@ -266,25 +357,29 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // DEBUG concatenate all data received

     /*

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

-    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 Time. ");

-    strcat(s_msg, s_timestamp);

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

+      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 Time. ");

+      strcat(s_msg, s_timestamp);

     */

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

-    text_layer_set_text(s_speed_text_layer, s_speed);

-    text_layer_set_text(s_other_text_layer, s_msg);

+    text_layer_set_text(s_upperleft_text_layer, s_altitude);

+    text_layer_set_text(s_upperright_text_layer, s_distance);

+    text_layer_set_text(s_main_text_layer, s_speed);

+    text_layer_set_text(s_lowerleft_text_layer, s_avg_speed);

+    text_layer_set_text(s_lowerright_text_layer, s_max_speed);

+    text_layer_set_text(s_lower_text_layer, s_duration);

   }else{

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

   }

@@ -71,16 +71,17 @@ static void prv_select_click_handler(ClickRecognizerRef recognizer, void *contex

 }

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

-  //text_layer_set_text(s_other_text_layer, "Up");

+  text_layer_set_text(s_other_text_layer, "Tracking stopped, sending...");

+  send_message("exit");

 }

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

-  //text_layer_set_text(s_other_text_layer, "Down");

+  text_layer_set_text(s_other_text_layer, "Tracking stopped, sending...");

   send_message("exit");

 }

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

-  //text_layer_set_text(s_other_text_layer, "Down");

+  //text_layer_set_text(s_other_text_layer, "back");

   //send_message("exit");

 }

@@ -120,14 +121,14 @@ static void prv_window_unload(Window *window) {

 void comm_is_ready() {

   // set the text

-  text_layer_set_text(s_speed_text_layer, "Press a button to start");

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

+  text_layer_set_text(s_speed_text_layer, "Press Select");

+  text_layer_set_text(s_other_text_layer, "Welcome to Bike Companion ! JS is ready");

 }

 static void inbox_received_callback(DictionaryIterator *iter, void *context) {

   // A new message has been successfully received

-  APP_LOG(APP_LOG_LEVEL_DEBUG, "New message! ");

+  APP_LOG(APP_LOG_LEVEL_INFO, "New message! ");

   size = dict_size(iter);

@@ -138,7 +139,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     //Pebblekit JS is ready ! Safe to send messages

     s_js_ready = true;

     comm_is_ready();

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "received jsready message on watch... ");

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "received jsready message on watch... ");

   }

   // Read latitude returns

@@ -150,7 +151,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_latitude);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "latitude message received : %s",s_latitude);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "latitude message received : %s",s_latitude);

   }else{

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

   }

@@ -164,7 +165,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_longitude);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "longitude message received : %s",s_longitude);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "longitude message received : %s",s_longitude);

   }else{

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

   }

@@ -178,7 +179,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_accuracy);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "accuracy message received : %s",s_accuracy);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "accuracy message received : %s",s_accuracy);

   }else{

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

   }

@@ -192,7 +193,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_altitude);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "altitude message received : %s",altitude_tuple->value->cstring);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "altitude message received : %s",altitude_tuple->value->cstring);

   }else{

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

   }

@@ -206,7 +207,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_altitude_accuracy);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "altitude_accuracy message received : %s",s_altitude_accuracy);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "altitude_accuracy message received : %s",s_altitude_accuracy);

   }else{

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

   }

@@ -220,7 +221,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     // Display in the TextLayer

     //text_layer_set_text(s_speed_text_layer, lf_timestamp);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "timestamp message received : %s",s_timestamp);

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "timestamp message received : %s",s_timestamp);

   }else{

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

   }

@@ -235,7 +236,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     //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... ");

   }

@@ -249,7 +250,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     //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);

+    //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... ");

   }

@@ -261,31 +262,29 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

   if(status_tuple) {

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

     strncpy(s_status, status_tuple->value->cstring, 4);

-    /*if (strcmp(s_status,"KO")== 0){

-      //find a way to exit 

-    }else{*/

-      APP_LOG(APP_LOG_LEVEL_DEBUG, "status message received : %s",s_status);

-

-      // DEBUG concatenate all data received

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

-      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 Time. ");

-      //strcat(s_msg, s_timestamp);

-

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

-

-      text_layer_set_text(s_speed_text_layer, s_speed);

-      text_layer_set_text(s_other_text_layer, s_msg);

-   // }

+    //APP_LOG(APP_LOG_LEVEL_DEBUG, "status message received : %s",s_status);

+

+    // DEBUG concatenate all data received

+    /*

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

+    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 Time. ");

+    strcat(s_msg, s_timestamp);

+    */

+

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

+

+    text_layer_set_text(s_speed_text_layer, s_speed);

+    text_layer_set_text(s_other_text_layer, s_msg);

   }else{

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

   }

@@ -340,7 +339,7 @@ static void prv_deinit(void) {

 int main(void) {

   prv_init();

-  APP_LOG(APP_LOG_LEVEL_DEBUG, "Done initializing, pushed window: %p", s_window);

+  //APP_LOG(APP_LOG_LEVEL_DEBUG, "Done initializing, pushed window: %p", s_window);

   app_event_loop();

   prv_deinit();

@@ -11,7 +11,7 @@ const uint32_t outbox_size = 64;

 static uint32_t size ;

 //static char * msg;

-static char s_status[3];

+static char s_status[4];

 //restricting long and lat to 13 char : 0-1 for the sign, 1-3 for integer, 1 for the point, 7-10 for decimal, 1 for \0

 static char s_longitude[13];

@@ -76,7 +76,7 @@ static void prv_up_click_handler(ClickRecognizerRef recognizer, void *context) {

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

   //text_layer_set_text(s_other_text_layer, "Down");

-  //send_message("exit");

+  send_message("exit");

 }

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

@@ -260,7 +260,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

   if(status_tuple) {

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

-    strncpy(s_status, status_tuple->value->cstring, 2);

+    strncpy(s_status, status_tuple->value->cstring, 4);

     /*if (strcmp(s_status,"KO")== 0){

       //find a way to exit 

     }else{*/

@@ -333,7 +333,7 @@ static void prv_init(void) {

 }

 static void prv_deinit(void) {

-  send_message("exit");

+  //send_message("exit");

   window_destroy(s_window);

 }

@@ -76,7 +76,7 @@ static void prv_up_click_handler(ClickRecognizerRef recognizer, void *context) {

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

   //text_layer_set_text(s_other_text_layer, "Down");

-  send_message("exit");

+  //send_message("exit");

 }

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

@@ -88,7 +88,7 @@ static void prv_click_config_provider(void *context) {

   window_single_click_subscribe(BUTTON_ID_SELECT, prv_select_click_handler);

   window_single_click_subscribe(BUTTON_ID_UP, prv_up_click_handler);

   window_single_click_subscribe(BUTTON_ID_DOWN, prv_down_click_handler);

-  window_single_click_subscribe(BUTTON_ID_BACK, prv_back_click_handler);

+  //window_single_click_subscribe(BUTTON_ID_BACK, prv_back_click_handler);

 }

 static void prv_window_load(Window *window) {

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

 }

 static void prv_deinit(void) {

+  send_message("exit");

   window_destroy(s_window);

 }

@@ -76,12 +76,19 @@ static void prv_up_click_handler(ClickRecognizerRef recognizer, void *context) {

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

   //text_layer_set_text(s_other_text_layer, "Down");

+  send_message("exit");

+}

+

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

+  //text_layer_set_text(s_other_text_layer, "Down");

+  //send_message("exit");

 }

 static void prv_click_config_provider(void *context) {

   window_single_click_subscribe(BUTTON_ID_SELECT, prv_select_click_handler);

   window_single_click_subscribe(BUTTON_ID_UP, prv_up_click_handler);

   window_single_click_subscribe(BUTTON_ID_DOWN, prv_down_click_handler);

+  window_single_click_subscribe(BUTTON_ID_BACK, prv_back_click_handler);

 }

 static void prv_window_load(Window *window) {

@@ -254,27 +261,31 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

   if(status_tuple) {

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

     strncpy(s_status, status_tuple->value->cstring, 2);

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "status message received : %s",s_status);

-

-    // DEBUG concatenate all data received

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

-    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 Time. ");

-    //strcat(s_msg, s_timestamp);

-

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

-

-    text_layer_set_text(s_speed_text_layer, s_speed);

-    text_layer_set_text(s_other_text_layer, s_msg);

+    /*if (strcmp(s_status,"KO")== 0){

+      //find a way to exit 

+    }else{*/

+      APP_LOG(APP_LOG_LEVEL_DEBUG, "status message received : %s",s_status);

+

+      // DEBUG concatenate all data received

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

+      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 Time. ");

+      //strcat(s_msg, s_timestamp);

+

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

+

+      text_layer_set_text(s_speed_text_layer, s_speed);

+      text_layer_set_text(s_other_text_layer, s_msg);

+   // }

   }else{

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

   }

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

 }

 static void prv_deinit(void) {

-  send_message("exit");

   window_destroy(s_window);

 }

@@ -65,7 +65,7 @@ static void send_message(char * msg){

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

-  text_layer_set_text(s_speed_text_layer, "");

+  text_layer_set_text(s_speed_text_layer, "0.0");

   text_layer_set_text(s_other_text_layer, "sending get geoloc");

   send_message("get");

 }

@@ -88,16 +88,16 @@ static void prv_window_load(Window *window) {

   Layer *window_layer = window_get_root_layer(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));

+  s_speed_text_layer = text_layer_create(GRect(0, 0, bounds.size.w, 54));

   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_ROBOTO_BOLD_SUBSET_49));

+  text_layer_set_font(s_speed_text_layer, fonts_get_system_font(FONT_KEY_BITHAM_42_BOLD));

   text_layer_set_text_alignment(s_speed_text_layer, GTextAlignmentCenter);

   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));

+  s_other_text_layer = text_layer_create(GRect(0, 55 ,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);

@@ -113,8 +113,7 @@ static void prv_window_unload(Window *window) {

 void comm_is_ready() {

   // set the text

-  text_layer_set_text(s_speed_text_layer, "Press a button to start");

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

+  text_layer_set_text(s_other_text_layer, "Press a button to start");

 }

@@ -260,9 +259,9 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

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

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

     strcat(s_msg, s_accuracy);

-    strcat(s_msg, "    Alt. ");

+    strcat(s_msg, "\nAlt. ");

     strcat(s_msg, s_altitude);

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

+    strcat(s_msg, "\nMax. ");

     strcat(s_msg, s_max_speed);

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

     //strcat(s_msg, s_latitude);

@@ -21,8 +21,8 @@ static char s_accuracy[5];

 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_speed[5];

+static char s_max_speed[3];

 static char s_msg[50];

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

   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));

+  text_layer_set_font(s_speed_text_layer, fonts_get_system_font(FONT_KEY_ROBOTO_BOLD_SUBSET_49));

   text_layer_set_text_alignment(s_speed_text_layer, GTextAlignmentCenter);

   layer_add_child(window_layer, text_layer_get_layer(s_speed_text_layer));

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

   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_18_BOLD));

+  text_layer_set_font(s_other_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_28_BOLD));

   text_layer_set_text_alignment(s_other_text_layer, GTextAlignmentCenter);

   layer_add_child(window_layer, text_layer_get_layer(s_other_text_layer));

 }

@@ -238,7 +238,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

   if(max_speed_tuple) {

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

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

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

     //uint i_max_speed=atoi(s_max_speed);

     // Display in the TextLayer

     //text_layer_set_text(s_max_speed_text_layer, lf_max_speed);

@@ -65,16 +65,17 @@ static void send_message(char * msg){

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

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

+  text_layer_set_text(s_speed_text_layer, "");

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

   send_message("get");

 }

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

-  text_layer_set_text(s_other_text_layer, "Up");

+  //text_layer_set_text(s_other_text_layer, "Up");

 }

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

-  text_layer_set_text(s_other_text_layer, "Down");

+  //text_layer_set_text(s_other_text_layer, "Down");

 }

 static void prv_click_config_provider(void *context) {

@@ -93,7 +94,6 @@ static void prv_window_load(Window *window) {

   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));

   text_layer_set_text_alignment(s_speed_text_layer, GTextAlignmentCenter);

-  text_layer_set_text(s_speed_text_layer, "Press a button");

   layer_add_child(window_layer, text_layer_get_layer(s_speed_text_layer));

@@ -101,9 +101,8 @@ static void prv_window_load(Window *window) {

   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));

+  text_layer_set_font(s_other_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_18_BOLD));

   text_layer_set_text_alignment(s_other_text_layer, GTextAlignmentCenter);

-  text_layer_set_text(s_other_text_layer, "Press a button");

   layer_add_child(window_layer, text_layer_get_layer(s_other_text_layer));

 }

@@ -114,6 +113,7 @@ static void prv_window_unload(Window *window) {

 void comm_is_ready() {

   // set the text

+  text_layer_set_text(s_speed_text_layer, "Press a button to start");

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

 }

@@ -273,7 +273,7 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

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

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

+    text_layer_set_text(s_speed_text_layer, s_speed);

     text_layer_set_text(s_other_text_layer, s_msg);

   }else{

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

@@ -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) {