]> granicus.if.org Git - esp-idf/commitdiff
unit_tests/Update unit test timer divider
authorDarian Leung <darian@espressif.com>
Mon, 30 Oct 2017 11:42:16 +0000 (19:42 +0800)
committerDarian Leung <darian@espressif.com>
Mon, 30 Oct 2017 11:42:16 +0000 (19:42 +0800)
This commit updates various test cases throughout esp-idf such that
the values used for timer divider pass the assertions in the timer component.
Timer divider values must be between 2 to 65536

components/app_trace/test/test_trace.c
components/freertos/test/test_suspend_scheduler.c
components/freertos/test/test_task_suspend_resume.c

index 6846ea50a26ea0e9b23023f3c82cc1e9690bbe25..6d95a87c554c1ff4141207cdaad703021bc35614 100644 (file)
@@ -67,7 +67,7 @@ static void esp_apptrace_test_timer_init(int timer_group, int timer_idx, uint32_
     config.alarm_en = 1;
     config.auto_reload = 1;
     config.counter_dir = TIMER_COUNT_UP;
-    config.divider = 1;
+    config.divider = 2;     //Range is 2 to 65536
     config.intr_type = TIMER_INTR_LEVEL;
     config.counter_en = TIMER_PAUSE;
     /*Configure timer*/
@@ -403,7 +403,7 @@ static void esp_apptrace_test_ts_init(int timer_group, int timer_idx)
     config.alarm_en = 0;
     config.auto_reload = 0;
     config.counter_dir = TIMER_COUNT_UP;
-    config.divider = 1;
+    config.divider = 2;     //Range is 2 to 65536
     config.counter_en = 0;
     /*Configure timer*/
     timer_init(timer_group, timer_idx, &config);
@@ -420,7 +420,7 @@ static void esp_apptrace_test_ts_cleanup()
     config.alarm_en = 0;
     config.auto_reload = 0;
     config.counter_dir = TIMER_COUNT_UP;
-    config.divider = 1;
+    config.divider = 2;     //Range is 2 to 65536
     config.counter_en = 0;
     /*Configure timer*/
     timer_init(s_ts_timer_group, s_ts_timer_idx, &config);
index c613dc64749a8bd4d21b343b49c124e7d4da9b38..3d8932d86af9ae782e6f04897a991d2ad84d90be 100644 (file)
@@ -69,7 +69,7 @@ TEST_CASE("Scheduler disabled can handle a pending context switch on resume", "[
         .alarm_en = 1,
         .auto_reload = 1,
         .counter_dir = TIMER_COUNT_UP,
-        .divider = 1,
+        .divider = 2,       //Range is 2 to 65536
         .intr_type = TIMER_INTR_LEVEL,
         .counter_en = TIMER_PAUSE,
     };
index 5908d2135fa7817dd56add9d29dcee0a9fc5b02b..d66e4af528ad5e5ec656954a2b71cb0193de0309 100644 (file)
@@ -140,7 +140,7 @@ static void test_resume_task_from_isr(int target_core)
         .alarm_en = 1,
         .auto_reload = 0,
         .counter_dir = TIMER_COUNT_UP,
-        .divider = 1,
+        .divider = 2,       //Range is 2 to 65536
         .intr_type = TIMER_INTR_LEVEL,
         .counter_en = TIMER_PAUSE,
     };