refactor led class

Moving average to be fixed

RotaxMonitor/.gitignore

@@ -3,3 +3,4 @@
 .vscode/c_cpp_properties.json
 .vscode/launch.json
 .vscode/ipch
+unpacked_fs

RotaxMonitor/.vscode/extensions.json

@@ -1,8 +1,7 @@
 {
     "recommendations": [
         "Jason2866.esp-decoder",
-        "pioarduino.pioarduino-ide",
+        "pioarduino.pioarduino-ide"
-        "platformio.platformio-ide"
     ],
     "unwantedRecommendations": [
         "ms-vscode.cpptools-extension-pack"

RotaxMonitor/lib/led/led.cpp

@@ -0,0 +1,32 @@
+#include <led.h>
+
+RGBled::RGBled(const uint8_t pin) : m_led(pin)
+{
+    pinMode(m_led, OUTPUT);
+    writeStatus(RGBled::ERROR);
+}
+
+RGBled::~RGBled()
+{
+    pinMode(m_led, INPUT);
+}
+
+void RGBled::setStatus(const LedStatus s)
+{
+    if (m_status == s)
+        return;
+    std::lock_guard<std::mutex> lock(m_mutex);
+    m_status = s;
+    writeStatus(m_status);
+}
+
+const RGBled::LedStatus RGBled::getSatus(void)
+{
+    return m_status;
+}
+
+void RGBled::writeStatus(const RGBled::LedStatus s)
+{
+    RGBled::color_u u{.status = s};
+    rgbLedWrite(m_led, u.color.r, u.color.g, u.color.b);
+}

RotaxMonitor/lib/led/led.h

@@ -0,0 +1,63 @@
+#pragma once
+
+// System Inlcudes
+#include <Arduino.h>
+#include <mutex>
+
+#define RED 0x00FF00
+#define GREEN 0xFF0000
+#define BLUE 0x0000FF
+#define WHITE 0xFFFFFF
+#define YELLOW 0xFFFF00
+#define CYAN 0xFF00FF
+#define MAGENTA 0x00FFFF
+#define ORANGE 0xA5FF00
+#define PURPLE 0x008080
+#define PINK 0x69FFB4
+#define LIME 0xCD3232
+#define SKY_BLUE 0xCE87EB
+#define GOLD 0xD7FF00
+#define TURQUOISE 0xE040D0
+#define INDIGO 0x004B82
+#define GRAY 0x808080
+
+class RGBled
+{
+public:
+    enum LedStatus
+    {
+        OK = GREEN,
+        ERROR = RED,
+        INIT = YELLOW,
+        DATA_A = CYAN,
+        DATA_B = MAGENTA,
+        DATA_ALL = ORANGE,
+        IDLE = GRAY
+    };
+
+    struct color_t
+    {
+        uint8_t a, g, r, b;
+    };
+
+    union color_u
+    {
+        uint32_t status;
+        color_t color;
+    };
+
+public:
+    RGBled(const uint8_t pin = 48);
+    ~RGBled();
+
+    void setStatus(const LedStatus s);
+    const LedStatus getSatus(void);
+
+private:
+    void writeStatus(const LedStatus s);
+
+private:
+    LedStatus m_status = LedStatus::IDLE;
+    std::mutex m_mutex;
+    const uint8_t m_led;
+};

RotaxMonitor/partitions/default_16MB.csv

@@ -1,6 +0,0 @@
-# Name, Type, SubType, Offset, Size, Flags
-nvs,      data, nvs,      0x9000,  0x5000,
-otadata,  data, ota,      0xe000,  0x2000,
-app0,     app,  ota_0,    0x10000, 0x700000,
-app1,     app,  ota_1,    0x710000,0x700000,
-spiffs,   data, spiffs,   0xE10000,0x1F0000,

RotaxMonitor/partitions/no_ota_10mb_littlefs.csv

@@ -0,0 +1,6 @@
+# ESP32 Partition Table
+# Name, Type, SubType, Offset, Size
+nvs,      data, nvs,     0x9000,  0x4000
+phy_init, data, phy,     0xd000,  0x1000
+factory,  app,  factory, 0x10000, 0x300000
+littlefs, data, littlefs, 0x310000, 0xCF0000

RotaxMonitor/partitions/no_ota_10mb_spiffs.csv

@@ -0,0 +1,6 @@
+# ESP32 Partition Table
+# Name, Type, SubType, Offset, Size
+nvs,      data, nvs,     0x9000,  0x4000
+phy_init, data, phy,     0xd000,  0x1000
+factory,  app,  factory, 0x10000, 0x300000
+spiffs,   data, spiffs,  0x310000, 0xCF0000

RotaxMonitor/platformio.ini

@@ -10,6 +10,8 @@
 
 [env:esp32-s3-devkitc1-n16r8]
 board = esp32-s3-devkitc1-n16r8
+board_build.partitions = partitions/no_ota_10mb_littlefs.csv
+board_build.filesystem = littlefs
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
 framework = arduino
 lib_deps = 
@@ -18,45 +20,40 @@ lib_deps =
 	hideakitai/PCA95x5@^0.1.3
 	me-no-dev/AsyncTCP@^3.3.2
 	me-no-dev/ESPAsyncWebServer@^3.6.0
+	adafruit/Adafruit NeoPixel@^1.15.4
 upload_protocol = esptool
-upload_port = /dev/ttyACM2
+upload_port = /dev/ttyACM1
 upload_speed = 921600
-
+monitor_port = /dev/ttyACM0
-;Monitor configuration
+monitor_speed = 921600
-monitor_speed = 115200
-monitor_port = /dev/ttyACM2
-
-; Build configuration
 build_type = release
 build_flags = 
-	-DCORE_DEBUG_LEVEL=3
+	-DCORE_DEBUG_LEVEL=1
 	-DARDUINO_USB_CDC_ON_BOOT=0
 	-DARDUINO_USB_MODE=0
 	-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=5000
 	-DCONFIG_ASYNC_TCP_PRIORITY=21
-	-DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
+	-DCONFIG_ASYNC_TCP_QUEUE_SIZE=64
 	-DCONFIG_ASYNC_TCP_RUNNING_CORE=1
-	-DCONFIG_ASYNC_TCP_STACK_SIZE=8192
+	-DCONFIG_ASYNC_TCP_STACK_SIZE=4096
+	-fstack-protector-all
 
 [env:esp32-s3-devkitc1-n16r8-debug]
 board = ${env:esp32-s3-devkitc1-n16r8.board}
+board_build.partitions = ${env:esp32-s3-devkitc1-n16r8.board_build.partitions}
+board_build.filesystem = ${env:esp32-s3-devkitc1-n16r8.board_build.filesystem}
 platform = ${env:esp32-s3-devkitc1-n16r8.platform}
 framework = ${env:esp32-s3-devkitc1-n16r8.framework}
 lib_deps = 
 	${env:esp32-s3-devkitc1-n16r8.lib_deps}
+	adafruit/Adafruit NeoPixel@^1.15.4
 upload_protocol = esptool
-upload_port = /dev/ttyACM2
+upload_port = /dev/ttyACM1
 upload_speed = 921600
-
+monitor_port = /dev/ttyACM0
-;Monitor configuration
+monitor_speed = 921600
-monitor_speed = 115200
-monitor_port = /dev/ttyACM2
-
-; Debug configuration
 debug_tool = esp-builtin
 debug_speed = 15000
-
-; Build configuration
 build_type = debug
 build_flags = 
 	-O0
@@ -67,6 +64,7 @@ build_flags =
 	-DARDUINO_USB_MODE=0
 	-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=5000
 	-DCONFIG_ASYNC_TCP_PRIORITY=21
-	-DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
+	-DCONFIG_ASYNC_TCP_QUEUE_SIZE=64
 	-DCONFIG_ASYNC_TCP_RUNNING_CORE=1
-	-DCONFIG_ASYNC_TCP_STACK_SIZE=8192
+	-DCONFIG_ASYNC_TCP_STACK_SIZE=4096
+	-fstack-protector-all

RotaxMonitor/src/ADS1256.cpp

@@ -1,766 +0,0 @@
-//ADS1256 cpp file
-/*
- Name:		ADS1256.cpp
- Created:	2022/07/14
- Author:	Curious Scientist
- Editor:	Notepad++
- Comment: Visit https://curiousscientist.tech/blog/ADS1256-custom-library
- Special thanks to:
- Abraão Queiroz for spending time on the code and suggesting corrections for ESP32 microcontrollers
- Benjamin Pelletier for pointing out and fixing an issue around the handling of the DRDY signal
- RadoMmm for suggesting an improvement on the ADC-to-Volts conversion
-*/
-
-#include "Arduino.h"
-#include "ADS1256.h"
-#include "SPI.h"
-
-#define convertSigned24BitToLong(value) ((value) & (1l << 23) ? (value) - 0x1000000 : value)
-
-//Constructor
-ADS1256::ADS1256(const int8_t DRDY_pin, const int8_t RESET_pin, const int8_t SYNC_pin, const int8_t CS_pin,float VREF, SPIClass* spi):  _spi(spi),
-  _DRDY_pin(DRDY_pin),  _RESET_pin(RESET_pin),  _SYNC_pin(SYNC_pin),  _CS_pin(CS_pin),  _VREF(VREF),  _PGA(0)
-{	
-	pinMode(_DRDY_pin, INPUT);	
-	 
-	if(RESET_pin != PIN_UNUSED)
-	{
-	pinMode(_RESET_pin, OUTPUT);
-	}
-	
-	if(SYNC_pin !=  PIN_UNUSED)
-	{
-	pinMode(_SYNC_pin, OUTPUT);
-	}
-	
-	if(CS_pin != PIN_UNUSED)
-	{
-	pinMode(_CS_pin, OUTPUT);	
-	}		
-	
-	updateConversionParameter();
-}	
-
-//Initialization
-void ADS1256::InitializeADC()
-{  
-  //Chip select LOW  
-  CS_LOW();
-  
-  //We do a manual chip reset on the ADS1256 - Datasheet Page 27/ RESET
-  if(_RESET_pin != PIN_UNUSED)
-  {
-  digitalWrite(_RESET_pin, LOW);
-  delay(200);
-  digitalWrite(_RESET_pin, HIGH); //RESET is set to high
-  delay(1000);
-  }
-  
-  //Sync pin is also treated if it is defined
-  if(_SYNC_pin != PIN_UNUSED)
-  {
-  digitalWrite(_SYNC_pin, HIGH); //RESET is set to high  
-  }
-  
-#ifndef ADS1256_SPI_ALREADY_STARTED //Guard macro to allow external initialization of the SPI
-  _spi->begin();	  
-#endif
-	
-  //Applying arbitrary default values to speed up the starting procedure if the user just want to get quick readouts
-  //We both pass values to the variables and then send those values to the corresponding registers
-  delay(200);
-
-  _STATUS = 0b00110110; //BUFEN and ACAL enabled, Order is MSB, rest is read only
-  writeRegister(STATUS_REG, _STATUS); 
-  delay(200);
-  
-  _MUX = 0b00000001; //MUX AIN0+AIN1
-  writeRegister(MUX_REG, _MUX); 
-  delay(200);
-  
-  _ADCON = 0b00000000; //ADCON - CLK: OFF, SDCS: OFF, PGA = 0 (+/- 5 V)
-  writeRegister(ADCON_REG, _ADCON); 
-  delay(200);
-  
-  updateConversionParameter();
-  
-  _DRATE = 0b10000010; //100SPS
-  writeRegister(DRATE_REG, _DRATE);  
-  delay(200);
-  
-  sendDirectCommand(0b11110000); //Offset and self-gain calibration
-  delay(200);  
-
-  _isAcquisitionRunning = false; //MCU will be waiting to start a continuous acquisition
-}
-
-void ADS1256::waitForLowDRDY()
-{		    
-    while (digitalRead(_DRDY_pin) == HIGH) {} 
-}
-
-void ADS1256::waitForHighDRDY()
-{		
-#if F_CPU >= 48000000  //Fast MCUs need this protection to wait until DRDY goes high after a conversion
-	while (digitalRead(_DRDY_pin) == LOW) {}   
-#endif
-}
-
-void ADS1256::stopConversion() //Sending SDATAC to stop the continuous conversion
-{	
-	waitForLowDRDY(); //SDATAC should be called after DRDY goes LOW (p35. Figure 33)
-	_spi->transfer(0b00001111); //Send SDATAC to the ADC	
-	CS_HIGH(); //We finished the command sequence, so we switch it back to HIGH
-	_spi->endTransaction();
-	
-	_isAcquisitionRunning = false; //Reset to false, so the MCU will be able to start a new conversion
-}
-
-void ADS1256::setDRATE(uint8_t drate) //Setting DRATE (sampling frequency)
-{		
-	writeRegister(DRATE_REG, drate);
-	_DRATE = drate;
-	delay(200);
-}
-
-void ADS1256::setMUX(uint8_t mux) //Setting MUX (input channel)
-{	
-	writeRegister(MUX_REG, mux);
-	_MUX = mux;
-	delay(200);
-}
-
-void ADS1256::setPGA(uint8_t pga) //Setting PGA (input voltage range)
-{	
-	_PGA = pga;
-	_ADCON = readRegister(ADCON_REG); //Read the most recent value of the register
-	
-	_ADCON = (_ADCON & 0b11111000) | (_PGA & 0b00000111); // Clearing and then setting bits 2-0 based on pga
-	
-	writeRegister(ADCON_REG, _ADCON);	
-	delay(200);
-	
-	updateConversionParameter(); //Update the multiplier according top the new PGA value
-}
-
-uint8_t ADS1256::getPGA() //Reading PGA from the ADCON register
-{
-	uint8_t pgaValue = readRegister(ADCON_REG) & 0b00000111; 
-	//Reading the ADCON_REG and keeping the first three bits.
-	
-	return(pgaValue);	
-}
-
-void ADS1256::setCLKOUT(uint8_t clkout) //Setting CLKOUT 
-{
-	_ADCON = readRegister(ADCON_REG); //Read the most recent value of the register
-	
-	//Values: 0, 1, 2, 3
-	
-	if(clkout == 0)
-	{
-		//00
-		bitWrite(_ADCON, 6, 0);
-		bitWrite(_ADCON, 5, 0);		
-	}
-	else if(clkout == 1)
-	{
-		//01 (default)	
-		bitWrite(_ADCON, 6, 0);
-		bitWrite(_ADCON, 5, 1);			
-	}
-	else if(clkout == 2)
-	{
-		//10
-		bitWrite(_ADCON, 6, 1);
-		bitWrite(_ADCON, 5, 0);		
-	}
-	else if(clkout == 3)
-	{
-		//11	
-		bitWrite(_ADCON, 6, 1);
-		bitWrite(_ADCON, 5, 1);				
-	}
-	else{}
-	
-	writeRegister(ADCON_REG, _ADCON);
-	delay(100);
-}
-
-void ADS1256::setSDCS(uint8_t sdcs) //Setting SDCS
-{
-	_ADCON = readRegister(ADCON_REG); //Read the most recent value of the register
-	
-	//Values: 0, 1, 2, 3
-	
-	if(sdcs == 0)
-	{
-		//00 (default)
-		bitWrite(_ADCON, 4, 0);
-		bitWrite(_ADCON, 3, 0);		
-	}
-	else if(sdcs == 1)
-	{
-		//01	
-		bitWrite(_ADCON, 4, 0);
-		bitWrite(_ADCON, 3, 1);		
-	}
-	else if(sdcs == 2)
-	{
-		//10
-		bitWrite(_ADCON, 4, 1);
-		bitWrite(_ADCON, 3, 0);		
-	}
-	else if(sdcs == 3)
-	{
-		//11
-		bitWrite(_ADCON, 4, 1);
-		bitWrite(_ADCON, 3, 1);				
-	}
-	else{}
-	
-	writeRegister(ADCON_REG, _ADCON);
-	delay(100);
-}
-
-void ADS1256::setByteOrder(uint8_t byteOrder) //Setting byte order (MSB/LSB)
-{
-	_STATUS = readRegister(STATUS_REG); //Read the most recent value of the register
-	
-	if(byteOrder == 0)
-	{
-		//Byte order is MSB (default)
-		bitWrite(_STATUS, 3, 0);
-		//Set value of _STATUS at the third bit to 0
-	}
-	else if(byteOrder == 1)
-	{
-		//Byte order is LSB
-		bitWrite(_STATUS, 3, 1);
-		//Set value of _STATUS at the third bit to 1
-	}
-	else{}
-	
-	writeRegister(STATUS_REG, _STATUS);
-	delay(100);
-}
-
-uint8_t ADS1256::getByteOrder() //Getting byte order (MSB/LSB)
-{	
-	uint8_t statusValue = readRegister(STATUS_REG);	//Read the whole STATUS register	
-		
-	return bitRead(statusValue, 3);
-}
-
-void ADS1256::setAutoCal(uint8_t acal) //Setting ACAL (Automatic SYSCAL)
-{	
-	_STATUS = readRegister(STATUS_REG); //Read the most recent value of the register
-	
-	if(acal == 0)
-	{
-		//Auto-calibration is disabled (default)
-		bitWrite(_STATUS, 2, 0);
-		//_STATUS |= B00000000;
-	}
-	else if(acal == 1)
-	{
-		//Auto-calibration is enabled
-		bitWrite(_STATUS, 2, 1);
-		//_STATUS |= B00000100;
-	}
-	else{}
-	
-	writeRegister(STATUS_REG, _STATUS);
-	delay(100);
-}
-
-uint8_t ADS1256::getAutoCal() //Getting ACAL (Automatic SYSCAL)
-{	
-	uint8_t statusValue = readRegister(STATUS_REG);	//Read the whole STATUS register	
-	
-	return bitRead(statusValue, 2);
-}
-
-void ADS1256::setBuffer(uint8_t bufen) //Setting input buffer (Input impedance)
-{	
-	_STATUS = readRegister(STATUS_REG); //Read the most recent value of the register
-	
-	if(bufen == 0)
-	{
-		//Analog input buffer is disabled (default)
-		//_STATUS |= B00000000;
-		bitWrite(_STATUS, 1, 0);
-	}
-	else if(bufen == 1)
-	{
-		//Analog input buffer is enabled (recommended)
-		//_STATUS |= B00000010;
-		bitWrite(_STATUS, 1, 1);
-	}
-	else{}
-	
-	writeRegister(STATUS_REG, _STATUS);
-	delay(100);
-}
-
-uint8_t ADS1256::getBuffer() //Getting input buffer (Input impedance)
-{	
-	uint8_t statusValue = readRegister(STATUS_REG);	//Read the whole STATUS register	
-		
-	return bitRead(statusValue, 1);
-}
-
-void ADS1256::setGPIO(uint8_t dir0, uint8_t dir1, uint8_t dir2, uint8_t dir3) //Setting GPIO
-{	
-	_GPIO = readRegister(IO_REG); //Read the most recent value of the register
-	
-	//Default: 11100000 - DEC: 224 - Ref: p32 I/O section
-	//Sets D3-D0 as input or output
-	uint8_t GPIO_bit7, GPIO_bit6, GPIO_bit5, GPIO_bit4;
-	
-	//Bit7: DIR3
-	if(dir3 == 1)
-	{
-		GPIO_bit7 = 1; //D3 is input (default)
-	}
-	else
-	{
-		GPIO_bit7 = 0; //D3 is output
-	}	
-	bitWrite(_GPIO, 7, GPIO_bit7);
-	//-----------------------------------------------------
-	//Bit6: DIR2
-	if(dir2 == 1)
-	{
-		GPIO_bit6 = 1; //D2 is input (default)
-	}
-	else
-	{
-		GPIO_bit6 = 0; //D2 is output
-	}
-	bitWrite(_GPIO, 6, GPIO_bit6);
-	//-----------------------------------------------------
-	//Bit5: DIR1 
-	if(dir1 == 1)
-	{
-		GPIO_bit5 = 1; //D1 is input (default) 
-	}
-	else
-	{
-		GPIO_bit5 = 0; //D1 is output
-	}
-	bitWrite(_GPIO, 5, GPIO_bit5);
-	//-----------------------------------------------------
-	//Bit4: DIR0
-	if(dir0 == 1)
-	{
-		GPIO_bit4 = 1; //D0 is input
-	}
-	else
-	{
-		GPIO_bit4 = 0; //D0 is output (default)
-	}
-	bitWrite(_GPIO, 4, GPIO_bit4);
-	//-----------------------------------------------------
-	
-	writeRegister(IO_REG, _GPIO);
-	delay(100);
-}
-
-void ADS1256::writeGPIO(uint8_t dir0value, uint8_t dir1value, uint8_t dir2value, uint8_t dir3value) //Writing GPIO
-{
-	_GPIO = readRegister(IO_REG);
-	
-	//Sets D3-D0 output values
-	//It is important that first one must use setGPIO, then writeGPIO
-	
-	uint8_t GPIO_bit3, GPIO_bit2, GPIO_bit1, GPIO_bit0;
-	
-	//Bit3: DIR3 
-	if(dir3value == 1)
-	{
-		GPIO_bit3 = 1;
-	}
-	else
-	{
-		GPIO_bit3 = 0;
-	}	
-	bitWrite(_GPIO, 3, GPIO_bit3);
-	//-----------------------------------------------------
-	//Bit2: DIR2 
-	if(dir2value == 1)
-	{
-		GPIO_bit2 = 1;
-	}
-	else
-	{
-		GPIO_bit2 = 0;
-	}	
-	bitWrite(_GPIO, 2, GPIO_bit2);
-	//-----------------------------------------------------
-	//Bit1: DIR1 
-	if(dir1value == 1)
-	{
-		GPIO_bit1 = 1;
-	}
-	else
-	{
-		GPIO_bit1 = 0;
-	}
-	bitWrite(_GPIO, 1, GPIO_bit1);	
-	//-----------------------------------------------------
-	//Bit0: DIR0 
-	if(dir0value == 1)
-	{
-		GPIO_bit0 = 1;
-	}
-	else
-	{
-		GPIO_bit0 = 0;
-	}	
-	bitWrite(_GPIO, 0, GPIO_bit0);
-	//-----------------------------------------------------	
-		
-	writeRegister(IO_REG, _GPIO);
-	delay(100);
-}
-
-uint8_t ADS1256::readGPIO(uint8_t gpioPin) //Reading GPIO
-{	
-	uint8_t GPIO_bit3, GPIO_bit2, GPIO_bit1, GPIO_bit0, GPIO_return;
-	
-	_GPIO = readRegister(IO_REG); //Read the GPIO register
-	
-	//Save each bit values in a variable
-	GPIO_bit3 = bitRead(_GPIO, 3);
-	GPIO_bit2 = bitRead(_GPIO, 2);
-	GPIO_bit1 = bitRead(_GPIO, 1);
-	GPIO_bit0 = bitRead(_GPIO, 0);	
-	
-	delay(100);	
-	
-	switch(gpioPin) //Selecting which value should be returned
-	{
-		case 0:
-		GPIO_return = GPIO_bit0;
-		break;
-		
-		case 1:
-		GPIO_return = GPIO_bit1;
-		break;
-		
-		case 2:
-		GPIO_return = GPIO_bit2;
-		break;
-		
-		case 3:
-		GPIO_return = GPIO_bit3;
-		break;
-	}
-
-	return GPIO_return;
-	
-}
-
-void ADS1256::sendDirectCommand(uint8_t directCommand)
-{
-  //Direct commands can be found in the datasheet Page 34, Table 24.
-  _spi->beginTransaction(SPISettings(1920000, MSBFIRST, SPI_MODE1));
-
-  CS_LOW(); //REF: P34: "CS must stay low during the entire command sequence"
-  delayMicroseconds(5);
-  _spi->transfer(directCommand); //Send Command
-  delayMicroseconds(5);
-  CS_HIGH(); //REF: P34: "CS must stay low during the entire command sequence"
-
-  _spi->endTransaction();
-}
-
-
-float ADS1256::convertToVoltage(int32_t rawData) //Converting the 24-bit data into a voltage value
-{	
-  return(conversionParameter * rawData);
-}
-
-void ADS1256::writeRegister(uint8_t registerAddress, uint8_t registerValueToWrite)
-{	
-  waitForLowDRDY();
-
-  _spi->beginTransaction(SPISettings(1920000, MSBFIRST, SPI_MODE1));
-  //SPI_MODE1 = output edge: rising, data capture: falling; clock polarity: 0, clock phase: 1.
-
-  CS_LOW(); //CS must stay LOW during the entire sequence [Ref: P34, T24]
-
-  delayMicroseconds(5); //see t6 in the datasheet
-
-  _spi->transfer(0x50 | registerAddress); // 0x50 = 01010000 = WREG
-
-  _spi->transfer(0x00); //2nd (empty) command byte
-
-  _spi->transfer(registerValueToWrite); //pass the value to the register
-  
-  CS_HIGH();
-  _spi->endTransaction();
-  delay(100);
-  
-}
-
-long ADS1256::readRegister(uint8_t registerAddress) //Reading a register
-{
-   waitForLowDRDY();
-	
-  _spi->beginTransaction(SPISettings(1920000, MSBFIRST, SPI_MODE1));
-  //SPI_MODE1 = output edge: rising, data capture: falling; clock polarity: 0, clock phase: 1.
-
-  CS_LOW(); //CS must stay LOW during the entire sequence [Ref: P34, T24]
-
-  _spi->transfer(0x10 | registerAddress); //0x10 = 0001000 = RREG - OR together the two numbers (command + address)
-
-  _spi->transfer(0x00); //2nd (empty) command byte
-
-  delayMicroseconds(5); //see t6 in the datasheet
-
-  uint8_t regValue = _spi->transfer(0xFF); //read out the register value
-
-  CS_HIGH();
-  _spi->endTransaction();
-  delay(100);
-  return regValue;
-}
-
-
-long ADS1256::readSingle() //Reading a single value ONCE using the RDATA command 
-{
-	_spi->beginTransaction(SPISettings(1920000, MSBFIRST, SPI_MODE1));
-	CS_LOW(); //REF: P34: "CS must stay low during the entire command sequence"  
-	waitForLowDRDY();
-	_spi->transfer(0b00000001); //Issue RDATA (0000 0001) command
-	delayMicroseconds(7); //Wait t6 time (~6.51 us) REF: P34, FIG:30.
-
-	_outputBuffer[0] = _spi->transfer(0); // MSB
-	_outputBuffer[1] = _spi->transfer(0); // Mid-byte
-	_outputBuffer[2] = _spi->transfer(0); // LSB		
-
-	//Shifting and combining the above three items into a single, 24-bit number
-	_outputValue = ((long)_outputBuffer[0]<<16) | ((long)_outputBuffer[1]<<8) | (_outputBuffer[2]);
-	_outputValue = convertSigned24BitToLong(_outputValue);
-	
-	CS_HIGH(); //We finished the command sequence, so we set CS to HIGH
-	_spi->endTransaction();
-  
-	return(_outputValue);
-}
-
-long ADS1256::readSingleContinuous() //Reads the recently selected input channel using RDATAC
-{		
-	if(_isAcquisitionRunning == false)
-	{
-	  _isAcquisitionRunning = true;
-	  _spi->beginTransaction(SPISettings(1920000, MSBFIRST, SPI_MODE1));
-	  CS_LOW(); //REF: P34: "CS must stay low during the entire command sequence"	  
-	  waitForLowDRDY();
-	  _spi->transfer(0b00000011);  //Issue RDATAC (0000 0011) 
-	  delayMicroseconds(7); //Wait t6 time (~6.51 us) REF: P34, FIG:30.	  
-	}
-	else
-	{
-		waitForLowDRDY();
-	}	
-	
-	_outputBuffer[0] = _spi->transfer(0); // MSB 
-	_outputBuffer[1] = _spi->transfer(0); // Mid-byte
-	_outputBuffer[2] = _spi->transfer(0); // LSB	 
-	
-	_outputValue = ((long)_outputBuffer[0]<<16) | ((long)_outputBuffer[1]<<8) | (_outputBuffer[2]);
-	_outputValue = convertSigned24BitToLong(_outputValue);			
-	
-	waitForHighDRDY();
-	
-	return _outputValue;
-}
-
-long ADS1256::cycleSingle()
-{
-	if(_isAcquisitionRunning == false)
-	{
-	  _isAcquisitionRunning = true;
-	  _cycle = 0;
-	  _spi->beginTransaction(SPISettings(1920000, MSBFIRST, SPI_MODE1));
-	  CS_LOW(); //CS must stay LOW during the entire sequence [Ref: P34, T24]
-	  _spi->transfer(0x50 | 1); // 0x50 = WREG //1 = MUX
-      _spi->transfer(0x00);
-      _spi->transfer(SING_0); //AIN0+AINCOM
-	  CS_HIGH();			
-	  delay(50);
-	  CS_LOW(); //CS must stay LOW during the entire sequence [Ref: P34, T24]
-	}
-	else
-	{}
-  
-	if(_cycle < 8)
-	{      
-	  _outputValue = 0;
-	  waitForLowDRDY();
-      //Step 1. - Updating MUX
-      switch (_cycle)
-      {
-        //Channels are written manually
-        case 0: //Channel 2
-		updateMUX(SING_1);  //AIN1+AINCOM
-          break;
-
-        case 1: //Channel 3
-          updateMUX(SING_2);  //AIN2+AINCOM
-          break;
-
-        case 2: //Channel 4
-          updateMUX(SING_3);  //AIN3+AINCOM
-          break;
-
-        case 3: //Channel 5
-          updateMUX(SING_4);  //AIN4+AINCOM
-          break;
-
-        case 4: //Channel 6
-          updateMUX(SING_5);  //AIN5+AINCOM
-          break;
-
-        case 5: //Channel 7
-          updateMUX(SING_6);  //AIN6+AINCOM
-          break;
-
-        case 6: //Channel 8
-          updateMUX(SING_7);  //AIN7+AINCOM
-          break;
-
-        case 7: //Channel 1
-          updateMUX(SING_0); //AIN0+AINCOM
-          break;
-      }
-      //Step 2.
-      _spi->transfer(0b11111100); //SYNC
-      delayMicroseconds(4); //t11 delay 24*tau = 3.125 us //delay should be larger, so we delay by 4 us
-      _spi->transfer(0b11111111); //WAKEUP
-
-      //Step 3.
-      //Issue RDATA (0000 0001) command
-      _spi->transfer(0b00000001);
-      delayMicroseconds(7); //Wait t6 time (~6.51 us) REF: P34, FIG:30.
-
-	  _outputBuffer[0] = _spi->transfer(0x0F); // MSB 
-	  _outputBuffer[1] = _spi->transfer(0x0F); // Mid-byte
-	  _outputBuffer[2] = _spi->transfer(0x0F); // LSB
-		
-	  _outputValue = ((long)_outputBuffer[0]<<16) | ((long)_outputBuffer[1]<<8) | (_outputBuffer[2]);
-	  _outputValue = convertSigned24BitToLong(_outputValue);
-		
-	  _cycle++; //Increase cycle - This will move to the next MUX input channel
-	  if(_cycle == 8)
-	  {
-		  _cycle = 0; //Reset to 0 - Restart conversion from the 1st input channel
-	  }
-    }	
-  
-	return _outputValue;
-}
-
-long ADS1256::cycleDifferential() 
-{
-	if(_isAcquisitionRunning == false)
-	{
-	  _cycle = 0;
-	  _isAcquisitionRunning = true;
-	  _spi->beginTransaction(SPISettings(1920000, MSBFIRST, SPI_MODE1));
-	  
-	  //Set the AIN0+AIN1 as inputs manually
-	  CS_LOW(); //CS must stay LOW during the entire sequence [Ref: P34, T24]
-	  _spi->transfer(0x50 | 1); // 0x50 = WREG //1 = MUX
-	  _spi->transfer(0x00);
-	  _spi->transfer(DIFF_0_1);  //AIN0+AIN1
-	  CS_HIGH();	  
-	  delay(50);
-	  CS_LOW(); //CS must stay LOW during the entire sequence [Ref: P34, T24]
-	}
-	else
-	{}
-	
-	if(_cycle < 4)
-    {
-	  _outputValue = 0;
-      //DRDY has to go low
-	  waitForLowDRDY();
-
-      //Step 1. - Updating MUX
-      switch (_cycle)
-      {
-        case 0: //Channel 2
-		  updateMUX(DIFF_2_3);  //AIN2+AIN3
-          break;
-
-        case 1: //Channel 3
-          updateMUX(DIFF_4_5); //AIN4+AIN5
-          break;
-
-        case 2: //Channel 4
-          updateMUX(DIFF_6_7); //AIN6+AIN7
-          break;
-
-        case 3: //Channel 1
-         updateMUX(DIFF_0_1); //AIN0+AIN1
-          break;
-      }
-
-      _spi->transfer(0b11111100); //SYNC
-      delayMicroseconds(4); //t11 delay 24*tau = 3.125 us //delay should be larger, so we delay by 4 us
-      _spi->transfer(0b11111111); //WAKEUP
-
-      //Step 3.
-      _spi->transfer(0b00000001); //Issue RDATA (0000 0001) command
-      delayMicroseconds(7); //Wait t6 time (~6.51 us) REF: P34, FIG:30.
-
-	  _outputBuffer[0] = _spi->transfer(0); // MSB 
-	  _outputBuffer[1] = _spi->transfer(0); // Mid-byte
-	  _outputBuffer[2] = _spi->transfer(0); // LSB
-		
-	  _outputValue = ((long)_outputBuffer[0]<<16) | ((long)_outputBuffer[1]<<8) | (_outputBuffer[2]);
-	  _outputValue = convertSigned24BitToLong(_outputValue);
-		
-	  _cycle++;
-	  if(_cycle == 4)
-	  {
-		  _cycle = 0;
-		  //After the 4th cycle, we reset to zero so the next iteration reads the 1st MUX again
-	  }
-    }	
-  
-	return _outputValue;
-}
-
-void ADS1256::updateConversionParameter()
-{
-	conversionParameter = ((2.0 * _VREF) / 8388608.0) / (pow(2, _PGA)); //Calculate the "bit to Volts" multiplier	
-	//8388608 = 2^{23} - 1, REF: p23, Table 16.
-}
-
-void ADS1256::updateMUX(uint8_t muxValue)
-{
-    _spi->transfer(0x50 | MUX_REG); //Write to the MUX register (0x50 is the WREG command)
-    _spi->transfer(0x00);           
-    _spi->transfer(muxValue);       //Write the new MUX value
-}
-
-inline void ADS1256::CS_LOW()
-{
-    if (_CS_pin != PIN_UNUSED) //Sets CS LOW if it is not an unused pin
-	{
-        digitalWrite(_CS_pin, LOW);
-	}
-}
-
-inline void ADS1256::CS_HIGH()
-{
-    if (_CS_pin != PIN_UNUSED) //Sets CS HIGH if it is not an unused pin
-	{
-        digitalWrite(_CS_pin, HIGH);
-	}
-}

RotaxMonitor/src/channels.h

@@ -1,11 +0,0 @@
-// ADC Channels
-
-#define A1_RAW  0
-#define A2_RAW  1
-#define B1_RAW  2
-#define B2_RAW  3
-
-#define A1_COND 4
-#define A2_COND 5
-#define B1_COND 6
-#define B2_COND 7

RotaxMonitor/src/datasave.cpp

@@ -0,0 +1,221 @@
+#include "datasave.h"
+#include <math.h>
+
+static const size_t min_free = 1024 * 1024; // minimum free space in LittleFS to allow saving history (1MB)
+
+LITTLEFSGuard::LITTLEFSGuard()
+{
+    if (!LittleFS.begin(true, "/littlefs", 10, "littlefs"))
+    {
+        LOG_ERROR("Failed to mount LittleFS");
+    }
+    else
+    {
+        LOG_INFO("LittleFS mounted successfully");
+        LOG_INFO("LittleFS Free KBytes:", (LittleFS.totalBytes() - LittleFS.usedBytes()) /1024);
+    }
+}
+
+LITTLEFSGuard::~LITTLEFSGuard()
+{
+    LittleFS.end();
+    LOG_INFO("LittleFS unmounted successfully");
+}
+
+void ignitionBoxStatusAverage::filter(int32_t &old, const int32_t value, const uint32_t k)
+{
+    float alpha = 1.0f / (float)k;
+    old = old + (int32_t)(alpha * (float)(value - old));
+}
+
+void ignitionBoxStatusAverage::filter(float &old, const float value, const uint32_t k)
+{
+    float alpha = 1.0f / (float)k;
+    old = old + (float)(alpha * (float)(value - old));
+}
+
+void ignitionBoxStatusAverage::reset()
+{
+    m_last = ignitionBoxStatus();
+    m_count = 0;
+    m_data_valid = false;
+}
+
+void ignitionBoxStatusAverage::update(const ignitionBoxStatus &new_status)
+{
+    if (m_count == 0 && !m_data_valid)
+    {
+        m_last = new_status;
+    }
+    m_count++;
+    // simple moving average calculation
+    m_last.timestamp = new_status.timestamp; // keep timestamp of latest status
+
+    m_last.coils12.n_events = new_status.coils12.n_events;                           // sum events instead of averaging
+    m_last.coils12.n_missed_firing = new_status.coils12.n_missed_firing;             // sum missed firings instead of averaging
+    m_last.coils12.spark_status = new_status.coils12.spark_status;                   // take latest spark status
+    m_last.coils12.sstart_status = new_status.coils12.sstart_status;                 // take latest soft start status
+    filter(m_last.coils12.spark_delay, new_status.coils12.spark_delay, m_max_count); // incremental average calculation
+    filter(m_last.coils12.peak_p_in, new_status.coils12.peak_p_in, m_max_count);     // incremental average calculation
+    filter(m_last.coils12.peak_n_in, new_status.coils12.peak_n_in, m_max_count);     // incremental average calculation
+    filter(m_last.coils12.peak_p_out, new_status.coils12.peak_p_out, m_max_count);   // incremental average calculation
+    filter(m_last.coils12.peak_n_out, new_status.coils12.peak_n_out, m_max_count);   // incremental average calculation
+
+    m_last.coils34.n_events = new_status.coils34.n_events;                           // sum events instead of averaging
+    m_last.coils34.n_missed_firing = new_status.coils34.n_missed_firing;             // sum missed firings instead of averaging
+    m_last.coils34.spark_status = new_status.coils34.spark_status;                   // take latest spark status
+    m_last.coils34.sstart_status = new_status.coils34.sstart_status;                 // take latest soft start status
+    filter(m_last.coils34.spark_delay, new_status.coils34.spark_delay, m_max_count); // incremental average calculation
+    filter(m_last.coils34.peak_p_in, new_status.coils34.peak_p_in, m_max_count);     // incremental average calculation
+    filter(m_last.coils34.peak_n_in, new_status.coils34.peak_n_in, m_max_count);     // incremental average calculation
+    filter(m_last.coils34.peak_p_out, new_status.coils34.peak_p_out, m_max_count);   // incremental average calculation
+    filter(m_last.coils34.peak_n_out, new_status.coils34.peak_n_out, m_max_count);   // incremental average calculation
+    filter(m_last.eng_rpm, new_status.eng_rpm, m_max_count);                         // incremental average calculation                   // incremental average calculation
+    filter(m_last.adc_read_time, m_last.adc_read_time, m_max_count);                 // incremental average calculation
+    m_last.n_queue_errors = new_status.n_queue_errors;                               // take last of queue errors since it's a cumulative count of errors in the queue, not an average value
+
+    if (m_count >= m_max_count)
+    {
+        m_count = 0;         // reset count after reaching max samples to average
+        m_data_valid = true; // set data valid flag after first average is calculated
+    }
+}
+
+const bool ignitionBoxStatusAverage::get(ignitionBoxStatus &status) const
+{
+    if (m_data_valid)
+    {
+        status = m_last;
+    }
+    return m_data_valid;
+}
+
+const ArduinoJson::JsonDocument ignitionBoxStatusAverage::toJson() const
+{
+    ArduinoJson::JsonDocument doc;
+    if (m_data_valid)
+    {
+        doc["timestamp"] = m_last.timestamp;
+        doc["datavalid"] = m_data_valid ? "TRUE" : "FALSE";
+
+        doc["coils12"]["n_events"] = m_last.coils12.n_events;
+        doc["coils12"]["n_missed_firing"] = m_last.coils12.n_missed_firing;
+        doc["coils12"]["spark_delay"] = m_last.coils12.spark_delay;
+        doc["coils12"]["spark_status"] = sparkStatusNames.at(m_last.coils12.spark_status);
+        doc["coils12"]["peak_p_in"] = m_last.coils12.peak_p_in;
+        doc["coils12"]["peak_n_in"] = m_last.coils12.peak_n_in;
+        doc["coils12"]["peak_p_out"] = m_last.coils12.peak_p_out;
+        doc["coils12"]["peak_n_out"] = m_last.coils12.peak_n_out;
+        doc["coils12"]["sstart_status"] = softStartStatusNames.at(m_last.coils12.sstart_status);
+
+        doc["coils34"]["n_events"] = m_last.coils34.n_events;
+        doc["coils34"]["n_missed_firing"] = m_last.coils34.n_missed_firing;
+        doc["coils34"]["spark_delay"] = m_last.coils34.spark_delay;
+        doc["coils34"]["spark_status"] = sparkStatusNames.at(m_last.coils34.spark_status);
+        doc["coils34"]["peak_p_in"] = m_last.coils34.peak_p_in;
+        doc["coils34"]["peak_n_in"] = m_last.coils34.peak_n_in;
+        doc["coils34"]["peak_p_out"] = m_last.coils34.peak_p_out;
+        doc["coils34"]["peak_n_out"] = m_last.coils34.peak_n_out;
+        doc["coils34"]["sstart_status"] = softStartStatusNames.at(m_last.coils34.sstart_status);
+
+        doc["eng_rpm"] = m_last.eng_rpm;
+        doc["adc_read_time"] = m_last.adc_read_time;
+        doc["n_queue_errors"] = m_last.n_queue_errors;
+    }
+    return doc;
+}
+
+void saveHistoryTask(void *pvParameters)
+{
+    const auto *params = static_cast<dataSaveParams *>(pvParameters);
+    const auto &history = *params->history;
+    const auto &file_path = params->file_path;
+    if (!params)
+    {
+        LOG_ERROR("Invalid parameters for saveHistoryTask");
+        return;
+    }
+    LOG_DEBUG("Starting saving: ", file_path.c_str());
+    save_history(history, file_path);
+    vTaskDelete(NULL);
+}
+
+void save_history(const PSRAMVector<ignitionBoxStatus> &history, const std::filesystem::path &file_name)
+{
+    // Initialize SPIFFS
+    if (!SAVE_HISTORY_TO_LITTLEFS)
+        return;
+
+    auto littlefs_guard = LITTLEFSGuard(); // use RAII guard to ensure LittleFS is properly mounted and unmounted
+
+    if (LittleFS.totalBytes() - LittleFS.usedBytes() < min_free) // check if at least 1MB is free for saving history
+    {
+        LOG_ERROR("Not enough space in SPIFFS to save history");
+        return;
+    }
+
+    std::filesystem::path file_path = file_name;
+    if (file_name.root_path() != "/littlefs")
+        file_path = std::filesystem::path("/littlefs") / file_name;
+
+    auto save_flags = std::ios::out;
+    if (first_save && LittleFS.exists(file_path.c_str()))
+    {
+        first_save = false;
+        save_flags |= std::ios::trunc;      // overwrite existing file
+        LittleFS.remove(file_path.c_str()); // ensure file is removed before saving to avoid issues with appending to existing file in SPIFFS
+        LOG_INFO("Saving history to LittleFS, new file:", file_path.c_str());
+    }
+    else
+    {
+        save_flags |= std::ios::app; // append to new file
+        LOG_INFO("Saving history to LittleFS, appending to existing file:", file_path.c_str());
+    }
+
+    std::ofstream ofs(file_path, save_flags);
+    if (ofs.fail())
+    {
+        LOG_ERROR("Failed to open file for writing");
+        return;
+    }
+
+    // write csv header
+    if (first_save)
+    {
+        ofs << "TS,\
+        EVENTS_12,DLY_12,STAT_12,V_12_1,V_12_2,V_12_3,V_12_4,IGNITION_MODE_12,\
+        EVENTS_34,DLY_34,STAT_34,V_34_1,V_34_2,V_34_3,V_34_4,IGNITION_MODE_34,\
+        ENGINE_RPM,ADC_READTIME,N_QUEUE_ERRORS"
+            << std::endl;
+        ofs.flush();
+    }
+
+    for (const auto &entry : history)
+    {
+        ofs << std::to_string(entry.timestamp) << ","
+            << std::to_string(entry.coils12.n_events) << ","
+            << std::to_string(entry.coils12.spark_delay) << ","
+            << std::string(sparkStatusNames.at(entry.coils12.spark_status)) << ","
+            << std::to_string(entry.coils12.peak_p_in) << ","
+            << std::to_string(entry.coils12.peak_n_in) << ","
+            << std::to_string(entry.coils12.peak_p_out) << ","
+            << std::to_string(entry.coils12.peak_n_out) << ","
+            << std::string(softStartStatusNames.at(entry.coils12.sstart_status)) << ","
+            << std::to_string(entry.coils34.n_events) << ","
+            << std::to_string(entry.coils34.spark_delay) << ","
+            << std::string(sparkStatusNames.at(entry.coils34.spark_status)) << ","
+            << std::to_string(entry.coils34.peak_p_in) << ","
+            << std::to_string(entry.coils34.peak_n_in) << ","
+            << std::to_string(entry.coils34.peak_p_out) << ","
+            << std::to_string(entry.coils34.peak_n_out) << ","
+            << std::string(softStartStatusNames.at(entry.coils34.sstart_status)) << ","
+            << std::to_string(entry.eng_rpm) << ","
+            << std::to_string(entry.adc_read_time) << ","
+            << std::to_string(entry.n_queue_errors);
+        ofs << std::endl;
+        ofs.flush();
+    }
+
+    ofs.close();
+    LOG_INFO("Ignition A history saved to LittleFS, records written: ", history.size());
+}

RotaxMonitor/src/datasave.h

@@ -0,0 +1,62 @@
+#pragma once
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+
+// System Includes
+#include <Arduino.h>
+#include <DebugLog.h>
+#include <string>
+#include <fstream>
+#include <ArduinoJson.h>
+#include <filesystem>
+#include <LittleFS.h>
+
+// Project Includes
+#include "isr.h"
+#include "psvector.h"
+
+const uint32_t max_history = 256;
+const bool SAVE_HISTORY_TO_LITTLEFS = false; // Set to true to enable saving history to LittleFS, false to disable
+static bool first_save = true;               // flag to indicate if this is the first save (to write header)
+
+struct dataSaveParams
+{
+    const PSRAMVector<ignitionBoxStatus> *history;
+    const std::filesystem::path file_path;
+};
+
+class LITTLEFSGuard
+{
+public:
+    LITTLEFSGuard();
+    ~LITTLEFSGuard();
+};
+
+class ignitionBoxStatusAverage
+{
+private:
+    ignitionBoxStatus m_last;
+    uint32_t m_count = 0;
+    uint32_t m_max_count = 100; // number of samples to average before resetting
+    bool m_data_valid = false;  // flag to indicate if the average data is valid (i.e. at least one sample has been added)
+
+public:
+    ignitionBoxStatusAverage() = default;
+    ignitionBoxStatusAverage(const uint32_t max_count) : m_max_count(max_count)
+    {
+        m_data_valid = false;
+        m_count = 0;
+    }
+
+    void reset();
+    void update(const ignitionBoxStatus &new_status);
+    const bool get(ignitionBoxStatus &status) const;
+    const ArduinoJson::JsonDocument toJson() const;
+
+private:
+    void filter(int32_t &old, const int32_t value, const uint32_t k);
+    void filter(float &old, const float value, const uint32_t k);
+};
+
+// Task and function declarations
+void saveHistoryTask(void *pvParameters);
+void save_history(const PSRAMVector<ignitionBoxStatus> &history, const std::filesystem::path &file_path);

RotaxMonitor/src/datastruct.h

@@ -0,0 +1,95 @@
+#pragma once
+#include <Arduino.h>
+#include <map>
+#include <psvector.h>
+
+// =====================
+// Event Flags (bitmask)
+// =====================
+static const uint32_t TRIG_FLAG_12P = (1 << 0);
+static const uint32_t TRIG_FLAG_12N = (1 << 1);
+static const uint32_t TRIG_FLAG_34P = (1 << 2);
+static const uint32_t TRIG_FLAG_34N = (1 << 3);
+
+static const uint32_t SPARK_FLAG_TIMEOUT = (1 << 8);
+static const uint32_t SPARK_FLAG_12 = (1 << 9);
+static const uint32_t SPARK_FLAG_34 = (1 << 10);
+
+// Spark Status
+enum sparkStatus
+{
+    SPARK_POS_OK,
+    SPARK_NEG_OK,
+    SPARK_POS_SKIP,
+    SPARK_NEG_SKIP,
+    SPARK_POS_WAIT,
+    SPARK_NEG_WAIT,
+    SPARK_POS_FAIL,
+    SPARK_NEG_FAIL,
+    SPARK_POS_UNEXPECTED,
+    SPARK_NEG_UNEXPECTED,
+    SPARK_SYNC_FAIL,
+};
+
+static const std::map<const sparkStatus, const char *> sparkStatusNames = {
+    {SPARK_POS_OK, "SPARK_POS_OK"},
+    {SPARK_NEG_OK, "SPARK_NEG_OK"},
+    {SPARK_POS_SKIP, "SPARK_POS_SKIP"},
+    {SPARK_NEG_SKIP, "SPARK_NEG_SKIP"},
+    {SPARK_POS_WAIT, "SPARK_POS_WAIT"},
+    {SPARK_NEG_WAIT, "SPARK_NEG_WAIT"},
+    {SPARK_POS_FAIL, "SPARK_POS_FAIL"},
+    {SPARK_NEG_FAIL, "SPARK_NEG_FAIL"},
+    {SPARK_POS_UNEXPECTED, "SPARK_POS_UNEXPECTED"},
+    {SPARK_NEG_UNEXPECTED, "SPARK_NEG_UNEXPECTED"},
+    {SPARK_SYNC_FAIL, "SPARK_SYNC_FAIL"},
+};
+
+enum softStartStatus
+{
+    NORMAL,
+    SOFT_START,
+    ERROR,
+};
+
+const std::map<const softStartStatus, const char *> softStartStatusNames = {
+    {NORMAL, "NORMAL"},
+    {SOFT_START, "SOFT_START"},
+    {ERROR, "ERROR"},
+};
+
+struct coilsStatus
+{
+    int64_t trig_time = 0;
+    int64_t spark_time = 0;
+    int32_t spark_delay = 0; // in microseconds
+    sparkStatus spark_status = sparkStatus::SPARK_POS_OK;
+    softStartStatus sstart_status = softStartStatus::NORMAL;
+    float peak_p_in = 0.0;
+    float peak_n_in = 0.0;
+    float peak_p_out = 0.0;
+    float peak_n_out = 0.0;
+    float level_spark = 0.0;
+    uint32_t n_events = 0;
+    uint32_t n_missed_firing = 0;
+};
+
+// Task internal Status
+struct ignitionBoxStatus
+{
+    int64_t timestamp = 0;
+    // coils pairs for each ignition
+    coilsStatus coils12;
+    coilsStatus coils34;
+    // voltage from generator
+    float volts_gen = 0.0;
+    // enine rpm
+    int32_t eng_rpm = 0;
+    // debug values
+    uint32_t n_queue_errors = 0;
+    int32_t adc_read_time = 0;
+};
+
+
+template <typename T>
+using PSRAMVector = std::vector<T, PSRAMAllocator<T>>;

RotaxMonitor/src/devices.h

@@ -1,5 +1,8 @@
 #pragma once
 
+// Library defines
+#define ADS1256_SPI_ALREADY_STARTED
+
 // Device Libraries
 #include <ADS1256.h>
 #include <AD5292.h>
@@ -16,26 +19,10 @@
 #define ADC_CH_PEAK_34N_OUT     SING_7
 
 // Device Pointer structs for tasks
-struct Devices
+struct Devices {
-{
+  AD5292 *pot_a = NULL, *pot_b = NULL;
-    // Busses
+  ADS1256 *adc_a = NULL, *adc_b = NULL; 
-    TwoWire *m_i2c = NULL;
+  PCA9555* io = NULL;
-    SPIClass *m_spi_a = NULL;
-    SPIClass *m_spi_b = NULL;
-
-    // Bus Mutextes
-    std::mutex m_spi_a_mutex;
-    std::mutex m_spi_b_mutex;
-    std::mutex m_i2c_mutex;
-
-    // Device Pointers
-    AD5292 *m_pot_a = NULL;
-    AD5292 *m_pot_b = NULL;
-
-    ADS1256 *m_adc_a = NULL;
-    ADS1256 *m_adc_b = NULL;
-
-    ExternalIO *m_ext_io = NULL;
 };
 
 // Adc read channel wrapper to selet mux before reading

RotaxMonitor/src/isr.cpp

@@ -4,7 +4,7 @@
 // ISR (Pass return bitmask to ISR management function)
 // one function for each wake up pin conncted to a trigger
 // =====================
-void trig_isr(void *arg)
+void trig_isr_A(void *arg)
 {
     const int64_t time_us = esp_timer_get_time();
 
@@ -36,18 +36,62 @@ void trig_isr(void *arg)
         xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
         break;
     case SPARK_FLAG_12:
-        box->coils34.spark_ok = false;
+
-        box->coils12.spark_ok = true;
+        box->coils12.spark_time = time_us;
+        xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+        break;
+    case SPARK_FLAG_34:
+        box->coils34.spark_time = time_us;
+        xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+        break;
+    default:
+        break;
+    }
+
+    if (xHigherPriorityTaskWoken)
+        portYIELD_FROM_ISR();
+}
+
+
+void trig_isr_B(void *arg)
+{
+    const int64_t time_us = esp_timer_get_time();
+
+    // exit if invalid args
+    if (!arg)
+        return;
+
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+    isrParams *params = (isrParams *)arg;
+    ignitionBoxStatus *box = params->ign_stat;
+    TaskHandle_t task_handle = params->rt_handle_ptr;
+
+    // exit if task not running
+    if (!task_handle)
+        return;
+
+    switch (params->flag)
+    {
+    case TRIG_FLAG_12P:
+    case TRIG_FLAG_12N:
+        // only on first trigger to avoid multiple firing due to noise, to be fixed with hardware debounce
+        box->coils12.trig_time = time_us;
+        xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+        break;
+    case TRIG_FLAG_34P:
+    case TRIG_FLAG_34N:
+        // only on first trigger to avoid multiple firing due to noise, to be fixed with hardware debounce
+        box->coils34.trig_time = time_us;
+        xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+        break;
+    case SPARK_FLAG_12:
+
         box->coils12.spark_time = time_us;
         xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
-        // vTaskNotifyGiveFromISR(task_handle, &xHigherPriorityTaskWoken);
         break;
     case SPARK_FLAG_34:
-        box->coils12.spark_ok = false;
-        box->coils34.spark_ok = true;
         box->coils34.spark_time = time_us;
         xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
-        // vTaskNotifyGiveFromISR(task_handle, &xHigherPriorityTaskWoken);
         break;
     default:
         break;

RotaxMonitor/src/isr.h

@@ -12,94 +12,12 @@
 #else
 #include "pins_test.h"
 #endif
+#include "datastruct.h"
 
 #define CORE_0 0
 #define CORE_1 1
-#define TASK_STACK 4096                          // in words
+#define RT_TASK_STACK 2048                          // in words
-#define TASK_PRIORITY (configMAX_PRIORITIES - 4) // highest priority after wifi tasks
+#define RT_TASK_PRIORITY (configMAX_PRIORITIES - 6) // highest priority after wifi tasks
-
-// =====================
-// Event Flags (bitmask)
-// =====================
-static const uint32_t TRIG_FLAG_12P = (1 << 0);
-static const uint32_t TRIG_FLAG_12N = (1 << 1);
-static const uint32_t TRIG_FLAG_34P = (1 << 2);
-static const uint32_t TRIG_FLAG_34N = (1 << 3);
-
-static const uint32_t SPARK_FLAG_NIL = (1 << 8);
-static const uint32_t SPARK_FLAG_12 = (1 << 9);
-static const uint32_t SPARK_FLAG_34 = (1 << 10);
-static const uint32_t SPARK_FLAG_TIMEOUT = (1 << 11);
-
-// Spark Status
-enum sparkStatus
-{
-    SPARK_POS_OK,
-    SPARK_NEG_OK,
-    SPARK_POS_SKIP,
-    SPARK_NEG_SKIP,
-    SPARK_POS_WAIT,
-    SPARK_NEG_WAIT,
-    SPARK_POS_FAIL,
-    SPARK_NEG_FAIL,
-    SPARK_POS_UNEXPECTED,
-    SPARK_NEG_UNEXPECTED,
-    SPARK_SYNC_FAIL,
-};
-
-static const std::map<const sparkStatus, const char *> sparkStatusNames = {
-    {SPARK_POS_OK, "SPARK_POS_OK"},
-    {SPARK_NEG_OK, "SPARK_NEG_OK"},
-    {SPARK_POS_SKIP, "SPARK_POS_SKIP"},
-    {SPARK_NEG_SKIP, "SPARK_NEG_SKIP"},
-    {SPARK_POS_WAIT, "SPARK_POS_WAIT"},
-    {SPARK_NEG_WAIT, "SPARK_NEG_WAIT"},
-    {SPARK_POS_FAIL, "SPARK_POS_FAIL"},
-    {SPARK_NEG_FAIL, "SPARK_NEG_FAIL"},
-    {SPARK_POS_UNEXPECTED, "SPARK_POS_UNEXPECTED"},
-    {SPARK_NEG_UNEXPECTED, "SPARK_NEG_UNEXPECTED"},
-    {SPARK_SYNC_FAIL, "SPARK_SYNC_FAIL"},
-};
-
-enum softStartStatus
-{
-    NORMAL,
-    SOFT_START,
-    ERROR,
-};
-
-const std::map<const softStartStatus, const char *> softStartStatusNames = {
-    {NORMAL, "NORMAL"},
-    {SOFT_START, "SOFT_START"},
-    {ERROR, "ERROR"},
-};
-
-struct coilsStatus
-{
-    int64_t trig_time = 0;
-    int64_t spark_time = 0;
-    int64_t spark_delay = 0; // in microseconds
-    sparkStatus spark_status = sparkStatus::SPARK_POS_OK;
-    softStartStatus sstart_status = softStartStatus::NORMAL;
-    float peak_p_in = 0.0, peak_n_in = 0.0;
-    float peak_p_out = 0.0, peak_n_out = 0.0;
-    float trigger_spark = 0.0;
-    bool spark_ok = false;
-    uint32_t n_events = 0;
-
-};
-
-// Task internal Status
-struct ignitionBoxStatus
-{
-    int64_t timestamp = 0;
-    // coils pairs for each ignition
-    coilsStatus coils12;
-    coilsStatus coils34;
-    // voltage from generator
-    float volts_gen = 0.0;
-    uint32_t n_queue_errors = 0;
-};
 
 struct isrParams
 {
@@ -108,4 +26,5 @@ struct isrParams
     TaskHandle_t rt_handle_ptr;
 };
 
-void IRAM_ATTR trig_isr(void *arg);
+void IRAM_ATTR trig_isr_A(void *arg);
+void IRAM_ATTR trig_isr_B(void *arg);

RotaxMonitor/src/main.cpp

@@ -1,61 +1,57 @@
-#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_DEBUG
 
 // Arduino Libraries
 #include <Arduino.h>
 #include <DebugLog.h>
 #include <DebugLogEnable.h>
 #include <SPI.h>
+#include <WiFi.h>
+#include <ArduinoJson.h>
 
 // Definitions
 #include <tasks.h>
-#include <channels.h>
 #include <devices.h>
+#include <datasave.h>
+#include <webserver.h>
 #include <ui.h>
+#include <led.h>
 
-#define CH_A_ENABLE
+// Defines to enable channel B
 #define CH_B_ENABLE
-#define CH_A_RT_ENABLE
+#define TEST
-#define CH_B_RT_ENABLE
-// #define I2C_ENABLE
-// #define WEB_ENABLE
 
 // Debug Defines
 #define WIFI_SSID "AstroRotaxMonitor"
 #define WIFI_PASSWORD "maledettirotax"
-#define PSRAM_MAX 1024
-#define QUEUE_MAX 32
 
 void setup()
 {
     Serial.begin(921600);
     delay(250);
-    Serial.setTimeout(5000);
 
     // Setup Logger
     LOG_ATTACH_SERIAL(Serial);
     LOG_SET_LEVEL(DebugLogLevel::LVL_INFO);
 
     // Print Processor Info
-    LOG_INFO("ESP32 Chip:", ESP.getChipModel());
+    LOG_DEBUG("ESP32 Chip:", ESP.getChipModel());
     if (psramFound())
     {
-        LOG_INFO("ESP32 PSram Found");
+        LOG_DEBUG("ESP32 PSram Found");
-        LOG_INFO("ESP32 PSram:", ESP.getPsramSize());
+        LOG_DEBUG("ESP32 PSram:", ESP.getPsramSize());
         psramInit();
     }
     LOG_DEBUG("ESP32 Flash:", ESP.getFlashChipSize());
     LOG_DEBUG("ESP32 Heap:", ESP.getHeapSize());
     LOG_DEBUG("ESP32 Sketch:", ESP.getFreeSketchSpace());
 
-// Init Wifi station
+    // Init Wifi station
-#ifdef WEB_ENABLE
     LOG_INFO("Initializing WiFi...");
     WiFi.mode(WIFI_AP);
     IPAddress local_IP(10, 11, 12, 1);
     IPAddress gateway(10, 11, 12, 1);
     IPAddress subnet(255, 255, 255, 0);
     WiFi.softAPConfig(local_IP, gateway, subnet);
-    WiFi.setTxPower(WIFI_POWER_5dBm); // reduce wifi power
     if (WiFi.softAP(WIFI_SSID, WIFI_PASSWORD))
     {
         LOG_INFO("WiFi AP Mode Started");
@@ -70,7 +66,6 @@ void setup()
         vTaskDelay(pdMS_TO_TICKS(5000));
         esp_restart();
     }
-#endif
 
     // Initialize Interrupt pins on PICKUP detectors
     initTriggerPinsInputs();
@@ -78,136 +73,42 @@ void setup()
     initSparkPinInputs();
 }
 
+////////////////////// MAIN LOOP //////////////////////
 void loop()
 {
     // global variables
     RGBled led;
-    led.setBrightness(0.025f);
     led.setStatus(RGBled::LedStatus::INIT);
-
-    Devices dev;
     bool running = true;
-    static Devices dev;
+    const uint32_t max_queue = 128;
+    const uint32_t filter_k = 10;
 
+    PSRAMVector<ignitionBoxStatus> ignA_history_0(max_history);
+    PSRAMVector<ignitionBoxStatus> ignA_history_1(max_history);
+    auto *active_history_A = &ignA_history_0;
+    auto *writable_history_A = &ignA_history_1;
+
+#ifdef CH_B_ENABLE
+    PSRAMVector<ignitionBoxStatus> ignB_history_0(max_history);
+    PSRAMVector<ignitionBoxStatus> ignB_history_1(max_history);
+    auto *active_history_B = &ignB_history_0;
+    auto *writable_history_B = &ignB_history_1;
+#endif
+
+    // Resources Initialization
+    Devices dev;
     // Task handle
-    static TaskHandle_t trigA_TaskHandle = NULL;
+    TaskHandle_t trigA_TaskHandle = NULL;
-    static TaskHandle_t trigB_TaskHandle = NULL;
+    TaskHandle_t trigB_TaskHandle = NULL;
+    // Data Queue for real time task to main loop communication
+    QueueHandle_t rt_taskA_queue = xQueueCreate(max_queue, sizeof(ignitionBoxStatus));
+    QueueHandle_t rt_taskB_queue = xQueueCreate(max_queue, sizeof(ignitionBoxStatus));
 
-    static QueueHandle_t rt_taskA_queue = xQueueCreate(10, sizeof(ignitionBoxStatus));
+    rtTaskParams taskA_params{
-    static QueueHandle_t rt_taskB_queue = xQueueCreate(10, sizeof(ignitionBoxStatus));
-    static rtTaskParams taskA_params{
         .rt_running = true,
         .dev = &dev,
-        .rt_handle_ptr = &trigA_TaskHandle,
         .rt_queue = rt_taskA_queue,
         .rt_int = rtTaskInterrupts{
-            .isr_ptr = trig_isr,
-            .trig_pin_12p = TRIG_PIN_A12P,
-            .trig_pin_12n = TRIG_PIN_A12N,
-            .trig_pin_34p = TRIG_PIN_A34P,
-            .trig_pin_34n = TRIG_PIN_A34N,
-            .spark_pin_12 = SPARK_PIN_A12,
-            .spark_pin_34 = SPARK_PIN_A34},
-        .rt_resets = rtTaskResets{.rst_io_12p = RST_EXT_A12P, .rst_io_12n = RST_EXT_A12N, .rst_io_34p = RST_EXT_A34P, .rst_io_34n = RST_EXT_A34N}};
-
-    LOG_INFO("Task Variables OK");
-
-#ifdef CH_B_ENABLE
-    QueueHandle_t rt_taskB_queue = xQueueCreate(10, sizeof(ignitionBoxStatus));
-    rtTaskParams taskB_params{
-        .rt_running = true,
-        .dev = &dev,
-        .rt_handle_ptr = &trigB_TaskHandle,
-        .rt_queue = rt_taskB_queue,
-        .rt_int = rtTaskInterrupts{
-            .isr_ptr = trig_isr,
-            .trig_pin_12p = TRIG_PIN_B12P,
-            .trig_pin_12n = TRIG_PIN_B12N,
-            .trig_pin_34p = TRIG_PIN_B34P,
-            .trig_pin_34n = TRIG_PIN_B34N,
-            .spark_pin_12 = SPARK_PIN_B12,
-            .spark_pin_34 = SPARK_PIN_B34},
-        .rt_resets = rtTaskResets{.rst_io_12p = RST_EXT_B12P, .rst_io_12n = RST_EXT_B12N, .rst_io_34p = RST_EXT_B34P, .rst_io_34n = RST_EXT_B34N}};
-#endif
-
-    bool spiA_ok = true;
-    bool spiB_ok = true;
-    //////// INIT SPI INTERFACES ////////
-    LOG_DEBUG("Init SPI Interfaces");
-#ifdef CH_A_ENABLE
-    LOG_DEBUG("Begin Init SPI_A");
-    SPIClass SPI_A(HSPI);
-    spiA_ok = SPI_A.begin(SPI_A_SCK, SPI_A_MISO, SPI_A_MOSI);
-    SPI_A.setDataMode(SPI_MODE1); // ADS1256 requires SPI mode 1
-    LOG_DEBUG("Init SPI_A -> OK");
-    delay(500);
-    LOG_DEBUG("Begin Init ADC_A");
-    ADS1256 ADC_A(ADC_A_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_A_CS, 2.5, &SPI_A);
-    ADC_A.InitializeADC();
-    ADC_A.setPGA(PGA_1);
-    ADC_A.setDRATE(DRATE_7500SPS);
-    dev.m_adc_a = &ADC_A;
-    dev.m_spi_a = &SPI_A;
-    LOG_DEBUG("Init ADC_A -> OK");
-    delay(1000);
-#endif
-
-#ifdef CH_B_ENABLE
-    LOG_DEBUG("Begin Init SPI_B");
-    SPIClass SPI_B(FSPI);
-    spiB_ok = SPI_B.begin(SPI_B_SCK, SPI_B_MISO, SPI_B_MOSI);
-    SPI_B.setDataMode(SPI_MODE1); // ADS1256 requires SPI mode 1
-    LOG_DEBUG("Init SPI_B -> OK");
-    delay(500);
-    LOG_DEBUG("Begin Init ADC_B");
-    ADS1256 ADC_B(ADC_B_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_B_CS, 2.5, &SPI_B);
-    ADC_B.InitializeADC();
-    ADC_B.setPGA(PGA_1);
-    ADC_B.setDRATE(DRATE_7500SPS);
-    dev.m_adc_b = &ADC_B;
-    dev.m_spi_b = &SPI_B;
-    LOG_DEBUG("Init ADC_B -> OK");
-    delay(1000);
-#endif
-
-    if (!spiA_ok || !spiB_ok)
-    {
-        LOG_ERROR("Unable to Initialize SPI Busses");
-        LOG_ERROR("5 seconds to restart...");
-        vTaskDelay(pdMS_TO_TICKS(5000));
-        esp_restart();
-    }
-    LOG_INFO("Init SPI OK");
-
-    LOG_DEBUG("Init SPI -> OK");
-
-//////// INIT I2C INTERFACES ////////
-#ifdef I2C_ENABLE
-    LOG_DEBUG("Init I2C Interfaces");
-    bool i2c_ok = true;
-    i2c_ok = Wire.begin(SDA, SCL, 100000);
-    if (!i2c_ok)
-    {
-        LOG_ERROR("Unable to Initialize I2C Bus");
-        LOG_ERROR("5 seconds to restart...");
-        vTaskDelay(pdMS_TO_TICKS(5000));
-        esp_restart();
-    }
-    LOG_DEBUG("Init I2c ok");
-    Serial.readStringUntil('\n');
-
-    // Init IO Expanders
-    dev->m_ext_io = std::make_unique<ExternalIO>(Wire, dev->m_i2c_mutex, EXPANDER_ALL_INTERRUPT);
-#endif
-
-//////// INIT REALTIME TASKS PARAMETERS ////////
-#ifdef CH_A_RT_ENABLE
-    const rtIgnitionTask::rtTaskParams taskA_params{
-        .rt_running = true,
-        .name = "rtIgnTask_A",
-        .rt_stack_size = RT_TASK_STACK,
-        .rt_priority = RT_TASK_PRIORITY,
-        .rt_int = rtIgnitionTask::rtTaskInterruptParams{
             .isr_ptr = &trig_isr_A,
             .trig_pin_12p = TRIG_PIN_A12P,
             .trig_pin_12n = TRIG_PIN_A12N,
@@ -215,31 +116,14 @@ void loop()
             .trig_pin_34n = TRIG_PIN_A34N,
             .spark_pin_12 = SPARK_PIN_A12,
             .spark_pin_34 = SPARK_PIN_A34},
-        .rt_io = rtIgnitionTask::rtTaskIOParams{
+        .rt_resets = rtTaskResets{.rst_io_peak = RST_EXT_PEAK_DETECT_A, .rst_io_sh = RST_EXT_SAMPLE_HOLD_A}};
-            .pot_cs_12 = POT_CS_A12,
+
-            .pot_cs_34 = POT_CS_A34,
+#ifdef CH_B_ENABLE
-            .ss_force = SS_FORCE_A,
+    rtTaskParams taskB_params{
-            .ss_inhibit_12 = SS_INIBHIT_A12,
-            .ss_inhibit_34 = SS_INHIBIT_A34,
-            .sh_disch_12 = SH_DISCH_A12,
-            .sh_disch_34 = SH_DISCH_A34,
-            .sh_arm_12 = SH_ARM_A12,
-            .sh_arm_34 = SH_ARM_A34,
-            .relay_in_12 = RELAY_IN_A12,
-            .relay_in_34 = RELAY_OUT_A12,
-            .relay_out_12 = RELAY_IN_A34,
-            .relay_out_34 = RELAY_OUT_A34,
-        },
-        .rt_queue = nullptr,
-        .dev = &dev};
-#endif
-#ifdef CH_B_RT_ENABLE
-    const rtIgnitionTask::rtTaskParams taskB_params{
         .rt_running = true,
-        .name = "rtIgnTask_B",
+        .dev = &dev,
-        .rt_stack_size = RT_TASK_STACK,
+        .rt_queue = rt_taskB_queue,
-        .rt_priority = RT_TASK_PRIORITY,
+        .rt_int = rtTaskInterrupts{
-        .rt_int = rtIgnitionTask::rtTaskInterruptParams{
             .isr_ptr = &trig_isr_B,
             .trig_pin_12p = TRIG_PIN_B12P,
             .trig_pin_12n = TRIG_PIN_B12N,
@@ -247,141 +131,216 @@ void loop()
             .trig_pin_34n = TRIG_PIN_B34N,
             .spark_pin_12 = SPARK_PIN_B12,
             .spark_pin_34 = SPARK_PIN_B34},
-        .rt_io = rtIgnitionTask::rtTaskIOParams{
+        .rt_resets = rtTaskResets{.rst_io_peak = RST_EXT_PEAK_DETECT_B, .rst_io_sh = RST_EXT_SAMPLE_HOLD_B}};
-            .pot_cs_12 = POT_CS_B12,
-            .pot_cs_34 = POT_CS_B34,
-            .ss_force = SS_FORCE_B,
-            .ss_inhibit_12 = SS_INIBHIT_B12,
-            .ss_inhibit_34 = SS_INHIBIT_B34,
-            .sh_disch_12 = SH_DISCH_B12,
-            .sh_disch_34 = SH_DISCH_B34,
-            .sh_arm_12 = SH_ARM_B12,
-            .sh_arm_34 = SH_ARM_B34,
-            .relay_in_12 = RELAY_IN_B12,
-            .relay_in_34 = RELAY_OUT_B12,
-            .relay_out_12 = RELAY_IN_B34,
-            .relay_out_34 = RELAY_OUT_B34,
-        },
-        .rt_queue = nullptr,
-        .dev = &dev};
 #endif
 
-    //////// SPAWN REALTIME TASKS ////////
+    if (!rt_taskA_queue || !rt_taskB_queue)
-    bool tasK_A_rt = true;
-    bool task_B_rt = true;
-    BaseType_t ignA_task_success = pdPASS;
-    BaseType_t ignB_task_success = pdPASS;
-
-#ifdef CH_A_RT_ENABLE
-    auto task_A = rtIgnitionTask(taskA_params, PSRAM_MAX, QUEUE_MAX, CORE_1, fs_mutex);
-    ignA_task_success = task_A.getStatus() == rtIgnitionTask::OK ? pdPASS : pdFAIL;
-    //tasK_A_rt = task_A.start();
-    delay(1000);
-#endif
-
-#ifdef CH_B_RT_ENABLE
-    auto task_B = rtIgnitionTask(taskB_params, PSRAM_MAX, QUEUE_MAX, CORE_1, fs_mutex);
-    ignB_task_success = task_B.getStatus() == rtIgnitionTask::OK ? pdPASS : pdFAIL;
-    //task_B_rt = task_B.start();
-    delay(1000);
-#endif
-
-    // Ignition A on Core 0
-    if (ignA_task_success != pdPASS || ignB_task_success != pdPASS)
     {
-        LOG_ERROR("Unble to initialize ISR task");
+        LOG_ERROR("Unable To Create task queues");
         LOG_ERROR("5 seconds to restart...");
         vTaskDelay(pdMS_TO_TICKS(5000));
         esp_restart();
     }
-    if (tasK_A_rt != true || task_B_rt != true)
-    {
-        led.setStatus(RGBled::LedStatus::ERROR);
-        LOG_ERROR("Unable to start realtime tasks");
-    }
     else
+        LOG_DEBUG("Task Variables OK");
+
+    // Spi ok flags
+    bool spiA_ok = true;
+    bool spiB_ok = true;
+    // Init 2 SPI interfaces
+    SPIClass SPI_A(FSPI);
+    spiA_ok = SPI_A.begin(SPI_A_SCK, SPI_A_MISO, SPI_A_MOSI);
+    SPI_A.setDataMode(SPI_MODE1); // ADS1256 requires SPI mode 1
+#ifdef CH_B_ENABLE
+#ifndef TEST
+    SPIClass SPI_B(HSPI);
+    spiB_ok = SPI_B.begin(SPI_B_SCK, SPI_B_MISO, SPI_B_MOSI);
+    SPI_B.setDataMode(SPI_MODE1); // ADS1256 requires SPI mode 1
+#endif
+#endif
+    if (!spiA_ok || !spiB_ok)
     {
-        LOG_DEBUG("Real Time Tasks A & B initialized");
+        LOG_ERROR("Unable to Initialize SPI Busses");
-        led.setStatus(RGBled::LedStatus::OK);
+        LOG_ERROR("5 seconds to restart...");
+        vTaskDelay(pdMS_TO_TICKS(5000));
+        esp_restart();
     }
+    LOG_DEBUG("Init SPI OK");
 
-    //////// SPAWN WEBSERVER and WEBSOCKET ////////
+#ifndef TEST
-    ArduinoJson::JsonDocument json_data;
+    // Init ADC_A
-    bool data_a = false, data_b = false;
+    dev.adc_a = new ADS1256(ADC_A_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_A_CS, 2.5, &SPI_A);
-#ifdef WEB_ENABLE
+    dev.adc_a->InitializeADC();
-    AstroWebServer webPage(80, LittleFS);
+    dev.adc_a->setPGA(PGA_1);
-    delay(1000);
+    dev.adc_a->setDRATE(DRATE_7500SPS);
-    task_A.onMessage([&webPage, &json_data, &data_a](ignitionBoxStatusFiltered sts)
+#endif
-                     {
+#ifdef CH_B_ENABLE
-    json_data["box_a"] = sts.toJson();
+#ifndef TEST
-    data_a = true; });
+    // Init ADC_B
-
+    dev.adc_a = new ADS1256(ADC_B_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_B_CS, 2.5, &SPI_B);
-    #ifdef CH_B_RT_ENABLE
+    dev.adc_a->InitializeADC();
-    task_B.onMessage([&webPage, &json_data, &data_b](ignitionBoxStatusFiltered sts)
+    dev.adc_a->setPGA(PGA_1);
-                     {
+    dev.adc_a->setDRATE(DRATE_1000SPS);
-    json_data["box_b"] = sts.toJson();
+#endif
-    data_b = true; });
-    #endif
 #endif
 
-    // task_A.enableSave(true, "ignitionA_test.csv");
+    LOG_DEBUG("Init ADC OK");
-    // task_B.enableSave(true, "ignitionB_test.csv");
+
+    // Ignition A on Core 0
+    auto ignA_task_success = pdPASS;
+    ignA_task_success = xTaskCreatePinnedToCore(
+        rtIgnitionTask,
+        "rtTask_A",
+        RT_TASK_STACK,
+        (void *)&taskA_params,
+        RT_TASK_PRIORITY,
+        &trigA_TaskHandle,
+        CORE_0);
+    delay(100); // give some time to the thread to start
+
+    // Ignition B on Core 1
+    auto ignB_task_success = pdPASS;
+
+#ifdef CH_B_ENABLE
+    ignB_task_success = xTaskCreatePinnedToCore(
+        rtIgnitionTask,
+        "rtTask_B",
+        RT_TASK_STACK,
+        (void *)&taskB_params,
+        RT_TASK_PRIORITY, // priorità leggermente più alta
+        &trigB_TaskHandle,
+        CORE_1);
+    delay(100); // give some time to the thread to start
+#endif
+
+    if (ignA_task_success != pdPASS || ignB_task_success != pdPASS)
+    {
+        LOG_ERROR("Unable to initialize ISR task");
+        LOG_ERROR("5 seconds to restart...");
+        vTaskDelay(pdMS_TO_TICKS(5000));
+        esp_restart();
+    }
+
+    LOG_DEBUG("Real Time Tasks A & B initialized");
+    led.setStatus(RGBled::LedStatus::OK);
+
+    bool partial_save = false; // flag to indicate if a partial save has been done after a timeout
+    auto last_data = millis();
+    auto last_info = millis();
+
+    uint32_t counter_a = 0;
+    uint32_t counter_b = 0;
+    uint32_t wait_count = 0;
+
+    ignitionBoxStatus ign_info_A;
+    ignitionBoxStatus ign_info_B;
+
+    ignitionBoxStatusAverage ign_info_avg_A(filter_k);
+    ignitionBoxStatusAverage ign_info_avg_B(filter_k);
+
+    LITTLEFSGuard fsGuard;
+    WebPage webPage(80, LittleFS); // Initialize webserver and Websocket
 
-    uint32_t monitor_loop = millis();
-    uint32_t data_loop = monitor_loop;
     //////////////// INNER LOOP /////////////////////
     while (running)
     {
-        uint32_t this_loop = millis();
+        auto dataA = pdFALSE;
-        if (this_loop - monitor_loop > 5000)
+        auto dataB = pdFALSE;
+
+        dataA = xQueueReceive(rt_taskA_queue, &ign_info_A, 0);
+        if (counter_a >= active_history_A->size()) // not concurrent with write task
         {
-            if (ignA.coils12.spark_status == sparkStatus::SPARK_NEG_FAIL || ignA.coils12.spark_status == sparkStatus::SPARK_POS_FAIL)
+            counter_a = 0;
-                missed_firings12++;
+            partial_save = false; // reset partial save flag on new data cycle
-            if (ignA.coils34.spark_status == sparkStatus::SPARK_POS_FAIL || ignA.coils34.spark_status == sparkStatus::SPARK_NEG_FAIL)
+            swapHistory(active_history_A, writable_history_A);
-                missed_firings34++; 
+            save_history(*writable_history_A, "ignition_historyA.csv"); // directly call the save task function to save without delay
-            clearScreen();
-            printRunningTasksMod(Serial);
-            monitor_loop = millis();
         }
-        vTaskDelay(pdMS_TO_TICKS(10));
+
-#ifdef WEB_ENABLE
+#ifdef CH_B_ENABLE
-        if ((data_a && data_b) || (this_loop - data_loop > 500))
+        dataB = xQueueReceive(rt_taskB_queue, &ign_info_B, 0);
+        if (counter_b >= active_history_B->size()) // not concurrent with write task
         {
-            webPage.sendWsData(json_data.as<String>());
+            counter_b = 0;
-            json_data.clear();
+            partial_save = false; // reset partial save flag on new data cycle
-            data_a = data_b = false;
+            swapHistory(active_history_B, writable_history_B);
-            data_loop = millis();
+            save_history(*writable_history_B, "ignition_historyB.csv"); // directly call the save task function to save without delay
         }
 #endif
-    } //////////////// INNER LOOP /////////////////////
+        // Update last data
+        if (dataA == pdTRUE || dataB == pdTRUE)
+            last_data = millis();
         
-            Serial.println("========== Coils 34 =============");
+        // Update Led color
-            printField("Events", (uint32_t)ignA.coils34.n_events, 0, 11);
+        if (dataA == pdTRUE && dataB == pdFALSE)
-            printField("Missed Firing", missed_firings34, 0, 12);
+            led.setStatus(RGBled::DATA_A);
-            printField("Spark Dly", (uint32_t)ignA.coils34.spark_delay, 0, 13);
+        else if (dataB == pdTRUE && dataA == pdFALSE)
-            printField("Spark Sts", sparkStatusNames.at(ignA.coils34.spark_status), 0, 14);
+            led.setStatus(RGBled::DATA_B);
-            // printField("Peak P_IN", ignA.coils34.peak_p_in, 0, 15);
+        else
-            // printField("Peak P_OUT", ignA.coils34.peak_p_out, 0, 16);
+            led.setStatus(RGBled::DATA_ALL);
-            // printField("Peak N_IN", ignA.coils34.peak_n_in, 0, 17);
-            // printField("Peak N_OUT", ignA.coils34.peak_n_out, 0, 18);
-            printField("Soft Start ", softStartStatusNames.at(ignA.coils34.sstart_status), 0, 19);
 
-            Serial.println("========== END =============");
+        if (dataA == pdTRUE)
-            Serial.println();
-            auto delta = (esp_timer_get_time() - last) / 1000000.0f; //in seconds
-            delta = delta > 0 ? 1.0f / delta : 0; // Calculate frequency (Hz)
-            printField("Frequency (Hz)", delta, 0, 21);
-            printField("Queue Errors", (uint32_t)ignA.n_queue_errors, 0, 22);
-            last = esp_timer_get_time();
-        } else
         {
-            Serial.println("Waiting for data... ");;
+            (*active_history_A)[counter_a++ % active_history_A->size()] = ign_info_A;
+            ign_info_avg_A.update(ign_info_A); // update moving average with latest ignition status
+            // Serial.printf("Data Received A: %d/%d\n\r", counter_a, (*active_history_A).size());
+            if (counter_a % filter_k == 0) // send data every 10 samples
+            {
+                ArduinoJson::JsonDocument wsData;
+                wsData["box_a"] = ign_info_avg_A.toJson();
+                wsData["box_b"] = JsonObject();
+                webPage.sendWsData(wsData.as<String>());
             }
         }
+#ifdef CH_B_ENABLE
+        if (dataB == pdTRUE)
+        {
+            (*active_history_B)[counter_b++ % active_history_B->size()] = ign_info_B;
+            ign_info_avg_B.update(ign_info_B); // update moving average with latest ignition status
+            // Serial.printf("Data Received B: %d/%d\n\r", counter_b, (*active_history_B).size());
+            if (counter_b % filter_k == 0) // send data every 10 samples
+            {
+                ArduinoJson::JsonDocument wsData;
+                wsData["box_a"] = JsonObject();
+                wsData["box_b"] = ign_info_avg_B.toJson();
+                webPage.sendWsData(wsData.as<String>());
+            }
+        }
+#endif
+        if (dataA == pdFALSE && dataB == pdFALSE && (millis() - last_data) > 2000)
+        {
+            if (!partial_save && counter_a > 0) // if timeout occurs but we have unsaved data, save it before next timeout
+            {
+                active_history_A->resize(counter_a); // resize active history to actual number of records received to avoid saving empty records
+                save_history(*active_history_A, "ignition_history_A.csv");
+                active_history_A->resize(max_history); // resize back to max history size for next data cycle
+#ifdef CH_B_ENABLE
+                active_history_B->resize(counter_a); // resize active history to actual number of records received to avoid saving empty records
+                save_history(*active_history_B, "ignition_history_B.csv");
+                active_history_B->resize(max_history); // resize back to max history size for next data cycle
+#endif
+                counter_a = 0; // reset counter after saving
+                counter_b = 0; // reset counter after saving
+
+                partial_save = true;
+                first_save = true;
+            }
+            // Serial.printf("[%d] Waiting for data...\r", wait_count++);
+            led.setStatus(RGBled::LedStatus::IDLE);
+            delay(100);
+        }
+
+        if ((millis() - last_info) > 1000)
+        {
+            clearScreen();
+            Serial.println();
+            printRunningTasksMod(Serial);
+            last_info = millis();
+        }
+    } //////////////// INNER LOOP /////////////////////
 
     if (trigA_TaskHandle)
         vTaskDelete(trigA_TaskHandle);
     if (trigB_TaskHandle)
         vTaskDelete(trigB_TaskHandle);
-    ////////////////////// MAIN LOOP //////////////////////
+
-}
+} ////////////////////// MAIN LOOP //////////////////////

RotaxMonitor/src/pins.h

@@ -26,83 +26,80 @@
 // =====================
 // SPI BUS ADC1 (VSPI)
 // =====================
-#define SPI_A_MOSI   11
+#define SPI_A_MOSI 10
-#define SPI_A_MISO   13
+#define SPI_A_SCK 11
-#define SPI_A_SCK    12
+#define SPI_A_MISO 12
 
 // =====================
 // SPI BUS ADC2 (HSPI)
 // =====================
-#define SPI_B_MOSI   35
+#define SPI_B_MOSI 36
-#define SPI_B_MISO   37
+#define SPI_B_SCK 37
-#define SPI_B_SCK    36
+#define SPI_B_MISO 38
 
 // =====================
 // I2C BUS (PCA9555)
 // =====================
 #define SDA 8
 #define SCL 9
+#define I2C_INT 17
 
 // =====================
 // ADC CONTROL
 // =====================
-#define ADC_A_CS     4
+#define ADC_A_CS 14
-#define ADC_A_DRDY   5
+#define ADC_A_DRDY 13
-#define ADC_A_RST    6
-#define ADC_A_SYNC   7
 
-#define ADC_B_CS     14
+#define ADC_B_CS 21
-#define ADC_B_DRDY   15
+#define ADC_B_DRDY 47
-#define ADC_B_RST    16
-#define ADC_B_SYNC   17
 
 // =====================
 // DIGITAL POT
 // =====================
-//#define POT_A_CS    1
+#define POT_A_CS 18
-//#define POT_B_CS    2
+#define POT_B_CS 35
 
 // =====================
 // TRIGGER INPUT INTERRUPTS
 // =====================
-#define TRIG_PIN_A12P   18
+#define TRIG_PIN_A12P 6
-#define TRIG_PIN_A12N   21
+#define TRIG_PIN_A12N 7
-#define TRIG_PIN_A34P   1
+#define TRIG_PIN_A34P 15
-#define TRIG_PIN_A34N   2
+#define TRIG_PIN_A34N 16
-#define TRIG_PIN_B12P   38
+#define TRIG_PIN_B12P 42
-#define TRIG_PIN_B12N   39
+#define TRIG_PIN_B12N 41
 #define TRIG_PIN_B34P 40
-#define TRIG_PIN_B34N   41
+#define TRIG_PIN_B34N 39
 
 // =====================
 // SPARK DETECT INPUTS
 // =====================
-#define SPARK_PIN_A12   42
+#define SPARK_PIN_A12 4
-#define SPARK_PIN_A34   45   // OK (strapping ma consentito) 45
+#define SPARK_PIN_A34 5
-#define SPARK_PIN_B12   46   // OK (strapping ma consentito) 46
+#define SPARK_PIN_B12 1
-#define SPARK_PIN_B34   47
+#define SPARK_PIN_B34 2
 
 // =====================
 // PCA9555 (I2C EXPANDER)
 // =====================
 
 // --- RESET LINES ---
-#define RST_EXT_A12P    0
+#define RST_EXT_PEAK_DETECT_A 0
-#define RST_EXT_A12N    1
+#define RST_EXT_SAMPLE_HOLD_A 1
-#define RST_EXT_A34P    2
+#define RST_EXT_PEAK_DETECT_B 2
-#define RST_EXT_A34N    3
+#define RST_EXT_SAMPLE_HOLD_B 3
-#define RST_EXT_B12P    4
+#define BTN_3 4
-#define RST_EXT_B12N    5
+#define BTN_4 5
-#define RST_EXT_B34P    6
+#define BTN_5 6
-#define RST_EXT_B34N    7
+#define BTN_6 7
 
 // --- RELAY ---
-#define A_EXT_RELAY     8
+#define EXT_RELAY_A 8
-#define B_EXT_RELAY     9
+#define EXT_RELAY_B 9
 
 // --- STATUS / BUTTON ---
-#define BTN_3       10
+#define BTN_7 10
-#define BTN_4       11
+#define BTN_8 11
 #define STA_1 12
 #define STA_2 13
 #define STA_3 14

RotaxMonitor/src/pins_test.h

@@ -65,7 +65,7 @@
 #define RST_EXT_A34N    3
 
 // --- RELAY ---
-#define A_EXT_RELAY     8
+#define EXT_RELAY_A     8
 
 
 // Init Pin Functions

RotaxMonitor/src/psvector.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <vector>
+#include "esp_heap_caps.h"
+
+// Allocator custom per PSRAM
+template <typename T>
+struct PSRAMAllocator {
+    using value_type = T;
+
+    PSRAMAllocator() noexcept {}
+
+    template <typename U>
+    PSRAMAllocator(const PSRAMAllocator<U>&) noexcept {}
+
+    T* allocate(std::size_t n) {
+        void* ptr = heap_caps_malloc(n * sizeof(T), MALLOC_CAP_SPIRAM);
+        if (!ptr) {
+            throw std::bad_alloc();
+        }
+        return static_cast<T*>(ptr);
+    }
+
+    void deallocate(T* p, std::size_t) noexcept {
+        heap_caps_free(p);
+    }
+};

RotaxMonitor/src/tasks.cpp

@@ -2,30 +2,13 @@
 #include <esp_timer.h>
 
 // Timeout callback for microsecond precision
-void spark_timeout_callback(void* arg) {
+void spark_timeout_callback(void *arg)
+{
     TaskHandle_t handle = (TaskHandle_t)arg;
     xTaskNotify(handle, SPARK_FLAG_TIMEOUT, eSetValueWithOverwrite);
 }
 
-// Manages queue receive, save data and callback to external tasks for communication
+void rtIgnitionTask(void *pvParameters)
-void rtIgnitionTask::rtIgnitionTask_manager(void *pvParameters)
-{
-    rtIgnitionTask *cls = (rtIgnitionTask *)pvParameters;
-    auto last_loop = millis();
-    uint32_t count(0);
-    while (cls->m_running)
-    {
-        cls->run();
-        // if (millis() - last_loop > 2000) {
-        //     LOG_DEBUG("TASK [", cls->m_name.c_str(), "] Alive -", count++);
-        //     last_loop = millis();
-        // }
-        vTaskDelay(pdMS_TO_TICKS(1));
-    }
-}
-
-// Static task function
-void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
 {
 
     // Invalid real time rt_task_ptr parameters, exit immediate
@@ -34,7 +17,7 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
         LOG_ERROR("Null rt_task_ptr parameters");
         vTaskDelete(NULL);
     }
-    LOG_INFO("rtTask Params OK");
+
     
     // Task Parameters and Devices
     rtTaskParams *params = (rtTaskParams *)pvParameters;
@@ -42,57 +25,56 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
     const rtTaskResets rt_rst = params->rt_resets;  // copy to avoid external override
     QueueHandle_t rt_queue = params->rt_queue;
     Devices *dev = params->dev;
-    ExternalIO *io = dev->m_ext_io;
+    ADS1256 *adc = dev->adc_a;
-    // ADS1256 *adc = params->name == "rtIgnTask_A" ? dev->m_adc_a : dev->m_adc_b;
+    PCA9555 *io = dev->io;
-    ADS1256 *adc = NULL;
-    // std::mutex &spi_mutex = params->name == "rtIgnTask_A" ? dev->m_spi_a_mutex : dev->m_spi_b_mutex;
-    std::mutex spi_mutex;
 
     TaskStatus_t rt_task_info;
     vTaskGetInfo(NULL, &rt_task_info, pdFALSE, eInvalid);
     
-    LOG_INFO("rtTask Params OK [", params->name.c_str(), "]");
+    const auto rt_task_name = pcTaskGetName(rt_task_info.xHandle);
+    LOG_INFO("rtTask Params OK [", rt_task_name, "]");
 
     ignitionBoxStatus ign_box_sts;
 
     // Variables for ISR, static to be fixed in memory locations
-    static isrParams isr_params_t12p{
+    isrParams isr_params_t12p{
         .flag = TRIG_FLAG_12P,
         .ign_stat = &ign_box_sts,
-        .rt_handle_ptr = rt_handle_ptr};
+        .rt_handle_ptr = rt_task_info.xHandle};
-    static isrParams isr_params_t12n{
+    isrParams isr_params_t12n{
         .flag = TRIG_FLAG_12N,
         .ign_stat = &ign_box_sts,
-        .rt_handle_ptr = rt_handle_ptr};
+        .rt_handle_ptr = rt_task_info.xHandle};
-    static isrParams isr_params_t34p{
+    isrParams isr_params_t34p{
         .flag = TRIG_FLAG_34P,
         .ign_stat = &ign_box_sts,
-        .rt_handle_ptr = rt_handle_ptr};
+        .rt_handle_ptr = rt_task_info.xHandle};
-    static isrParams isr_params_t34n{
+    isrParams isr_params_t34n{
         .flag = TRIG_FLAG_34N,
         .ign_stat = &ign_box_sts,
-        .rt_handle_ptr = rt_handle_ptr};
+        .rt_handle_ptr = rt_task_info.xHandle};
-    static isrParams isr_params_sp12{
+    isrParams isr_params_sp12{
         .flag = SPARK_FLAG_12,
         .ign_stat = &ign_box_sts,
-        .rt_handle_ptr = rt_handle_ptr};
+        .rt_handle_ptr = rt_task_info.xHandle};
-    static isrParams isr_params_sp34{
+    isrParams isr_params_sp34{
         .flag = SPARK_FLAG_34,
         .ign_stat = &ign_box_sts,
         .rt_handle_ptr = rt_task_info.xHandle};
 
+    LOG_DEBUG("rtTask HDL Params OK, HDL* [", (uint32_t)rt_task_info.xHandle, "]");
+    LOG_DEBUG("rtTask ISR Params OK, ISR* [", (uint32_t)rt_int.isr_ptr, "]");
+    LOG_DEBUG("rtTask QUE Params OK, QUE* [", (uint32_t)rt_queue, "]");
+
     // Create esp_timer for microsecond precision timeout
     esp_timer_handle_t timeout_timer;
     esp_timer_create_args_t timer_args = {
         .callback = spark_timeout_callback,
-        .arg = (void*)rt_handle_ptr,
+        .arg = (void *)rt_task_info.xHandle,
         .dispatch_method = ESP_TIMER_TASK,
         .name = "spark_timeout"};
-    if (esp_timer_create(&timer_args, &timeout_timer) != ESP_OK)
+    esp_timer_create(&timer_args, &timeout_timer);
-    {
+
-        LOG_INFO("rtTask [", params->name.c_str(), "] Fail to allocate timeoutTimer");
-        vTaskDelete(NULL);
-    }
 
     // Attach Pin Interrupts
     attachInterruptArg(digitalPinToInterrupt(rt_int.trig_pin_12p), rt_int.isr_ptr, (void *)&isr_params_t12p, RISING);
@@ -102,19 +84,14 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
     attachInterruptArg(digitalPinToInterrupt(rt_int.spark_pin_12), rt_int.isr_ptr, (void *)&isr_params_sp12, RISING);
     attachInterruptArg(digitalPinToInterrupt(rt_int.spark_pin_34), rt_int.isr_ptr, (void *)&isr_params_sp34, RISING);
 
-    LOG_INFO("rtTask ISR Attach OK");
+    LOG_INFO("rtTask ISR Attach OK [", rt_task_name, "]");
 
-    // Compute Reset Pin Bitmask
-    const uint16_t rst_bitmask = (1 << rt_rst.rst_io_12p) |
-                                 (1 << rt_rst.rst_io_12n) |
-                                 (1 << rt_rst.rst_io_34p) |
-                                 (1 << rt_rst.rst_io_34n);
-
-    LOG_WARN("rtTask Init Correct");
     // Global rt_task_ptr variables
     bool first_cycle = true;
     bool cycle12 = false;
     bool cycle34 = false;
+    int64_t last_cycle_time = 0;
+    uint32_t n_errors = 0;
 
     while (params->rt_running)
     {
@@ -129,70 +106,43 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
             portMAX_DELAY);
 
         if (first_cycle && pickup_flag != TRIG_FLAG_12P) // skip first cycle because of possible initial noise on pickup signals at startu
-        {
             continue;
-        }
-
-#ifdef DEBUG
-        Serial.print("\033[2J"); // clear screen
-        Serial.print("\033[H");  // cursor home
-        LOG_INFO("Iteration [", it++, "]");
-
-        if (!names.contains(pickup_flag))
-        {
-            LOG_ERROR("Wrong Pickup Flag");
-            LOG_ERROR("Pickup Flags: ", printBits(pickup_flag).c_str());
-            continue;
-        }
-        else
-        {
-            LOG_INFO("Pickup Trigger: ", names.at(pickup_flag));
-        }
-#endif
 
         // Start microsecond precision timeout timer
         esp_timer_stop(timeout_timer); // stop timer in case it was running from previous cycle
         esp_timer_start_once(timeout_timer, spark_timeout_max);
 
-        spark_flag = SPARK_FLAG_NIL; // default value in case of timeout, to be set by ISR if spark event occours
         // WAIT FOR SPARK TO HAPPEN OR TIMEOUT
-        BaseType_t sp = pdFALSE;
+        xTaskNotifyWait(
-        sp = xTaskNotifyWait(
             0x00,           // non pulire all'ingresso
             ULONG_MAX,      // pulisci i primi 8 bit
             &spark_flag,    // valore ricevuto
             portMAX_DELAY); // wait indefinitely, timeout handled by esp_timer
 
         // Handle timeout or spark event
-        if (spark_flag == SPARK_FLAG_TIMEOUT) {
+        if (spark_flag != SPARK_FLAG_TIMEOUT)
-            spark_flag = SPARK_FLAG_NIL;
-        } else {
-            // Spark occurred, stop the timer
             esp_timer_stop(timeout_timer);
-        }
-
-#ifdef DEBUG
-        // LOG_INFO("Spark Flags: ", printBits(spark_flag).c_str());
-        LOG_INFO("Spark12:", ign_box_sts.coils12.spark_ok ? "TRUE" : "FALSE");
-        LOG_INFO("Spark34:", ign_box_sts.coils34.spark_ok ? "TRUE" : "FALSE");
-        if (names.contains(spark_flag))
-            LOG_INFO("Spark Trigger:", names.at(spark_flag));
-#endif
-        xTaskNotifyStateClear(NULL);
-        ulTaskNotifyValueClear(NULL, 0xFFFFFFFF);
 
         // A trigger from pickup 12 is followed by a spark event on 34 or vice versa pickup 34 triggers spark on 12
-        if ((pickup_flag == TRIG_FLAG_12P || pickup_flag == TRIG_FLAG_12N) && (spark_flag != SPARK_FLAG_12 && spark_flag != SPARK_FLAG_NIL))
+        if ((pickup_flag == TRIG_FLAG_12P || pickup_flag == TRIG_FLAG_12N) && (spark_flag != SPARK_FLAG_12 && spark_flag != SPARK_FLAG_TIMEOUT))
         {
             ign_box_sts.coils12.spark_status = ign_box_sts.coils34.spark_status = sparkStatus::SPARK_SYNC_FAIL;
             continue;
         }
 
+        // Select coil status reference based on pickup_flag
         coilsStatus *coils;
         switch (pickup_flag)
         {
         case TRIG_FLAG_12P:
+        {
             first_cycle = false;
+            // compute engine rpm from cycle time
+            auto current_time = esp_timer_get_time();
+            auto cycle_time = current_time - last_cycle_time;
+            last_cycle_time = current_time;
+            ign_box_sts.eng_rpm = (int32_t)(60.0f / (cycle_time / 1000000.0f));
+        }
         case TRIG_FLAG_12N:
             coils = &ign_box_sts.coils12;
             break;
@@ -202,24 +152,21 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
             break;
         }
 
+        // Select logic based on pickup and spark flags
         switch (pickup_flag)
         {
         case TRIG_FLAG_12P:
         case TRIG_FLAG_34P:
         {
             // Timeout not occourred, expected POSITIVE edge spark OCCOURRED
-            if (spark_flag != SPARK_FLAG_NIL)
+            if (spark_flag != SPARK_FLAG_TIMEOUT)
             {
-                coils->spark_delay = coils->spark_time - coils->trig_time;
+                coils->spark_delay = (int32_t)(coils->spark_time - coils->trig_time);
                 coils->sstart_status = softStartStatus::NORMAL;  // because spark on positive edge
                 coils->spark_status = sparkStatus::SPARK_POS_OK; // do not wait for spark on negative edge
-#ifdef DEBUG
-                LOG_INFO("Spark on POSITIVE pulse");
-                LOG_INFO("Spark Delay Time: ", (int32_t)coils->spark_delay);
-#endif
             }
             // Timeout occourred, expected POSITIVE edge spark NOT OCCOURRED
-            else if (spark_flag == SPARK_FLAG_NIL)
+            else if (spark_flag == SPARK_FLAG_TIMEOUT)
             {
                 coils->spark_status = sparkStatus::SPARK_NEG_WAIT;
                 coils->sstart_status = softStartStatus::NORMAL;
@@ -232,24 +179,20 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
         {
             const bool expected_negative = coils->spark_status == sparkStatus::SPARK_NEG_WAIT;
             // Timeout not occourred, expected NEGATIVE edge spark OCCOURRED
-            if (spark_flag != SPARK_FLAG_NIL && expected_negative)
+            if (spark_flag != SPARK_FLAG_TIMEOUT && expected_negative)
             {
-                coils->spark_delay = coils->spark_time - coils->trig_time;
+                coils->spark_delay = (int32_t)(coils->spark_time - coils->trig_time);
                 coils->sstart_status = softStartStatus::SOFT_START;
                 coils->spark_status = sparkStatus::SPARK_NEG_OK;
-#ifdef DEBUG
-                LOG_INFO("Spark on NEGATIVE pulse");
-                LOG_INFO("Spark Delay Time: ", (int32_t)coils->spark_delay);
-#endif
             }
             // Timeout occourred, expected POSITIVE edge spark NOT OCCOURRED
-            else if (spark_flag == SPARK_FLAG_NIL && expected_negative)
+            else if (spark_flag == SPARK_FLAG_TIMEOUT && expected_negative)
             {
                 coils->sstart_status = softStartStatus::ERROR;
                 coils->spark_status = sparkStatus::SPARK_NEG_FAIL;
             }
             // Timeout not occouured, unexpected negative edge spark
-            else if (spark_flag != SPARK_FLAG_NIL && !expected_negative)
+            else if (spark_flag != SPARK_FLAG_TIMEOUT && !expected_negative)
             {
                 coils->sstart_status = softStartStatus::SOFT_START;
                 coils->spark_status = sparkStatus::SPARK_NEG_UNEXPECTED;
@@ -263,11 +206,6 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
             break;
         }
         default:
-#ifdef DEUG
-            LOG_ERROR("Invalid Interrupt");
-            LOG_ERROR("Pickup Flags: ", printBits(pickup_flag).c_str());
-            LOG_ERROR("Spark Flags: ", printBits(spark_flag).c_str());
-#endif
             break;
         }
 
@@ -275,21 +213,26 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
         {
             cycle12 = false;
             cycle34 = false;
-            // vTaskDelay(pdMS_TO_TICKS(1)); // delay 1ms to allow peak detectors to charge for negative cycle
+
+            if (ign_box_sts.coils12.spark_status == sparkStatus::SPARK_POS_FAIL || ign_box_sts.coils12.spark_status == sparkStatus::SPARK_NEG_FAIL)
+                ign_box_sts.coils12.n_missed_firing++;
+            if (ign_box_sts.coils34.spark_status == sparkStatus::SPARK_POS_FAIL || ign_box_sts.coils34.spark_status == sparkStatus::SPARK_NEG_FAIL)
+                ign_box_sts.coils34.n_missed_firing++;
+
             //  read adc channels: pickup12, out12 [ pos + neg ]
             if (adc) // read only if adc initialized
             {
+                uint32_t start_adc_read = esp_timer_get_time();
                 // from peak detector circuits
-                ign_box_sts.coils12.peak_p_in = adc->convertToVoltage(adc->cycleSingle());
+                ign_box_sts.coils12.peak_p_in = adcReadChannel(adc, ADC_CH_PEAK_12P_IN);
-                ign_box_sts.coils12.peak_n_in = adc->convertToVoltage(adc->cycleSingle());
+                ign_box_sts.coils12.peak_n_in = adcReadChannel(adc, ADC_CH_PEAK_12N_IN);
-                ign_box_sts.coils34.peak_p_in = adc->convertToVoltage(adc->cycleSingle());
+                ign_box_sts.coils34.peak_p_in = adcReadChannel(adc, ADC_CH_PEAK_34P_IN);
-                ign_box_sts.coils34.peak_n_in = adc->convertToVoltage(adc->cycleSingle());
+                ign_box_sts.coils34.peak_n_in = adcReadChannel(adc, ADC_CH_PEAK_34N_IN);
-                ign_box_sts.coils12.peak_p_out = adc->convertToVoltage(adc->cycleSingle());
+                ign_box_sts.coils12.peak_p_out = adcReadChannel(adc, ADC_CH_PEAK_12P_OUT);
-                ign_box_sts.coils12.peak_n_out = adc->convertToVoltage(adc->cycleSingle());
+                ign_box_sts.coils12.peak_n_out = adcReadChannel(adc, ADC_CH_PEAK_12N_OUT);
-                ign_box_sts.coils34.peak_p_out = adc->convertToVoltage(adc->cycleSingle());
+                ign_box_sts.coils34.peak_p_out = adcReadChannel(adc, ADC_CH_PEAK_34P_OUT);
-                ign_box_sts.coils34.peak_n_out = adc->convertToVoltage(adc->cycleSingle());
+                ign_box_sts.coils34.peak_n_out = adcReadChannel(adc, ADC_CH_PEAK_34N_OUT);
                 ign_box_sts.adc_read_time = (int32_t)(esp_timer_get_time() - start_adc_read);
-                adc->stopConversion();
             }
             else // simulate adc read timig
                 vTaskDelay(pdMS_TO_TICKS(1));
@@ -299,6 +242,7 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
             if (io)
             {
                 const uint16_t iostat = io->read();
+                const uint16_t rst_bitmask = (0x0001 << rt_rst.rst_io_peak);
                 io->write(iostat | rst_bitmask);
                 vTaskDelay(pdMS_TO_TICKS(1));
                 io->write(iostat & ~rst_bitmask);
@@ -308,11 +252,10 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
 
             // send essage to main loop with ignition info, by copy so local static variable is ok
             if (rt_queue)
+            {
                 ign_box_sts.timestamp = esp_timer_get_time(); // update data timestamp
                 if (xQueueSendToBack(rt_queue, (void *)&ign_box_sts, 0) != pdPASS)
-            {
+                    ign_box_sts.n_queue_errors = ++n_errors;
-                ign_box_sts.n_queue_errors++;
-                LOG_ERROR("Failed to send to rt_queue");
             }
         }
     }
@@ -329,254 +272,3 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
     // delete present task
     vTaskDelete(NULL);
 }
-
-///////////// CLASS MEMBER DEFINITIONS /////////////
-rtIgnitionTask::rtIgnitionTask(const rtTaskParams params, const uint32_t history_size, const uint32_t queue_size, const uint8_t core, std::mutex &fs_mutex, fs::FS &filesystem) : m_params(params), m_filesystem(filesystem), m_fs_mutex(fs_mutex), m_core(core), m_max_history(history_size)
-{
-    LOG_WARN("Starting Manager for [", m_params.name.c_str(), "]");
-    // create queue buffers
-    m_queue = xQueueCreate(queue_size, sizeof(ignitionBoxStatus));
-    if (!m_queue)
-    {
-        LOG_ERROR("Unable To Create Task [", params.name.c_str(), "] queues");
-        m_manager_status = rtTaskStatus::ERROR;
-        return;
-    }
-    else
-        m_params.rt_queue = m_queue;
-
-    // create PSram history vectors
-    m_history_0 = PSHistory(history_size);
-    m_history_1 = PSHistory(history_size);
-    // assing active and writable history
-    m_active_history = std::unique_ptr<PSHistory>(&m_history_0);
-    m_save_history = std::unique_ptr<PSHistory>(&m_history_1);
-
-    m_name = (std::string("man_") + m_params.name).c_str();
-    // auto task_success = pdPASS;
-    auto task_success = xTaskCreatePinnedToCore(
-        rtIgnitionTask_manager,
-        m_name.c_str(),
-        RT_TASK_STACK,
-        (void *)this,
-        m_params.rt_priority >> 2,
-        &m_manager_handle,
-        m_core);
-
-    if (task_success != pdPASS)
-    {
-        LOG_ERROR("Unable To Create Manager for [", params.name.c_str(), "]");
-        m_manager_status = rtTaskStatus::ERROR;
-        return;
-    }
-
-    // average every 10 samples
-    m_info_filtered = ignitionBoxStatusFiltered(10);
-    m_last_data = millis();
-    m_manager_status = rtTaskStatus::OK;
-}
-
-rtIgnitionTask::~rtIgnitionTask()
-{
-    if (m_rt_handle)
-        vTaskDelete(m_rt_handle);
-    if (m_manager_handle)
-        vTaskDelete(m_manager_handle);
-    if (m_queue)
-        vQueueDelete(m_queue);
-}
-
-void rtIgnitionTask::run()
-{
-    // receive new data from the queue
-    auto new_data = xQueueReceive(m_queue, &m_last_status, 0); // non blocking receive
-
-    if (new_data == pdPASS)
-    {
-        m_last_data = millis();
-        m_manager_status = rtTaskStatus::RUNNING;
-        // if history buffer is full swap buffers and if enabled save history buffer
-        if (m_counter_status >= m_max_history)
-        {
-            LOG_DEBUG("Save for Buffer Full: ", m_counter_status);
-            m_counter_status = 0;
-            m_partial_save = false; // reset partial save flag on new data cycle
-            std::swap(m_active_history, m_save_history);
-            if (m_enable_save)
-                // saveHistory(m_save_history, m_history_path); // directly call the save task function to save without delay
-                LOG_INFO("Save History");
-        }
-
-        // update filtered data
-        m_info_filtered.update(m_last_status);
-        (*m_active_history)[m_counter_status] = m_last_status;
-
-        if (m_on_message_cb && m_counter_status % 10 == 0)
-        {
-            m_on_message_cb(m_info_filtered);
-        }
-
-        // update data counter
-        m_counter_status++;
-    }
-    else
-    {
-        if (millis() - m_last_data > c_idle_time)
-        {
-            if (m_counter_status > 0 && !m_partial_save)
-            {
-                LOG_DEBUG("Save Partial: ", m_counter_status);
-                // m_active_history->resize(m_counter_status);
-                // saveHistory(m_active_history, m_history_path);
-                // m_active_history->resize(m_max_history);
-                m_counter_status = 0;
-                m_partial_save = true;
-            }
-            m_manager_status = rtTaskStatus::IDLE;
-        }
-    }
-}
-
-const bool rtIgnitionTask::start()
-{
-    LOG_WARN("Starting rtTask [", m_params.name.c_str(), "]");
-    auto task_success = xTaskCreatePinnedToCore(
-        rtIgnitionTask_realtime,
-        m_params.name.c_str(),
-        m_params.rt_stack_size,
-        (void *)&m_params,
-        m_params.rt_priority,
-        &m_rt_handle,
-        m_core);
-    const bool success = task_success == pdPASS && m_rt_handle != nullptr;
-    if (success)
-        m_manager_status = rtTaskStatus::IDLE;
-    return success;
-}
-
-const bool rtIgnitionTask::stop()
-{
-    LOG_WARN("Ending Task [", m_params.name.c_str(), "]");
-    if (m_rt_handle)
-    {
-        m_params.rt_running = false;
-        m_rt_handle = nullptr;
-        m_manager_status = rtTaskStatus::STOPPED;
-        return true;
-    }
-    return false;
-}
-
-const ignitionBoxStatus rtIgnitionTask::getLast() const
-{
-    return m_last_status;
-}
-
-const ignitionBoxStatusFiltered rtIgnitionTask::getFiltered() const
-{
-    return m_info_filtered;
-}
-
-const rtIgnitionTask::rtTaskStatus rtIgnitionTask::getStatus() const
-{
-    return m_manager_status;
-}
-
-void rtIgnitionTask::enableSave(const bool enable, const std::filesystem::path filename)
-{
-    m_enable_save = enable;
-    if (enable && !filename.empty())
-    {
-        LOG_WARN("Save History Enabled Task [", m_params.name.c_str(), "]");
-        m_history_path = m_filesystem.mountpoint() / filename;
-    }
-    else
-    {
-        LOG_WARN("Save History Disabled Task [", m_params.name.c_str(), "]");
-    }
-}
-
-void rtIgnitionTask::onMessage(std::function<void(ignitionBoxStatusFiltered)> callaback)
-{
-    m_on_message_cb = callaback;
-}
-
-void rtIgnitionTask::saveHistory(const rtIgnitionTask::PSHistory &history, const std::filesystem::path &file_name)
-{
-    // Lock filesystem mutex to avoid concurrent access
-    std::lock_guard<std::mutex> fs_lock(m_fs_mutex);
-
-    // Check for free space
-    if (LittleFS.totalBytes() - LittleFS.usedBytes() < history.size() * sizeof(ignitionBoxStatus)) // check if at least 1MB is free for saving history
-    {
-        LOG_ERROR("Not enough space in SPIFFS to save history");
-        return;
-    }
-
-    // create complete file path
-    const std::filesystem::path mount_point = std::filesystem::path(m_filesystem.mountpoint());
-    std::filesystem::path file_path = file_name;
-    if (file_name.root_path() != mount_point)
-        file_path = mount_point / file_name;
-
-    // if firt save remove old file and create new
-    auto save_flags = std::ios::out;
-    if (m_first_save)
-    {
-        save_flags |= std::ios::trunc;          // overwrite existing file
-        m_filesystem.remove(file_path.c_str()); // ensure file is removed before saving to avoid issues with appending to existing file in SPIFFS
-        LOG_INFO("Saving history to Flash, new file:", file_path.c_str());
-    }
-    else // else append to existing file
-    {
-        save_flags |= std::ios::app; // append to new file
-        LOG_INFO("Saving history to Flash, appending to existing file:", file_path.c_str());
-    }
-
-    std::ofstream ofs(file_path, save_flags);
-    if (ofs.fail())
-    {
-        LOG_ERROR("Failed to open file for writing");
-        return;
-    }
-
-    // write csv header
-    if (m_first_save)
-    {
-        ofs << "TS,EVENTS_12,DLY_12,STAT_12,V_12_1,V_12_2,V_12_3,V_12_4,IGNITION_MODE_12,"
-            << "EVENTS_34,DLY_34,STAT_34,V_34_1,V_34_2,V_34_3,V_34_4,IGNITION_MODE_34,"
-            << "ENGINE_RPM,ADC_READTIME,N_QUEUE_ERRORS"
-            << std::endl;
-        ofs.flush();
-        m_first_save = false;
-    }
-
-    for (const auto &entry : history)
-    {
-        ofs << std::to_string(entry.timestamp) << ","
-            << std::to_string(entry.coils12.n_events) << ","
-            << std::to_string(entry.coils12.spark_delay) << ","
-            << std::string(sparkStatusNames.at(entry.coils12.spark_status)) << ","
-            << std::to_string(entry.coils12.peak_p_in) << ","
-            << std::to_string(entry.coils12.peak_n_in) << ","
-            << std::to_string(entry.coils12.peak_p_out) << ","
-            << std::to_string(entry.coils12.peak_n_out) << ","
-            << std::string(softStartStatusNames.at(entry.coils12.sstart_status)) << ","
-            << std::to_string(entry.coils34.n_events) << ","
-            << std::to_string(entry.coils34.spark_delay) << ","
-            << std::string(sparkStatusNames.at(entry.coils34.spark_status)) << ","
-            << std::to_string(entry.coils34.peak_p_in) << ","
-            << std::to_string(entry.coils34.peak_n_in) << ","
-            << std::to_string(entry.coils34.peak_p_out) << ","
-            << std::to_string(entry.coils34.peak_n_out) << ","
-            << std::string(softStartStatusNames.at(entry.coils34.sstart_status)) << ","
-            << std::to_string(entry.eng_rpm) << ","
-            << std::to_string(entry.adc_read_time) << ","
-            << std::to_string(entry.n_queue_errors);
-        ofs << std::endl;
-        ofs.flush();
-    }
-
-    ofs.close();
-    LOG_INFO("Ignition Box history saved to Flash, records written: ", history.size());
-}

RotaxMonitor/src/tasks.h

@@ -34,13 +34,6 @@ static const std::map<const uint32_t, const char *> names = {
 // RT task Interrupt parameters
 struct rtTaskInterrupts
 {
-    using PSHistory = PSRAMVector<ignitionBoxStatus>;
-    // using PSHistory = std::vector<ignitionBoxStatus>;
-
-public:
-    // RT task Interrupt parameters
-    struct rtTaskInterruptParams
-    {
     void (*isr_ptr)(void *);
     const uint8_t trig_pin_12p;
     const uint8_t trig_pin_12n;
@@ -48,119 +41,13 @@ public:
     const uint8_t trig_pin_34n;
     const uint8_t spark_pin_12;
     const uint8_t spark_pin_34;
-    };
-
-    // RT Task Peak Detector Reset pins
-    struct rtTaskIOParams
-    {
-        const uint32_t expander_addr;
-        const uint32_t pot_cs_12;
-        const uint32_t pot_cs_34;
-        const uint32_t ss_force;
-        const uint32_t ss_inhibit_12;
-        const uint32_t ss_inhibit_34;
-        const uint32_t sh_disch_12;
-        const uint32_t sh_disch_34;
-        const uint32_t sh_arm_12;
-        const uint32_t sh_arm_34;
-        const uint32_t relay_in_12;
-        const uint32_t relay_in_34;
-        const uint32_t relay_out_12;
-        const uint32_t relay_out_34;
-    };
-
-    // RT task parameters
-    struct rtTaskParams
-    {
-        bool rt_running; // run flag, false to terminate
-        const std::string name;
-        const uint32_t rt_stack_size;
-        const uint32_t rt_priority;
-        const rtTaskInterruptParams rt_int; // interrupt pins to attach
-        const rtTaskIOParams rt_io;         // reset ping for peak detectors
-        QueueHandle_t rt_queue;             // queue for task io
-        Devices *dev;
-    };
-
-    enum rtTaskStatus
-    {
-        INIT,
-        OK,
-        ERROR,
-        RUNNING,
-        IDLE,
-        STOPPED
-    };
-
-public:
-    rtIgnitionTask(const rtTaskParams params, const uint32_t history_size, const uint32_t queue_size, const uint8_t core, std::mutex &fs_mutex, fs::FS &filesystem = LittleFS);
-    ~rtIgnitionTask();
-
-    void run();
-    const bool start();
-    const bool stop();
-
-    const ignitionBoxStatus getLast() const;
-    const ignitionBoxStatusFiltered getFiltered() const;
-
-    const rtTaskStatus getStatus() const;
-
-    void enableSave(const bool enable, const std::filesystem::path filename);
-
-    void onMessage(std::function<void(ignitionBoxStatusFiltered)> callaback);
-
-private:
-    void saveHistory(const rtIgnitionTask::PSHistory &history, const std::filesystem::path &file_name);
-
-private: // static functions for FreeRTOS
-    static void rtIgnitionTask_manager(void *pvParameters);
-    static void rtIgnitionTask_realtime(void *pvParameters);
-
-private:
-    bool m_running = true;
-    rtTaskStatus m_manager_status = INIT;
-    std::string m_name;
-
-    rtTaskParams m_params;
-    const uint8_t m_core;
-
-    TaskHandle_t m_rt_handle = nullptr;
-    TaskHandle_t m_manager_handle = nullptr;
-    QueueHandle_t m_queue = nullptr;
-
-    bool m_enable_save = false;
-    std::filesystem::path m_history_path;
-    const uint32_t m_max_history;
-    PSHistory m_history_0;
-    PSHistory m_history_1;
-    std::unique_ptr<PSHistory> m_active_history;
-    std::unique_ptr<PSHistory> m_save_history;
-    fs::FS &m_filesystem;
-    std::mutex &m_fs_mutex;
-
-    bool m_partial_save = false;
-    bool m_first_save = true;
-
-    uint32_t m_counter_status = 0;
-    uint32_t m_last_data = 0;
-    ignitionBoxStatus m_last_status;
-    ignitionBoxStatusFiltered m_info_filtered;
-
-    std::function<void(ignitionBoxStatusFiltered)> m_on_message_cb = nullptr;
-
-    static const uint32_t c_idle_time = 10000;       // in mS
-    static const uint32_t c_spark_timeout_max = 500; // uS
-    static const uint8_t c_adc_time = 4;             // in mS
-    static const uint8_t c_io_time = 2;              // in mS
 };
 
 // RT Task Peak Detector Reset pins
 struct rtTaskResets
 {
-    const uint8_t rst_io_12p;
+    const uint8_t rst_io_peak;
-    const uint8_t rst_io_12n;
+    const uint8_t rst_io_sh;
-    const uint8_t rst_io_34p;
-    const uint8_t rst_io_34n;
 };
 
 // RT task parameters
@@ -168,7 +55,6 @@ struct rtTaskParams
 {
     bool rt_running; // run flag, false to terminate
     Devices *dev;
-    TaskHandle_t* rt_handle_ptr;
     const QueueHandle_t rt_queue;
     const rtTaskInterrupts rt_int; // interrupt pins to attach
     const rtTaskResets rt_resets;  // reset ping for peak detectors

RotaxMonitor/src/ui.cpp

@@ -0,0 +1,73 @@
+#include <ui.h>
+
+void clearScreen()
+{
+    Serial.print("\033[2J"); // clear screen
+    Serial.print("\033[H");  // cursor home
+    Serial.flush();
+}
+
+void setCursor(const uint8_t x, const uint8_t y)
+{
+    Serial.printf("\033[%d;%d", y, x + 1);
+    Serial.flush();
+}
+
+void printField(const char name[], const uint32_t val)
+{
+    Serial.printf("%15s: %06u\n", name, val);
+}
+
+void printField(const char name[], const int32_t val)
+{
+    Serial.printf("%15s: %06d\n", name, val);
+}
+
+void printField(const char name[], const int64_t val)
+{
+    Serial.printf("%15s: %06u\n", name, (uint64_t)val);
+}
+
+void printField(const char name[], const float val)
+{
+    Serial.printf("%15s: %4.2f\n", name, val);
+}
+
+void printField(const char name[], const char *val)
+{
+    Serial.printf("%15s: %s\n", name, val);
+}
+
+void printInfo(const ignitionBoxStatus &info)
+{
+    clearScreen();
+    setCursor(0, 0);
+    printField("++ Timestamp ++", (uint32_t)info.timestamp);
+    Serial.println("========== Coils 12 =============");
+    printField("Events", info.coils12.n_events);
+    printField("Events Missed", info.coils12.n_missed_firing);
+    printField("Spark Dly", (uint32_t)info.coils12.spark_delay);
+    printField("Spark Sts", sparkStatusNames.at(info.coils12.spark_status));
+    printField("Peak P_IN", info.coils12.peak_p_in);
+    printField("Peak N_IN", info.coils12.peak_n_in);
+    printField("Peak P_OUT", info.coils12.peak_p_out);
+    printField("Peak N_OUT", info.coils12.peak_n_out);
+    printField("Soft Start ", softStartStatusNames.at(info.coils12.sstart_status));
+
+    Serial.println("========== Coils 34 =============");
+    printField("Events", info.coils34.n_events);
+    printField("Events Missed", info.coils34.n_missed_firing);
+    printField("Spark Dly", (uint32_t)info.coils34.spark_delay);
+    printField("Spark Sts", sparkStatusNames.at(info.coils34.spark_status));
+    printField("Peak P_IN", info.coils34.peak_p_in);
+    printField("Peak N_IN", info.coils34.peak_n_in);
+    printField("Peak P_OUT", info.coils34.peak_p_out);
+    printField("Peak N_OUT", info.coils34.peak_n_out);
+    printField("Soft Start ", softStartStatusNames.at(info.coils34.sstart_status));
+
+    Serial.println("============ END ===============");
+    Serial.println();
+    printField("Engine RPM", info.eng_rpm);
+    printField("ADC Read Time", info.adc_read_time);
+    printField("Queue Errors", info.n_queue_errors);
+}

RotaxMonitor/src/ui.h

@@ -1,59 +1,16 @@
 #pragma once
 
 #include <Arduino.h>
+#include <datastruct.h>
+#include <string>
 
-static bool firstRun = true;
+void clearScreen();
+void setCursor(const uint8_t x, const uint8_t y);
+void printField(const char name[], const uint32_t val);
+void printField(const char name[], const int32_t val);
+void printField(const char name[], const int64_t val);
+void printField(const char name[], const float val);
+void printField(const char name[], const char *val);
 
-void clearScreen(){
+void printInfo(const ignitionBoxStatus &info);
-    Serial.print("\033[2J"); // clear screen
-    Serial.print("\033[H");  // cursor home
-    Serial.flush();
-}
 
-void setCursor(const uint8_t x, const uint8_t y) {
-    Serial.printf("\033[%d;%d", y, x+1);
-    Serial.flush();
-}
-
-void printField(const char name[], const uint32_t val, const uint8_t x, const uint8_t y) {
-    if (firstRun) {
-        setCursor(x,y);
-        Serial.printf("%15s: %06d\n", name, val);
-        return;
-    }
-    setCursor(x+16, y);
-    Serial.print(val);
-}
-
-void printField(const char name[], const int64_t val, const uint8_t x, const uint8_t y) {
-    if (firstRun) {
-        setCursor(x,y);
-        Serial.printf("%15s: %06u\n", name, (uint64_t)val);
-        return;
-    }
-    setCursor(x+16, y);
-    Serial.print((uint64_t)val);
-    Serial.flush();
-}
-
-void printField(const char name[], const float val, const uint8_t x, const uint8_t y) {
-    if (firstRun) {
-        setCursor(x,y);
-        Serial.printf("%15s: %4.2f\n", name, val);
-        return;
-    }
-    setCursor(x+16, y);
-    Serial.print(val);
-    Serial.flush();
-}
-
-void printField(const char name[], const char *val, const uint8_t x, const uint8_t y) {
-    if (firstRun) {
-        setCursor(x,y);
-        Serial.printf("%15s: %s\n", name, val);
-        return;
-    }
-    setCursor(x+16, y);
-    Serial.print(val);
-    Serial.flush();
-}

RotaxMonitor/src/utils.cpp

@@ -1,26 +1,17 @@
 #include "utils.h"
+#include "freertos_stats.h"
+#include "sdkconfig.h"
 
-<<<<<<< Updated upstream
-std::string printBits(uint32_t value) {
-=======
 #include "freertos/FreeRTOS.h"
 #include "freertos/portable.h"
 
-#include "esp_heap_caps.h"
-#include "esp_system.h"
-#include "spi_flash_mmap.h"
-#include "esp_partition.h"
-#include "LittleFS.h"
-
 #include <vector>
 #include <algorithm>
 #include <functional>
 
 #define FREERTOS_TASK_NUMBER_MAX_NUM 256 // RunTime stats for how many Tasks to be stored
 
-std::string printBits(uint32_t value)
+std::string printBits(uint32_t value) {
-{
->>>>>>> Stashed changes
     std::string result;
     for (int i = 31; i >= 0; i--) {
         // ottieni il singolo bit
@@ -33,45 +24,6 @@ std::string printBits(uint32_t value)
     return result;
 }
 
-// ANSI colors
-#define BAR_WIDTH 30
-#define COLOR_RESET "\033[0m"
-#define COLOR_RED "\033[31m"
-#define COLOR_GREEN "\033[32m"
-#define COLOR_BLUE "\033[34m"
-#define COLOR_MAGENTA "\033[35m"
-#define COLOR_CYAN "\033[36m"
-#define COLOR_YELLOW "\033[33m"
-#define COLOR_WHITE "\033[37m"
-#define COLOR_LBLUE "\033[94m"
-
-void printBar(Print &printer, const char *label, size_t used, size_t total, const char *color)
-{
-    float perc = total > 0 ? ((float)used / total) : 0;
-    int filled = perc * BAR_WIDTH;
-    char str[256] = {0};
-    uint16_t k(0);
-
-    k += sprintf(str, "%s%-12s [" COLOR_RESET, color, label);
-
-    for (int i = 0; i < BAR_WIDTH; i++)
-    {
-        if (i < filled)
-            k += sprintf(&str[k], "%s#%s", color, COLOR_RESET);
-        else
-            k += sprintf(&str[k], "-");
-    }
-
-    sprintf(&str[k], "] %s%6.2f%%%s (%5.3f/%5.3f)MB\n",
-                   color,
-                   perc * 100.0,
-                   COLOR_RESET,
-                   (used / 1024.0f / 1024.0f),
-                   (total / 1024.0f / 1024.0f));
-
-    printer.println(str);
-}
-
 void printRunningTasksMod(Print &printer, std::function<bool(const TaskStatus_t &a, const TaskStatus_t &b)> orderBy)
 {
     static const char *taskStates[] = {"Running", "Ready", "Blocked", "Suspended", "Deleted", "Invalid"};
@@ -99,69 +51,8 @@ void printRunningTasksMod(Print &printer, std::function<bool(const TaskStatus_t
 
     // Compute system total runtime
     ulCurrentRunTime = ulTotalRunTime - ulLastRunTime;
-    ulCurrentRunTime = ulCurrentRunTime > 0 ? ulCurrentRunTime : 1;
     ulLastRunTime = ulTotalRunTime;
 
-    // PRINT MEMORY INFO
-    printer.printf("\033[H");
-    printer.printf(COLOR_LBLUE "===================  ESP32 SYSTEM MONITOR  ===================\n" COLOR_RESET);
-
-    std::string buffer;
-    time_t now = time(nullptr);
-    struct tm *t = localtime(&now);
-    buffer.resize(64);
-    strftime(buffer.data(), sizeof(buffer), "%Y-%m-%d %H:%M:%S", t);
-    printer.printf(COLOR_YELLOW "=============== Datetime: %s ===============\n\n" COLOR_RESET, buffer.c_str());
-
-    // ===== HEAP =====
-    size_t freeHeap = esp_get_free_heap_size();
-    size_t totalHeap = heap_caps_get_total_size(MALLOC_CAP_DEFAULT);
-    printBar(printer, "HEAP", totalHeap - freeHeap, totalHeap, COLOR_GREEN);
-
-    // ===== RAM INTERNA =====
-    size_t freeInternal = heap_caps_get_free_size(MALLOC_CAP_INTERNAL);
-    size_t totalInternal = heap_caps_get_total_size(MALLOC_CAP_INTERNAL);
-    printBar(printer, "INTERNAL", totalInternal - freeInternal, totalInternal, COLOR_BLUE);
-
-    // ===== PSRAM =====
-    size_t totalPsram = heap_caps_get_total_size(MALLOC_CAP_SPIRAM);
-    if (totalPsram > 0)
-    {
-        size_t freePsram = heap_caps_get_free_size(MALLOC_CAP_SPIRAM);
-        printBar(printer, "PSRAM", totalPsram - freePsram, totalPsram, COLOR_MAGENTA);
-    }
-
-    printer.printf("\n");
-
-    // ===== FLASH APP (approssimato) =====
-    const esp_partition_t *app_partition =
-        esp_partition_find_first(ESP_PARTITION_TYPE_APP,
-                                 ESP_PARTITION_SUBTYPE_APP_FACTORY,
-                                 NULL);
-
-    // ===== LITTLEFS (corretto con partition table) =====
-    const esp_partition_t *fs_partition =
-        esp_partition_find_first(ESP_PARTITION_TYPE_DATA,
-                                 ESP_PARTITION_SUBTYPE_DATA_LITTLEFS,
-                                 "littlefs");
-
-    if (fs_partition)
-    {
-        size_t totalFS = fs_partition->size;  // dimensione reale partizione
-        size_t usedFS = LittleFS.usedBytes(); // spazio usato reale
-        printBar(printer, "LITTLEFS", usedFS, totalFS, COLOR_YELLOW);
-    }
-    else
-    {
-        printer.printf(COLOR_YELLOW "%-12s [NOT FOUND]\n" COLOR_RESET, "LITTLEFS");
-    }
-
-    // ===== MIN HEAP =====
-    size_t minHeap = esp_get_minimum_free_heap_size();
-    printer.printf("%s\nMin Heap Ever:%s %u KB\n", COLOR_RED, COLOR_RESET, minHeap / 1024);
-    size_t max_block = heap_caps_get_largest_free_block(MALLOC_CAP_SPIRAM);
-    printer.printf("%s\nMax PSRAM Block:%s %u KB\n\n", COLOR_RED, COLOR_RESET, max_block / 1024);
-
     // Print Runtime Information
     printer.printf("Tasks: %u, Runtime: %lus, Period: %luus\r\n", uxArraySize, ulTotalRunTime / 1000000, ulCurrentRunTime);
 
@@ -188,3 +79,4 @@ void printRunningTasksMod(Print &printer, std::function<bool(const TaskStatus_t
     }
     printer.println();
 }
+

RotaxMonitor/src/utils.h

@@ -2,5 +2,14 @@
 
 #include <Arduino.h>
 #include <string>
+#include <datastruct.h>
 
 std::string printBits(uint32_t value);
+
+void printRunningTasksMod(Print &printer, std::function<bool(const TaskStatus_t &a, const TaskStatus_t &b)> orderBy = nullptr);
+
+inline void swapHistory(PSRAMVector<ignitionBoxStatus>* active, PSRAMVector<ignitionBoxStatus>* writable) {
+    auto *temp = active;
+    active = writable; // switch active and writable buffers
+    writable = temp;   // ensure writable_history points to the buffer we just filled
+}

RotaxMonitor/src/webserver.cpp

@@ -0,0 +1,98 @@
+#include <webserver.h>
+
+WebPage::WebPage(const uint8_t port, fs::FS &filesystem) : m_port(port), m_webserver(AsyncWebServer(port)), m_websocket(AsyncWebSocket("/ws")), m_filesystem(filesystem)
+{
+    m_websocket.onEvent([this](AsyncWebSocket *server, AsyncWebSocketClient *client,
+                               AwsEventType type, void *arg, uint8_t *data, size_t len)
+                        { onWsEvent(server, client, type, arg, data, len); });
+
+    m_webserver.addHandler(&m_websocket);
+    m_webserver.serveStatic("/", m_filesystem, "/").setDefaultFile("index.html");
+
+    m_webserver.on("/upload", HTTP_POST, 
+        [this](AsyncWebServerRequest *request)
+        { onUploadRequest(request); },
+        [this](AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final)
+        { onUploadHandler(request, filename, index, data, len, final); }
+    );
+
+    m_webserver.begin();
+}
+
+WebPage::~WebPage()
+{
+    m_webserver.removeHandler(&m_websocket);
+    m_webserver.end();
+}
+
+void WebPage::sendWsData(const String &data){
+    if (m_websocket.count()){
+        m_websocket.textAll(data);
+    }
+}
+
+void WebPage::onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len)
+{
+    switch (type)
+    {
+    case WS_EVT_CONNECT:
+        Serial.printf("WS client IP[%s]-ID[%u] CONNECTED\r\n", client->remoteIP().toString().c_str(), client->id());
+        break;
+    case WS_EVT_DISCONNECT:
+        Serial.printf("WS client ID[%u] DISCONNECTED\r\n", client->remoteIP().toString().c_str(), client->id());
+        break;
+    }
+}
+
+void WebPage::onUploadRequest(AsyncWebServerRequest *request)
+{
+    if (m_upload_failed)
+        request->send(500, "text/plain", "Upload failed");
+    else
+        request->send(200, "text/plain", "Upload successful");
+}
+
+void WebPage::onUploadHandler(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final)
+{
+    if (index == 0) // only on first iteration to open file
+    {
+        m_upload_failed = false;
+        String safeName = filename;
+        int slashIndex = safeName.lastIndexOf('/');
+        if (slashIndex >= 0)
+            safeName = safeName.substring(slashIndex + 1);
+        if (safeName.length() == 0)
+        {
+            m_upload_failed = true;
+            LOG_ERROR("Invalid file name");
+            return;
+        }
+
+        const std::filesystem::path filePath = std::filesystem::path(m_filesystem.mountpoint()) / safeName.c_str();
+        if (m_filesystem.exists(filePath.c_str()))
+            m_filesystem.remove(filePath.c_str());
+
+        m_upload_file = m_filesystem.open(filePath.c_str(), FILE_WRITE);
+        if (!m_upload_file)
+        {
+            m_upload_failed = true;
+            LOG_ERROR("Failed to open upload file:", filePath.c_str());
+            return;
+        }
+    }
+
+    // Actual write of file data
+    if (!m_upload_failed && m_upload_file)
+    {
+        if (m_upload_file.write(data, len) != len)
+            m_upload_failed = true;
+    }
+
+    // close the file and save on final call
+    if (final && m_upload_file)
+    {
+        m_upload_file.close();
+        if (!m_upload_failed)
+            LOG_INFO("Uploaded file to LittleFS:", filename.c_str());
+    }
+}

RotaxMonitor/src/webserver.h

@@ -0,0 +1,38 @@
+#pragma once
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+
+// System includes
+#include <Arduino.h>
+#include <DebugLog.h>
+#include <ESPAsyncWebServer.h>
+#include <AsyncTCP.h>
+#include <filesystem>
+#include <FS.h>
+
+class WebPage
+{
+    const uint8_t m_port = 80;
+    fs::FS &m_filesystem;
+    AsyncWebServer m_webserver;
+    AsyncWebSocket m_websocket;
+    bool m_upload_failed = false;
+    fs::File m_upload_file;
+
+public:
+    WebPage(const uint8_t port, fs::FS &filesystem);
+    ~WebPage();
+
+    void sendWsData(const String &data);
+
+private:
+    void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client,
+              AwsEventType type, void *arg, uint8_t *data, size_t len);
+
+    void onUploadRequest(AsyncWebServerRequest *request);
+    void onUploadHandler(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final);
+
+    void onStart(AsyncWebServerRequest *request);
+    void onStop(AsyncWebServerRequest *request);
+    void onDownload(AsyncWebServerRequest *request);
+
+};

RotaxMonitorTester/.vscode/extensions.json

@@ -1,8 +1,7 @@
 {
     "recommendations": [
         "Jason2866.esp-decoder",
-        "pioarduino.pioarduino-ide",
+        "pioarduino.pioarduino-ide"
-        "platformio.platformio-ide"
     ],
     "unwantedRecommendations": [
         "ms-vscode.cpptools-extension-pack"

RotaxMonitorTester/platformio.ini

@@ -16,7 +16,7 @@ lib_deps =
 	hideakitai/DebugLog@^0.8.4
 board_build.flash_size = 4MB
 board_build.partitions = default.csv
-monitor_speed = 115200
+monitor_speed = 921600
 build_type = release
 
 [env:esp32-devtest-debug]
@@ -27,7 +27,7 @@ lib_deps =
 	hideakitai/DebugLog@^0.8.4
 board_build.flash_size = 4MB
 board_build.partitions = default.csv
-monitor_speed = 115200
+monitor_speed = 921600
 build_type = debug
 build_flags = 
 	-O0

RotaxMonitorTester/src/main.cpp

@@ -1,3 +1,5 @@
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_DEBUG
+
 #include <Arduino.h>
 #include <DebugLog.h>
 
@@ -16,15 +18,19 @@ static uint32_t count = 0;
 #define SPARK_DLY_MAX 490
 
 #define PAUSE_LONG_MIN 5000
-#define PAUSE_LONG_MAX PAUSE_LONG_MIN*100
+#define PAUSE_LONG_MAX PAUSE_LONG_MIN * 100
 
-void clearScreen(){
+#define RPM_MIN 250
+#define RPM_MAX 5500
+
+void clearScreen()
+{
   Serial.print("\033[2J"); // clear screen
   Serial.print("\033[H");  // cursor home
   Serial.flush();
 }
 
-static double filtered = 0;
+static double filtered_rpm = 0;
 
 static const std::map<const uint32_t, const char *> pin2Name = {
     {PIN_TRIG_A12P, "HIGH_PIN_TRIG_A12P"},
@@ -49,8 +55,34 @@ static timerStatus stsA = {
     .coil_pulse_us = 1000,
     .spark_pulse_us = 100,
     .spark_delay_us = 50,
+    .pins = {
+        .pin_trig_12p = PIN_TRIG_A12P,
+        .pin_trig_12n = PIN_TRIG_A12N,
+        .pin_trig_34p = PIN_TRIG_A34P,
+        .pin_trig_34n = PIN_TRIG_A34N,
+        .pin_spark_12 = SPARK_A12,
+        .pin_spark_34 = SPARK_A34},
     .main_task = NULL};
 
+static timerStatus stsB = {
+    .clock_period_us = (uint32_t)PERIOD_US,
+    .pause_long_us = 10000,
+    .pause_short_us = 1000,
+    .coil_pulse_us = 1000,
+    .spark_pulse_us = 100,
+    .spark_delay_us = 50,
+    .pins = {
+        .pin_trig_12p = PIN_TRIG_B12P,
+        .pin_trig_12n = PIN_TRIG_B12N,
+        .pin_trig_34p = PIN_TRIG_B34P,
+        .pin_trig_34n = PIN_TRIG_B34N,
+        .pin_spark_12 = SPARK_B12,
+        .pin_spark_34 = SPARK_B34},
+    .main_task = NULL};
+
+static bool isEnabled_A = false;
+static bool isEnabled_B = false;
+
 void setup()
 {
 
@@ -73,11 +105,28 @@ void setup()
   pinMode(SPARK_B34, OUTPUT);
 
   pinMode(SPARK_DELAY_POT, ANALOG);
-  stsA.main_task = xTaskGetCurrentTaskHandleForCore(1);
+  pinMode(FREQ_POT, ANALOG);
 
+  pinMode(ENABLE_PIN_A, INPUT_PULLUP);
+  pinMode(ENABLE_PIN_B, INPUT_PULLUP);
+
+  // get the task handle for the main loop
+  stsA.main_task = xTaskGetCurrentTaskHandleForCore(1);
+  stsB.main_task = xTaskGetCurrentTaskHandleForCore(1);
+
+  // Begin timer with preset fixed frequency
   timerA = timerBegin(FREQUENCY);
+  timerB = timerBegin(FREQUENCY);
+
+  // Stop timers because of autostart
+  timerStop(timerA);
+  timerStop(timerB);
+
+  // Attach interrupts and call callback every timer expiry
   timerAttachInterruptArg(timerA, &onTimer, (void *)&stsA);
-  timerAlarm(timerA, 1, true, 0);
+  timerAttachInterruptArg(timerB, &onTimer, (void *)&stsB);
+  timerAlarm(timerA, 1, true, 0); // infinite number of reloads
+  timerAlarm(timerB, 1, true, 0);
 
   LOG_INFO("Setup Complete");
 }
@@ -87,21 +136,59 @@ void loop()
   LOG_INFO("Loop: ", count++);
   uint32_t spark_delay = (uint32_t)(map(analogRead(SPARK_DELAY_POT), 0, 4096, SPARK_DLY_MIN, SPARK_DLY_MAX) / PERIOD_US);
   stsA.spark_delay_us = spark_delay * PERIOD_US;
-  if (stsA.spark_delay_us > (SPARK_DLY_MIN + SPARK_DLY_MAX) / 2) {
+  if (stsA.spark_delay_us > (SPARK_DLY_MIN + SPARK_DLY_MAX) / 2)
+  {
     stsA.soft_start = true;
     stsA.spark_delay_us -= (SPARK_DLY_MIN + SPARK_DLY_MAX) / 2;
-  } else {
+  }
+  else
+  {
     stsA.soft_start = false;
   }
+  stsB.soft_start = stsA.soft_start;
+  stsB.spark_delay_us = stsA.spark_delay_us;
+
+  double new_rpm = (double)(map(analogRead(FREQ_POT), 0, 4096, RPM_MIN, RPM_MAX));
+  filtered_rpm = filtered_rpm + 0.1 * (new_rpm - filtered_rpm);
+  stsA.pause_long_us = (uint32_t)(60000000.0f / filtered_rpm / 2.0f);
+  stsB.pause_long_us = stsA.pause_long_us;
+
+  if (isEnabled_A)
+    LOG_INFO("==== System A is ENABLED ====");
+  else
+    LOG_INFO("==== System A is DISABLED ====");
+
+  if (isEnabled_B)
+    LOG_INFO("==== System B is ENABLED ====");
+  else
+    LOG_INFO("==== System B is DISABLED ====");
 
-  double new_val = (float)(map(analogRead(FREQ_POT), 0, 4096, PAUSE_LONG_MIN, PAUSE_LONG_MAX));
-  filtered = filtered + 0.1 * (new_val - filtered);
-  stsA.pause_long_us = (uint32_t)filtered;
   LOG_INFO("Spark Delay uS: ", stsA.spark_delay_us, "\tSoft Start: ", stsA.soft_start ? "TRUE" : "FALSE");
-  LOG_INFO("Pause: ", (uint32_t)(stsA.pause_long_us / 1000), "ms");
+  LOG_INFO("Engine Rpm: ", (uint32_t)(filtered_rpm));
   LOG_INFO("Coil Pulse: ", stsA.coil_pulse_us, "us");
   LOG_INFO("Spark Pulse: ", stsA.spark_pulse_us, "us");
 
+  if (digitalRead(ENABLE_PIN_A) == LOW && !isEnabled_A)
+  {
+    timerStart(timerA);
+    isEnabled_A = true;
+  }
+  else if (digitalRead(ENABLE_PIN_A) == HIGH && isEnabled_A)
+  {
+    timerStop(timerA);
+    isEnabled_A = false;
+  }
+
+  if (digitalRead(ENABLE_PIN_B) == LOW && !isEnabled_B)
+  {
+    timerStart(timerB);
+    isEnabled_B = true;
+  }
+  else if (digitalRead(ENABLE_PIN_B) == HIGH && isEnabled_B)
+  {
+    timerStop(timerB);
+    isEnabled_B = false;
+  }
 
   delay(100);
   clearScreen();

RotaxMonitorTester/src/pins.h

@@ -1,5 +1,9 @@
 #pragma once
 
+// Enable Pin
+#define ENABLE_PIN_A 16
+#define ENABLE_PIN_B 15
+
 ///// Ignition Box A /////
 #define PIN_TRIG_A12P 18
 #define PIN_TRIG_A12N 19

RotaxMonitorTester/src/timer.cpp

@@ -7,20 +7,18 @@ void onTimer(void *arg)
     BaseType_t xHigherPriorityTaskWoken = pdFALSE;
     timerStatus *params = (timerStatus *)(arg);
     TaskHandle_t task = params->main_task;
+    const timerPins pins = params->pins;
 
     // increment state time
     params->state_time += params->clock_period_us;
 
-    digitalWrite(PIN_TRIG_B12P, HIGH);
-
     switch (params->state)
     {
 
     case S_12P:
         if (params->state_time == params->clock_period_us && !params->coil12p_high)
         {
-            // xTaskNotifyFromISR(task, PIN_TRIG_A12P, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+            digitalWrite(pins.pin_trig_12p, HIGH);
-            digitalWrite(PIN_TRIG_A12P, HIGH);
             params->coil12p_high = true;
             wait_sent = false;
         }
@@ -29,21 +27,18 @@ void onTimer(void *arg)
         {
             if (params->state_time == params->spark_delay_us)
             {
-                // xTaskNotifyFromISR(task, SPARK_A12, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+                digitalWrite(pins.pin_spark_12, HIGH);
-                digitalWrite(SPARK_A12, HIGH);
             }
 
             if (params->state_time == (params->spark_delay_us + params->spark_pulse_us))
             {
-                // xTaskNotifyFromISR(task, ~SPARK_A12, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+                digitalWrite(pins.pin_spark_12, LOW);
-                digitalWrite(SPARK_A12, LOW);
             }
         }
 
         if (params->state_time >= params->coil_pulse_us && params->coil12p_high)
         {
-            // xTaskNotifyFromISR(task, ~PIN_TRIG_A12P, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+            digitalWrite(pins.pin_trig_12p, LOW);
-            digitalWrite(PIN_TRIG_A12P, LOW);
             params->coil12p_high = false;
         }
 
@@ -57,8 +52,7 @@ void onTimer(void *arg)
     case S_12N:
         if (params->state_time == params->clock_period_us && !params->coil12n_high)
         {
-            // xTaskNotifyFromISR(task, PIN_TRIG_A12N, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+            digitalWrite(pins.pin_trig_12n, HIGH);
-            digitalWrite(PIN_TRIG_A12N, HIGH);
             params->coil12n_high = true;
         }
 
@@ -66,21 +60,18 @@ void onTimer(void *arg)
         {
             if (params->state_time == params->spark_delay_us)
             {
-                // xTaskNotifyFromISR(task, SPARK_A12, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+                digitalWrite(pins.pin_spark_12, HIGH);
-                digitalWrite(SPARK_A12, HIGH);
             }
 
             if (params->state_time == (params->spark_delay_us + params->spark_pulse_us))
             {
-                // xTaskNotifyFromISR(task, ~SPARK_A12, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+                digitalWrite(pins.pin_spark_12, LOW);
-                digitalWrite(SPARK_A12, LOW);
             }
         }
 
         if (params->state_time >= params->coil_pulse_us && params->coil12n_high)
         {
-            // xTaskNotifyFromISR(task, ~PIN_TRIG_A12N, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+            digitalWrite(pins.pin_trig_12n, LOW);
-            digitalWrite(PIN_TRIG_A12N, LOW);
             params->coil12n_high = false;
             params->state = S_WAIT_10MS;
             params->state_time = 0;
@@ -90,7 +81,6 @@ void onTimer(void *arg)
     case S_WAIT_10MS:
         if (!wait_sent)
         {
-            // xTaskNotifyFromISR(task, S_WAIT_10MS, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
             wait_sent = true;
         }
         if (params->state_time >= params->pause_long_us)
@@ -103,8 +93,7 @@ void onTimer(void *arg)
     case S_34P:
         if (params->state_time == params->clock_period_us && !params->coil34p_high)
         {
-            // xTaskNotifyFromISR(task, PIN_TRIG_A34P, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+            digitalWrite(pins.pin_trig_34p, HIGH);
-            digitalWrite(PIN_TRIG_A34P, HIGH);
             params->coil34p_high = true;;
             wait_sent = false;
         }
@@ -113,21 +102,18 @@ void onTimer(void *arg)
         {
             if (params->state_time == params->spark_delay_us)
             {
-                // xTaskNotifyFromISR(task, SPARK_A34, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+                digitalWrite(pins.pin_spark_34, HIGH);
-                digitalWrite(SPARK_A34, HIGH);
             }
 
             if (params->state_time == params->spark_delay_us + params->spark_pulse_us)
             {
-                // xTaskNotifyFromISR(task, ~SPARK_A34, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+                digitalWrite(pins.pin_spark_34, LOW);
-                digitalWrite(SPARK_A34, LOW);
             }
         }
 
         if (params->state_time >= params->coil_pulse_us && params->coil34p_high)
         {
-            // xTaskNotifyFromISR(task, ~PIN_TRIG_A34P, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+            digitalWrite(pins.pin_trig_34p, LOW);
-            digitalWrite(PIN_TRIG_A34P, LOW);
             params->coil34p_high = false;
         }
 
@@ -141,8 +127,7 @@ void onTimer(void *arg)
     case S_34N:
         if (params->state_time == params->clock_period_us && !params->coil34n_high)
         {
-            // xTaskNotifyFromISR(task, PIN_TRIG_A34N, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+            digitalWrite(pins.pin_trig_34n, HIGH);
-            digitalWrite(PIN_TRIG_A34N, HIGH);
             params->coil34n_high = true;
         }
 
@@ -150,21 +135,18 @@ void onTimer(void *arg)
         {
             if (params->state_time == params->spark_delay_us)
             {
-                // xTaskNotifyFromISR(task, SPARK_A34, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+                digitalWrite(pins.pin_spark_34, HIGH);
-                digitalWrite(SPARK_A34, HIGH);
             }
 
             if (params->state_time == params->spark_delay_us + params->spark_pulse_us)
             {
-                // xTaskNotifyFromISR(task, ~SPARK_A34, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+                digitalWrite(pins.pin_spark_34, LOW);
-                digitalWrite(SPARK_A34, LOW);
             }
         }
 
         if (params->state_time >= params->coil_pulse_us && params->coil34n_high)
         {
-            // xTaskNotifyFromISR(task, ~PIN_TRIG_A34N, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
+            digitalWrite(pins.pin_trig_34n, LOW);
-            digitalWrite(PIN_TRIG_A34N, LOW);
             params->coil34n_high = false;
             params->state = S_WAIT_10MS_END;
             params->state_time = 0;
@@ -174,7 +156,6 @@ void onTimer(void *arg)
     case S_WAIT_10MS_END:
         if (!wait_sent)
         {
-            // xTaskNotifyFromISR(task, S_WAIT_10MS_END, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
             wait_sent = true;
         }
         if (params->state_time >= params->pause_long_us)
@@ -185,8 +166,6 @@ void onTimer(void *arg)
         break;
     }
     
-    digitalWrite(PIN_TRIG_B12P, LOW);
-
     if (xHigherPriorityTaskWoken)
         portYIELD_FROM_ISR();
 }

RotaxMonitorTester/src/timer.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_DEBUG
+
 #include <Arduino.h>
 #include <DebugLog.h>
 #include "pins.h"
@@ -19,6 +21,15 @@ enum State
     S_WAIT_10MS_END
 };
 
+struct timerPins {
+    const uint8_t pin_trig_12p;
+    const uint8_t pin_trig_12n;
+    const uint8_t pin_trig_34p;
+    const uint8_t pin_trig_34n;
+    const uint8_t pin_spark_12;
+    const uint8_t pin_spark_34;
+};
+
 struct timerStatus
 {
     State state = State::S_12P;
@@ -34,6 +45,7 @@ struct timerStatus
     bool coil34p_high = false;
     bool coil12n_high = false;
     bool coil34n_high = false;
+    timerPins pins;
     TaskHandle_t main_task;
 };