further performance improvements

.gitignore

@@ -32,3 +32,34 @@ Temporary Items
 .apdisk
 .lock-waf_darwin_build
 build
+
+
+
+# Created by https://www.gitignore.io/api/xcode
+
+### Xcode ###
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate
+*.pbxproj
+*.xcworkspacedata

appinfo.json

@@ -5,6 +5,7 @@
         "btvibe": 12,
         "center": 11,
         "contrast": 13,
+        "debugwatch": 50,
         "eu_date": 1,
         "invert": 9,
         "large_mode": 0,
@@ -17,7 +18,8 @@
         "number_variation": 6,
         "ornament_base_color": 7,
         "ornament_variation": 8,
-        "quick_start": 2
+        "quick_start": 2,
+        "weekday": 18
     },
     "capabilities": [
         "configurable"
@@ -36,7 +38,7 @@
         "chalk"
     ],
     "uuid": "793bab03-9464-48a2-b63f-3f779c473db8",
-    "versionLabel": "4.7",
+    "versionLabel": "4.11",
     "watchapp": {
         "watchface": true
     }

src/pebble-app.js

@@ -1,5 +1,33 @@
+String.prototype.hashCode = function(){
+    var hash = 0;
+    if (this.length === 0) return hash;
+    for (var i = 0; i < this.length; i++) {
+        var char = this.charCodeAt(i);
+        hash = ((hash<<5)-hash)+char;
+        hash = hash & hash; // Convert to 32bit integer
+    }
+    return hash;
+};
+
+var debugwatches = Array(
+  1568511776, //c
+  1135189913, //b
+  -826258655, //a
+  -1783317168, //em
+  91860716, //a sl
+  -1462573071, //b sl
+  244993878 //c sl
+);
+var tokenhash;
+
+
 Pebble.addEventListener('ready', function() {
-    console.log('PebbleKit JS ready!');
+  console.log('PebbleKit JS ready!');
+  console.log('WatchToken '+Pebble.getWatchToken());
+});
+
+Pebble.addEventListener('appmessage', function() {
+  console.log('got appmessage');
 });
 
 Pebble.addEventListener('showConfiguration', function() {
@@ -7,44 +35,54 @@ Pebble.addEventListener('showConfiguration', function() {
     if(Pebble.getActiveWatchInfo) {
       watch = Pebble.getActiveWatchInfo();
     }
-    var url='http://pebble.lastfuture.de/config/squared46/';
+    var url='http://pebble.lastfuture.de/config/squared48/';
     url += "?model="+watch.model;
     if (watch.platform == "basalt") {
       url += "&rect=true";
     } else if (watch.platform == "aplite") {
       url += "&rect=true&bw=true";
     }
+    tokenhash = Pebble.getWatchToken().hashCode();
+    if (debugwatches.indexOf(tokenhash) > -1) {
+      url += "&debug=true";
+    }
     console.log('Showing configuration page: '+url);
     Pebble.openURL(url);
 });
 
 Pebble.addEventListener('webviewclosed', function(e) {
-    var configData = JSON.parse(decodeURIComponent(e.response));
+  var configData = JSON.parse(decodeURIComponent(e.response));
-    console.log('Configuration page returned: '+JSON.stringify(configData));
+  console.log('Configuration page returned: '+JSON.stringify(configData));
-    if (configData.background_color) {
+  var options = {
-        Pebble.sendAppMessage({
+    large_mode: 0+(configData.large_mode === 'true'),
-            large_mode: 0+(configData.large_mode === 'true'),
+    eu_date: 0+(configData.eu_date === 'true'),
-            eu_date: 0+(configData.eu_date === 'true'),
+    quick_start: 0+(configData.quick_start === 'true'),
-            quick_start: 0+(configData.quick_start === 'true'),
+    leading_zero: 0+(configData.leading_zero === 'true'),
-            leading_zero: 0+(configData.leading_zero === 'true'),
+    background_color: configData.background_color,
-            background_color: configData.background_color,
+    number_base_color: configData.number_base_color,
-            number_base_color: configData.number_base_color,
+    number_variation: configData.number_variation,
-            number_variation: configData.number_variation,
+    ornament_base_color: configData.ornament_base_color,
-            ornament_base_color: configData.ornament_base_color,
+    ornament_variation: configData.ornament_variation,
-            ornament_variation: configData.ornament_variation,
+    invert: 0+(configData.invert === 'true'),
-            invert: 0+(configData.invert === 'true'),
+    monochrome: 0+(configData.monochrome === 'true'),
-            monochrome: 0+(configData.monochrome === 'true'),
+    center: 0+(configData.center === 'true'),
-            center: 0+(configData.center === 'true'),
+    btvibe: 0+(configData.btvibe === 'true'),
-            btvibe: 0+(configData.btvibe === 'true'),
+    contrast: 0+(configData.contrast === 'true'),
-            contrast: 0+(configData.contrast === 'true'),
+    nightsaver: 0+(configData.nightsaver === 'true'),
-            nightsaver: 0+(configData.nightsaver === 'true'),
+    ns_start: parseInt(configData.ns_start),
-            ns_start: parseInt(configData.ns_start),
+    ns_stop: parseInt(configData.ns_stop),
-            ns_stop: parseInt(configData.ns_stop),
+    backlight: 0+(configData.backlight === 'true'),
-            backlight: 0+(configData.backlight === 'true')
+    weekday: 0+(configData.weekday === 'true'),
-        }, function() {
+  };
-            console.log('Send successful!');
+  if (debugwatches.indexOf(tokenhash) > -1) {
-        }, function() {
+    console.log('Debug Watch with Hash '+tokenhash+'. Setting debug flag on watchface …');
-            console.log('Send failed!');
+    options.debugwatch = 1;
-        });
+  }
-    }
+  if (configData.background_color) {
+    Pebble.sendAppMessage(options, function() {
+      console.log('Send successful!');
+    }, function() {
+      console.log('Send failed!');
+    });
+  }
 });

src/squared.c

@@ -14,10 +14,10 @@ typedef struct {
   bool eu_date;
   bool quick_start;
   bool leading_zero;
-  int background_color;
+  uint8_t background_color;
-  int number_base_color;
+  uint8_t number_base_color;
   bool number_variation;
-  int ornament_base_color;
+  uint8_t ornament_base_color;
   bool ornament_variation;
   bool invert;
   bool monochrome;
@@ -25,9 +25,10 @@ typedef struct {
   bool btvibe;
   bool contrast;
   bool nightsaver;
-  int ns_start;
+  uint8_t ns_start;
-  int ns_stop;
+  uint8_t ns_stop;
   bool backlight;
+  bool weekday;
   
 } Preferences;
 
@@ -52,11 +53,21 @@ enum {
     KEY_NS_START,
     KEY_NS_STOP,
     KEY_BACKLIGHT,
+    KEY_WEEKDAY,
 };
 
+#define KEY_DEBUGWATCH 50
+
 #define PREFERENCES_KEY 0
 
-#define US_DATE (!curPrefs.eu_date) // true == MM/DD, false == DD/MM
+#define SCREENSHOTMODE false
+
+#define DEBUG false
+#define SUPERDEBUG false
+
+
+#define EU_DATE (curPrefs.eu_date) // true == MM/DD, false == DD/MM
+#define WEEKDAY (curPrefs.weekday)
 #define CENTER_DATE (curPrefs.center)
 #define DISCONNECT_VIBRATION (curPrefs.btvibe)
 #define CONTRAST_WHILE_CHARGING PBL_IF_BW_ELSE(false, (curPrefs.contrast))
@@ -71,35 +82,210 @@ enum {
 #define NUMSLOTS PBL_IF_RECT_ELSE(8, 18)
 #define SPACING_X TILE_SIZE
 #define SPACING_Y (curPrefs.large_mode ? TILE_SIZE - 1 : TILE_SIZE)
-#define DIGIT_CHANGE_ANIM_DURATION 1500
+#define DIGIT_CHANGE_ANIM_DURATION (curPrefs.quick_start ? 1500 : 2000)
-#define STARTDELAY (curPrefs.quick_start ? 1000 : 2000)
+#define STARTDELAY (curPrefs.quick_start ? 700 : 2000)
 
 #define NUMBER_BASE_COLOR_ARGB8   (curPrefs.number_base_color)
 #define ORNAMENT_BASE_COLOR_ARGB8 (curPrefs.ornament_base_color)
 #define NUMBER_ADD_VARIATION      (curPrefs.number_variation)
 #define ORNAMENT_ADD_VARIATION    (curPrefs.ornament_variation)
-
 #define BACKGROUND_COLOR    PBL_IF_BW_ELSE((INVERT ? GColorWhite : GColorBlack), ((GColor8) { .argb = curPrefs.background_color }))
 
 #define FONT blocks
+#define ALPHAFONT alphablocks
 
 typedef struct {
 	Layer *layer;
-	int   prevDigit;
+	uint8_t   prevDigit;
-	int   curDigit;
+	uint8_t   curDigit;
-	int   divider;
+	bool  isalpha;
+	uint8_t   divider;
 	AnimationProgress normTime;
-  int   slotIndex;
+  uint8_t   slotIndex;
 } digitSlot;
 
 digitSlot slot[NUMSLOTS];
 
+static char weekday_buffer[2];
+
 AnimationImplementation animImpl;
 Animation *anim;
-bool splashEnded = false;
+static bool splashEnded = false, debug = false;
-static bool debug = false;
 
-unsigned char blocks[][5][5] =  {{
+static const char * locales[6] = {"en", "de", "es", "fr", "it", "pt"};
+static const char * weekdays[6][7] =  {
+{ "SU","MO","TU","WE","TH","FR","SA" }, // EN
+{ "SO","MO","DI","MI","DO","FR","SA" }, // DE
+{ "DO","LU","MA","MI","JU","VI","SA" }, // ES - from https://forums.getpebble.com/discussion/comment/166975/#Comment_166975
+{ "DI","LU","MA","ME","JE","VE","SA" }, // FR - from https://www.quora.com/How-are-days-of-the-week-abbreviated-in-various-languages
+{ "DO","LU","MA","ME","GI","VE","SA" }, // IT - from https://www.quora.com/How-are-days-of-the-week-abbreviated-in-various-languages
+{ "DO","SG","TE","QA","QI","SX","SA" }  // PT - from http://www.brazil-help.com/week.htm (is this correct?)
+}; // required Letters: ADEFGHIJLMOQRSTUVWX
+
+static const uint8_t alphablocks[][5][5] =  {
+[65] = { // A
+	{1,1,1,1,1},
+	{1,0,0,0,1},
+	{1,1,1,1,1},
+	{1,0,0,0,1},
+	{1,0,2,0,1}
+},
+[68] = { // D
+	{1,1,1,1,1},
+	{1,0,0,0,1},
+	{1,0,2,0,1},
+	{1,0,0,0,1},
+	{1,1,1,1,0}
+},
+[69] = { // E
+	{1,1,1,1,1},
+	{1,0,0,0,0},
+	{1,1,1,1,0},
+	{1,0,0,0,0},
+	{1,1,1,1,1}
+},
+[70] = { // F
+	{1,1,1,1,1},
+	{1,0,0,0,0},
+	{1,1,1,1,0},
+	{1,0,0,0,0},
+	{1,0,2,2,2}
+},
+[71] = { // G
+	{1,1,1,1,1},
+	{1,0,0,0,0},
+	{1,0,1,1,1},
+	{1,0,0,0,1},
+	{1,1,1,1,1}
+},
+[72] = { // H
+	{1,0,2,0,1},
+	{1,0,0,0,1},
+	{1,1,1,1,1},
+	{1,0,0,0,1},
+	{1,0,2,0,1}
+},
+[73] = { // I
+	{1,1,1,1,1},
+	{0,0,1,0,0},
+	{2,0,1,0,2},
+	{0,0,1,0,0},
+	{1,1,1,1,1}
+},
+[74] = { // J
+	{2,0,1,1,1},
+	{0,0,0,0,1},
+	{2,2,2,0,1},
+	{0,0,0,0,1},
+	{1,1,1,1,1}
+},
+[76] = { // L
+	{1,0,2,0,2},
+	{1,0,2,0,2},
+	{1,0,2,0,2},
+	{1,0,0,0,0},
+	{1,1,1,1,1}
+},
+[77] = { // M
+	{1,1,1,1,1},
+	{1,0,1,0,1},
+	{1,0,1,0,1},
+	{1,0,0,0,1},
+	{1,0,2,0,1}
+},
+[79] = { // O
+	{1,1,1,1,1},
+	{1,0,0,0,1},
+	{1,0,2,0,1},
+	{1,0,0,0,1},
+	{1,1,1,1,1}
+},
+[81] = { // Q
+	{1,1,1,1,1},
+	{1,0,0,0,1},
+	{1,0,0,0,1},
+	{1,0,1,0,1},
+	{1,1,1,1,1}
+},
+[82] = { // R
+	{1,1,1,1,1},
+	{0,0,0,0,1},
+	{1,1,1,1,1},
+	{1,0,0,1,0},
+	{1,0,2,0,1}
+},
+[83] = { // S
+	{1,1,1,1,1},
+	{1,0,0,0,0},
+	{1,1,1,1,1},
+	{0,0,0,0,1},
+	{1,1,1,1,1}
+},
+[84] = { // T
+	{1,1,1,1,1},
+	{0,0,1,0,0},
+	{2,0,1,0,2},
+	{2,0,1,0,2},
+	{2,0,1,0,2}
+},
+[85] = { // U
+	{1,0,2,0,1},
+	{1,0,2,0,1},
+	{1,0,2,0,1},
+	{1,0,0,0,1},
+	{1,1,1,1,1}
+},
+[86] = { // V
+	{1,0,2,0,1},
+	{1,0,2,0,1},
+	{1,0,2,0,1},
+	{1,0,0,0,1},
+	{1,1,1,1,0}
+},
+[87] = { // W
+	{1,0,2,0,1},
+	{1,0,0,0,1},
+	{1,0,1,0,1},
+	{1,0,1,0,1},
+	{1,1,1,1,1}
+},
+[88] = { // X
+	{1,0,0,0,1},
+	{0,1,0,1,0},
+	{0,0,1,0,0},
+	{0,1,0,1,0},
+	{1,0,0,0,1}
+},
+[10] = {
+	{2,2,2,2,2},
+	{0,0,0,0,0},
+	{2,2,2,2,2},
+	{0,0,0,0,0},
+	{2,2,2,2,2}
+},
+[11] = {
+	{2,0,2,0,2},
+	{2,0,2,0,2},
+	{2,0,2,0,2},
+	{2,0,2,0,2},
+	{2,0,2,0,2}
+},
+[12] = {
+	{1,1,1,1,1},
+	{0,0,0,0,0},
+	{1,1,1,1,1},
+	{0,0,0,0,0},
+	{1,1,1,1,1}
+},
+[13] = {
+	{1,0,1,0,1},
+	{1,0,1,0,1},
+	{1,0,1,0,1},
+	{1,0,1,0,1},
+	{1,0,1,0,1}
+}};
+
+static const uint8_t blocks[][5][5] =  {{
 	{1,1,1,1,1},
 	{1,0,0,0,1},
 	{1,0,2,0,1},
@@ -183,14 +369,20 @@ unsigned char blocks[][5][5] =  {{
 	{1,0,1,0,1},
 	{1,0,1,0,1},
 	{1,0,1,0,1}
+},
+[99] = {
+	{1,1,1,1,1},
+	{1,1,1,1,1},
+	{1,1,1,1,1},
+	{1,1,1,1,1},
+	{1,1,1,1,1}
 }};
 
-int startDigit[18] = {
+static const uint8_t startDigit[18] = {
 	11,12,12,11,11,12,10,13,12,11,12,11,11,12,10,13,12,10 // 2x h, 2x m, 4x date, 2x filler top, 4x filler sides, 2x filler bottom, 2x filler bottom sides
 };
 
-
+static const uint8_t variation[100] = {
-unsigned char variation[] = {
   0b00000000, 0b00010000, 0b00000100, 0b00010000, 0b00000000,
   0b00010001, 0b00010000, 0b00000000, 0b00000101, 0b00010000,
   0b00000001, 0b00000000, 0b00000000, 0b00010100, 0b00010001,
@@ -213,7 +405,7 @@ unsigned char variation[] = {
   0b00000000, 0b00000001, 0b00010001, 0b00000101, 0b00010100
 };
 
-static uint8_t shadowtable[] = {
+static const uint8_t shadowtable[256] = {
   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,
@@ -232,7 +424,7 @@ static uint8_t shadowtable[] = {
   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;
+static const uint8_t alpha = 0b10111111;
 
 /*
 uint8_t combine_colors(uint8_t fg_color, uint8_t bg_color) {
@@ -254,11 +446,11 @@ uint8_t combine_colors(uint8_t fg_color, uint8_t bg_color) {
 #define ORIGIN_X PBL_IF_RECT_ELSE(((144 - TILES_X)/2), ((180 - TILES_X)/2))
 #define ORIGIN_Y PBL_IF_RECT_ELSE((curPrefs.large_mode ? 1 : TILE_SIZE*1.5), (TILE_SIZE*2.2))
 
-static bool contrastmode = false, previous_contrastmode = false, allow_animate = true;
+static bool contrastmode = false, previous_contrastmode = false, allow_animate = true, initial_anim = false;
 
 static void handle_bluetooth(bool connected) {
   if (DISCONNECT_VIBRATION && !connected) {
-    static uint32_t const segments[] = { 200, 200, 50, 150, 200 };
+    static const uint32_t segments[] = { 200, 200, 50, 150, 200 };
     VibePattern pat = {
     	.durations = segments,
     	.num_segments = ARRAY_LENGTH(segments),
@@ -267,8 +459,8 @@ static void handle_bluetooth(bool connected) {
   }
 }
 
-static GRect slotFrame(int i) {
+static GRect slotFrame(int8_t i) {
-	int x, y, w, h;
+	int16_t x, y, w, h;
 	if (i<4) { // main digits
 		w = FONT_WIDTH;
 		h = FONT_HEIGHT;
@@ -296,14 +488,14 @@ static GRect slotFrame(int i) {
 		} else {
 			x = ORIGIN_X; // i = 0 or 2
 		}
-    y = ORIGIN_Y - FONT_HEIGHT - SPACING_Y;
+    y = (int8_t) (ORIGIN_Y - FONT_HEIGHT - SPACING_Y);
   } else if (i<14) { // side filler for round
     w = FONT_WIDTH;
 		h = FONT_HEIGHT;
     if (i%2) {
 			x = ORIGIN_X + FONT_WIDTH + SPACING_X + FONT_WIDTH + SPACING_X;
 		} else {
-			x = (int) (ORIGIN_X - FONT_WIDTH - SPACING_X);
+			x = (int8_t) (ORIGIN_X - FONT_WIDTH - SPACING_X);
 		}
 		if (i<12) {
 			y = ORIGIN_Y;
@@ -328,15 +520,22 @@ static GRect slotFrame(int i) {
 	return GRect(x, y, w, h);
 }
 
-static GColor8 getSlotColor(int x, int y, int digit, int pos) {
+static GColor8 getSlotColor(uint8_t x, uint8_t y, uint8_t digit, uint8_t pos, bool isalpha) {
-  int argb;
+  static uint8_t argb;
-  bool should_add_var = false;
+  static bool should_add_var = false;
-  if (FONT[digit][y][x] == 0) {
+  uint8_t thisrect = FONT[digit][y][x];
+  if (isalpha) {
+    thisrect = ALPHAFONT[digit][y][x];
+  }
+  if (SCREENSHOTMODE) {
+    thisrect = FONT[99][y][x];
+  }
+  if (thisrect == 0) {
     if (contrastmode) {
       return GColorBlack;
     }
     return BACKGROUND_COLOR;
-  } else if (FONT[digit][y][x] == 1) {
+  } else if (thisrect == 1) {
     #if defined(PBL_COLOR)
       if (contrastmode && pos >= 8) {
         argb = 0b11000000;
@@ -368,10 +567,14 @@ static GColor8 getSlotColor(int x, int y, int digit, int pos) {
     #endif
   }
   if (should_add_var) {
-    argb += variation[ ( y*5 + x + digit*17 + pos*19 )%sizeof(variation) ];
+    if (argb == 0b11111111) {
+      argb -= variation[ ( y*5 + x + digit*17 + pos*19 )%sizeof(variation) ];
+    } else {
+      argb += variation[ ( y*5 + x + digit*17 + pos*19 )%sizeof(variation) ];
+    }
   }
   if (pos >= 8) {
-    int argb_temp = shadowtable[alpha & argb];
+    uint8_t argb_temp = shadowtable[alpha & argb];
     if (argb_temp == BACKGROUND_COLOR.argb) {
       argb_temp = argb;
     }
@@ -403,8 +606,8 @@ static void updateSlot(Layer *layer, GContext *ctx) {
 		ty = t / FONT_HEIGHT_BLOCKS;
 		shift = 0-(t-ty);
     
-    GColor8 oldColor = getSlotColor(tx, ty, slot->prevDigit, slot->slotIndex);
+    GColor8 oldColor = getSlotColor(tx, ty, slot->prevDigit, slot->slotIndex, slot->isalpha);
-    GColor8 newColor = getSlotColor(tx, ty, slot->curDigit, slot->slotIndex);
+    GColor8 newColor = getSlotColor(tx, ty, slot->curDigit, slot->slotIndex, slot->isalpha);
     
 	  graphics_context_set_fill_color(ctx, oldColor);
     graphics_fill_rect(ctx, GRect((tx*tilesize)-(tx*widthadjust), ty*tilesize-(ty*widthadjust), tilesize-widthadjust, tilesize-widthadjust), 0, GCornerNone);
@@ -422,25 +625,22 @@ static void updateSlot(Layer *layer, GContext *ctx) {
 	}
 }
 
-static unsigned short get_display_hour(unsigned short hour) {
+static unsigned short get_display_hour(uint8_t hour) {
     if (clock_is_24h_style()) {
         return hour;
     }
-    unsigned short display_hour = hour % 12;
+    uint8_t display_hour = hour % 12;
     return display_hour ? display_hour : 12;
 }
 
 static void setupAnimation() {
-  if (debug) {
-    APP_LOG(APP_LOG_LEVEL_INFO, "Setting up anim");
-  }
   anim = animation_create();
 	animation_set_delay(anim, 0);
 	animation_set_duration(anim, contrastmode ? 500 : DIGIT_CHANGE_ANIM_DURATION);
 	animation_set_implementation(anim, &animImpl);
   animation_set_curve(anim, AnimationCurveEaseInOut);
   if (debug) {
-    APP_LOG(APP_LOG_LEVEL_INFO, "Done setting up anim %i", (int)anim);
+    APP_LOG(APP_LOG_LEVEL_INFO, "Set up anim %i", (int)anim);
   }
 }
 
@@ -452,10 +652,10 @@ static void destroyAnimation() {
   anim = NULL;
 }
 
-void handle_tick(struct tm *t, TimeUnits units_changed) {
+static void handle_tick(struct tm *t, TimeUnits units_changed) {
-	int ho, mi, da, mo, i;
+	static uint8_t ho, mi, da, mo;
 
-  if (splashEnded) {
+  if (splashEnded && !initial_anim) {
     if (animation_is_scheduled(anim)){
       animation_unschedule(anim);
       animation_destroy(anim);
@@ -464,34 +664,52 @@ void handle_tick(struct tm *t, TimeUnits units_changed) {
     mi = t->tm_min;
     da = t->tm_mday;
     mo = t->tm_mon+1;
-    if (debug) {
+    if (debug && SUPERDEBUG) {
-      ho = 9;
+      ho = 8+(mi%4);
+    }
+    uint8_t localeid = 0;
+    static char weekdayname[3];
+    static char locale[3];
+    strncpy(locale, i18n_get_system_locale(), 2);
+    if (WEEKDAY) {
+      strftime(weekday_buffer, sizeof(weekday_buffer), "%w", t);
+      for (uint8_t lid = 0; lid < 6; lid++) {
+        if (strncmp(locales[lid], locale, 2) == 0) { localeid = lid; }
+      }
+      uint8_t weekdaynum = ((int)weekday_buffer[0])-0x30;
+      if (debug && SUPERDEBUG) {
+        weekdaynum = (int)mi%7;
+      }
+      strcpy(weekdayname, weekdays[localeid][weekdaynum]);
     }
-    
-    APP_LOG(APP_LOG_LEVEL_INFO, "It is now %d:%d %d.%d.", (int)ho, (int)mi, (int)da, (int)mo);
     
     allow_animate = true;
     if (DISABLE_ANIM) {
-      if (DISABLE_ANIM_START_TIME > DISABLE_ANIM_END_TIME) {
+      if (DISABLE_ANIM_START_TIME == DISABLE_ANIM_END_TIME) {
+        allow_animate = false;
+        if (debug) {
+          APP_LOG(APP_LOG_LEVEL_INFO, "Animation always off");
+        }
+      } else if (DISABLE_ANIM_START_TIME > DISABLE_ANIM_END_TIME) {
         // across midnight
-        if (ho >= DISABLE_ANIM_START_TIME || ho < DISABLE_ANIM_END_TIME) {
+        if (t->tm_hour >= DISABLE_ANIM_START_TIME || t->tm_hour < DISABLE_ANIM_END_TIME) {
           allow_animate = false;
           if (debug) {
-            APP_LOG(APP_LOG_LEVEL_INFO, "Hour %d was after %d and before %d", (int)ho, (int)DISABLE_ANIM_START_TIME , (int)DISABLE_ANIM_END_TIME );
+            APP_LOG(APP_LOG_LEVEL_INFO, "Animation off (%d:00 - %d:00)", (int)DISABLE_ANIM_START_TIME , (int)DISABLE_ANIM_END_TIME );
           }
         }
       } else {
         // prior to midnight
-        if (ho >= DISABLE_ANIM_START_TIME && ho < DISABLE_ANIM_END_TIME) {
+        if (t->tm_hour >= DISABLE_ANIM_START_TIME && t->tm_hour < DISABLE_ANIM_END_TIME) {
           allow_animate = false;
           if (debug) {
-            APP_LOG(APP_LOG_LEVEL_INFO, "Hour %d was after %d and before %d", (int)ho, (int)DISABLE_ANIM_START_TIME , (int)DISABLE_ANIM_END_TIME );
+            APP_LOG(APP_LOG_LEVEL_INFO, "Animation off (%d:00 - %d:00)", (int)DISABLE_ANIM_START_TIME , (int)DISABLE_ANIM_END_TIME );
           }
         }
       }
     }
 
-    for (i=0; i<NUMSLOTS; i++) {
+    for (uint8_t i=0; i<NUMSLOTS; i++) {
       slot[i].prevDigit = slot[i].curDigit;
     }
 
@@ -499,9 +717,22 @@ void handle_tick(struct tm *t, TimeUnits units_changed) {
     slot[1].curDigit = ho%10;
     slot[2].curDigit = mi/10;
     slot[3].curDigit = mi%10;
-    if (US_DATE) {
+    
-      slot[4].curDigit = mo/10;
+    slot[4].isalpha = false;
-      slot[5].curDigit = mo%10;
+    slot[5].isalpha = false;
+    slot[6].isalpha = false;
+    slot[7].isalpha = false;
+    
+    if (!EU_DATE) {
+      if (WEEKDAY) {
+        slot[4].isalpha = true;
+        slot[5].isalpha = true;
+        slot[4].curDigit = (uint8_t) weekdayname[0];
+        slot[5].curDigit = (uint8_t) weekdayname[1];
+      } else {
+        slot[4].curDigit = mo/10;
+        slot[5].curDigit = mo%10;
+      }
       if (CENTER_DATE && da < 10) {
         slot[6].curDigit = da%10;
         if (slot[7].prevDigit == 10 || slot[7].prevDigit == 12) {
@@ -516,44 +747,41 @@ void handle_tick(struct tm *t, TimeUnits units_changed) {
     } else {
       slot[4].curDigit = da/10;
       slot[5].curDigit = da%10;
-      if (CENTER_DATE && mo < 10) {
+      if (WEEKDAY) {
-        slot[6].curDigit = mo%10;
+        slot[6].isalpha = true;
-        if (slot[7].prevDigit == 10 || slot[7].prevDigit == 12) {
+        slot[7].isalpha = true;
-          slot[7].curDigit = 11;
+        slot[6].curDigit = (uint8_t) weekdayname[0];
-        } else {
+        slot[7].curDigit = (uint8_t) weekdayname[1];
-          slot[7].curDigit = 10;
-        }
       } else {
-        slot[6].curDigit = mo/10;
+        if (CENTER_DATE && mo < 10) {
-        slot[7].curDigit = mo%10;
+          slot[6].curDigit = mo%10;
+          if (slot[7].prevDigit == 10 || slot[7].prevDigit == 12) {
+            slot[7].curDigit = 11;
+          } else {
+            slot[7].curDigit = 10;
+          }
+        } else {
+          slot[6].curDigit = mo/10;
+          slot[7].curDigit = mo%10;
+        }
       }
     }
     
     if (NO_ZERO) {
-      if (debug) {
+      if (slot[0].curDigit == 0) {
-        APP_LOG(APP_LOG_LEVEL_INFO, "Slot 0 was %d", (int) slot[0].prevDigit);
-      }
-      if (ho < 10 && slot[0].prevDigit >= 10) {
         if (NUMSLOTS > 8) {
-          if (debug) {
+          if (slot[10].prevDigit != 10 && slot[10].prevDigit != 12) {
-            APP_LOG(APP_LOG_LEVEL_INFO, "More than 8 slots");
-          }
-          if (slot[10].prevDigit != 10 && slot[10].prevDigit < 12) {
             slot[0].curDigit = 11;
           } else {
             slot[0].curDigit = 10;
           }
         } else {
-          if (debug) {
-            APP_LOG(APP_LOG_LEVEL_INFO, "8 slots or fewer");
-          }
           if (slot[0].prevDigit == 10) {
             slot[0].curDigit = 11;
           } else {
             slot[0].curDigit = 10;
           }
         }
-        APP_LOG(APP_LOG_LEVEL_INFO, "Slot 0 is now %d", (int) slot[0].curDigit);
       }
       if (slot[4].curDigit == 0) {
         slot[4].curDigit = 10;
@@ -582,6 +810,10 @@ void handle_tick(struct tm *t, TimeUnits units_changed) {
   }
 }
 
+static void initialAnimationDone() {
+  initial_anim = false;
+}
+
 void handle_timer(void *data) {
 	time_t curTime;
 	
@@ -589,6 +821,12 @@ void handle_timer(void *data) {
 
   curTime = time(NULL);
   handle_tick(localtime(&curTime), SECOND_UNIT|MINUTE_UNIT|HOUR_UNIT|DAY_UNIT|MONTH_UNIT|YEAR_UNIT);
+  initial_anim = true;
+  if (initial_anim) {
+    app_timer_register(contrastmode ? 500 : DIGIT_CHANGE_ANIM_DURATION, initialAnimationDone, NULL);
+  }
+
+
 }
 
 
@@ -611,13 +849,12 @@ void initSlot(int i, Layer *parent) {
 	layer_add_child(parent, s->layer);
 }
 
-static void deinitSlot(int i) {
+static void deinitSlot(uint8_t i) {
 	layer_destroy(slot[i].layer);
 }
 
 static void animateDigits(struct Animation *anim, const AnimationProgress normTime) {
-	int i;
+	for (uint8_t i=0; i<NUMSLOTS; i++) {
-	for (i=0; i<NUMSLOTS; i++) {
 		if (slot[i].curDigit != slot[i].prevDigit) {
       if (allow_animate) {
         slot[i].normTime = normTime;
@@ -631,7 +868,6 @@ static void animateDigits(struct Animation *anim, const AnimationProgress normTi
 
 static void setupUI() {
   Layer *rootLayer;
-	int i;
   
   window_set_background_color(window, contrastmode ? GColorBlack : BACKGROUND_COLOR);
 	
@@ -639,7 +875,7 @@ static void setupUI() {
 
 	rootLayer = window_get_root_layer(window);
 
-	for (i=0; i<NUMSLOTS; i++) {
+	for (uint8_t i=0; i<NUMSLOTS; i++) {
 		initSlot(i, rootLayer);
 	}
 
@@ -653,8 +889,7 @@ static void setupUI() {
 }
 
 static void teardownUI() {
-	int i;
+	for (uint8_t i=0; i<NUMSLOTS; i++) {
-	for (i=0; i<NUMSLOTS; i++) {
 		deinitSlot(i);
 	}
 	
@@ -704,62 +939,46 @@ static void in_received_handler(DictionaryIterator *iter, void *context) {
   Tuple *ns_start_t = dict_find(iter, KEY_NS_START);
   Tuple *ns_stop_t = dict_find(iter, KEY_NS_STOP);
   Tuple *backlight_t = dict_find(iter, KEY_BACKLIGHT);
+  Tuple *weekday_t = dict_find(iter, KEY_WEEKDAY);
+  Tuple *debug_t = dict_find(iter, KEY_DEBUGWATCH);
   
-  if (large_mode_t) {
+  if (debug_t) {
-    curPrefs.large_mode =             large_mode_t->value->int8;
+    if (debug_t->value->int8 == 1) {
+      APP_LOG(APP_LOG_LEVEL_INFO, "Setting debug watch");
+      debug = true;
+    }
   }
-  if (eu_date_t) {
+  
-    curPrefs.eu_date =                eu_date_t->value->int8;
+  if (debug) {
+    APP_LOG(APP_LOG_LEVEL_INFO, "Got config");
   }
-  if (quick_start_t) {
+  if (large_mode_t) {          curPrefs.large_mode =             large_mode_t->value->int8; }
-    curPrefs.quick_start =            quick_start_t->value->int8;
+  if (eu_date_t) {             curPrefs.eu_date =                eu_date_t->value->int8; }
-  }
+  if (quick_start_t) {         curPrefs.quick_start =            quick_start_t->value->int8; }
-  if (leading_zero_t) {
+  if (leading_zero_t) {        curPrefs.leading_zero =           leading_zero_t->value->int8; }
-    curPrefs.leading_zero =           leading_zero_t->value->int8;
+  if (background_color_t) {    curPrefs.background_color =       background_color_t->value->int8; }
-  }
+  if (number_base_color_t) {   curPrefs.number_base_color =      number_base_color_t->value->int8; }
-  if (background_color_t) {
+  if (number_variation_t) {    curPrefs.number_variation =       number_variation_t->value->int8; }
-    curPrefs.background_color =       background_color_t->value->int32;
+  if (ornament_base_color_t) { curPrefs.ornament_base_color =    ornament_base_color_t->value->int8; }
-  }
+  if (ornament_variation_t) {  curPrefs.ornament_variation =     ornament_variation_t->value->int8; }
-  if (number_base_color_t) {
+  if (invert_t) {              curPrefs.invert =                 invert_t->value->int8; }
-    curPrefs.number_base_color =      number_base_color_t->value->int32;
+  if (monochrome_t) {          curPrefs.monochrome =             monochrome_t->value->int8; }
-  }
+  if (center_t) {              curPrefs.center =                 center_t->value->int8; }
-  if (number_variation_t) {
+  if (btvibe_t) {              curPrefs.btvibe =                 btvibe_t->value->int8; }
-    curPrefs.number_variation =       number_variation_t->value->int8;
+  if (contrast_t) {            curPrefs.contrast =               contrast_t->value->int8; }
-  }
+  if (nightsaver_t) {          curPrefs.nightsaver =             nightsaver_t->value->int8; }
-  if (ornament_base_color_t) {
+  if (ns_start_t) {            curPrefs.ns_start =               ns_start_t->value->int8; }
-    curPrefs.ornament_base_color =    ornament_base_color_t->value->int32;
+  if (ns_stop_t) {             curPrefs.ns_stop =                ns_stop_t->value->int8; }
-  }
+  if (backlight_t) {           curPrefs.backlight =              backlight_t->value->int8; }
-  if (ornament_variation_t) {
+  if (weekday_t) {             curPrefs.weekday =                weekday_t->value->int8; }
-    curPrefs.ornament_variation =     ornament_variation_t->value->int8;
+
-  }
+  if (debug) {
-  if (invert_t) {
+    APP_LOG(APP_LOG_LEVEL_INFO, "Writing config");
-    curPrefs.invert =                 invert_t->value->int8;
-  }
-  if (monochrome_t) {
-    curPrefs.monochrome =             monochrome_t->value->int8;
-  }
-  if (center_t) {
-    curPrefs.center =                 center_t->value->int8;
-  }
-  if (btvibe_t) {
-    curPrefs.btvibe =                 btvibe_t->value->int8;
-  }
-  if (contrast_t) {
-    curPrefs.contrast =               contrast_t->value->int8;
-  }
-  if (nightsaver_t) {
-    curPrefs.nightsaver =             nightsaver_t->value->int8;
-  }
-  if (ns_start_t) {
-    curPrefs.ns_start =               ns_start_t->value->int8;
-  }
-  if (ns_stop_t) {
-    curPrefs.ns_stop =                ns_stop_t->value->int8;
-  }
-  if (backlight_t) {
-    curPrefs.backlight =              backlight_t->value->int8;
   }
   persist_write_data(PREFERENCES_KEY, &curPrefs, sizeof(curPrefs));
+  if (debug) {
+    APP_LOG(APP_LOG_LEVEL_INFO, "Wrote config");
+  }
   vibes_short_pulse();
   #if defined(PBL_COLOR)
   if (curPrefs.contrast == false) {
@@ -782,11 +1001,11 @@ static void in_received_handler(DictionaryIterator *iter, void *context) {
     }
   }
   if (debug) {
-    APP_LOG(APP_LOG_LEVEL_INFO, "Tearing down");
+    APP_LOG(APP_LOG_LEVEL_INFO, "Teardown");
   }
   teardownUI();
   if (debug) {
-    APP_LOG(APP_LOG_LEVEL_INFO, "Setting up");
+    APP_LOG(APP_LOG_LEVEL_INFO, "Setup");
   }
   setupUI();
   if (debug) {
@@ -795,16 +1014,17 @@ static void in_received_handler(DictionaryIterator *iter, void *context) {
 }
 
 static void in_dropped_handler(AppMessageResult reason, void *context) {
-  APP_LOG(APP_LOG_LEVEL_WARNING, "Dropped a message because %i", (int)reason);
+  APP_LOG(APP_LOG_LEVEL_WARNING, "Dropped message because %i", (int)reason);
 }
 
+
 static void init() {
-  if (watch_info_get_model()==WATCH_INFO_MODEL_UNKNOWN) {
+  window = window_create();
+  
+  if (DEBUG) {
     debug = true;
   }
   
-  window = window_create();
-  
   // Set up preferences
   if(persist_exists(PREFERENCES_KEY)){
     persist_read_data(PREFERENCES_KEY, &curPrefs, sizeof(curPrefs));
@@ -828,6 +1048,7 @@ static void init() {
       .ns_start = 0,
       .ns_stop = 6,
       .backlight = false,
+      .weekday = false,
     };
   }
   
@@ -856,10 +1077,6 @@ static void init() {
 	
 	tick_timer_service_subscribe(MINUTE_UNIT, handle_tick);
   
-  if (debug) {
-    //light_enable(true);
-  }
-  
   handle_bluetooth(connection_service_peek_pebble_app_connection());
   
   battery_state_service_subscribe(battery_handler);