eeeck/the-waterinator
1
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix vTaskDelay syntax error

Browse Source
This commit is contained in:
Erick
2025-11-30 23:46:21 +01:00
parent 213f6b399f
commit c6c4011a47
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/esp32/main/main.cpp
+2 -4
View File
@@ -7,7 +7,7 @@
#include "esp_task_wdt.h" #include "esp_task_wdt.h"
#include "wifi.hpp" #include "wifi.hpp"
#define WATCHDOG_KEEPALIVE_TICKS pdMS_TO_TICKS(8000) #define WATCHDOG_KEEPALIVE_MS 8000
extern EventGroupHandle_t connectivity_event_group; extern EventGroupHandle_t connectivity_event_group;
extern EventBits_t bits = xEventGroupGetBits(connectivity_event_group); extern EventBits_t bits = xEventGroupGetBits(connectivity_event_group);
@@ -27,8 +27,6 @@ static void watchdogTask(void *pvParameters) {
ESP_ERROR_CHECK(esp_task_wdt_add(NULL)); ESP_ERROR_CHECK(esp_task_wdt_add(NULL));
const TickType_t keepAlivePeriod = pdMS_TO_TICKS(WATCHDOG_KEEPALIVE_TICKS);
for(;;) { for(;;) {
if (criticalErrorFlag) { if (criticalErrorFlag) {
ESP_LOGE(TAG, "Critical error flag raised. Rebooting."); ESP_LOGE(TAG, "Critical error flag raised. Rebooting.");
@@ -38,7 +36,7 @@ static void watchdogTask(void *pvParameters) {
ESP_ERROR_CHECK(esp_task_wdt_reset()); ESP_ERROR_CHECK(esp_task_wdt_reset());
ESP_LOGV(TAG, "WDT reset"); ESP_LOGV(TAG, "WDT reset");
vTaskDelay(keepAlivePeriod); vTaskDelay(pdMS_TO_TICKS(WATCHDOG_KEEPALIVE_MS));
} }
} }
firmware/esp32/main/mqtt.cpp
+4 -4
View File
@@ -7,8 +7,8 @@
#include "main.hpp" #include "main.hpp"
#include "i2c.hpp" #include "i2c.hpp"
#define MQTT_TASK_TIMEOUT_TICKS pdMS_TO_TICKS(3000) #define MQTT_TASK_TIMEOUT_MS 3000
#define MQTT_TIMEOUT_TICKS pdMS_TO_TICKS(MQTT_TASK_TIMEOUT/2) #define MQTT_TIMEOUT_MS MQTT_TASK_TIMEOUT_MS/2
static const char* TAG = "MQTT"; static const char* TAG = "MQTT";
@@ -82,11 +82,11 @@ void mqttTask(void *pvParameters) {
if(bits && MQTT_CONNECTED_BIT) { if(bits && MQTT_CONNECTED_BIT) {
ESP_LOGV(TAG, "Connection estabilished"); ESP_LOGV(TAG, "Connection estabilished");
uint32_t task_notification = ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(MQTT_TASK_TIMEOUT_TICKS)); uint32_t task_notification = ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(MQTT_TASK_TIMEOUT_MS));
if (task_notification) twi_do(global_rx_buffer); //FIXME: develop i2c libs! (this func should then call mqtt_publish() if needed) if (task_notification) twi_do(global_rx_buffer); //FIXME: develop i2c libs! (this func should then call mqtt_publish() if needed)
} else { } else {
ESP_LOGW(TAG, "Waiting for connection..."); ESP_LOGW(TAG, "Waiting for connection...");
vTaskDelay(pdMS_TO_TICKS(MQTT_TIMEOUT_TICKS)); vTaskDelay(pdMS_TO_TICKS(MQTT_TIMEOUT_MS));
} }
ESP_ERROR_CHECK(esp_task_wdt_reset()); ESP_ERROR_CHECK(esp_task_wdt_reset());
firmware/esp32/main/wifi.cpp
+2 -2
View File
@@ -8,7 +8,7 @@
#include "main.hpp" #include "main.hpp"
#include "wifi-credentials.h" #include "wifi-credentials.h"
#define WIFI_TIMEOUT_TICKS pdMS_TO_TICKS(4500) #define WIFI_TIMEOUT_MS 4500
static const char* TAG = "WIFI"; static const char* TAG = "WIFI";
@@ -83,6 +83,6 @@ void wifiTask(void *pvParameters) {
for(;;) { for(;;) {
ESP_ERROR_CHECK(esp_task_wdt_reset()); ESP_ERROR_CHECK(esp_task_wdt_reset());
ESP_LOGV(TAG, "Task reset"); ESP_LOGV(TAG, "Task reset");
vTaskDelay(pdMS_TO_TICKS(WIFI_TIMEOUT_TICKS)); vTaskDelay(pdMS_TO_TICKS(WIFI_TIMEOUT_MS));
} }
} }