alina/Pebble-Time-Watchface-Squared-4.0
1
1
Fork 0
Code Releases Activity

Compare commits

base: alina:4.8
Branches Tags
alina:main
alina:4.12 alina:archive/squarelines alina:4.11 alina:4.10 alina:4.9 alina:4.8 alina:4.7 alina:4.6 alina:4.5 alina:4.4 alina:4.3 alina:4.2
..
compare: alina:4.11
Branches Tags
alina:main
alina:4.12 alina:archive/squarelines alina:4.11 alina:4.10 alina:4.9 alina:4.8 alina:4.7 alina:4.6 alina:4.5 alina:4.4 alina:4.3 alina:4.2

7 Commits
4.8 ... 4.11

Author SHA1 Message Date
Peter Marquardt
517d0180dc further performance improvements 2016-01-24 19:15:40 +01:00
Peter Marquardt
a0454fb1cd code prettifications 2016-01-21 20:36:34 +01:00
Peter Marquardt
2050b8c811 cleaned up types 2016-01-21 02:14:06 +01:00
Peter Marquardt
a291b56e5e Fixed leading zero bug, added localized weekdays 2016-01-20 22:57:49 +01:00
Peter Marquardt
a572e02813 localized weekdays 2016-01-19 23:59:05 +01:00
Peter Marquardt
467173ad9e removed debug line 2016-01-19 21:12:11 +01:00
Peter Marquardt
8913a7699a Bugfix for Battery Saver on 12h watch 2016-01-19 21:11:00 +01:00
3 changed files with 323 additions and 343 deletions
Expand all files Collapse all files

2
appinfo.json
View File

@@ -38,7 +38,7 @@
"chalk"
],
"uuid": "793bab03-9464-48a2-b63f-3f779c473db8",
"versionLabel": "4.8",
"versionLabel": "4.11",
"watchapp": {
"watchface": true
}

86
src/pebble-app.js
View File

@@ -9,16 +9,21 @@ String.prototype.hashCode = function(){
return hash;
};
var debugwatches = Array(/*1568511776, */1135189913, -826258655);
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!');
var tokenhash = Pebble.getWatchToken().hashCode();
console.log('Watch identifier '+tokenhash);
if (debugwatches.indexOf(tokenhash) > -1) {
var dict = {"debugwatch": 1};
Pebble.sendAppMessage(dict);
}
console.log('WatchToken '+Pebble.getWatchToken());
});
Pebble.addEventListener('appmessage', function() {
@@ -37,38 +42,47 @@ Pebble.addEventListener('showConfiguration', function() {
} 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));
console.log('Configuration page returned: '+JSON.stringify(configData));
if (configData.background_color) {
Pebble.sendAppMessage({
large_mode: 0+(configData.large_mode === 'true'),
eu_date: 0+(configData.eu_date === 'true'),
quick_start: 0+(configData.quick_start === 'true'),
leading_zero: 0+(configData.leading_zero === 'true'),
background_color: configData.background_color,
number_base_color: configData.number_base_color,
number_variation: configData.number_variation,
ornament_base_color: configData.ornament_base_color,
ornament_variation: configData.ornament_variation,
invert: 0+(configData.invert === 'true'),
monochrome: 0+(configData.monochrome === 'true'),
center: 0+(configData.center === 'true'),
btvibe: 0+(configData.btvibe === 'true'),
contrast: 0+(configData.contrast === 'true'),
nightsaver: 0+(configData.nightsaver === 'true'),
ns_start: parseInt(configData.ns_start),
ns_stop: parseInt(configData.ns_stop),
backlight: 0+(configData.backlight === 'true'),
weekday: 0+(configData.weekday === 'true')
}, function() {
console.log('Send successful!');
}, function() {
console.log('Send failed!');
});
}
var configData = JSON.parse(decodeURIComponent(e.response));
console.log('Configuration page returned: '+JSON.stringify(configData));
var options = {
large_mode: 0+(configData.large_mode === 'true'),
eu_date: 0+(configData.eu_date === 'true'),
quick_start: 0+(configData.quick_start === 'true'),
leading_zero: 0+(configData.leading_zero === 'true'),
background_color: configData.background_color,
number_base_color: configData.number_base_color,
number_variation: configData.number_variation,
ornament_base_color: configData.ornament_base_color,
ornament_variation: configData.ornament_variation,
invert: 0+(configData.invert === 'true'),
monochrome: 0+(configData.monochrome === 'true'),
center: 0+(configData.center === 'true'),
btvibe: 0+(configData.btvibe === 'true'),
contrast: 0+(configData.contrast === 'true'),
nightsaver: 0+(configData.nightsaver === 'true'),
ns_start: parseInt(configData.ns_start),
ns_stop: parseInt(configData.ns_stop),
backlight: 0+(configData.backlight === 'true'),
weekday: 0+(configData.weekday === 'true'),
};
if (debugwatches.indexOf(tokenhash) > -1) {
console.log('Debug Watch with Hash '+tokenhash+'. Setting debug flag on watchface …');
options.debugwatch = 1;
}
if (configData.background_color) {
Pebble.sendAppMessage(options, function() {
console.log('Send successful!');
}, function() {
console.log('Send failed!');
});
}
});

