andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-06-15 20:36:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

add volatile, as they are ISR-written outside the main loop

Browse Source
This commit is contained in:
proddy
2026-06-06 16:40:23 +02:00
parent 2d0bb34d17
commit b85085790a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/analogsensor.cpp
View File

@@ -26,8 +26,8 @@ std::vector<uint8_t> AnalogSensor::exclude_types_;
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
portMUX_TYPE mux = portMUX_INITIALIZER_UNLOCKED; portMUX_TYPE mux = portMUX_INITIALIZER_UNLOCKED;
unsigned long AnalogSensor::edge[] = {0, 0, 0}; volatile unsigned long AnalogSensor::edge[] = {0, 0, 0};
unsigned long AnalogSensor::edgecnt[] = {0, 0, 0}; volatile unsigned long AnalogSensor::edgecnt[] = {0, 0, 0};
void IRAM_ATTR AnalogSensor::freqIrq0() { void IRAM_ATTR AnalogSensor::freqIrq0() {
portENTER_CRITICAL_ISR(&mux); portENTER_CRITICAL_ISR(&mux);

4
src/core/analogsensor.h
View File

@@ -210,8 +210,8 @@ class AnalogSensor {
static void IRAM_ATTR freqIrq0(); static void IRAM_ATTR freqIrq0();
static void IRAM_ATTR freqIrq1(); static void IRAM_ATTR freqIrq1();
static void IRAM_ATTR freqIrq2(); static void IRAM_ATTR freqIrq2();
static unsigned long edge[3]; static volatile unsigned long edge[3]; // written from freqIrqN() ISRs, read from the main measure() loop (partly outside the critical section)
static unsigned long edgecnt[3]; static volatile unsigned long edgecnt[3]; // written from freqIrqN() ISRs, read from the main measure() loop (partly outside the critical section)
unsigned long lastedge[3] = {0, 0, 0}; unsigned long lastedge[3] = {0, 0, 0};
#endif #endif
}; };