1
0

22 Commits
0.9 ... 1.3

Author SHA1 Message Date
404536c3b7 release 2015-11-20 01:27:50 +01:00
b48313dba4 added setting for tick marks 2015-11-20 00:33:31 +01:00
b8508ce0fd made watchface always light up in emulator 2015-11-18 22:50:23 +01:00
f6d3c9c3f5 excluded binaries from repo 2015-11-18 22:28:21 +01:00
e7c01919d4 added shadow-toggle to the settings page 2015-11-18 22:25:45 +01:00
e3216b3352 removed config page from repo 2015-11-18 21:05:31 +01:00
2604a8d3ae added drop shadows to the hands 2015-11-18 21:01:57 +01:00
d0fa7bc990 Merge branch 'master' of https://github.com/lastfuture/Pebble-Time-Watchface---Super-Simple 2015-11-18 19:21:24 +01:00
f032dc6488 removed assets 2015-11-18 19:20:40 +01:00
a27ed69547 added shadowtable
added shadowtable from https://github.com/robisodd/transparency/blob/master/src/transparency.c
2015-11-16 22:38:40 +01:00
ff15d72028 added banner for chalk 2015-11-15 20:44:59 +01:00
5296df4453 added more screenshots and animated screens to the assets 2015-11-14 23:39:45 +01:00
e1511925f8 bugfix when loading colors configured as black 2015-11-14 21:47:34 +01:00
d93e38187a Merge branch 'master' of https://github.com/lastfuture/Pebble-Time-Watchface---Super-Simple 2015-11-14 20:56:31 +01:00
55d64b8f9c created new assets for color configurations 2015-11-14 20:56:21 +01:00
c34c5e9b4c added color configuration to the C part 2015-11-14 20:38:08 +01:00
c9d52de376 added pebble-js-app.js 2015-11-14 19:44:20 +01:00
6d69c296d9 turned divs into labels to make color pickers work 2015-11-14 19:43:39 +01:00
f616ae6dd2 corrected colors to reflect default colors in watchface 2015-11-14 19:31:07 +01:00
99e43e6502 added HTML/JS/CSS for config page (but not the integration into the watchface yet) 2015-11-14 19:28:49 +01:00
99b0cdeee6 added assets for basalt as well 2015-11-14 18:00:10 +01:00
aff6eaa6c0 added assets for pebble watch app store 2015-11-14 17:55:26 +01:00
5 changed files with 255 additions and 25 deletions

32
.gitignore vendored Normal file
View File

@@ -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

View File

@@ -1 +1 @@
# Pebble-Time-Watchface---Super-Simple
# “Super Simple” watchface for Pebble Time Round and Pebble Time

View File

@@ -1,5 +1,13 @@
{
"appKeys": {},
"appKeys": {
"colorbg": 0,
"colorh": 2,
"colorm": 1,
"colorp": 3,
"colort": 6,
"shadows": 4,
"ticks": 5
},
"capabilities": [
"configurable"
],
@@ -16,7 +24,7 @@
"chalk"
],
"uuid": "ceeae81b-6b50-43b6-8bbb-6d6f6eb62b69",
"versionLabel": "0.9",
"versionLabel": "1.3",
"watchapp": {
"watchface": true
}

29
src/js/pebble-js-app.js Normal file
View File

@@ -0,0 +1,29 @@
Pebble.addEventListener('ready', function() {
console.log('PebbleKit JS ready!');
});
Pebble.addEventListener('showConfiguration', function() {
var url='http://pebble.lastfuture.de/config/supersimple13/';
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.colorbg) {
Pebble.sendAppMessage({
colorbg: parseInt(configData.colorbg, 16),
colorm: parseInt(configData.colorm, 16),
colorh: parseInt(configData.colorh, 16),
colorp: parseInt(configData.colorp, 16),
shadows: configData.shadows === true,
ticks: configData.ticks,
colort: parseInt(configData.colort, 16)
}, function() {
console.log('Send successful!');
}, function() {
console.log('Send failed!');
});
}
});

View File

@@ -1,21 +1,45 @@
#include <pebble.h>
#define MINUTE_COLOR GColorWhite
#define HOUR_COLOR GColorRed
#define PEG_COLOR GColorDarkGray
#define BG_COLOR GColorBlack
#define KEY_BG_COLOR 0
#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,10 +51,63 @@ 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, 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;
persist_write_int(KEY_MINUTE_COLOR, colorm);
gcolorm = GColorFromHEX(colorm);
}
if(colorh_t) {
int colorh = colorh_t->value->int32;
persist_write_int(KEY_HOUR_COLOR, colorh);
gcolorh = GColorFromHEX(colorh);
}
if(colorp_t) {
int colorp = colorp_t->value->int32;
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);
}
}
/*************************** AnimationImplementation **************************/
static void animation_started(Animation *anim, void *context) {
@@ -60,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) {
@@ -71,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, BG_COLOR);
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
@@ -89,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,
@@ -106,20 +187,51 @@ 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, HOUR_COLOR);
graphics_context_set_stroke_color(ctx, gcolorh);
graphics_context_set_stroke_width(ctx, HAND_WIDTH);
graphics_draw_line(ctx, hour_hand_inner, hour_hand_outer);
}
if(s_radius > HAND_MARGIN_OUTER) {
graphics_context_set_stroke_color(ctx, MINUTE_COLOR);
graphics_context_set_stroke_color(ctx, gcolorm);
graphics_context_set_stroke_width(ctx, HAND_WIDTH);
graphics_draw_line(ctx, minute_hand_inner, minute_hand_outer);
}
}
graphics_context_set_fill_color(ctx, PEG_COLOR);
graphics_context_set_fill_color(ctx, gcolorp);
graphics_fill_circle(ctx, s_center, DOT_RADIUS);
}
@@ -130,6 +242,48 @@ static void window_load(Window *window) {
s_center = grect_center_point(&window_bounds);
if (persist_exists(KEY_BG_COLOR)) {
int colorbg = persist_read_int(KEY_BG_COLOR);
gcolorbg = GColorFromHEX(colorbg);
} else {
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;
}
if (persist_exists(KEY_HOUR_COLOR)) {
int colorh = persist_read_int(KEY_HOUR_COLOR);
gcolorh = GColorFromHEX(colorh);
} else {
gcolorh = GColorRed;
}
if (persist_exists(KEY_PEG_COLOR)) {
int colorp = persist_read_int(KEY_PEG_COLOR);
gcolorp = GColorFromHEX(colorp);
} else {
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);
layer_set_update_proc(s_canvas_layer, update_proc);
layer_add_child(window_layer, s_canvas_layer);
@@ -153,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);
@@ -166,6 +325,9 @@ static void init() {
tick_timer_service_subscribe(MINUTE_UNIT, tick_handler);
app_message_register_inbox_received(inbox_received_handler);
app_message_open(app_message_inbox_size_maximum(), app_message_outbox_size_maximum());
// Prepare animations
AnimationImplementation radius_impl = {
.update = radius_update
@@ -183,4 +345,3 @@ int main() {
deinit();
}