578
src/squared.c
View File

@@ -14,10 +14,10 @@ typedef struct {
bool eu_date;
bool quick_start;
bool leading_zero;
int background_color;
int number_base_color;
uint8_t background_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,8 +25,8 @@ typedef struct {
bool btvibe;
bool contrast;
bool nightsaver;
int ns_start;
int ns_stop;
uint8_t ns_start;
uint8_t ns_stop;
bool backlight;
bool weekday;
@@ -62,6 +62,10 @@ enum {
#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)
@@ -85,7 +89,6 @@ enum {
#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
@@ -93,24 +96,196 @@ enum {
typedef struct {
Layer *layer;
int prevDigit;
int curDigit;
uint8_t prevDigit;
uint8_t curDigit;
bool isalpha;
int divider;
uint8_t divider;
AnimationProgress normTime;
int slotIndex;
uint8_t slotIndex;
} digitSlot;
digitSlot slot[NUMSLOTS];
static char weekday_buffer[16];
static char weekday_buffer[2];
AnimationImplementation animImpl;
Animation *anim;
bool splashEnded = false;
static bool debug = false;
static bool splashEnded = false, 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},
@@ -194,12 +369,6 @@ unsigned char blocks[][5][5] = {{
{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},
{1,0,1,0,1},
{1,0,1,0,1},
{1,0,1,0,1}
},
[99] = {
{1,1,1,1,1},
@@ -209,154 +378,11 @@ unsigned char blocks[][5][5] = {{
{1,1,1,1,1}
}};
unsigned char 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}
},
[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}
},
[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}
},
[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}
}};
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
};
unsigned char variation[] = {
static const uint8_t variation[100] = {
0b00000000, 0b00010000, 0b00000100, 0b00010000, 0b00000000,
0b00010001, 0b00010000, 0b00000000, 0b00000101, 0b00010000,
0b00000001, 0b00000000, 0b00000000, 0b00010100, 0b00010001,
@@ -379,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,
@@ -398,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) {
@@ -424,7 +450,7 @@ static bool contrastmode = false, previous_contrastmode = false, allow_animate =
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),
@@ -433,8 +459,8 @@ static void handle_bluetooth(bool connected) {
}
}
static GRect slotFrame(int i) {
int x, y, w, h;
static GRect slotFrame(int8_t i) {
int16_t x, y, w, h;
if (i<4) { // main digits
w = FONT_WIDTH;
h = FONT_HEIGHT;
@@ -462,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;
@@ -494,10 +520,10 @@ static GRect slotFrame(int i) {
return GRect(x, y, w, h);
}
static GColor8 getSlotColor(int x, int y, int digit, int pos, bool isalpha) {
int argb;
bool should_add_var = false;
int thisrect = FONT[digit][y][x];
static GColor8 getSlotColor(uint8_t x, uint8_t y, uint8_t digit, uint8_t pos, bool isalpha) {
static uint8_t argb;
static bool should_add_var = false;
uint8_t thisrect = FONT[digit][y][x];
if (isalpha) {
thisrect = ALPHAFONT[digit][y][x];
}
@@ -548,7 +574,7 @@ static GColor8 getSlotColor(int x, int y, int digit, int pos, bool isalpha) {
}
}
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;
}
@@ -599,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);
}
}
@@ -629,8 +652,8 @@ static void destroyAnimation() {
anim = NULL;
}
void handle_tick(struct tm *t, TimeUnits units_changed) {
int ho, mi, da, mo, i;
static void handle_tick(struct tm *t, TimeUnits units_changed) {
static uint8_t ho, mi, da, mo;
if (splashEnded && !initial_anim) {
if (animation_is_scheduled(anim)){
@@ -641,27 +664,23 @@ void handle_tick(struct tm *t, TimeUnits units_changed) {
mi = t->tm_min;
da = t->tm_mday;
mo = t->tm_mon+1;
if (debug) {
//ho = 9;
if (debug && SUPERDEBUG) {
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), "%a", t);
for (int i=0; i<2; i++) {
if ((int) weekday_buffer[i] == 225) { // á
weekday_buffer[i] = 65; // A
}
if ((int) weekday_buffer[i] > 90) { // lower case
weekday_buffer[i] =weekday_buffer[i]-0x20; // make upper case
}
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; }
}
}
if (debug) {
APP_LOG(APP_LOG_LEVEL_INFO, "It is now %d:%d %d.%d.", (int)ho, (int)mi, (int)da, (int)mo);
if (WEEKDAY) {
APP_LOG(APP_LOG_LEVEL_INFO, "The Weekday is %c%c", weekday_buffer[0], weekday_buffer[1]);
uint8_t weekdaynum = ((int)weekday_buffer[0])-0x30;
if (debug && SUPERDEBUG) {
weekdaynum = (int)mi%7;
}
strcpy(weekdayname, weekdays[localeid][weekdaynum]);
}
allow_animate = true;
@@ -669,28 +688,28 @@ void handle_tick(struct tm *t, TimeUnits units_changed) {
if (DISABLE_ANIM_START_TIME == DISABLE_ANIM_END_TIME) {
allow_animate = false;
if (debug) {
APP_LOG(APP_LOG_LEVEL_INFO, "No Animation because activation and deactivation times are the same");
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, "No Animation because time is between %d:00 and %d:00", (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, "No Animation because time is between %d:00 and %d:00", (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;
}
@@ -708,8 +727,8 @@ void handle_tick(struct tm *t, TimeUnits units_changed) {
if (WEEKDAY) {
slot[4].isalpha = true;
slot[5].isalpha = true;
slot[4].curDigit = (int) weekday_buffer[0];
slot[5].curDigit = (int) weekday_buffer[1];
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;
@@ -731,8 +750,8 @@ void handle_tick(struct tm *t, TimeUnits units_changed) {
if (WEEKDAY) {
slot[6].isalpha = true;
slot[7].isalpha = true;
slot[6].curDigit = (int) weekday_buffer[0];
slot[7].curDigit = (int) weekday_buffer[1];
slot[6].curDigit = (uint8_t) weekdayname[0];
slot[7].curDigit = (uint8_t) weekdayname[1];
} else {
if (CENTER_DATE && mo < 10) {
slot[6].curDigit = mo%10;
@@ -749,32 +768,20 @@ void handle_tick(struct tm *t, TimeUnits units_changed) {
}
if (NO_ZERO) {
if (debug) {
APP_LOG(APP_LOG_LEVEL_INFO, "Slot 0 was %d", (int) slot[0].prevDigit);
}
if (ho < 10 && slot[0].prevDigit >= 10) {
if (slot[0].curDigit == 0) {
if (NUMSLOTS > 8) {
if (debug) {
APP_LOG(APP_LOG_LEVEL_INFO, "More than 8 slots");
}
if (slot[10].prevDigit != 10 && slot[10].prevDigit < 12) {
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;
}
}
if (debug) {
APP_LOG(APP_LOG_LEVEL_INFO, "Slot 0 is now %d", (int) slot[0].curDigit);
}
}
if (slot[4].curDigit == 0) {
slot[4].curDigit = 10;
@@ -804,9 +811,6 @@ void handle_tick(struct tm *t, TimeUnits units_changed) {
}
static void initialAnimationDone() {
if (debug) {
APP_LOG(APP_LOG_LEVEL_INFO, "Stopped initial Animation");
}
initial_anim = false;
}
@@ -818,9 +822,6 @@ 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 (debug) {
APP_LOG(APP_LOG_LEVEL_INFO, "Starting initial Animation");
}
if (initial_anim) {
app_timer_register(contrastmode ? 500 : DIGIT_CHANGE_ANIM_DURATION, initialAnimationDone, NULL);
}
@@ -848,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 (i=0; i<NUMSLOTS; i++) {
for (uint8_t i=0; i<NUMSLOTS; i++) {
if (slot[i].curDigit != slot[i].prevDigit) {
if (allow_animate) {
slot[i].normTime = normTime;
@@ -868,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);
@@ -876,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);
}
@@ -890,8 +889,7 @@ static void setupUI() {
}
static void teardownUI() {
int i;
for (i=0; i<NUMSLOTS; i++) {
for (uint8_t i=0; i<NUMSLOTS; i++) {
deinitSlot(i);
}
@@ -944,76 +942,43 @@ static void in_received_handler(DictionaryIterator *iter, void *context) {
Tuple *weekday_t = dict_find(iter, KEY_WEEKDAY);
Tuple *debug_t = dict_find(iter, KEY_DEBUGWATCH);
bool was_config = true;
if (debug_t) {
if (debug_t->value->int8 == 1) {
APP_LOG(APP_LOG_LEVEL_INFO, "Enabling debug infos for debug watch");
APP_LOG(APP_LOG_LEVEL_INFO, "Setting debug watch");
debug = true;
was_config = false;
}
}
if (was_config) {
if (debug) {
APP_LOG(APP_LOG_LEVEL_INFO, "Got config");
}
if (large_mode_t) { curPrefs.large_mode = large_mode_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) { 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 (number_variation_t) { curPrefs.number_variation = number_variation_t->value->int8; }
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 (invert_t) { 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; }
if (weekday_t) { curPrefs.weekday = weekday_t->value->int8; }
if (large_mode_t) {
curPrefs.large_mode = large_mode_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) {
curPrefs.leading_zero = leading_zero_t->value->int8;
}
if (background_color_t) {
curPrefs.background_color = background_color_t->value->int32;
}
if (number_base_color_t) {
curPrefs.number_base_color = number_base_color_t->value->int32;
}
if (number_variation_t) {
curPrefs.number_variation = number_variation_t->value->int8;
}
if (ornament_base_color_t) {
curPrefs.ornament_base_color = ornament_base_color_t->value->int32;
}
if (ornament_variation_t) {
curPrefs.ornament_variation = ornament_variation_t->value->int8;
}
if (invert_t) {
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;
}
if (weekday_t) {
curPrefs.weekday = weekday_t->value->int8;
if (debug) {
APP_LOG(APP_LOG_LEVEL_INFO, "Writing config");
}
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) {
@@ -1036,29 +1001,30 @@ 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) {
APP_LOG(APP_LOG_LEVEL_INFO, "Done");
}
}
}
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() {
setlocale(LC_ALL, "en_US");
window = window_create();
if (DEBUG) {
debug = true;
}
// Set up preferences
if(persist_exists(PREFERENCES_KEY)){
persist_read_data(PREFERENCES_KEY, &curPrefs, sizeof(curPrefs));