release

added setting for tick marks
made watchface always light up in emulator
2025-12-14 15:45:22 +01:00 · 2015-11-20 01:27:50 +01:00 · 2015-11-20 00:33:31 +01:00 · 2015-11-18 22:50:23 +01:00 · 2015-11-18 22:28:21 +01:00 · 2015-11-18 22:25:45 +01:00
18 changed files with 161 additions and 129 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,32 @@
+assets
+config
+bin
+
+# Created by https://www.gitignore.io/api/osx
+
+### OSX ###
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
--- a/appinfo.json
+++ b/appinfo.json
@@ -3,7 +3,10 @@
        "colorbg": 0,
        "colorh": 2,
        "colorm": 1,
-        "colorp": 3
+        "colorp": 3,
+        "colort": 6,
+        "shadows": 4,
+        "ticks": 5
    },
    "capabilities": [
        "configurable"
@@ -21,7 +24,7 @@
        "chalk"
    ],
    "uuid": "ceeae81b-6b50-43b6-8bbb-6d6f6eb62b69",
-    "versionLabel": "1.1",
+    "versionLabel": "1.3",
    "watchapp": {
        "watchface": true
    }
--- a/assets/basalt/screenshot.afphoto
+++ b/assets/basalt/screenshot.afphoto
--- a/assets/basalt/screenshot.png
+++ b/assets/basalt/screenshot.png
--- a/assets/basalt/screenshot2.png
+++ b/assets/basalt/screenshot2.png
--- a/assets/basalt/screenshot3.png
+++ b/assets/basalt/screenshot3.png
--- a/assets/chalk/screenshot.afphoto
+++ b/assets/chalk/screenshot.afphoto
--- a/assets/chalk/screenshot.png
+++ b/assets/chalk/screenshot.png
--- a/assets/chalk/screenshot2.png
+++ b/assets/chalk/screenshot2.png
--- a/assets/chalk/screenshot3.png
+++ b/assets/chalk/screenshot3.png
--- a/config/css/slate.min.css
+++ b/config/css/slate.min.css
--- a/config/fonts/PFDinDisplayPro-Light.woff
+++ b/config/fonts/PFDinDisplayPro-Light.woff
--- a/config/fonts/ptsans-regular.woff
+++ b/config/fonts/ptsans-regular.woff
--- a/config/index.html
+++ b/config/index.html
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<title>Super Simple Settings</title>
-	<link rel="stylesheet" href="css/slate.min.css">
-<body>
-	
-	<div class="item-container">
-    	<div class="item-container-header">Color settings</div>
-    	<div class="item-container-content">
-        	<label class="item">
-            	Background
-            	<input id="color-bg" type="text" class="item-color item-color-normal" value="#000000">
-        	</label>
-        	<label class="item">
-            	Minute Hand
-            	<input id="color-m" type="text" class="item-color item-color-normal" value="#ffffff">
-        	</label>
-        	<label class="item">
-            	Hour Hand
-            	<input id="color-h" type="text" class="item-color item-color-normal" value="#ff0000">
-        	</label>
-        	<label class="item">
-            	Center Peg
-            	<input id="color-p" type="text" class="item-color item-color-normal" value="#555555">
-        	</label>
-    	</div>
-	</div>
-    
-    <div class="item-container">
-      <div class="button-container">
-        <input id="send" type="button" class="item-button" value="SEND">
-      </div>
-    </div>
-	
-    <script src="js/slate.min.js"></script>
-    <script src="js/main.js"></script>
-</body>
-</html>
--- a/config/js/main.js
+++ b/config/js/main.js
@@ -1,63 +0,0 @@
-(function() {
-  loadOptions();
-  submitHandler();
-})();
-
-function submitHandler() {
-  var $submitButton = $('#send');
-
-  $submitButton.on('click', function() {
-    console.log('Submit');
-
-    var return_to = getQueryParam('return_to', 'pebblejs://close#');
-    document.location = return_to + encodeURIComponent(JSON.stringify(getAndStoreConfigData()));
-  });
-}
-
-function loadOptions() {
-  var $colorbg = $('#color-bg');
-  var $colorm = $('#color-m');
-  var $colorh = $('#color-h');
-  var $colorp = $('#color-p');
-
-  if (localStorage.colorbg) {
-    $colorbg[0].value = localStorage.colorbg;
-    $colorm[0].value = localStorage.colorm;
-    $colorh[0].value = localStorage.colorh;
-    $colorp[0].value = localStorage.colorp;
-  }
-}
-
-function getAndStoreConfigData() {
-  var $colorbg = $('#color-bg');
-  var $colorm = $('#color-m');
-  var $colorh = $('#color-h');
-  var $colorp = $('#color-p');
-
-  var options = {
-    colorbg: $colorbg.val(),
-    colorm: $colorm.val(),
-    colorh: $colorh.val(),
-    colorp: $colorp.val(),
-  };
-
-  localStorage.colorbg = options.colorbg;
-  localStorage.colorm = options.colorm;
-  localStorage.colorh = options.colorh;
-  localStorage.colorp = options.colorp;
-
-  console.log('Got options: ' + JSON.stringify(options));
-  return options;
-}
-
-function getQueryParam(variable, defaultValue) {
-  var query = location.search.substring(1);
-  var vars = query.split('&');
-  for (var i = 0; i < vars.length; i++) {
-    var pair = vars[i].split('=');
-    if (pair[0] === variable) {
-      return decodeURIComponent(pair[1]);
-    }
-  }
-  return defaultValue || false;
-}
--- a/config/js/slate.min.js
+++ b/config/js/slate.min.js
--- a/src/js/pebble-js-app.js
+++ b/src/js/pebble-js-app.js
@@ -3,7 +3,7 @@ Pebble.addEventListener('ready', function() {
 });

 Pebble.addEventListener('showConfiguration', function() {
-    var url='http://pebble.lastfuture.de/config/supersimple/';
+    var url='http://pebble.lastfuture.de/config/supersimple13/';
    console.log('Showing configuration page: '+url);
    Pebble.openURL(url);
 });
