From 11eac7a8e4b6ad3bb90a1786ce9ad76ce400a23b Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 9 Mar 2021 19:33:29 +0100 Subject: [PATCH] fix --- src/main/counter.c | 14 +++++++------- src/main/gpio.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/counter.c b/src/main/counter.c index 2fe0465..0e5be94 100644 --- a/src/main/counter.c +++ b/src/main/counter.c @@ -1,6 +1,6 @@ #include -#include "timer.h" +#include "counter.h" #include #include @@ -16,10 +16,10 @@ static xQueueHandle zeroCrossingQueue = NULL; static const uint64_t QUEUE_MARKER = UINT64_MAX; -static void counterTask(void *arg) { +static void counterSecondTask(void *arg) { while (1) { vTaskDelay(1000 / portTICK_PERIOD_MS); - xQueueSend(zeroCrossingQueue, QUEUE_MARKER, portMAX_DELAY); + xQueueSend(zeroCrossingQueue, &QUEUE_MARKER, portMAX_DELAY); } } @@ -32,7 +32,7 @@ static void counterZeroCrossingAveragerTask(void *arg) { if (counterCurrentValue == QUEUE_MARKER) { if (counterCnt > 0) { uint32_t counterSecondAverage = ((uint32_t)(counterSum)) / ((uint32_t)(counterCnt)); - ESP_LOGI(TAG, "second average is %lu", counterSecondAverage); + ESP_LOGI(TAG, "second average is %u", counterSecondAverage); } else { ESP_LOGW(TAG, "counterCnt is zero"); } @@ -40,7 +40,7 @@ static void counterZeroCrossingAveragerTask(void *arg) { counterSum = 0; } else { counterSum += 1; - counterCnt += counterValue; + counterCnt += counterCurrentValue; } } } @@ -49,11 +49,11 @@ void IRAM_ATTR counterZeroCrossingISR(void *arg) { uint64_t counterValue = 0; timer_spinlock_take(TIMER_GROUP_0); - counterValue = time_group_get_counter_value_in_isr(TIMER_GROUP_0, 0); + counterValue = timer_group_get_counter_value_in_isr(TIMER_GROUP_0, 0); timer_spinlock_give(TIMER_GROUP_0); if (zeroCrossingQueue) { - xQueueSendFromISR(zeroCrossingQueue, counterValue, NULL); + xQueueSendFromISR(zeroCrossingQueue, &counterValue, NULL); } } diff --git a/src/main/gpio.c b/src/main/gpio.c index b3416b8..5ecee51 100644 --- a/src/main/gpio.c +++ b/src/main/gpio.c @@ -23,7 +23,7 @@ void gpioInit() { io_conf.mode = GPIO_MODE_INPUT; io_conf.pull_up_en = 0; io_conf.pull_down_en = 0; - gpio_config(&i_conf); + gpio_config(&io_conf); gpio_isr_handler_add(GPIO_ZERO_CROSSING, counterZeroCrossingISR, NULL);