appinfo.json

@@ -6,11 +6,9 @@
         "colorm": 1,
         "colorp": 3,
         "colort": 6,
-        "invert": 9,
         "rectticks": 7,
         "shadows": 4,
-        "ticks": 5,
+        "ticks": 5
-        "whwidth": 10
     },
     "capabilities": [
         "configurable"
@@ -24,12 +22,11 @@
     "sdkVersion": "3",
     "shortName": "Super Simple",
     "targetPlatforms": [
-        "aplite",
         "basalt",
         "chalk"
     ],
     "uuid": "ceeae81b-6b50-43b6-8bbb-6d6f6eb62b69",
-    "versionLabel": "1.8",
+    "versionLabel": "1.7",
     "watchapp": {
         "watchface": true
     }

src/js/pebble-js-app.js

@@ -7,11 +7,9 @@ Pebble.addEventListener('showConfiguration', function() {
     if(Pebble.getActiveWatchInfo) {
       watch = Pebble.getActiveWatchInfo();
     }
-    var url='http://pebble.lastfuture.de/config/supersimple18/';
+    var url='http://pebble.lastfuture.de/config/supersimple17/';
-    if (watch.platform == "basalt") {
+    if (watch.platform != "chalk") {
       url += "?rect=true";
-    } else if (watch.platform == "aplite") {
-      url += "?rect=true&bw=true";
     }
     console.log('Showing configuration page: '+url);
     Pebble.openURL(url);
@@ -30,9 +28,7 @@ Pebble.addEventListener('webviewclosed', function(e) {
             ticks: configData.ticks,
             colort: parseInt(configData.colort, 16),
             rectticks: 0+(configData.rectticks === 'true'),
-            btvibe: 0+(configData.btvibe === 'true'),
+            btvibe: 0+(configData.btvibe === 'true')
-            invert: 0+(configData.invert === 'true'),
-            whwidth: configData.whwidth,
         }, function() {
             console.log('Send successful!');
         }, function() {

src/main.c

@@ -9,12 +9,12 @@
 #define KEY_TICK_COLOR         6
 #define KEY_RECT_TICKS         7
 #define KEY_BT_VIBE            8
-#define KEY_INVERT             9
-#define KEY_HAND_WIDTH        10
 
 #define ANTIALIASING true
 
+#define HAND_WIDTH             7
 #define TICK_RADIUS            3
+#define DOT_RADIUS             HAND_WIDTH/4
 #define HAND_MARGIN_M          16
 #define HAND_MARGIN_H          42
 #define SHADOW_OFFSET          2
@@ -52,29 +52,11 @@ static Layer *bg_canvas_layer, *s_canvas_layer;
 
 static GPoint s_center;
 static Time s_last_time;
-static int animpercent = 0, ticks = 0, whwidth = 7;
+static int animpercent = 0, ticks;
-static bool s_animating = false, shadows = true, debug = false, rectticks = true, btvibe = false, invert = false;
+static bool s_animating = false, shadows = true, debug = false, rectticks = true, btvibe = false;
 
 static GColor gcolorbg, gcolorm, gcolorh, gcolorp, gcolorshadow, gcolort;
 
-static void handle_bw_colors() {
-  if (!invert) {
-    gcolorbg = GColorBlack;
-    gcolorm = GColorWhite;
-    gcolorh = GColorWhite;
-    gcolorp = GColorBlack;
-    gcolort = GColorWhite;
-    shadows = false;
-  } else {
-    gcolorbg = GColorWhite;
-    gcolorm = GColorBlack;
-    gcolorh = GColorBlack;
-    gcolorp = GColorWhite;
-    gcolort = GColorBlack;
-    shadows = false;
-  }
-}
-
 static void inbox_received_handler(DictionaryIterator *iter, void *context) {
   Tuple *colorbg_t = dict_find(iter, KEY_BG_COLOR);
   Tuple *colorm_t = dict_find(iter, KEY_MINUTE_COLOR);
@@ -85,10 +67,7 @@ static void inbox_received_handler(DictionaryIterator *iter, void *context) {
   Tuple *colort_t = dict_find(iter, KEY_TICK_COLOR);
   Tuple *rectticks_t = dict_find(iter, KEY_RECT_TICKS);
   Tuple *btvibe_t = dict_find(iter, KEY_BT_VIBE);
-  Tuple *invert_t = dict_find(iter, KEY_INVERT);
-  Tuple *whwidth_t = dict_find(iter, KEY_HAND_WIDTH);
     
-  #if defined(PBL_COLOR)
   if(colorbg_t) {
     int colorbg = colorbg_t->value->int32;
     persist_write_int(KEY_BG_COLOR, colorbg);
@@ -110,11 +89,6 @@ static void inbox_received_handler(DictionaryIterator *iter, void *context) {
     persist_write_int(KEY_PEG_COLOR, colorp);
     gcolorp = GColorFromHEX(colorp);
   }
-    if(colort_t) {
-      int colort = colort_t->value->int32;
-      persist_write_int(KEY_TICK_COLOR, colort);
-      gcolort = GColorFromHEX(colort);
-    }
   if(shadows_t && shadows_t->value->int8 > 0) {
     persist_write_bool(KEY_SHADOWS, true);
     shadows = true;
@@ -122,20 +96,15 @@ static void inbox_received_handler(DictionaryIterator *iter, void *context) {
     persist_write_bool(KEY_SHADOWS, false);
     shadows = false;
   }
-  #elif defined(PBL_BW)
-    if(invert_t && invert_t->value->int8 > 0) {
-      persist_write_bool(KEY_INVERT, true);
-      invert = true;
-    } else {
-      persist_write_bool(KEY_INVERT, false);
-      invert = false;
-    }
-    handle_bw_colors();
-  #endif
   if(ticknum_t) {
     ticks = ticknum_t->value->uint8;
     persist_write_int(KEY_TICKS, ticks);
   }
+  if(colort_t) {
+    int colort = colort_t->value->int32;
+    persist_write_int(KEY_TICK_COLOR, colort);
+    gcolort = GColorFromHEX(colort);
+  }
   if(rectticks_t && rectticks_t->value->int8 > 0) {
     persist_write_bool(KEY_RECT_TICKS, true);
     rectticks = true;
@@ -150,11 +119,6 @@ static void inbox_received_handler(DictionaryIterator *iter, void *context) {
     persist_write_bool(KEY_BT_VIBE, false);
     btvibe = false;
   }
-  if(whwidth_t) {
-    whwidth = whwidth_t->value->uint8;
-    persist_write_int(KEY_HAND_WIDTH, whwidth);
-  }
-
   if(bg_canvas_layer) {
     layer_mark_dirty(bg_canvas_layer);
   }
@@ -195,12 +159,8 @@ static void tick_handler(struct tm *tick_time, TimeUnits changed) {
   // Store time
   // dummy time in emulator
   if (debug) {
-    /*
     s_last_time.hours = 0;
     s_last_time.minutes = tick_time->tm_sec;
-    */
-    s_last_time.hours = 10;
-    s_last_time.minutes = 8;
   } else {
     s_last_time.hours = tick_time->tm_hour;
     s_last_time.hours -= (s_last_time.hours > 12) ? 12 : 0;
@@ -331,7 +291,7 @@ static void update_proc(Layer *layer, GContext *ctx) {
   
   if(shadows) {
     graphics_context_set_stroke_color(ctx, gcolorshadow);
-    graphics_context_set_stroke_width(ctx, whwidth);
+    graphics_context_set_stroke_width(ctx, HAND_WIDTH);
     hour_hand_outer.y += SHADOW_OFFSET;
     s_center.y += SHADOW_OFFSET;
     graphics_draw_line(ctx, s_center, hour_hand_outer);
@@ -343,13 +303,13 @@ static void update_proc(Layer *layer, GContext *ctx) {
     s_center.y -= SHADOW_OFFSET+1;
   }
   graphics_context_set_stroke_color(ctx, gcolorh);
-  graphics_context_set_stroke_width(ctx, whwidth);
+  graphics_context_set_stroke_width(ctx, HAND_WIDTH);
   graphics_draw_line(ctx, s_center, hour_hand_outer);
   graphics_context_set_stroke_color(ctx, gcolorm);
-  graphics_context_set_stroke_width(ctx, whwidth);
+  graphics_context_set_stroke_width(ctx, HAND_WIDTH);
   graphics_draw_line(ctx, s_center, minute_hand_outer);
   graphics_context_set_fill_color(ctx, gcolorp);
-  graphics_fill_circle(ctx, s_center, whwidth/4);
+  graphics_fill_circle(ctx, s_center, DOT_RADIUS);
 
 }
 
@@ -361,7 +321,6 @@ static void window_load(Window *window) {
   s_center.x -= 1;
   s_center.y -= 1;
     
-  #if defined(PBL_COLOR)
   if (persist_exists(KEY_BG_COLOR)) {
     int colorbg = persist_read_int(KEY_BG_COLOR);
     gcolorbg = GColorFromHEX(colorbg);
@@ -387,30 +346,22 @@ static void window_load(Window *window) {
   } else {
     gcolorp = GColorDarkGray;
   }
-    if (persist_exists(KEY_TICK_COLOR)) {
-      int colort = persist_read_int(KEY_TICK_COLOR);
-      gcolort = GColorFromHEX(colort);
-    } else {
-      gcolort = GColorWhite;
-    }
   if (persist_exists(KEY_SHADOWS)) {
     shadows = persist_read_bool(KEY_SHADOWS);
   } else {
     shadows = false;
   }
-  #elif defined(PBL_BW)
-    if (persist_exists(KEY_INVERT)) {
-      invert = persist_read_bool(KEY_INVERT);
-    } else {
-      invert = false;
-    }
-    handle_bw_colors();
-  #endif
   if (persist_exists(KEY_TICKS)) {
     ticks = persist_read_int(KEY_TICKS);
   } else {
     ticks = 0;
   }
+  if (persist_exists(KEY_TICK_COLOR)) {
+    int colort = persist_read_int(KEY_TICK_COLOR);
+    gcolort = GColorFromHEX(colort);
+  } else {
+    gcolort = GColorWhite;
+  }
   if (persist_exists(KEY_RECT_TICKS)) {
     rectticks = persist_read_bool(KEY_RECT_TICKS);
   } else {
@@ -421,11 +372,6 @@ static void window_load(Window *window) {
   } else {
     btvibe = false;
   }
-  if (persist_exists(KEY_HAND_WIDTH)) {
-    whwidth = persist_read_int(KEY_HAND_WIDTH);
-  } else {
-    whwidth = 7;
-  }
 
   bg_canvas_layer = layer_create(window_bounds);
   s_canvas_layer = layer_create(window_bounds);