From 6c88540334cec03ffa44e8e7c0b231a90fa01c39 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Sun, 27 Dec 2015 08:53:30 -0700 Subject: [PATCH] Disable BT alerts on PTR --- appinfo.json | 28 ++++++++++++++-------------- src/main.c | 5 +++++ 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/appinfo.json b/appinfo.json index 3ebef28..2afe47f 100644 --- a/appinfo.json +++ b/appinfo.json @@ -8,19 +8,6 @@ "projectType": "native", "resources": { "media": [ - { - "file": "images/icon", - "name": "IMAGE_ICON", - "targetPlatforms": null, - "type": "bitmap" - }, - { - "characterRegex": "[0-9]", - "file": "fonts/Helvetica-Bold.ttf", - "name": "FONT_24", - "targetPlatforms": null, - "type": "font" - }, { "file": "images/menu.png", "menuIcon": true, @@ -28,12 +15,25 @@ "targetPlatforms": null, "type": "png" }, + { + "file": "images/icon", + "name": "IMAGE_ICON", + "targetPlatforms": null, + "type": "bitmap" + }, { "characterRegex": "[\uf10b]", "file": "fonts/fontawesome-webfont.ttf", "name": "SYMBOLS_64", "targetPlatforms": null, "type": "font" + }, + { + "characterRegex": "[0-9]", + "file": "fonts/Helvetica-Bold.ttf", + "name": "FONT_24", + "targetPlatforms": null, + "type": "font" } ] }, @@ -44,7 +44,7 @@ "chalk" ], "uuid": "029c47c0-f364-4d8f-bf66-abd35a9008f8", - "versionLabel": "1.0", + "versionLabel": "1.1", "watchapp": { "watchface": true } diff --git a/src/main.c b/src/main.c index 6d6a1b5..1dfa25e 100644 --- a/src/main.c +++ b/src/main.c @@ -183,8 +183,13 @@ static void init() { gpath_move_to(s_hour_arrow, center); tick_subscribe(); + +#ifdef PBL_ROUND + bt_connected = true; +#else bluetooth_connection_service_subscribe(bt_handler); bt_connected = bluetooth_connection_service_peek(); +#endif } static void deinit() {