v16.1

Added pull request from Nerten for https://github.com/MarSoft/pebble-mss. Pull request #1 "Prevent hourly vibes on quiet time".
cfg1 · Dec 11, 2017 · 73372ca · 73372ca
1 parent aead684
commit 73372ca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -2,14 +2,14 @@
     "author": "fg",
     "dependencies": {},
     "keywords": [],
-    "name": "m7s_wf_16_0",
+    "name": "m7s_wf_16_1",
     "pebble": {
         "capabilities": [
             "location",
             "configurable",
             "health"
         ],
-        "displayName": "M7S_16_0",
+        "displayName": "M7S_16_1",
         "enableMultiJS": true,
         "messageKeys": {
             "KEY_BTY_LAST_CHARGED": 13,
@@ -122,5 +122,5 @@
             "watchface": true
         }
     },
-    "version": "16.0.0"
+    "version": "16.1.0"
 }
diff --git a/src/c/main_modern.h b/src/c/main_modern.h
@@ -922,7 +922,7 @@ static void handle_second_tick(struct tm* current_time, TimeUnits units_changed)
 		layer_mark_dirty(s_image_layer_hour_2);
 
 		if (vibe_hour_old < 0) vibe_hour_old = current_time_copy.tm_hour;
-		if (vibe_on_hour && (vibe_hour_old != current_time_copy.tm_hour)){
+		if (vibe_on_hour && (vibe_hour_old != current_time_copy.tm_hour)  && !quiet_time_is_active()){
 			// Vibe pattern: ON for 200ms, OFF for 100ms, ON for 400ms:
 			static const uint32_t segments[] = { 150, 70, 150 };
 			VibePattern pat = {

diff --git a/src/c/main_platform_aplite.h b/src/c/main_platform_aplite.h
@@ -911,7 +911,7 @@ static void handle_second_tick(struct tm* current_time, TimeUnits units_changed)
     layer_mark_dirty(s_image_layer_hour_2);
 
     if (vibe_hour_old < 0) vibe_hour_old = current_time_copy.tm_hour;
-    if (vibe_on_hour && (vibe_hour_old != current_time_copy.tm_hour)){
+    if (vibe_on_hour && (vibe_hour_old != current_time_copy.tm_hour) && !quiet_time_is_active()){
       // Vibe pattern: ON for 200ms, OFF for 100ms, ON for 400ms:
       static const uint32_t segments[] = { 150, 70, 150 };
       VibePattern pat = {