mainscnt/mains-frequency-counter-esp32
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2021-03-09 19:33:29 +01:00
parent c225080693
commit 11eac7a8e4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/counter.c
View File

@ -1,6 +1,6 @@
#include <stdint.h> #include <stdint.h>
#include "timer.h" #include "counter.h"
#include <driver/timer.h> #include <driver/timer.h>
#include <esp_log.h> #include <esp_log.h>
@ -16,10 +16,10 @@ static xQueueHandle zeroCrossingQueue = NULL;
static const uint64_t QUEUE_MARKER = UINT64_MAX; static const uint64_t QUEUE_MARKER = UINT64_MAX;
static void counterTask(void *arg) { static void counterSecondTask(void *arg) {
while (1) { while (1) {
vTaskDelay(1000 / portTICK_PERIOD_MS); 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 (counterCurrentValue == QUEUE_MARKER) {
if (counterCnt > 0) { if (counterCnt > 0) {
uint32_t counterSecondAverage = ((uint32_t)(counterSum)) / ((uint32_t)(counterCnt)); 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 { } else {
ESP_LOGW(TAG, "counterCnt is zero"); ESP_LOGW(TAG, "counterCnt is zero");
} }
@ -40,7 +40,7 @@ static void counterZeroCrossingAveragerTask(void *arg) {
counterSum = 0; counterSum = 0;
} else { } else {
counterSum += 1; counterSum += 1;
counterCnt += counterValue; counterCnt += counterCurrentValue;
} }
} }
} }
@ -49,11 +49,11 @@ void IRAM_ATTR counterZeroCrossingISR(void *arg) {
uint64_t counterValue = 0; uint64_t counterValue = 0;
timer_spinlock_take(TIMER_GROUP_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); timer_spinlock_give(TIMER_GROUP_0);
if (zeroCrossingQueue) { if (zeroCrossingQueue) {
xQueueSendFromISR(zeroCrossingQueue, counterValue, NULL); xQueueSendFromISR(zeroCrossingQueue, &counterValue, NULL);
} }
} }

2
src/main/gpio.c
View File

@ -23,7 +23,7 @@ void gpioInit() {
io_conf.mode = GPIO_MODE_INPUT; io_conf.mode = GPIO_MODE_INPUT;
io_conf.pull_up_en = 0; io_conf.pull_up_en = 0;
io_conf.pull_down_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); gpio_isr_handler_add(GPIO_ZERO_CROSSING, counterZeroCrossingISR, NULL);