From 53e5fae80e666961c313806eeb33b2faf0d66630 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Wed, 25 Nov 2015 22:45:42 +0100 Subject: [PATCH] added option for vibration on bt disconnect --- appinfo.json | 3 ++- src/js/pebble-js-app.js | 5 +++-- src/main.c | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/appinfo.json b/appinfo.json index 4acf7c4..5ba29e8 100644 --- a/appinfo.json +++ b/appinfo.json @@ -1,5 +1,6 @@ { "appKeys": { + "btvibe": 2, "colors": 0, "inverse": 1 }, @@ -18,7 +19,7 @@ "chalk" ], "uuid": "000fd62a-3f0a-4bdd-a118-b3caa48893a0", - "versionLabel": "1.2", + "versionLabel": "1.3", "watchapp": { "watchface": true } diff --git a/src/js/pebble-js-app.js b/src/js/pebble-js-app.js index f38b276..cbc826d 100644 --- a/src/js/pebble-js-app.js +++ b/src/js/pebble-js-app.js @@ -3,7 +3,7 @@ Pebble.addEventListener('ready', function() { }); Pebble.addEventListener('showConfiguration', function() { - var url='http://pebble.lastfuture.de/config/arcangle11/'; + var url='http://pebble.lastfuture.de/config/arcangle13/'; console.log('Showing configuration page: '+url); Pebble.openURL(url); }); @@ -14,7 +14,8 @@ Pebble.addEventListener('webviewclosed', function(e) { if (configData.colors) { Pebble.sendAppMessage({ colors: configData.colors, - inverse: 0+(configData.inverse === true) + inverse: 0+(configData.inverse === true), + btvibe: 0+(configData.btvibe === true) }, function() { console.log('Send successful!'); }, function() { diff --git a/src/main.c b/src/main.c index fdfa954..efe1bce 100644 --- a/src/main.c +++ b/src/main.c @@ -2,6 +2,7 @@ #define KEY_COLORS 0 #define KEY_INVERSE 1 +#define KEY_BT_VIBE 2 #define ANTIALIASING true #define INVERSE true @@ -27,7 +28,7 @@ static Layer *bg_canvas_layer, *s_canvas_layer; static GPoint s_center; static Time s_last_time; static int colors = 1; -static bool s_animating = false, debug = false, inverse = false; +static bool s_animating = false, debug = false, inverse = false, btvibe = false; static GColor gcolorbg, gcolorh, gcolort; @@ -91,6 +92,7 @@ static void handle_colorchange() { static void inbox_received_handler(DictionaryIterator *iter, void *context) { Tuple *colors_t = dict_find(iter, KEY_COLORS); Tuple *inverse_t = dict_find(iter, KEY_INVERSE); + Tuple *btvibe_t = dict_find(iter, KEY_BT_VIBE); if(colors_t) { colors = colors_t->value->uint8; @@ -103,6 +105,13 @@ static void inbox_received_handler(DictionaryIterator *iter, void *context) { persist_write_bool(KEY_INVERSE, false); inverse = false; } + if(btvibe_t && btvibe_t->value->int8 > 0) { + persist_write_bool(KEY_BT_VIBE, true); + btvibe = true; + } else { + persist_write_bool(KEY_BT_VIBE, false); + btvibe = false; + } handle_colorchange(); if(bg_canvas_layer) { layer_mark_dirty(bg_canvas_layer); @@ -110,6 +119,7 @@ static void inbox_received_handler(DictionaryIterator *iter, void *context) { if(s_canvas_layer) { layer_mark_dirty(s_canvas_layer); } + vibes_short_pulse(); } /*************************** AnimationImplementation **************************/ @@ -157,6 +167,17 @@ static void tick_handler(struct tm *tick_time, TimeUnits changed) { } } +static void handle_bluetooth(bool connected) { + if (btvibe && !connected) { + static uint32_t const segments[] = { 200, 200, 50, 150, 200 }; + VibePattern pat = { + .durations = segments, + .num_segments = ARRAY_LENGTH(segments), + }; + vibes_enqueue_custom_pattern(pat); + } +} + static int32_t get_angle_for_minute(int minute) { // Progress through 60 minutes, out of 360 degrees return (minute * 360) / 60; @@ -245,6 +266,11 @@ static void window_load(Window *window) { } else { inverse = false; } + if (persist_exists(KEY_BT_VIBE)) { + btvibe = persist_read_bool(KEY_BT_VIBE); + } else { + btvibe = false; + } bg_canvas_layer = layer_create(window_bounds); s_canvas_layer = layer_create(window_bounds); @@ -304,6 +330,12 @@ static void init() { light_enable(true); } + handle_bluetooth(connection_service_peek_pebble_app_connection()); + + connection_service_subscribe((ConnectionHandlers) { + .pebble_app_connection_handler = handle_bluetooth + }); + app_message_register_inbox_received(inbox_received_handler); app_message_open(app_message_inbox_size_maximum(), app_message_outbox_size_maximum()); }