Update Version and Server Address

Fertogo · Apr 26, 2015 · cefb0d8 · cefb0d8
1 parent 28207cb
commit cefb0d8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/appinfo.json b/appinfo.json
@@ -40,7 +40,7 @@
     "shortName": "Workout Timer",
     "uuid": "2add7054-08bc-4dda-b4d8-28f22f3d7ec2",
     "versionCode": 1,
-    "versionLabel": "2.5",
+    "versionLabel": "2.7",
     "watchapp": {
         "watchface": false
     }

diff --git a/src/app.js b/src/app.js
@@ -2,7 +2,7 @@
 //By Fernando Trujano
 //    [email protected]
 // 02/15/2015
-var version = "2.6";
+var version = "2.7";
 //Sends workouts to watch app using Pebble.sendAppMesssage
 
 var counter = 0; 
@@ -35,7 +35,7 @@ Pebble.addEventListener("ready", function(e){
 Pebble.addEventListener("showConfiguration", function(){ 
   console.log("Showing Configuration v" + version);
   console.log(version); 
-  Pebble.openURL("http://fernandotrujano.com/pebble/index.html?info="+Pebble.getAccountToken()+','+version); 
+  Pebble.openURL("http://pebble.fernandotrujano.com/workout-manager.html?info="+Pebble.getAccountToken()+','+version); 
 });
 
 //After Closing settings view

diff --git a/src/main.c b/src/main.c
@@ -270,11 +270,15 @@ void window_load(Window *window) {
 
 static TextLayer *loading_text; 
 void loading_window_load(Window *loading_window){ 
+      APP_LOG(APP_LOG_LEVEL_DEBUG,"Loading Window Load"); 
+
    Layer *loading_window_layer = window_get_root_layer(loading_window);
     GRect bounds = layer_get_frame(loading_window_layer);
 
-    loading_text = text_layer_create(GRect(0, 10, bounds.size.w /* width */, 28 /* height */));
-    text_layer_set_text(loading_text, "Loading...");
+    loading_text = text_layer_create(GRect(0, 10, bounds.size.w /* width */, 80 /* height */));
+    if (bluetooth_connection_service_peek()) text_layer_set_text(loading_text, "Loading...");
+
+    else text_layer_set_text(loading_text, "Please connect Pebble to Phone then try again.");
     text_layer_set_font(loading_text, fonts_get_system_font(FONT_KEY_GOTHIC_24_BOLD));
     text_layer_set_text_alignment(loading_text, GTextAlignmentCenter);
     layer_add_child(loading_window_layer, text_layer_get_layer(loading_text));
@@ -299,7 +303,7 @@ static void time_window_disappear(Window *window){
 *
 */
 static void timer_callback(void *data) {
-      APP_LOG(APP_LOG_LEVEL_DEBUG,"Restore?: %d", needRestore);
+//      APP_LOG(APP_LOG_LEVEL_DEBUG,"Restore?: %d", needRestore);
     //if (persist_exists(PERSIST_KEY_WAKEUP_ID))   APP_LOG(APP_LOG_LEVEL_DEBUG,"WAKEUP WILL HAPPEN");
 
     if (timer_time==0) {