From 3708927d2fe15a747270619d1467486c040e57dd Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Tue, 9 Jun 2015 14:09:22 +0200
Subject: Stop alarm when shaking too

---
 ui.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui.c b/ui.c
index 3d8a8d2..e71db36 100644
--- a/ui.c
+++ b/ui.c
@@ -318,7 +318,8 @@ static void doFlashOn () {
 
 	switch (fmode) {
 		case FLASH_ALARM:
-			if (horizonChanged) {
+			if (horizonChanged || accelGetShakeCount () > 0) {
+				accelResetShakeCount ();
 				enterIdle ();
 				stopFlash = true;
 			}
@@ -367,7 +368,9 @@ static void doFlashOff () {
 
 	switch (fmode) {
 		case FLASH_ALARM:
-			if (horizonChanged || flashCount >= FLASH_ALARM_NUM) {
+			if (horizonChanged || accelGetShakeCount () > 0 ||
+						flashCount >= FLASH_ALARM_NUM) {
+				accelResetShakeCount ();
 				enterIdle ();
 				stopFlash = true;
 			}
-- 
cgit v1.2.3