Bläddra i källkod

Merge cntdown_timer from https://github.com/0w0mewo/fpz_cntdown_timer

# Conflicts:
#	cntdown_timer/application.fam
#	cntdown_timer/views/countdown_view.c
Willy-JL 1 år sedan
förälder
incheckning
e96183c398
2 ändrade filer med 4 tillägg och 5 borttagningar
  1. 1 1
      cntdown_timer/application.fam
  2. 3 4
      cntdown_timer/views/countdown_view.c

+ 1 - 1
cntdown_timer/application.fam

@@ -13,6 +13,6 @@ App(
     fap_category="Tools",
     fap_category="Tools",
     fap_author="@0w0mewo",
     fap_author="@0w0mewo",
     fap_weburl="https://github.com/0w0mewo/fpz_cntdown_timer",
     fap_weburl="https://github.com/0w0mewo/fpz_cntdown_timer",
-    fap_version="1.3",
+    fap_version="1.4"
     fap_description="Simple count down timer",
     fap_description="Simple count down timer",
 )
 )

+ 3 - 4
cntdown_timer/views/countdown_view.c

@@ -93,7 +93,8 @@ static void countdown_timer_view_on_draw(Canvas* canvas, void* ctx) {
     char buffer[64];
     char buffer[64];
 
 
     int32_t count = model->count;
     int32_t count = model->count;
-    int32_t expected_count = MAX(model->saved_count_setting, 1);
+    int32_t expected_count = model->saved_count_setting;
+    furi_check(expected_count > 0, "expected_count < 0");
 
 
     CountDownViewSelect select = model->select;
     CountDownViewSelect select = model->select;
 
 
@@ -222,9 +223,7 @@ static void handle_time_setting_updown(CountDownTimView* cdv, CountDownViewCmd c
                 break;
                 break;
             }
             }
 
 
-            if(count <= 0) {
-                count = 1;
-            }
+            count = MAX(count, 1);
 
 
             // update count state
             // update count state
             model->count = count;
             model->count = count;