@@ -16,7 +16,10 @@ Pebble.addEventListener('webviewclosed', function(e) {
            colorbg: parseInt(configData.colorbg, 16),
            colorm: parseInt(configData.colorm, 16),
            colorh: parseInt(configData.colorh, 16),
-            colorp: parseInt(configData.colorp, 16)
+            colorp: parseInt(configData.colorp, 16),
+            shadows: configData.shadows === true,
+            ticks: configData.ticks,
+            colort: parseInt(configData.colort, 16)
        }, function() {
            console.log('Send successful!');
        }, function() {
--- a/src/main.c
+++ b/src/main.c
@@ -4,18 +4,42 @@
 #define KEY_MINUTE_COLOR       1
 #define KEY_HOUR_COLOR         2
 #define KEY_PEG_COLOR          3
-
+#define KEY_SHADOWS            4
+#define KEY_TICKS              5
+#define KEY_TICK_COLOR         6

 #define ANTIALIASING true

 #define FINAL_RADIUS       88
 #define HAND_WIDTH         7
+#define TICK_RADIUS        3
 #define DOT_RADIUS         HAND_WIDTH/4
 #define HAND_MARGIN_OUTER  10-(HAND_WIDTH/2)
 #define HAND_MARGIN_INNER  0
+#define SHADOW_OFFSET      2

-#define ANIMATION_DURATION 600
-#define ANIMATION_DELAY    150
+#define ANIMATION_DURATION 400
+#define ANIMATION_DELAY    100
+
+static uint8_t shadowtable[] = {192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,192, \
+                                192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,192, \
+                                192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,192, \
+                                192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,192, \
+                                192,192,192,193,192,192,192,193,192,192,192,193,196,196,196,197, \
+                                192,192,192,193,192,192,192,193,192,192,192,193,196,196,196,197, \
+                                192,192,192,193,192,192,192,193,192,192,192,193,196,196,196,197, \
+                                208,208,208,209,208,208,208,209,208,208,208,209,212,212,212,213, \
+                                192,192,193,194,192,192,193,194,196,196,197,198,200,200,201,202, \
+                                192,192,193,194,192,192,193,194,196,196,197,198,200,200,201,202, \
+                                208,208,209,210,208,208,209,210,212,212,213,214,216,216,217,218, \
+                                224,224,225,226,224,224,225,226,228,228,229,230,232,232,233,234, \
+                                192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207, \
+                                208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223, \
+                                224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239, \
+                                240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255};
+
+// alpha should only be 0b??111111 where ?? = 00 (full shade), 01 (much shade), 10 (some shade), 11 (none shade)
+static uint8_t alpha = 0b10111111;

 typedef struct {
  int hours;
@@ -27,22 +51,26 @@ static Layer *s_canvas_layer;

 static GPoint s_center;
 static Time s_last_time;
-static int s_radius = 0;
-static bool s_animating = false;
+static int s_radius = 0, ticks;
+static bool s_animating = false, shadows = true;
 static float anim_offset;

-static GColor gcolorbg, gcolorm, gcolorh, gcolorp;
+static GColor gcolorbg, gcolorm, gcolorh, gcolorp, gcolorshadow, gcolort;

 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);
  Tuple *colorh_t = dict_find(iter, KEY_HOUR_COLOR);
  Tuple *colorp_t = dict_find(iter, KEY_PEG_COLOR);
+  Tuple *shadows_t = dict_find(iter, KEY_SHADOWS);
+  Tuple *ticknum_t = dict_find(iter, KEY_TICKS);
+  Tuple *colort_t = dict_find(iter, KEY_TICK_COLOR);
    
  if(colorbg_t) {
    int colorbg = colorbg_t->value->int32;
    persist_write_int(KEY_BG_COLOR, colorbg);
    gcolorbg = GColorFromHEX(colorbg);
+    gcolorshadow = (GColor8) shadowtable[alpha & gcolorbg.argb];
  }
  if(colorm_t) {
    int colorm = colorm_t->value->int32;
@@ -59,6 +87,22 @@ static void inbox_received_handler(DictionaryIterator *iter, void *context) {
    persist_write_int(KEY_PEG_COLOR, colorp);
    gcolorp = GColorFromHEX(colorp);
  }
+  if(shadows_t && shadows_t->value->int32 > 0) {
+    persist_write_bool(KEY_SHADOWS, true);
+    shadows = true;
+  } else {
+    persist_write_bool(KEY_SHADOWS, false);
+    shadows = false;
+  }
+  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(s_canvas_layer) {
    layer_mark_dirty(s_canvas_layer);
  }
@@ -93,9 +137,15 @@ static void animate(int duration, int delay, AnimationImplementation *implementa

 static void tick_handler(struct tm *tick_time, TimeUnits changed) {
  // Store time
-  s_last_time.hours = tick_time->tm_hour;
-  s_last_time.hours -= (s_last_time.hours > 12) ? 12 : 0;
-  s_last_time.minutes = tick_time->tm_min;
+  // dummy time in emulator
+  /*if (watch_info_get_model()==WATCH_INFO_MODEL_UNKNOWN) {
+    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;
+    s_last_time.minutes = tick_time->tm_min;
+  /* } */

  // Redraw
  if(s_canvas_layer) {
@@ -104,13 +154,12 @@ static void tick_handler(struct tm *tick_time, TimeUnits changed) {
 }

 static void update_proc(Layer *layer, GContext *ctx) {
-  // Color background?
  GRect bounds = layer_get_bounds(layer);
  graphics_context_set_fill_color(ctx, gcolorbg);
  graphics_fill_rect(ctx, bounds, 0, GCornerNone);
  graphics_context_set_antialiased(ctx, ANTIALIASING);

-  // Don't use current time while animating
+  // Use current time while animating
  Time mode_time = s_last_time;

  // Adjust for minutes through the hour
@@ -122,7 +171,6 @@ static void update_proc(Layer *layer, GContext *ctx) {
 	  minute_angle -= anim_offset;
  }

-  // Plot hands
  GPoint minute_hand_outer = (GPoint) {
    .x = (int16_t)(sin_lookup(TRIG_MAX_ANGLE * mode_time.minutes / 60) * (int32_t)(s_radius - HAND_MARGIN_OUTER) / TRIG_MAX_RATIO) + s_center.x,
    .y = (int16_t)(-cos_lookup(TRIG_MAX_ANGLE * mode_time.minutes / 60) * (int32_t)(s_radius - HAND_MARGIN_OUTER) / TRIG_MAX_RATIO) + s_center.y,
@@ -139,8 +187,39 @@ static void update_proc(Layer *layer, GContext *ctx) {
    .x = (int16_t)(sin_lookup(hour_angle) * (int32_t)HAND_MARGIN_INNER / TRIG_MAX_RATIO) + s_center.x,
    .y = (int16_t)(-cos_lookup(hour_angle) * (int32_t)HAND_MARGIN_INNER / TRIG_MAX_RATIO) + s_center.y,
  };
-  // Draw hands with positive length only
+  if (ticks > 0) {
+    graphics_context_set_fill_color(ctx, gcolort);
+    GRect insetbounds = GRect(2, 2, bounds.size.w-4, bounds.size.h-4);
+    GRect insetbounds12 = GRect(4, 4, bounds.size.w-8, bounds.size.h-8);
+    for(int i = 0; i < ticks; i++) {
+      int hour_angle = (i * 360) / ticks;
+      if (ticks == 12 && i%3!=0) {
+        GPoint pos = gpoint_from_polar(insetbounds12, GOvalScaleModeFitCircle , DEG_TO_TRIGANGLE(hour_angle));
+        graphics_fill_circle(ctx, pos, TICK_RADIUS/2);
+      } else {
+        GPoint pos = gpoint_from_polar(insetbounds, GOvalScaleModeFitCircle , DEG_TO_TRIGANGLE(hour_angle));
+        graphics_fill_circle(ctx, pos, TICK_RADIUS);
+      }
+    }
+  }
+
  if((s_radius - HAND_MARGIN_OUTER) > HAND_MARGIN_INNER) {
+    if(shadows) {
+        if(s_radius > 2 * HAND_MARGIN_OUTER) {
+          graphics_context_set_stroke_color(ctx, gcolorshadow);
+          graphics_context_set_stroke_width(ctx, HAND_WIDTH);
+          hour_hand_inner.y += SHADOW_OFFSET; hour_hand_outer.y += SHADOW_OFFSET;
+          graphics_draw_line(ctx, hour_hand_inner, hour_hand_outer);
+          hour_hand_inner.y -= SHADOW_OFFSET; hour_hand_outer.y -= SHADOW_OFFSET;
+        }
+        if(s_radius > HAND_MARGIN_OUTER) {
+          graphics_context_set_stroke_color(ctx, gcolorshadow);
+          graphics_context_set_stroke_width(ctx, HAND_WIDTH);
+          minute_hand_inner.y += SHADOW_OFFSET+1; minute_hand_outer.y += SHADOW_OFFSET+1;
+          graphics_draw_line(ctx, minute_hand_inner, minute_hand_outer);
+          minute_hand_inner.y -= SHADOW_OFFSET+1; minute_hand_outer.y -= SHADOW_OFFSET+1;
+        }
+    }
    if(s_radius > 2 * HAND_MARGIN_OUTER) {
      graphics_context_set_stroke_color(ctx, gcolorh);
      graphics_context_set_stroke_width(ctx, HAND_WIDTH);
@@ -167,25 +246,42 @@ static void window_load(Window *window) {
    int colorbg = persist_read_int(KEY_BG_COLOR);
    gcolorbg = GColorFromHEX(colorbg);
  } else {
-    gcolorbg=GColorBlack;
+    gcolorbg = GColorBlack;
  }
+  gcolorshadow = (GColor8) shadowtable[alpha & gcolorbg.argb];
  if (persist_exists(KEY_MINUTE_COLOR)) {
    int colorm = persist_read_int(KEY_MINUTE_COLOR);
    gcolorm = GColorFromHEX(colorm);
  } else {
-    gcolorm=GColorWhite;
+    gcolorm = GColorWhite;
  }
  if (persist_exists(KEY_HOUR_COLOR)) {
    int colorh = persist_read_int(KEY_HOUR_COLOR);
    gcolorh = GColorFromHEX(colorh);
  } else {
-    gcolorh=GColorRed;
+    gcolorh = GColorRed;
  }
  if (persist_exists(KEY_PEG_COLOR)) {
    int colorp = persist_read_int(KEY_PEG_COLOR);
    gcolorp = GColorFromHEX(colorp);
  } else {
-    gcolorp=GColorDarkGray;
+    gcolorp = GColorDarkGray;
+  }
+  if (persist_exists(KEY_SHADOWS)) {
+    shadows = persist_read_bool(KEY_SHADOWS);
+  } else {
+    shadows = false;
+  }
+  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;
  }

  s_canvas_layer = layer_create(window_bounds);
@@ -211,6 +307,11 @@ static void radius_update(Animation *anim, AnimationProgress dist_normalized) {
 static void init() {
  srand(time(NULL));
  
+  // keep lit only in emulator
+  if (watch_info_get_model()==WATCH_INFO_MODEL_UNKNOWN) {
+    light_enable(true);
+  }
+
  time_t t = time(NULL);
  struct tm *time_now = localtime(&t);
  tick_handler(time_now, MINUTE_UNIT);
@@ -244,4 +345,3 @@ int main() {
  deinit();
 }

-
Author	SHA1	Message	Date
Peter Marquardt	404536c3b7	release	2015-11-20 01:27:50 +01:00
Peter Marquardt	b48313dba4	added setting for tick marks	2015-11-20 00:33:31 +01:00
Peter Marquardt	b8508ce0fd	made watchface always light up in emulator	2015-11-18 22:50:23 +01:00
Peter Marquardt	f6d3c9c3f5	excluded binaries from repo	2015-11-18 22:28:21 +01:00
Peter Marquardt	e7c01919d4	added shadow-toggle to the settings page	2015-11-18 22:25:45 +01:00
Peter Marquardt	e3216b3352	removed config page from repo	2015-11-18 21:05:31 +01:00
Peter Marquardt	2604a8d3ae	added drop shadows to the hands	2015-11-18 21:01:57 +01:00
Peter Marquardt	d0fa7bc990	Merge branch 'master' of https://github.com/lastfuture/Pebble-Time-Watchface---Super-Simple	2015-11-18 19:21:24 +01:00
Peter Marquardt	f032dc6488	removed assets	2015-11-18 19:20:40 +01:00
Peter Marquardt	a27ed69547	added shadowtable added shadowtable from https://github.com/robisodd/transparency/blob/master/src/transparency.c	2015-11-16 22:38:40 +01:00
Peter Marquardt	ff15d72028	added banner for chalk	2015-11-15 20:44:59 +01:00
Peter Marquardt	5296df4453	added more screenshots and animated screens to the assets	2015-11-14 23:39:45 +01:00