Fixup esp32 test counter

steadramon · Apr 30, 2023 · e82abaa · e82abaa
1 parent 48cfd88
commit e82abaa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/ESPGeiger/src/Counter/Counter.cpp b/ESPGeiger/src/Counter/Counter.cpp
@@ -94,11 +94,8 @@ void Counter::begin() {
   timer1_enable(TIM_DIV16, TIM_EDGE, TIM_LOOP);
   timer1_write(600);
   #else
-  hw_timer_t * timer = NULL;
-  timer = timerBegin(0, 80, true);
-  timerAttachInterrupt(timer, &count, true);
-  timerAlarmWrite(timer, 600, true);
-  timerAlarmEnable(timer);
+  hwtimer = timerBegin(0, 80, true);
+  timerAlarmEnable(hwtimer);
   #endif
 #elif GEIGER_TYPE == GEIGER_TYPE_TESTPULSE
   Log::console(PSTR("Counter: Setting up test pulse geiger ..."));
@@ -139,15 +136,15 @@ void Counter::handleSerial(char* input)
 #endif
       Log::debug(PSTR("Counter loop - %d"), _scpm);
 #ifdef ESP32
-    portENTER_CRITICAL(&timerMux);
+  portENTER_CRITICAL(&timerMux);
 #endif
 #if GEIGER_SERIAL_TYPE == GEIGER_SERIAL_CPM
       eventCounter = (float)_scpm/(float)60;
 #else
       eventCounter = (float)_scpm;
 #endif
 #ifdef ESP32
-    portEXIT_CRITICAL(&timerMux);
+  portEXIT_CRITICAL(&timerMux);
 #endif
     }
 }
@@ -176,7 +173,7 @@ void Counter::loop() {
       _serial_idx = 0;
     }
 
-    if (_serial_idx > 42) {
+    if (_serial_idx > 52) {
       _serial_idx = 0;
     }
   }

diff --git a/ESPGeiger/src/Counter/Counter.h b/ESPGeiger/src/Counter/Counter.h
@@ -217,6 +217,7 @@ static bool _handlesecond = false;
 
 #ifdef ESP32
 static portMUX_TYPE timerMux = portMUX_INITIALIZER_UNLOCKED;
+static hw_timer_t * hwtimer = NULL;
 
 static void IRAM_ATTR count() {
   unsigned long cycles = ESP.getCycleCount();
@@ -229,13 +230,17 @@ static void IRAM_ATTR count() {
 };
 
 static void IRAM_ATTR handleSecondTick() {
-  _handlesecond = true;
   portENTER_CRITICAL_ISR(&timerMux);
+  _handlesecond = true;
 #ifdef USE_PCNT
   int16_t pulseCount;
   pcnt_get_counter_value(PCNT_UNIT, &pulseCount);
   pcnt_counter_clear(PCNT_UNIT);
   eventCounter = pulseCount;
+#endif
+#if GEIGER_TYPE == GEIGER_TYPE_TEST && ESP32
+  eventCounter = timerRead(hwtimer)/600;
+  timerRestart(hwtimer);
 #endif
   status.geigerTicks.add(eventCounter);
   eventCounter = 0;