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

Improvements all around 

Memory usage improvements, combination of charsets, better handling of config page submit Started adding health / battery display, more...
master
Alina Marquardt 2016-02-12 17:50:10 +01:00
parent 517d0180dc
commit 78396c4c6e
2 changed files with 577 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
appinfo.json
View File

@ -22,9 +22,11 @@
"weekday": 18 "weekday": 18
}, },
"capabilities": [ "capabilities": [
"configurable" "configurable",
"health"
], ],
"companyName": "lastfuture", "companyName": "lastfuture",
"enableMultiJS": false,
"longName": "Squared 4.0", "longName": "Squared 4.0",
"projectType": "native", "projectType": "native",
"resources": { "resources": {
@ -38,7 +40,7 @@
"chalk" "chalk"
], ],
"uuid": "793bab03-9464-48a2-b63f-3f779c473db8", "uuid": "793bab03-9464-48a2-b63f-3f779c473db8",
"versionLabel": "4.11", "versionLabel": "4.12",
"watchapp": { "watchapp": {
"watchface": true "watchface": true
} }

834
src/squared.c
View File

@ -2,7 +2,7 @@
* Original source code by lastfuture * Original source code by lastfuture
* SDK 2.0beta4 port by Jnm * SDK 2.0beta4 port by Jnm
* SDK 3.0 port and colorizing by hexahedria * SDK 3.0 port and colorizing by hexahedria
* adaptations for Chalk and Aplite as well as continued development by lastfuture * adaptations for Chalk and Aplite as well as continued development since SDK 3.8.2 by lastfuture
*/ */
#include <pebble.h> #include <pebble.h>
@ -56,6 +56,12 @@ enum {
KEY_WEEKDAY, KEY_WEEKDAY,
}; };
enum {
SLOT_TYPE_DIGIT,
SLOT_TYPE_ALPHA,
SLOT_TYPE_PROGRESS,
};
#define KEY_DEBUGWATCH 50 #define KEY_DEBUGWATCH 50
#define PREFERENCES_KEY 0 #define PREFERENCES_KEY 0
@ -68,6 +74,14 @@ enum {
#define EU_DATE (curPrefs.eu_date) // true == MM/DD, false == DD/MM #define EU_DATE (curPrefs.eu_date) // true == MM/DD, false == DD/MM
#define WEEKDAY (curPrefs.weekday) #define WEEKDAY (curPrefs.weekday)
#define BATTERY_PERCENTAGE false
#define STEP_PERCENTAGE (BATTERY_PERCENTAGE ? false : true) // replace "true" with pref
#define PROGRESS (BATTERY_PERCENTAGE || STEP_PERCENTAGE)
#define PROGRESS_MIRROR false // TODO: this needs to work without mirroring the previous digits
#define PROGRESS_ON_SHAKE true
#define STEP_GOAL 10000
#define CENTER_DATE (curPrefs.center) #define CENTER_DATE (curPrefs.center)
#define DISCONNECT_VIBRATION (curPrefs.btvibe) #define DISCONNECT_VIBRATION (curPrefs.btvibe)
#define CONTRAST_WHILE_CHARGING PBL_IF_BW_ELSE(false, (curPrefs.contrast)) #define CONTRAST_WHILE_CHARGING PBL_IF_BW_ELSE(false, (curPrefs.contrast))
@ -91,14 +105,27 @@ enum {
#define ORNAMENT_ADD_VARIATION (curPrefs.ornament_variation) #define ORNAMENT_ADD_VARIATION (curPrefs.ornament_variation)
#define BACKGROUND_COLOR PBL_IF_BW_ELSE((INVERT ? GColorWhite : GColorBlack), ((GColor8) { .argb = curPrefs.background_color })) #define BACKGROUND_COLOR PBL_IF_BW_ELSE((INVERT ? GColorWhite : GColorBlack), ((GColor8) { .argb = curPrefs.background_color }))
#define FONT blocks #define FONT_WIDTH_BLOCKS 5
#define ALPHAFONT alphablocks #define FONT_HEIGHT_BLOCKS 5
#define TOTALBLOCKS FONT_WIDTH_BLOCKS*FONT_HEIGHT_BLOCKS
#define FONT_HEIGHT FONT_WIDTH_BLOCKS*TILE_SIZE
#define FONT_WIDTH FONT_HEIGHT_BLOCKS*TILE_SIZE
#define TILES_X ( \
FONT_WIDTH + SPACING_X + FONT_WIDTH)
#define TILES_Y ( \
FONT_HEIGHT + SPACING_Y + FONT_HEIGHT)
#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))
typedef struct { typedef struct {
Layer *layer; Layer *layer;
bool mirror;
uint8_t prevDigit; uint8_t prevDigit;
uint8_t curDigit; uint8_t curDigit;
bool isalpha;
uint8_t divider; uint8_t divider;
AnimationProgress normTime; AnimationProgress normTime;
uint8_t slotIndex; uint8_t slotIndex;
@ -110,7 +137,8 @@ static char weekday_buffer[2];
AnimationImplementation animImpl; AnimationImplementation animImpl;
Animation *anim; Animation *anim;
static bool splashEnded = false, debug = false; static bool splashEnded = false, debug = false, in_shake_mode = false;
static uint8_t progress = 0;
static const char * locales[6] = {"en", "de", "es", "fr", "it", "pt"}; static const char * locales[6] = {"en", "de", "es", "fr", "it", "pt"};
static const char * weekdays[6][7] = { static const char * weekdays[6][7] = {
@ -122,261 +150,347 @@ static const char * weekdays[6][7] = {
{ "DO","SG","TE","QA","QI","SX","SA" } // PT - from http://www.brazil-help.com/week.htm (is this correct?) { "DO","SG","TE","QA","QI","SX","SA" } // PT - from http://www.brazil-help.com/week.htm (is this correct?)
}; // required Letters: ADEFGHIJLMOQRSTUVWX }; // required Letters: ADEFGHIJLMOQRSTUVWX
static const uint8_t alphablocks[][5][5] = { // character_map[] maps 0-9 (digits), 10-13 (ornaments), ascii codes of uppercase letters and 100-109 (progress indicators) to characters[]
[65] = { // A static const uint8_t character_map[] = {
{1,1,1,1,1}, // DIGITS
{1,0,0,0,1}, [0] = 0,
{1,1,1,1,1}, [1] = 1,
{1,0,0,0,1}, [2] = 2,
{1,0,2,0,1} [3] = 3,
}, [4] = 4,
[68] = { // D [5] = 5,
{1,1,1,1,1}, [6] = 6,
{1,0,0,0,1}, [7] = 7,
{1,0,2,0,1}, [8] = 8,
{1,0,0,0,1}, [9] = 9,
{1,1,1,1,0} // ORNAMENTS
}, [10] = 10,
[69] = { // E [11] = 11,
{1,1,1,1,1}, [12] = 12,
{1,0,0,0,0}, [13] = 13,
{1,1,1,1,0}, // UPPERCASE ASCII CHARACTERS
{1,0,0,0,0}, [65] = 14,
{1,1,1,1,1} [68] = 15,
}, [69] = 16,
[70] = { // F [70] = 17,
{1,1,1,1,1}, [71] = 18,
{1,0,0,0,0}, [72] = 19,
{1,1,1,1,0}, [73] = 20,
{1,0,0,0,0}, [74] = 21,
{1,0,2,2,2} [76] = 22,
}, [77] = 23,
[71] = { // G [79] = 0, // same as 0
{1,1,1,1,1}, [81] = 24,
{1,0,0,0,0}, [82] = 25,
{1,0,1,1,1}, [83] = 26,
{1,0,0,0,1}, [84] = 27,
{1,1,1,1,1} [85] = 28,
}, [86] = 29,
[72] = { // H [87] = 30,
{1,0,2,0,1}, [88] = 31,
{1,0,0,0,1}, // PROGRESS
{1,1,1,1,1}, [100] = 10, // same as ornament 10
{1,0,0,0,1}, [101] = 32,
{1,0,2,0,1} [102] = 33,
}, [103] = 34,
[73] = { // I [104] = 35,
{1,1,1,1,1}, [105] = 36,
{0,0,1,0,0}, [106] = 37,
{2,0,1,0,2}, [107] = 38,
{0,0,1,0,0}, [108] = 39,
{1,1,1,1,1} [109] = 13 // same as ornament 13
}, };
[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] = {{ // left column is digit color, right column is ornament color
{1,1,1,1,1}, static const uint8_t characters[][10] = {
{1,0,0,0,1}, // DIGITS
{1,0,2,0,1}, {
{1,0,0,0,1}, 0b11111, 0b00000,
{1,1,1,1,1} 0b10001, 0b00000,
}, { 0b10001, 0b00100,
{2,2,0,1,1}, 0b10001, 0b00000,
{0,0,0,0,1}, 0b11111, 0b00000
{2,2,2,0,1},
{0,0,0,0,1},
{2,2,2,0,1}
}, {
{1,1,1,1,1},
{0,0,0,0,1},
{1,1,1,1,1},
{1,0,0,0,0},
{1,1,1,1,1}
}, {
{1,1,1,1,1},
{0,0,0,0,1},
{0,1,1,1,1},
{0,0,0,0,1},
{1,1,1,1,1}
}, {
{1,0,2,0,1},
{1,0,0,0,1},
{1,1,1,1,1},
{0,0,0,0,1},
{2,2,2,0,1}
}, {
{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}
}, {
{1,1,1,1,1},
{1,0,0,0,0},
{1,1,1,1,1},
{1,0,0,0,1},
{1,1,1,1,1}
}, {
{1,1,1,1,1},
{0,0,0,0,1},
{2,0,2,0,1},
{2,0,2,0,1},
{2,0,2,0,1}
}, {
{1,1,1,1,1},
{1,0,0,0,1},
{1,1,1,1,1},
{1,0,0,0,1},
{1,1,1,1,1}
}, {
{1,1,1,1,1},
{1,0,0,0,1},
{1,1,1,1,1},
{0,0,0,0,1},
{1,1,1,1,1}
}, {
{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}
}, {
{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}
}, {
{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}
}, {
{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}, 0b00011, 0b11000,
{1,1,1,1,1}, 0b00001, 0b00000,
{1,1,1,1,1}, 0b00001, 0b11100,
{1,1,1,1,1}, 0b00001, 0b00000,
{1,1,1,1,1} 0b00001, 0b11100
}}; },
{
0b11111, 0b00000,
0b00001, 0b00000,
0b11111, 0b00000,
0b10000, 0b00000,
0b11111, 0b00000
},
{
0b11111, 0b00000,
0b00001, 0b00000,
0b01111, 0b00000,
0b00001, 0b00000,
0b11111, 0b00000
},
{
0b10001, 0b00100,
0b10001, 0b00000,
0b11111, 0b00000,
0b00001, 0b00000,
0b00001, 0b11100
},
{
0b11111, 0b00000,
0b10000, 0b00000,
0b11111, 0b00000,
0b00001, 0b00000,
0b11111, 0b00000
},
{
0b11111, 0b00000,
0b10000, 0b00000,
0b11111, 0b00000,
0b10001, 0b00000,
0b11111, 0b00000
},
{
0b11111, 0b00000,
0b00001, 0b00000,
0b00001, 0b10100,
0b00001, 0b10100,
0b00001, 0b10100
},
{
0b11111, 0b00000,
0b10001, 0b00000,
0b11111, 0b00000,
0b10001, 0b00000,
0b11111, 0b00000
},
{
0b11111, 0b00000,
0b10001, 0b00000,
0b11111, 0b00000,
0b00001, 0b00000,
0b11111, 0b00000
},
// ORNAMENTS
{
0b00000, 0b11111,
0b00000, 0b00000,
0b00000, 0b11111,
0b00000, 0b00000,
0b00000, 0b11111
},
{
0b00000, 0b10101,
0b00000, 0b10101,
0b00000, 0b10101,
0b00000, 0b10101,
0b00000, 0b10101
},
{
0b11111, 0b00000,
0b00000, 0b00000,
0b11111, 0b00000,
0b00000, 0b00000,
0b11111, 0b00000
},
{
0b10101, 0b00000,
0b10101, 0b00000,
0b10101, 0b00000,
0b10101, 0b00000,
0b10101, 0b00000
},
// UPPERCASE ASCII CHARACTERS
{ // A
0b11111, 0b00000,
0b10001, 0b00000,
0b11111, 0b00000,
0b10001, 0b00000,
0b10001, 0b00100
},
{ // D
0b11111, 0b00000,
0b10001, 0b00000,
0b10001, 0b00100,
0b10001, 0b00000,
0b11110, 0b00000
},
{ // E
0b11111, 0b00000,
0b10000, 0b00000,
0b11110, 0b00000,
0b10000, 0b00000,
0b11111, 0b00000
},
{ // F
0b11111, 0b00000,
0b10000, 0b00000,
0b11110, 0b00000,
0b10000, 0b00000,
0b10000, 0b00111
},
{ // G
0b11111, 0b00000,
0b10000, 0b00000,
0b10111, 0b00000,
0b10001, 0b00000,
0b11111, 0b00000
},
{ // H
0b10001, 0b00100,
0b10001, 0b00000,
0b11111, 0b00000,
0b10001, 0b00000,
0b10001, 0b00100
},
{ // I
0b11111, 0b00000,
0b00100, 0b00000,
0b00100, 0b10001,
0b00100, 0b00000,
0b11111, 0b00000
},
{ // J
0b00111, 0b10000,
0b00001, 0b00000,
0b00001, 0b11100,
0b00001, 0b00000,
0b11111, 0b00000
},
{ // L
0b10000, 0b00101,
0b10000, 0b00101,
0b10000, 0b00101,
0b10000, 0b00000,
0b11111, 0b00000
},
{ // M
0b11111, 0b00000,
0b10101, 0b00000,
0b10101, 0b00000,
0b10001, 0b00000,
0b10001, 0b00100
},
// O is same as 0
{ // Q
0b11111, 0b00000,
0b10001, 0b00000,
0b10001, 0b00000,
0b10101, 0b00000,
0b11111, 0b00000
},
{ // R
0b11111, 0b00000,
0b00001, 0b00000,
0b11111, 0b00000,
0b10010, 0b00000,
0b10001, 0b00100
},
{ // S
0b11111, 0b00000,
0b10000, 0b00000,
0b11111, 0b00000,
0b00001, 0b00000,
0b11111, 0b00000
},
{ // T
0b11111, 0b00000,
0b00100, 0b00000,
0b00100, 0b10001,
0b00100, 0b10001,
0b00100, 0b10001
},
{ // U
0b10001, 0b00100,
0b10001, 0b00100,
0b10001, 0b00100,
0b10001, 0b00000,
0b11111, 0b00000
},
{ // V
0b10001, 0b00100,
0b10001, 0b00100,
0b10001, 0b00100,
0b10001, 0b00000,
0b11110, 0b00000
},
{ // W
0b10001, 0b00100,
0b10001, 0b00000,
0b10101, 0b00000,
0b10101, 0b00000,
0b11111, 0b00000
},
{ // X
0b10001, 0b00000,
0b01010, 0b00000,
0b00100, 0b00000,
0b01010, 0b00000,
0b10001, 0b00000
},
// PROGRESS
// 01% is same as ornament 10
{ // 12%
0b00000, 0b11111,
0b00000, 0b00000,
0b00000, 0b11111,
0b00000, 0b00000,
0b10000, 0b00111
},
{ // 23%
0b00000, 0b11111,
0b00000, 0b00000,
0b10000, 0b00111,
0b10000, 0b00000,
0b10000, 0b00111
},
{ // 34%
0b10000, 0b00111,
0b10000, 0b00000,
0b10000, 0b00111,
0b10000, 0b00000,
0b10000, 0b00111
},
{ // 45%
0b10000, 0b00111,
0b10000, 0b00000,
0b10000, 0b00111,
0b10000, 0b00000,
0b10100, 0b00001
},
{ // 56%
0b10000, 0b00111,
0b10000, 0b00000,
0b10100, 0b00001,
0b10100, 0b00000,
0b10100, 0b00001
},
{ // 67%
0b10100, 0b00001,
0b10100, 0b00000,
0b10100, 0b00001,
0b10100, 0b00000,
0b10100, 0b00001
},
{ // 78%
0b10100, 0b00001,
0b10100, 0b00000,
0b10100, 0b00001,
0b10100, 0b00000,
0b10101, 0b00000
},
{ // 89%
0b10100, 0b00001,
0b10100, 0b00000,
0b10101, 0b00000,
0b10101, 0b00000,
0b10101, 0b00000
},
// 100% is same as ornament 13
};
static const uint8_t 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 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
@ -426,27 +540,11 @@ static const uint8_t shadowtable[256] = {
// alpha should only be 0b??111111 where ?? = 00 (full shade), 01 (much shade), 10 (some shade), 11 (none shade) // alpha should only be 0b??111111 where ?? = 00 (full shade), 01 (much shade), 10 (some shade), 11 (none shade)
static const uint8_t alpha = 0b10111111; static const uint8_t alpha = 0b10111111;
/* static bool contrastmode = false, allow_animate = true, initial_anim = false;
uint8_t combine_colors(uint8_t fg_color, uint8_t bg_color) {
return (shadowtable[((~fg_color)&0b11000000) + (bg_color&63)]&63) + shadowtable[fg_color];
}
*/
#define FONT_HEIGHT_BLOCKS (sizeof *FONT / sizeof **FONT) #if defined(PBL_COLOR)
#define FONT_WIDTH_BLOCKS (sizeof **FONT) static bool previous_contrastmode = false;
#define TOTALBLOCKS FONT_HEIGHT_BLOCKS * FONT_WIDTH_BLOCKS #endif
#define FONT_HEIGHT FONT_HEIGHT_BLOCKS*TILE_SIZE
#define FONT_WIDTH FONT_WIDTH_BLOCKS*TILE_SIZE
#define TILES_X ( \
FONT_WIDTH + SPACING_X + FONT_WIDTH)
#define TILES_Y ( \
FONT_HEIGHT + SPACING_Y + FONT_HEIGHT)
#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, initial_anim = false;
static void handle_bluetooth(bool connected) { static void handle_bluetooth(bool connected) {
if (DISCONNECT_VIBRATION && !connected) { if (DISCONNECT_VIBRATION && !connected) {
@ -520,15 +618,29 @@ static GRect slotFrame(int8_t i) {
return GRect(x, y, w, h); return GRect(x, y, w, h);
} }
static GColor8 getSlotColor(uint8_t x, uint8_t y, uint8_t digit, uint8_t pos, bool isalpha) { static uint8_t fetchrect(uint8_t digit, uint8_t x, uint8_t y, bool mirror) {
// character_map maps 0-9 (digits), 10-13 (ornaments), ascii codes of uppercase letters and 100-109 (progress) to characters[]
uint8_t color1 = characters[character_map[digit]][(y*2)]; // get one row of digit colors
uint8_t color2 = characters[character_map[digit]][(y*2)+1]; // get one row of ornament colors
uint8_t mask = 0b10000 >> x;
if (mirror) {
mask = 0b00001 << x;
}
if (color1 & mask) { // check column of row
return 1;
} else if (color2 & mask) {
return 2;
} else {
return 0;
}
}
static GColor8 getSlotColor(uint8_t x, uint8_t y, uint8_t digit, uint8_t pos, bool mirror) {
static uint8_t argb; static uint8_t argb;
static bool should_add_var = false; static bool should_add_var = false;
uint8_t thisrect = FONT[digit][y][x]; uint8_t thisrect = fetchrect(digit, x, y, mirror);
if (isalpha) {
thisrect = ALPHAFONT[digit][y][x];
}
if (SCREENSHOTMODE) { if (SCREENSHOTMODE) {
thisrect = FONT[99][y][x]; thisrect = 1;
} }
if (thisrect == 0) { if (thisrect == 0) {
if (contrastmode) { if (contrastmode) {
@ -606,8 +718,8 @@ static void updateSlot(Layer *layer, GContext *ctx) {
ty = t / FONT_HEIGHT_BLOCKS; ty = t / FONT_HEIGHT_BLOCKS;
shift = 0-(t-ty); shift = 0-(t-ty);
GColor8 oldColor = getSlotColor(tx, ty, slot->prevDigit, slot->slotIndex, slot->isalpha); GColor8 oldColor = getSlotColor(tx, ty, slot->prevDigit, slot->slotIndex, slot->mirror);
GColor8 newColor = getSlotColor(tx, ty, slot->curDigit, slot->slotIndex, slot->isalpha); GColor8 newColor = getSlotColor(tx, ty, slot->curDigit, slot->slotIndex, slot->mirror);
graphics_context_set_fill_color(ctx, oldColor); 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); graphics_fill_rect(ctx, GRect((tx*tilesize)-(tx*widthadjust), ty*tilesize-(ty*widthadjust), tilesize-widthadjust, tilesize-widthadjust), 0, GCornerNone);
@ -652,9 +764,90 @@ static void destroyAnimation() {
anim = NULL; anim = NULL;
} }
static void setProgressSlots(uint8_t progress, bool showgoal, bool mirrored) {
uint8_t mappedProgress = (((progress+3)*0.95*40)/100);
if (showgoal && progress == 100) {
slot[4].curDigit = 'G';
slot[5].curDigit = 'O';
slot[6].curDigit = 'A';
slot[7].curDigit = 'L';
} else {
slot[4].curDigit = 100;
slot[5].curDigit = 100;
slot[6].curDigit = 100;
slot[7].curDigit = 100;
uint8_t partialSegment = 100+mappedProgress%10;
if (!mirrored) {
slot[4].curDigit = partialSegment;
if (mappedProgress >= 10) {
slot[4].curDigit = 109;
slot[5].curDigit = partialSegment;
}
if (mappedProgress >= 20) {
slot[5].curDigit = 109;
slot[6].curDigit = partialSegment;
}
if (mappedProgress >= 30) {
slot[6].curDigit = 109;
slot[7].curDigit = partialSegment;
}
if (mappedProgress >= 40) {
slot[7].curDigit = 109;
}
} else {
slot[4].mirror = true;
slot[5].mirror = true;
slot[6].mirror = true;
slot[7].mirror = true;
slot[7].curDigit = partialSegment;
if (mappedProgress >= 10) {
slot[7].curDigit = 109;
slot[6].curDigit = partialSegment;
}
if (mappedProgress >= 20) {
slot[6].curDigit = 109;
slot[5].curDigit = partialSegment;
}
if (mappedProgress >= 30) {
slot[5].curDigit = 109;
slot[4].curDigit = partialSegment;
}
if (mappedProgress >= 40) {
slot[4].curDigit = 109;
}
}
}
}
static void update_step_goal() {
#if defined(PBL_HEALTH)
HealthMetric metric = HealthMetricStepCount;
time_t start = time_start_of_today();
time_t end = time(NULL);
// Check the metric has data available for today
HealthServiceAccessibilityMask mask = health_service_metric_accessible(metric,
start, end);
if(mask & HealthServiceAccessibilityMaskAvailable) {
// Data is available!
progress = (int)(((float)health_service_sum_today(metric)/(float)STEP_GOAL)*100);
APP_LOG(APP_LOG_LEVEL_INFO, "Step progress: %d%%", progress);
} else {
// No data recorded yet today
APP_LOG(APP_LOG_LEVEL_ERROR, "Data unavailable!");
progress = 0;
}
#endif
}
static void handle_tick(struct tm *t, TimeUnits units_changed) { static void handle_tick(struct tm *t, TimeUnits units_changed) {
static uint8_t ho, mi, da, mo; static uint8_t ho, mi, da, mo;
if (STEP_PERCENTAGE && !PROGRESS_ON_SHAKE) {
update_step_goal();
}
if (splashEnded && !initial_anim) { if (splashEnded && !initial_anim) {
if (animation_is_scheduled(anim)){ if (animation_is_scheduled(anim)){
animation_unschedule(anim); animation_unschedule(anim);
@ -718,15 +911,8 @@ static void handle_tick(struct tm *t, TimeUnits units_changed) {
slot[2].curDigit = mi/10; slot[2].curDigit = mi/10;
slot[3].curDigit = mi%10; slot[3].curDigit = mi%10;
slot[4].isalpha = false;
slot[5].isalpha = false;
slot[6].isalpha = false;
slot[7].isalpha = false;
if (!EU_DATE) { if (!EU_DATE) {
if (WEEKDAY) { if (WEEKDAY) {
slot[4].isalpha = true;
slot[5].isalpha = true;
slot[4].curDigit = (uint8_t) weekdayname[0]; slot[4].curDigit = (uint8_t) weekdayname[0];
slot[5].curDigit = (uint8_t) weekdayname[1]; slot[5].curDigit = (uint8_t) weekdayname[1];
} else { } else {
@ -748,8 +934,6 @@ static void handle_tick(struct tm *t, TimeUnits units_changed) {
slot[4].curDigit = da/10; slot[4].curDigit = da/10;
slot[5].curDigit = da%10; slot[5].curDigit = da%10;
if (WEEKDAY) { if (WEEKDAY) {
slot[6].isalpha = true;
slot[7].isalpha = true;
slot[6].curDigit = (uint8_t) weekdayname[0]; slot[6].curDigit = (uint8_t) weekdayname[0];
slot[7].curDigit = (uint8_t) weekdayname[1]; slot[7].curDigit = (uint8_t) weekdayname[1];
} else { } else {
@ -767,6 +951,7 @@ static void handle_tick(struct tm *t, TimeUnits units_changed) {
} }
} }
if (!in_shake_mode) {
if (NO_ZERO) { if (NO_ZERO) {
if (slot[0].curDigit == 0) { if (slot[0].curDigit == 0) {
if (NUMSLOTS > 8) { if (NUMSLOTS > 8) {
@ -805,6 +990,14 @@ static void handle_tick(struct tm *t, TimeUnits units_changed) {
} }
} }
} }
} else {
for(int dig = 0; dig < 4; dig++) {
slot[dig].curDigit = slot[dig].prevDigit;
}
for(int dig = 8; dig < NUMSLOTS; dig++) {
slot[dig].curDigit = slot[dig].prevDigit;
}
}
setupAnimation(); setupAnimation();
animation_schedule(anim); animation_schedule(anim);
} }
@ -815,20 +1008,35 @@ static void initialAnimationDone() {
} }
void handle_timer(void *data) { void handle_timer(void *data) {
time_t curTime;
splashEnded = true; splashEnded = true;
time_t curTime = time(NULL);
curTime = time(NULL);
handle_tick(localtime(&curTime), SECOND_UNIT|MINUTE_UNIT|HOUR_UNIT|DAY_UNIT|MONTH_UNIT|YEAR_UNIT); handle_tick(localtime(&curTime), SECOND_UNIT|MINUTE_UNIT|HOUR_UNIT|DAY_UNIT|MONTH_UNIT|YEAR_UNIT);
in_shake_mode = false;
initial_anim = true; initial_anim = true;
if (initial_anim) { if (initial_anim) {
app_timer_register(contrastmode ? 500 : DIGIT_CHANGE_ANIM_DURATION, initialAnimationDone, NULL); app_timer_register(contrastmode ? 500 : DIGIT_CHANGE_ANIM_DURATION, initialAnimationDone, NULL);
} }
} }
static void tap_handler(AccelAxisType axis, int32_t direction) {
if (!in_shake_mode) {
for (uint8_t i=0; i<NUMSLOTS; i++) {
slot[i].prevDigit = slot[i].curDigit;
}
if (STEP_PERCENTAGE && PROGRESS_ON_SHAKE) {
update_step_goal();
}
if (PROGRESS) {
setProgressSlots(progress, STEP_PERCENTAGE, PROGRESS_MIRROR); // only show "GOAL" if PERCENTAGE is STEP_PERCENTAGE
}
setupAnimation();
animation_schedule(anim);
app_timer_register(3000, handle_timer, NULL);
in_shake_mode = true;
}
}
void initSlot(int i, Layer *parent) { void initSlot(int i, Layer *parent) {
digitSlot *s = &slot[i]; digitSlot *s = &slot[i];
@ -897,6 +1105,9 @@ static void teardownUI() {
} }
static void battery_handler(BatteryChargeState charge_state) { static void battery_handler(BatteryChargeState charge_state) {
if (BATTERY_PERCENTAGE) {
progress = charge_state.charge_percent;
}
#if defined(PBL_COLOR) #if defined(PBL_COLOR)
if (CONTRAST_WHILE_CHARGING) { if (CONTRAST_WHILE_CHARGING) {
previous_contrastmode = contrastmode; previous_contrastmode = contrastmode;
@ -1000,17 +1211,8 @@ static void in_received_handler(DictionaryIterator *iter, void *context) {
light_enable(true); light_enable(true);
} }
} }
if (debug) { window_set_background_color(window, contrastmode ? GColorBlack : BACKGROUND_COLOR);
APP_LOG(APP_LOG_LEVEL_INFO, "Teardown"); app_timer_register(0, handle_timer, NULL);
}
teardownUI();
if (debug) {
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) { static void in_dropped_handler(AppMessageResult reason, void *context) {
@ -1025,6 +1227,11 @@ static void init() {
debug = true; debug = true;
} }
if (BATTERY_PERCENTAGE) {
BatteryChargeState charge_state = battery_state_service_peek();
progress = charge_state.charge_percent;
}
// Set up preferences // Set up preferences
if(persist_exists(PREFERENCES_KEY)){ if(persist_exists(PREFERENCES_KEY)){
persist_read_data(PREFERENCES_KEY, &curPrefs, sizeof(curPrefs)); persist_read_data(PREFERENCES_KEY, &curPrefs, sizeof(curPrefs));
@ -1084,12 +1291,15 @@ static void init() {
connection_service_subscribe((ConnectionHandlers) { connection_service_subscribe((ConnectionHandlers) {
.pebble_app_connection_handler = handle_bluetooth .pebble_app_connection_handler = handle_bluetooth
}); });
accel_tap_service_subscribe(tap_handler);
} }
static void deinit() { static void deinit() {
tick_timer_service_unsubscribe(); tick_timer_service_unsubscribe();
connection_service_unsubscribe(); connection_service_unsubscribe();
battery_state_service_unsubscribe(); battery_state_service_unsubscribe();
accel_tap_service_unsubscribe();
teardownUI(); teardownUI();
window_destroy(window); window_destroy(window);
} }