comparison: main/task_user.c
main/task_user.c
- changeset 78
- e03d729aecb8
- parent 77
- 15dc572a7fcb
- child 80
- 715785443a95
equal
deleted
inserted
replaced
| 77:15dc572a7fcb | 78:e03d729aecb8 |
|---|---|
| 10 | 10 |
| 11 EventGroupHandle_t xEventGroupUser; ///< Events User task | 11 EventGroupHandle_t xEventGroupUser; ///< Events User task |
| 12 esp_timer_handle_t timerHandle; ///< Seconds timer | 12 esp_timer_handle_t timerHandle; ///< Seconds timer |
| 13 uint32_t SecsCount = 0; ///< Seconds counter | 13 uint32_t SecsCount = 0; ///< Seconds counter |
| 14 uint32_t UserTimer = 0; ///< User inactive timeout | 14 uint32_t UserTimer = 0; ///< User inactive timeout |
| 15 uint32_t AlarmTimer = 0; ///< Alarm timer | 15 uint32_t LoopTimer = 0; ///< Alarm timer |
| 16 int Main_Loop2 = -1; ///< Effective menu | 16 int Main_Loop2 = -1; ///< Effective menu |
| 17 int New_Loop2 = ML2_INIT; ///< New menu | 17 int New_Loop2 = ML2_INIT; ///< New menu |
| 18 int SubMenu = 0; ///< Submenu number | 18 int SubMenu = 0; ///< Submenu number |
| 19 int SubOffset = 0; ///< Submenu offset | 19 int SubOffset = 0; ///< Submenu offset |
| 20 u8g2_t u8g2; ///< A structure which will contain all the data for one display | 20 u8g2_t u8g2; ///< A structure which will contain all the data for one display |
| 81 } | 81 } |
| 82 if (UserTimer) { | 82 if (UserTimer) { |
| 83 UserTimer--; | 83 UserTimer--; |
| 84 } | 84 } |
| 85 | 85 |
| 86 if (AlarmTimer == 1) { | 86 if (LoopTimer == 1) { |
| 87 ESP_LOGI(TAG, "Alarm Timer timeout"); | 87 ESP_LOGI(TAG, "Alarm Timer timeout"); |
| 88 Main_Loop1 = ML1_INIT; | 88 Main_Loop1 = ML1_INIT; |
| 89 err_alarm++; | 89 } |
| 90 } | 90 |
| 91 | 91 if (LoopTimer) { |
| 92 if (AlarmTimer) { | 92 LoopTimer--; |
| 93 AlarmTimer--; | |
| 94 } | 93 } |
| 95 } | 94 } |
| 96 | 95 |
| 97 | 96 |
| 98 | 97 |
