diff --git a/src/main/app_main.c b/src/main/app_main.c index 4727a85..e5b3581 100644 --- a/src/main/app_main.c +++ b/src/main/app_main.c @@ -36,14 +36,12 @@ void deviceInit() { void app_main(void) { deviceInit(); + counterInit(); gpioInit(); networkInit(isGpioForceProv()); - counterInit(); - /* Start main application now */ while (1) { - ESP_LOGI(TAG, "Hello World!"); vTaskDelay(1000 / portTICK_PERIOD_MS); } } diff --git a/src/main/counter.c b/src/main/counter.c index 0e5be94..07a9e95 100644 --- a/src/main/counter.c +++ b/src/main/counter.c @@ -32,15 +32,15 @@ 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 %u", counterSecondAverage); + ESP_LOGI(TAG, "%u %u %u", (uint32_t)counterCnt, (uint32_t)counterSum, counterSecondAverage); } else { ESP_LOGW(TAG, "counterCnt is zero"); } counterCnt = 0; counterSum = 0; } else { - counterSum += 1; - counterCnt += counterCurrentValue; + counterCnt += 1; + counterSum += counterCurrentValue; } } } diff --git a/src/main/gpio.c b/src/main/gpio.c index 5ecee51..aa8a460 100644 --- a/src/main/gpio.c +++ b/src/main/gpio.c @@ -25,6 +25,7 @@ void gpioInit() { io_conf.pull_down_en = 0; gpio_config(&io_conf); + gpio_install_isr_service(0); gpio_isr_handler_add(GPIO_ZERO_CROSSING, counterZeroCrossingISR, NULL); ESP_LOGI(TAG, "gpios configured");