ADC ok with interrupt or drdy

RotaxMonitor/lib/ADS1256/ADS1256.cpp

@@ -17,28 +17,55 @@
 
 #define convertSigned24BitToLong(value) ((value) & (1l << 23) ? (value) - 0x1000000 : value)
 
+void drdyCallback(void *arg)
+{
+	auto cls = (ADS1256 *)arg;
+	if (!arg)
+		return;
+	BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+
+	if (digitalRead(cls->getDRDYpin())) // impose wait on low
+	{
+		xSemaphoreTakeFromISR(cls->getDRDYsemaphoreLow(), &xHigherPriorityTaskWoken);
+		xSemaphoreGiveFromISR(cls->getDRDYsemaphoreHigh(), &xHigherPriorityTaskWoken);
+	}
+	else // impose wait on high
+	{
+		xSemaphoreTakeFromISR(cls->getDRDYsemaphoreHigh(), &xHigherPriorityTaskWoken);
+		xSemaphoreGiveFromISR(cls->getDRDYsemaphoreLow(), &xHigherPriorityTaskWoken);
+	}
+	if (xHigherPriorityTaskWoken)
+		portYIELD_FROM_ISR();
+}
+
 // 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)
+																																		 m_DRDY_pin(DRDY_pin), m_RESET_pin(RESET_pin), m_SYNC_pin(SYNC_pin), m_CS_pin(CS_pin), m_VREF(VREF), m_PGA(0)
 {
-	pinMode(_DRDY_pin, INPUT);	
+	pinMode(m_DRDY_pin, INPUT);
 
 	if (RESET_pin != PIN_UNUSED)
 	{
-	pinMode(_RESET_pin, OUTPUT);
+		pinMode(m_RESET_pin, OUTPUT);
 	}
 
 	if (SYNC_pin != PIN_UNUSED)
 	{
-	pinMode(_SYNC_pin, OUTPUT);
+		pinMode(m_SYNC_pin, OUTPUT);
 	}
 
 	if (CS_pin != PIN_UNUSED)
 	{
-	pinMode(_CS_pin, OUTPUT);	
+		pinMode(m_CS_pin, OUTPUT);
 	}
 
 	updateConversionParameter();
+
+	m_drdyHigh = xSemaphoreCreateBinary();
+	m_drdyLow = xSemaphoreCreateBinary();
+	xSemaphoreGive(m_drdyHigh);
+	xSemaphoreGive(m_drdyLow);
+	attachInterruptArg(DRDY_pin, drdyCallback, (void *)this, CHANGE);
 }
 
 // Initialization
@@ -48,18 +75,18 @@ void ADS1256::InitializeADC()
 	CS_LOW();
 
 	// We do a manual chip reset on the ADS1256 - Datasheet Page 27/ RESET
-  if(_RESET_pin != PIN_UNUSED)
+	if (m_RESET_pin != PIN_UNUSED)
 	{
-  digitalWrite(_RESET_pin, LOW);
+		digitalWrite(m_RESET_pin, LOW);
 		delay(200);
-  digitalWrite(_RESET_pin, HIGH); //RESET is set to high
+		digitalWrite(m_RESET_pin, HIGH); // RESET is set to high
 		delay(1000);
 	}
 
 	// Sync pin is also treated if it is defined
-  if(_SYNC_pin != PIN_UNUSED)
+	if (m_SYNC_pin != PIN_UNUSED)
 	{
-  digitalWrite(_SYNC_pin, HIGH); //RESET is set to high  
+		digitalWrite(m_SYNC_pin, HIGH); // RESET is set to high
 	}
 
 #ifndef ADS1256_SPI_ALREADY_STARTED // Guard macro to allow external initialization of the SPI
@@ -70,75 +97,75 @@ void ADS1256::InitializeADC()
 	// 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
+	m_STATUS = 0b00110110; // BUFEN and ACAL enabled, Order is MSB, rest is read only
-  writeRegister(STATUS_REG, _STATUS); 
+	writeRegister(STATUS_REG, m_STATUS);
 	delay(200);
 
-  _MUX = 0b00000001; //MUX AIN0+AIN1
+	m_MUX = DIFF_0_1; // MUX AIN0+AIN1
-  writeRegister(MUX_REG, _MUX); 
+	writeRegister(MUX_REG, m_MUX);
 	delay(200);
 
-  _ADCON = 0b00000000; //ADCON - CLK: OFF, SDCS: OFF, PGA = 0 (+/- 5 V)
+	m_ADCON = WAKEUP; // ADCON - CLK: OFF, SDCS: OFF, PGA = 0 (+/- 5 V)
-  writeRegister(ADCON_REG, _ADCON); 
+	writeRegister(ADCON_REG, m_ADCON);
 	delay(200);
 
 	updateConversionParameter();
 
-  _DRATE = 0b10000010; //100SPS
+	m_DRATE = DRATE_100SPS; // 100SPS
-  writeRegister(DRATE_REG, _DRATE);  
+	writeRegister(DRATE_REG, m_DRATE);
 	delay(200);
 
-  sendDirectCommand(0b11110000); //Offset and self-gain calibration
+	sendDirectCommand(SELFCAL); // Offset and self-gain calibration
 	delay(200);
 
-  _isAcquisitionRunning = false; //MCU will be waiting to start a continuous acquisition
+	m_isAcquisitionRunning = false; // MCU will be waiting to start a continuous acquisition
 }
 
 void ADS1256::waitForLowDRDY()
 {
-    while (digitalRead(_DRDY_pin) == HIGH) {} 
+	xSemaphoreTake(m_drdyLow, pdMS_TO_TICKS(10));
+	xSemaphoreGive(m_drdyLow);
 }
 
 void ADS1256::waitForHighDRDY()
 {
-#if F_CPU >= 48000000  //Fast MCUs need this protection to wait until DRDY goes high after a conversion
+	xSemaphoreTake(m_drdyHigh, pdMS_TO_TICKS(10));
-	while (digitalRead(_DRDY_pin) == LOW) {}   
+	xSemaphoreGive(m_drdyHigh);
-#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	
+	_spi->transfer(SDATAC); // 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
+	m_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;
+	m_DRATE = drate;
-	delayMicroseconds(500);
+	delay(200);
 }
 
 void ADS1256::setMUX(uint8_t mux) // Setting MUX (input channel)
 {
 	writeRegister(MUX_REG, mux);
-	_MUX = mux;
+	m_MUX = mux;
-	//delayMicroseconds(500);
+	delay(200);
 }
 
 void ADS1256::setPGA(uint8_t pga) // Setting PGA (input voltage range)
 {
-	_PGA = pga;
+	m_PGA = pga;
-	_ADCON = readRegister(ADCON_REG); //Read the most recent value of the register
+	m_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
+	m_ADCON = (m_ADCON & 0b11111000) | (m_PGA & 0b00000111); // Clearing and then setting bits 2-0 based on pga
 
-	writeRegister(ADCON_REG, _ADCON);	
+	writeRegister(ADCON_REG, m_ADCON);
-	delayMicroseconds(1000); //Delay to allow the PGA to settle after changing its value
+	delay(200);
 
 	updateConversionParameter(); // Update the multiplier according top the new PGA value
 }
@@ -153,95 +180,101 @@ uint8_t ADS1256::getPGA() //Reading PGA from the ADCON register
 
 void ADS1256::setCLKOUT(uint8_t clkout) // Setting CLKOUT
 {
-	_ADCON = readRegister(ADCON_REG); //Read the most recent value of the register
+	m_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(m_ADCON, 6, 0);
-		bitWrite(_ADCON, 5, 0);		
+		bitWrite(m_ADCON, 5, 0);
 	}
 	else if (clkout == 1)
 	{
 		// 01 (default)
-		bitWrite(_ADCON, 6, 0);
+		bitWrite(m_ADCON, 6, 0);
-		bitWrite(_ADCON, 5, 1);			
+		bitWrite(m_ADCON, 5, 1);
 	}
 	else if (clkout == 2)
 	{
 		// 10
-		bitWrite(_ADCON, 6, 1);
+		bitWrite(m_ADCON, 6, 1);
-		bitWrite(_ADCON, 5, 0);		
+		bitWrite(m_ADCON, 5, 0);
 	}
 	else if (clkout == 3)
 	{
 		// 11
-		bitWrite(_ADCON, 6, 1);
+		bitWrite(m_ADCON, 6, 1);
-		bitWrite(_ADCON, 5, 1);				
+		bitWrite(m_ADCON, 5, 1);
+	}
+	else
+	{
 	}
-	else{}
 
-	writeRegister(ADCON_REG, _ADCON);
+	writeRegister(ADCON_REG, m_ADCON);
 	delay(100);
 }
 
 void ADS1256::setSDCS(uint8_t sdcs) // Setting SDCS
 {
-	_ADCON = readRegister(ADCON_REG); //Read the most recent value of the register
+	m_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(m_ADCON, 4, 0);
-		bitWrite(_ADCON, 3, 0);		
+		bitWrite(m_ADCON, 3, 0);
 	}
 	else if (sdcs == 1)
 	{
 		// 01
-		bitWrite(_ADCON, 4, 0);
+		bitWrite(m_ADCON, 4, 0);
-		bitWrite(_ADCON, 3, 1);		
+		bitWrite(m_ADCON, 3, 1);
 	}
 	else if (sdcs == 2)
 	{
 		// 10
-		bitWrite(_ADCON, 4, 1);
+		bitWrite(m_ADCON, 4, 1);
-		bitWrite(_ADCON, 3, 0);		
+		bitWrite(m_ADCON, 3, 0);
 	}
 	else if (sdcs == 3)
 	{
 		// 11
-		bitWrite(_ADCON, 4, 1);
+		bitWrite(m_ADCON, 4, 1);
-		bitWrite(_ADCON, 3, 1);				
+		bitWrite(m_ADCON, 3, 1);
+	}
+	else
+	{
 	}
-	else{}
 
-	writeRegister(ADCON_REG, _ADCON);
+	writeRegister(ADCON_REG, m_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
+	m_STATUS = readRegister(STATUS_REG); // Read the most recent value of the register
 
 	if (byteOrder == 0)
 	{
 		// Byte order is MSB (default)
-		bitWrite(_STATUS, 3, 0);
+		bitWrite(m_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);
+		bitWrite(m_STATUS, 3, 1);
 		// Set value of _STATUS at the third bit to 1
 	}
-	else{}
+	else
+	{
+	}
 
-	writeRegister(STATUS_REG, _STATUS);
+	writeRegister(STATUS_REG, m_STATUS);
 	delay(100);
 }
 
@@ -254,23 +287,25 @@ uint8_t ADS1256::getByteOrder() //Getting byte order (MSB/LSB)
 
 void ADS1256::setAutoCal(uint8_t acal) // Setting ACAL (Automatic SYSCAL)
 {
-	_STATUS = readRegister(STATUS_REG); //Read the most recent value of the register
+	m_STATUS = readRegister(STATUS_REG); // Read the most recent value of the register
 
 	if (acal == 0)
 	{
 		// Auto-calibration is disabled (default)
-		bitWrite(_STATUS, 2, 0);
+		bitWrite(m_STATUS, 2, 0);
 		//_STATUS |= B00000000;
 	}
 	else if (acal == 1)
 	{
 		// Auto-calibration is enabled
-		bitWrite(_STATUS, 2, 1);
+		bitWrite(m_STATUS, 2, 1);
 		//_STATUS |= B00000100;
 	}
-	else{}
+	else
+	{
+	}
 
-	writeRegister(STATUS_REG, _STATUS);
+	writeRegister(STATUS_REG, m_STATUS);
 	delay(100);
 }
 
@@ -283,23 +318,25 @@ uint8_t ADS1256::getAutoCal() //Getting ACAL (Automatic SYSCAL)
 
 void ADS1256::setBuffer(uint8_t bufen) // Setting input buffer (Input impedance)
 {
-	_STATUS = readRegister(STATUS_REG); //Read the most recent value of the register
+	m_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);
+		bitWrite(m_STATUS, 1, 0);
 	}
 	else if (bufen == 1)
 	{
 		// Analog input buffer is enabled (recommended)
 		//_STATUS |= B00000010;
-		bitWrite(_STATUS, 1, 1);
+		bitWrite(m_STATUS, 1, 1);
+	}
+	else
+	{
 	}
-	else{}
 
-	writeRegister(STATUS_REG, _STATUS);
+	writeRegister(STATUS_REG, m_STATUS);
 	delay(100);
 }
 
@@ -312,7 +349,7 @@ uint8_t ADS1256::getBuffer() //Getting input buffer (Input impedance)
 
 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
+	m_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
@@ -327,7 +364,7 @@ void ADS1256::setGPIO(uint8_t dir0, uint8_t dir1, uint8_t dir2, uint8_t dir3) //
 	{
 		GPIO_bit7 = 0; // D3 is output
 	}
-	bitWrite(_GPIO, 7, GPIO_bit7);
+	bitWrite(m_GPIO, 7, GPIO_bit7);
 	//-----------------------------------------------------
 	// Bit6: DIR2
 	if (dir2 == 1)
@@ -338,7 +375,7 @@ void ADS1256::setGPIO(uint8_t dir0, uint8_t dir1, uint8_t dir2, uint8_t dir3) //
 	{
 		GPIO_bit6 = 0; // D2 is output
 	}
-	bitWrite(_GPIO, 6, GPIO_bit6);
+	bitWrite(m_GPIO, 6, GPIO_bit6);
 	//-----------------------------------------------------
 	// Bit5: DIR1
 	if (dir1 == 1)
@@ -349,7 +386,7 @@ void ADS1256::setGPIO(uint8_t dir0, uint8_t dir1, uint8_t dir2, uint8_t dir3) //
 	{
 		GPIO_bit5 = 0; // D1 is output
 	}
-	bitWrite(_GPIO, 5, GPIO_bit5);
+	bitWrite(m_GPIO, 5, GPIO_bit5);
 	//-----------------------------------------------------
 	// Bit4: DIR0
 	if (dir0 == 1)
@@ -360,16 +397,16 @@ void ADS1256::setGPIO(uint8_t dir0, uint8_t dir1, uint8_t dir2, uint8_t dir3) //
 	{
 		GPIO_bit4 = 0; // D0 is output (default)
 	}
-	bitWrite(_GPIO, 4, GPIO_bit4);
+	bitWrite(m_GPIO, 4, GPIO_bit4);
 	//-----------------------------------------------------
 
-	writeRegister(IO_REG, _GPIO);
+	writeRegister(IO_REG, m_GPIO);
 	delay(100);
 }
 
 void ADS1256::writeGPIO(uint8_t dir0value, uint8_t dir1value, uint8_t dir2value, uint8_t dir3value) // Writing GPIO
 {
-	_GPIO = readRegister(IO_REG);
+	m_GPIO = readRegister(IO_REG);
 
 	// Sets D3-D0 output values
 	// It is important that first one must use setGPIO, then writeGPIO
@@ -385,7 +422,7 @@ void ADS1256::writeGPIO(uint8_t dir0value, uint8_t dir1value, uint8_t dir2value,
 	{
 		GPIO_bit3 = 0;
 	}
-	bitWrite(_GPIO, 3, GPIO_bit3);
+	bitWrite(m_GPIO, 3, GPIO_bit3);
 	//-----------------------------------------------------
 	// Bit2: DIR2
 	if (dir2value == 1)
@@ -396,7 +433,7 @@ void ADS1256::writeGPIO(uint8_t dir0value, uint8_t dir1value, uint8_t dir2value,
 	{
 		GPIO_bit2 = 0;
 	}
-	bitWrite(_GPIO, 2, GPIO_bit2);
+	bitWrite(m_GPIO, 2, GPIO_bit2);
 	//-----------------------------------------------------
 	// Bit1: DIR1
 	if (dir1value == 1)
@@ -407,7 +444,7 @@ void ADS1256::writeGPIO(uint8_t dir0value, uint8_t dir1value, uint8_t dir2value,
 	{
 		GPIO_bit1 = 0;
 	}
-	bitWrite(_GPIO, 1, GPIO_bit1);	
+	bitWrite(m_GPIO, 1, GPIO_bit1);
 	//-----------------------------------------------------
 	// Bit0: DIR0
 	if (dir0value == 1)
@@ -418,10 +455,10 @@ void ADS1256::writeGPIO(uint8_t dir0value, uint8_t dir1value, uint8_t dir2value,
 	{
 		GPIO_bit0 = 0;
 	}
-	bitWrite(_GPIO, 0, GPIO_bit0);
+	bitWrite(m_GPIO, 0, GPIO_bit0);
 	//-----------------------------------------------------
 
-	writeRegister(IO_REG, _GPIO);
+	writeRegister(IO_REG, m_GPIO);
 	delay(100);
 }
 
@@ -429,13 +466,13 @@ 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
+	m_GPIO = readRegister(IO_REG); // Read the GPIO register
 
 	// Save each bit values in a variable
-	GPIO_bit3 = bitRead(_GPIO, 3);
+	GPIO_bit3 = bitRead(m_GPIO, 3);
-	GPIO_bit2 = bitRead(_GPIO, 2);
+	GPIO_bit2 = bitRead(m_GPIO, 2);
-	GPIO_bit1 = bitRead(_GPIO, 1);
+	GPIO_bit1 = bitRead(m_GPIO, 1);
-	GPIO_bit0 = bitRead(_GPIO, 0);	
+	GPIO_bit0 = bitRead(m_GPIO, 0);
 
 	delay(100);
 
@@ -459,13 +496,12 @@ uint8_t ADS1256::readGPIO(uint8_t gpioPin) //Reading GPIO
 	}
 
 	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));
+	_spi->beginTransaction(SPISettings(SPI_FREQ, MSBFIRST, SPI_MODE1));
 
 	CS_LOW(); // REF: P34: "CS must stay low during the entire command sequence"
 	delayMicroseconds(5);
@@ -476,24 +512,23 @@ void ADS1256::sendDirectCommand(uint8_t directCommand)
 	_spi->endTransaction();
 }
 
-
 float ADS1256::convertToVoltage(int32_t rawData) // Converting the 24-bit data into a voltage value
 {
-  return(conversionParameter * rawData);
+	return (m_conversionParameter * rawData);
 }
 
 void ADS1256::writeRegister(uint8_t registerAddress, uint8_t registerValueToWrite)
 {
 	waitForLowDRDY();
 
-  _spi->beginTransaction(SPISettings(1920000, MSBFIRST, SPI_MODE1));
+	_spi->beginTransaction(SPISettings(SPI_FREQ, 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(WREG | registerAddress); // 0x50 = 01010000 = WREG
 
 	_spi->transfer(0x00); // 2nd (empty) command byte
 
@@ -501,63 +536,63 @@ void ADS1256::writeRegister(uint8_t registerAddress, uint8_t registerValueToWrit
 
 	CS_HIGH();
 	_spi->endTransaction();
+	delay(100);
 }
 
 long ADS1256::readRegister(uint8_t registerAddress) // Reading a register
 {
 	waitForLowDRDY();
 
-  _spi->beginTransaction(SPISettings(1920000, MSBFIRST, SPI_MODE1));
+	_spi->beginTransaction(SPISettings(SPI_FREQ, 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(RREG | 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
+	uint8_t regValue = _spi->transfer(0x00); // 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));
+	_spi->beginTransaction(SPISettings(SPI_FREQ, 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
+	_spi->transfer(RDATA); // Issue RDATA (0000 0001) command
 	delayMicroseconds(7);  // Wait t6 time (~6.51 us) REF: P34, FIG:30.
 
-	_outputBuffer[0] = _spi->transfer(0); // MSB
+	m_outputBuffer[0] = _spi->transfer(0); // MSB
-	_outputBuffer[1] = _spi->transfer(0); // Mid-byte
+	m_outputBuffer[1] = _spi->transfer(0); // Mid-byte
-	_outputBuffer[2] = _spi->transfer(0); // LSB		
+	m_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]);
+	m_outputValue = ((long)m_outputBuffer[0] << 16) | ((long)m_outputBuffer[1] << 8) | (m_outputBuffer[2]);
-	_outputValue = convertSigned24BitToLong(_outputValue);
+	m_outputValue = convertSigned24BitToLong(m_outputValue);
 
 	CS_HIGH(); // We finished the command sequence, so we set CS to HIGH
 	_spi->endTransaction();
 
-	return(_outputValue);
+	return (m_outputValue);
 }
 
 long ADS1256::readSingleContinuous() // Reads the recently selected input channel using RDATAC
 {
-	if(_isAcquisitionRunning == false)
+	if (m_isAcquisitionRunning == false)
 	{
-	  _isAcquisitionRunning = true;
+		m_isAcquisitionRunning = true;
-	  _spi->beginTransaction(SPISettings(1920000, MSBFIRST, SPI_MODE1));
+		_spi->beginTransaction(SPISettings(SPI_FREQ, MSBFIRST, SPI_MODE1));
 		CS_LOW(); // REF: P34: "CS must stay low during the entire command sequence"
 		waitForLowDRDY();
-	  _spi->transfer(0b00000011);  //Issue RDATAC (0000 0011) 
+		_spi->transfer(RDATAC); // Issue RDATAC (0000 0011)
 		delayMicroseconds(7);	// Wait t6 time (~6.51 us) REF: P34, FIG:30.
 	}
 	else
@@ -565,42 +600,41 @@ long ADS1256::readSingleContinuous() //Reads the recently selected input channel
 		waitForLowDRDY();
 	}
 
-	_outputBuffer[0] = _spi->transfer(0); // MSB 
+	m_outputBuffer[0] = _spi->transfer(0); // MSB
-	_outputBuffer[1] = _spi->transfer(0); // Mid-byte
+	m_outputBuffer[1] = _spi->transfer(0); // Mid-byte
-	_outputBuffer[2] = _spi->transfer(0); // LSB	 
+	m_outputBuffer[2] = _spi->transfer(0); // LSB
 
-	_outputValue = ((long)_outputBuffer[0]<<16) | ((long)_outputBuffer[1]<<8) | (_outputBuffer[2]);
+	m_outputValue = ((long)m_outputBuffer[0] << 16) | ((long)m_outputBuffer[1] << 8) | (m_outputBuffer[2]);
-	_outputValue = convertSigned24BitToLong(_outputValue);			
+	m_outputValue = convertSigned24BitToLong(m_outputValue);
 
 	waitForHighDRDY();
 
-	return _outputValue;
+	return m_outputValue;
 }
 
 long ADS1256::cycleSingle()
 {
-	if(_isAcquisitionRunning == false)
+	if (m_isAcquisitionRunning == false)
 	{
-	  _isAcquisitionRunning = true;
+		m_isAcquisitionRunning = true;
-	  _cycle = 0;
+		m_cycle = 0;
-	  _spi->beginTransaction(SPISettings(1920000, MSBFIRST, SPI_MODE1));
+		_spi->beginTransaction(SPISettings(SPI_FREQ, 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(WREG | MUX_REG); // 0x50 = WREG //1 = MUX
 		_spi->transfer(0x00);
 		_spi->transfer(SING_0); // AIN0+AINCOM
-	  CS_HIGH();			
+		delayMicroseconds(250);
-	  delay(50);
-	  CS_LOW(); //CS must stay LOW during the entire sequence [Ref: P34, T24]
 	}
 	else
-	{}
-  
-	if(_cycle < 8)
 	{
-	  _outputValue = 0;
+	}
+
+	if (m_cycle < 8)
+	{
+		m_outputValue = 0;
 		waitForLowDRDY();
 		// Step 1. - Updating MUX
-      switch (_cycle)
+		switch (m_cycle)
 		{
 		// Channels are written manually
 		case 0:				   // Channel 2
@@ -636,60 +670,59 @@ long ADS1256::cycleSingle()
 			break;
 		}
 		// Step 2.
-      _spi->transfer(0b11111100); //SYNC
+		_spi->transfer(SYNC);	// SYNC
 		delayMicroseconds(4);	// t11 delay 24*tau = 3.125 us //delay should be larger, so we delay by 4 us
-      _spi->transfer(0b11111111); //WAKEUP
+		_spi->transfer(WAKEUP); // WAKEUP
 
 		// Step 3.
 		// Issue RDATA (0000 0001) command
-      _spi->transfer(0b00000001);
+		_spi->transfer(RDATA);
 		delayMicroseconds(7); // Wait t6 time (~6.51 us) REF: P34, FIG:30.
 
-	  _outputBuffer[0] = _spi->transfer(0x0F); // MSB 
+		m_outputBuffer[0] = _spi->transfer(0); // MSB
-	  _outputBuffer[1] = _spi->transfer(0x0F); // Mid-byte
+		m_outputBuffer[1] = _spi->transfer(0); // Mid-byte
-	  _outputBuffer[2] = _spi->transfer(0x0F); // LSB
+		m_outputBuffer[2] = _spi->transfer(0); // LSB
 
-	  _outputValue = ((long)_outputBuffer[0]<<16) | ((long)_outputBuffer[1]<<8) | (_outputBuffer[2]);
+		m_outputValue = ((long)m_outputBuffer[0] << 16) | ((long)m_outputBuffer[1] << 8) | (m_outputBuffer[2]);
-	  _outputValue = convertSigned24BitToLong(_outputValue);
+		m_outputValue = convertSigned24BitToLong(m_outputValue);
 
-	  _cycle++; //Increase cycle - This will move to the next MUX input channel
+		m_cycle++; // Increase cycle - This will move to the next MUX input channel
-	  if(_cycle == 8)
+		if (m_cycle == 8)
 		{
-		  _cycle = 0; //Reset to 0 - Restart conversion from the 1st input channel
+			m_cycle = 0; // Reset to 0 - Restart conversion from the 1st input channel
 		}
 	}
 
-	return _outputValue;
+	return m_outputValue;
 }
 
 long ADS1256::cycleDifferential()
 {
-	if(_isAcquisitionRunning == false)
+	if (m_isAcquisitionRunning == false)
 	{
-	  _cycle = 0;
+		m_cycle = 0;
-	  _isAcquisitionRunning = true;
+		m_isAcquisitionRunning = true;
-	  _spi->beginTransaction(SPISettings(1920000, MSBFIRST, SPI_MODE1));
+		_spi->beginTransaction(SPISettings(SPI_FREQ, 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(WREG | MUX_REG); // 0x50 = WREG //1 = MUX
 		_spi->transfer(0x00);
 		_spi->transfer(DIFF_0_1); // AIN0+AIN1
-	  CS_HIGH();	  
+		delayMicroseconds(250);
-	  delay(50);
-	  CS_LOW(); //CS must stay LOW during the entire sequence [Ref: P34, T24]
 	}
 	else
-	{}
-	
-	if(_cycle < 4)
 	{
-	  _outputValue = 0;
+	}
+
+	if (m_cycle < 4)
+	{
+		m_outputValue = 0;
 		// DRDY has to go low
 		waitForLowDRDY();
 
 		// Step 1. - Updating MUX
-      switch (_cycle)
+		switch (m_cycle)
 		{
 		case 0:					 // Channel 2
 			updateMUX(DIFF_2_3); // AIN2+AIN3
@@ -708,57 +741,57 @@ long ADS1256::cycleDifferential()
 			break;
 		}
 
-      _spi->transfer(0b11111100); //SYNC
+		_spi->transfer(SYNC);	// SYNC
 		delayMicroseconds(4);	// t11 delay 24*tau = 3.125 us //delay should be larger, so we delay by 4 us
-      _spi->transfer(0b11111111); //WAKEUP
+		_spi->transfer(WAKEUP); // WAKEUP
 
 		// Step 3.
-      _spi->transfer(0b00000001); //Issue RDATA (0000 0001) command
+		_spi->transfer(RDATA); // Issue RDATA (0000 0001) command
 		delayMicroseconds(7);  // Wait t6 time (~6.51 us) REF: P34, FIG:30.
 
-	  _outputBuffer[0] = _spi->transfer(0); // MSB 
+		m_outputBuffer[0] = _spi->transfer(0); // MSB
-	  _outputBuffer[1] = _spi->transfer(0); // Mid-byte
+		m_outputBuffer[1] = _spi->transfer(0); // Mid-byte
-	  _outputBuffer[2] = _spi->transfer(0); // LSB
+		m_outputBuffer[2] = _spi->transfer(0); // LSB
 
-	  _outputValue = ((long)_outputBuffer[0]<<16) | ((long)_outputBuffer[1]<<8) | (_outputBuffer[2]);
+		m_outputValue = ((long)m_outputBuffer[0] << 16) | ((long)m_outputBuffer[1] << 8) | (m_outputBuffer[2]);
-	  _outputValue = convertSigned24BitToLong(_outputValue);
+		m_outputValue = convertSigned24BitToLong(m_outputValue);
 
-	  _cycle++;
+		m_cycle++;
-	  if(_cycle == 4)
+		if (m_cycle == 4)
 		{
-		  _cycle = 0;
+			m_cycle = 0;
 			// After the 4th cycle, we reset to zero so the next iteration reads the 1st MUX again
 		}
 	}
 
-	return _outputValue;
+	return m_outputValue;
 }
 
 void ADS1256::updateConversionParameter()
 {
-	conversionParameter = ((2.0 * _VREF) / 8388608.0) / (pow(2, _PGA)); //Calculate the "bit to Volts" multiplier	
+	m_conversionParameter = ((2.0 * m_VREF) / 8388608.0) / (pow(2, m_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(WREG | 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
+	if (m_CS_pin != PIN_UNUSED) // Sets CS LOW if it is not an unused pin
 	{
-        digitalWrite(_CS_pin, LOW);
+		digitalWrite(m_CS_pin, LOW);
 	}
 }
 
 inline void ADS1256::CS_HIGH()
 {
-    if (_CS_pin != PIN_UNUSED) //Sets CS HIGH if it is not an unused pin
+	if (m_CS_pin != PIN_UNUSED) // Sets CS HIGH if it is not an unused pin
 	{
-        digitalWrite(_CS_pin, HIGH);
+		digitalWrite(m_CS_pin, HIGH);
 	}
 }

RotaxMonitor/lib/ADS1256/ADS1256.h

@@ -14,6 +14,10 @@
 #define _ADS1256_h
 
 #include <SPI.h>
+#include <Arduino.h>
+
+// SPI Frequency
+#define SPI_FREQ 1920000
 
 // Differential inputs
 #define DIFF_0_1 0b00000001 // A0 + A1 as differential input
@@ -96,7 +100,6 @@
 #define RESET 0b11111110
 //----------------------------------------------------------------
 
-
 class ADS1256
 {
 public:
@@ -104,6 +107,11 @@ static constexpr int8_t PIN_UNUSED = -1;
 
 	// Constructor
 	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);
+	~ADS1256()
+	{
+		vSemaphoreDelete(m_drdyHigh);
+		vSemaphoreDelete(m_drdyLow);
+	}
 
 	// Initializing function
 	void InitializeADC();
@@ -151,8 +159,23 @@ static constexpr int8_t PIN_UNUSED = -1;
 	// Stop AD
 	void stopConversion();
 
-private:
+	// functions for callback
+	inline uint8_t getDRDYpin()
+	{
+		return m_DRDY_pin;
+	}
 
+	SemaphoreHandle_t getDRDYsemaphoreHigh()
+	{
+		return m_drdyHigh;
+	}
+
+	SemaphoreHandle_t getDRDYsemaphoreLow()
+	{
+		return m_drdyLow;
+	}
+
+private:
 	SPIClass *_spi; // Pointer to an SPIClass object
 
 	void waitForLowDRDY();	// Block until DRDY is low
@@ -163,27 +186,30 @@ inline void CS_HIGH();
 
 	void updateConversionParameter(); // Refresh the conversion parameter based on the PGA
 
-float _VREF = 0; //Value of the reference voltage
+	float m_VREF = 0;				 // Value of the reference voltage
-float conversionParameter = 0; //PGA-dependent multiplier
+	float m_conversionParameter = 0; // PGA-dependent multiplier
 	// Pins
-int8_t _DRDY_pin; //Pin assigned for DRDY
+	int8_t m_DRDY_pin;	// Pin assigned for DRDY
-int8_t _RESET_pin; //Pin assigned for RESET
+	int8_t m_RESET_pin; // Pin assigned for RESET
-int8_t _SYNC_pin; //Pin assigned for SYNC
+	int8_t m_SYNC_pin;	// Pin assigned for SYNC
-int8_t _CS_pin; //Pin assigned for CS
+	int8_t m_CS_pin;	// Pin assigned for CS
 
 	// Register values
-byte _DRATE; //Value of the DRATE register
+	uint8_t m_DRATE;	 // Value of the DRATE register
-byte _ADCON; //Value of the ADCON register
+	uint8_t m_ADCON;	 // Value of the ADCON register
-byte _MUX; //Value of the MUX register
+	uint8_t m_MUX;		 // Value of the MUX register
-byte _PGA; //Value of the PGA (within ADCON)
+	uint8_t m_PGA;		 // Value of the PGA (within ADCON)
-byte _GPIO; //Value of the GPIO register
+	uint8_t m_GPIO;		 // Value of the GPIO register
-byte _STATUS; //Value of the status register
+	uint8_t m_STATUS;	 // Value of the status register
-byte _GPIOvalue; //GPIO value
+	uint8_t m_GPIOvalue; // GPIO value
-byte _ByteOrder; //Byte order
+	uint8_t m_ByteOrder; // Byte order
 
-byte _outputBuffer[3]; //3-byte (24-bit) buffer for the fast acquisition - Single-channel, continuous
+	uint8_t m_outputBuffer[3];	 // 3-byte (24-bit) buffer for the fast acquisition - Single-channel, continuous
-long _outputValue; //Combined value of the _outputBuffer[3]
+	int32_t m_outputValue;		 // Combined value of the m_outputBuffer[3]
-bool _isAcquisitionRunning; //bool that keeps track of the acquisition (running or not)
+	bool m_isAcquisitionRunning; // bool that keeps track of the acquisition (running or not)
-uint8_t _cycle; //Tracks the cycles as the MUX is cycling through the input channels
+	uint8_t m_cycle;			 // Tracks the cycles as the MUX is cycling through the input channels
+
+	SemaphoreHandle_t m_drdyHigh;
+	SemaphoreHandle_t m_drdyLow;
 };
 #endif

RotaxMonitor/lib/led/led.cpp

@@ -4,6 +4,7 @@ RGBled::RGBled(const uint8_t pin) : m_led(pin)
 {
     pinMode(m_led, OUTPUT);
     writeStatus(RGBled::ERROR);
+    m_brightness = 1.0f; 
 }
 
 RGBled::~RGBled()
@@ -11,6 +12,11 @@ RGBled::~RGBled()
     pinMode(m_led, INPUT);
 }
 
+void RGBled::setBrightness(const float b)
+{
+    m_brightness = b;
+}
+
 void RGBled::setStatus(const LedStatus s)
 {
     if (m_status == s)
@@ -27,6 +33,6 @@ const RGBled::LedStatus RGBled::getSatus(void)
 
 void RGBled::writeStatus(const RGBled::LedStatus s)
 {
-    RGBled::color_u u{.status = s};
+    const RGBled::color_u u{.status = s};
-    rgbLedWrite(m_led, u.color.r, u.color.g, u.color.b);
+    rgbLedWrite(m_led, (uint8_t)(m_brightness*u.color.r), (uint8_t)(m_brightness*u.color.g), (uint8_t)(m_brightness*u.color.b));
 }

RotaxMonitor/lib/led/led.h

@@ -50,6 +50,7 @@ public:
     RGBled(const uint8_t pin = 48);
     ~RGBled();
 
+    void setBrightness(const float b);
     void setStatus(const LedStatus s);
     const LedStatus getSatus(void);
 
@@ -59,5 +60,6 @@ private:
 private:
     LedStatus m_status = LedStatus::IDLE;
     std::mutex m_mutex;
+    float m_brightness;
     const uint8_t m_led;
 };

RotaxMonitor/platformio.ini

@@ -28,7 +28,7 @@ monitor_port = /dev/ttyACM0
 monitor_speed = 921600
 build_type = release
 build_flags = 
-	-DCORE_DEBUG_LEVEL=1
+	-DCORE_DEBUG_LEVEL=5
 	-DARDUINO_USB_CDC_ON_BOOT=0
 	-DARDUINO_USB_MODE=0
 	-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=5000
@@ -59,7 +59,7 @@ build_flags =
 	-O0
 	-g3
 	-ggdb3
-	-DCORE_DEBUG_LEVEL=3
+	-DCORE_DEBUG_LEVEL=5
 	-DARDUINO_USB_CDC_ON_BOOT=0
 	-DARDUINO_USB_MODE=0
 	-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=5000

RotaxMonitor/src/datasave.cpp

@@ -1,8 +1,6 @@
 #include "datasave.h"
 #include <math.h>
 
-
-
 LITTLEFSGuard::LITTLEFSGuard()
 {
     if (!LittleFS.begin(true, "/littlefs", 10, "littlefs"))
@@ -50,7 +48,6 @@ void ignitionBoxStatusFiltered::update(const ignitionBoxStatus &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
@@ -72,7 +69,7 @@ void ignitionBoxStatusFiltered::update(const ignitionBoxStatus &new_status)
     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
+    m_last.n_queue_errors = new_status.n_queue_errors;
 
     if (m_count >= m_max_count)
     {
@@ -124,4 +121,3 @@ const ArduinoJson::JsonDocument ignitionBoxStatusFiltered::toJson() const
     }
     return doc;
 }
-

RotaxMonitor/src/devices.h

@@ -9,7 +9,8 @@
 // Device Libraries
 #include <ADS1256.h>
 #include <AD5292.h>
-#include <PCA95x5.h>
+#include <extio.h>
+#include <Wire.h>
 
 // ADC Channel mapping
 #define ADC_CH_PEAK_12P_IN SING_0
@@ -24,34 +25,31 @@
 // Device Pointer structs for tasks
 struct Devices
 {
+    // Busses
+    std::unique_ptr<TwoWire> m_i2c = nullptr;
     std::unique_ptr<SPIClass> m_spi_a = nullptr;
     std::unique_ptr<SPIClass> m_spi_b = nullptr;
 
+    // Bus Mutextes
+    std::mutex m_spi_a_mutex;
+    std::mutex m_spi_b_mutex;
+    std::mutex m_i2c_mutex;
+
+    // Device Pointers
     std::unique_ptr<AD5292> m_pot_a = nullptr;
     std::unique_ptr<AD5292> m_pot_b = nullptr;
 
     std::unique_ptr<ADS1256> m_adc_a = nullptr;
     std::unique_ptr<ADS1256> m_adc_b = nullptr;
 
-    std::unique_ptr<PCA9555> m_expander_a = nullptr;
+    std::unique_ptr<ExternalIO> m_ext_io = nullptr;
-    std::unique_ptr<PCA9555> m_expander_b = nullptr;
-    std::unique_ptr<PCA9555> m_expander_inputs_ab = nullptr;
-
-    std::mutex m_spi_a_mutex;
-    std::mutex m_spi_b_mutex;
-
-    std::mutex m_i2c_mutex;
 };
 
 // Adc read channel wrapper to selet mux before reading
 inline float adcReadChannel(ADS1256 *adc, const uint8_t ch)
 {
     adc->setMUX(ch);
-    // scarta 3 conversioni
-    for (int i = 0; i < 3; i++)
-    {
     adc->readSingle();
-    }
     // ora lettura valida a 30kSPS → ~100 µs di settling
     return adc->convertToVoltage(adc->readSingle());
 }

RotaxMonitor/src/extio.cpp

@@ -0,0 +1,129 @@
+#include <extio.h>
+
+// Static interrupt callback
+static void onExpanderInterrupt(void *arg)
+{
+    auto cls = (ExternalIO *)(arg);
+    if (!cls) // invalid args
+        return;
+    cls->extReadInterrupt();
+}
+
+ExternalIO::ExternalIO(TwoWire &i2c, std::mutex &i2c_mutex, const uint8_t int_pin) : m_i2cMutex(i2c_mutex), m_i2c(i2c), m_intPin(int_pin)
+{
+    std::lock_guard<std::mutex> lock(m_i2cMutex);
+    // Attach OUT expanders on BUS
+    m_outMap[EXPANDER_A_OUT_ADDR] = std::make_unique<PCA9555>();
+    m_outMap[EXPANDER_A_OUT_ADDR]->attach(m_i2c, EXPANDER_A_OUT_ADDR);
+    m_outMap[EXPANDER_B_OUT_ADDR] = std::make_unique<PCA9555>();
+    m_outMap[EXPANDER_B_OUT_ADDR]->attach(m_i2c, EXPANDER_B_OUT_ADDR);
+
+    for (auto &[a, e] : m_outMap)
+    {
+        e->direction(PCA95x5::Direction::OUT_ALL);
+        e->polarity(PCA95x5::Polarity::ORIGINAL_ALL);
+    };
+
+    // Attach IN Expanders on Bus
+    m_inMap[EXPANDER_A_IN_ADDR] = std::make_unique<PCA9555>();
+    m_inMap[EXPANDER_A_IN_ADDR]->attach(m_i2c, EXPANDER_A_IN_ADDR);
+    m_inMap[EXPANDER_B_IN_ADDR] = std::make_unique<PCA9555>();
+    m_inMap[EXPANDER_B_IN_ADDR]->attach(m_i2c, EXPANDER_B_IN_ADDR);
+
+    for (auto &[a, e] : m_inMap)
+    {
+        e->direction(PCA95x5::Direction::IN_ALL);
+        e->polarity(PCA95x5::Polarity::ORIGINAL_ALL);
+        m_lastInputState[a] = e->read(); /// initialize input state to collect interrupts
+    };
+}
+ExternalIO::~ExternalIO() {
+
+}
+
+void ExternalIO::extDigitalWrite(const uint32_t mappedPin, const bool val)
+{
+    std::lock_guard<std::mutex> lock(m_i2cMutex);
+    const io_t pa = map2pin(mappedPin);
+    if (!m_outMap.contains(pa.addr))
+    {
+        LOG_ERROR("Undefined IO Expander addr: [", pa.addr, "]");
+        return;
+    }
+    auto &io = m_outMap.at(pa.addr);
+    if (!io->write(static_cast<PCA95x5::Port::Port>(pa.pin), val ? PCA95x5::Level::H : PCA95x5::Level::L))
+    {
+        LOG_ERROR("IO Expander [", pa.addr, "] Unable to WRITE Port [", pa.pin, "] to [", val ? "HIGH" : "LOW");
+        LOG_ERROR("IO Expander Error [", io->i2c_error(), "]");
+    }
+}
+
+const bool ExternalIO::extDigitalRead(const uint32_t mappedPin)
+{
+    std::lock_guard<std::mutex> lock(m_i2cMutex);
+    const io_t pa = map2pin(mappedPin);
+    if (!m_inMap.contains(pa.addr))
+    {
+        LOG_ERROR("Undefined IO Expander addr: [", pa.addr, "]");
+        return false;
+    }
+    auto &io = m_inMap.at(pa.addr);
+    const bool rv = io->read(static_cast<PCA95x5::Port::Port>(pa.pin)) == PCA95x5::Level::H ? true : false; // read value
+    const uint8_t err = io->i2c_error();
+    if (err)
+    {
+        LOG_ERROR("IO Expander [", pa.addr, "] Unable to READ Port [", pa.pin, "]");
+        LOG_ERROR("IO Expander Error [", err, "]");
+    }
+    return rv;
+}
+
+void ExternalIO::extAttachInterrupt(ExtInterruptCb cb)
+{
+    attachInterruptArg(EXPANDER_ALL_INTERRUPT, onExpanderInterrupt, (void *)(this), FALLING);
+    m_extInterruptCb = cb;
+}
+
+void ExternalIO::extDetachInterrupt()
+{
+    detachInterrupt(EXPANDER_ALL_INTERRUPT);
+}
+
+void ExternalIO::extReadInterrupt()
+{
+    std::lock_guard<std::mutex> lock(m_i2cMutex);
+    disableInterrupt(EXPANDER_ALL_INTERRUPT);
+    // read all registers and collect
+    IOstate interruptState;
+    for (auto &[a, e] : m_inMap)
+    {
+        interruptState[a] = e->read();
+    }
+    m_lastInputState = interruptState; // restore to current values
+    // compare to last state to see the difference
+    if (m_extInterruptCb)
+    {
+        for (auto &[a, v] : interruptState)
+        {
+            if (v)
+                m_extInterruptCb(stat2map(a, v));
+        }
+    }
+
+    enableInterrupt(EXPANDER_ALL_INTERRUPT);
+}
+
+const ExternalIO::io_t ExternalIO::map2pin(const uint32_t mappedIO)
+{
+    return io_t{
+        .addr = (uint8_t)((mappedIO >> 16) & (uint8_t)0xFF),
+        .pin = (uint8_t)(mappedIO && (uint32_t)0xFF),
+    };
+}
+
+const uint32_t ExternalIO::stat2map(const uint8_t addr, const uint16_t stat)
+{
+    if (!stat)
+        return 0;
+    return (uint32_t)(addr << 16) | (1UL << __builtin_ctz(stat));
+}

RotaxMonitor/src/extio.h

@@ -0,0 +1,49 @@
+#pragma once
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_DEBUG
+
+#include <Arduino.h>
+#include <DebugLog.h>
+#include <PCA95x5.h>
+
+#include <pins.h>
+
+#include <memory>
+#include <map>
+
+class ExternalIO
+{
+    using IOptr = std::unique_ptr<PCA9555>;
+    using IOmap = std::map<const uint8_t, IOptr>;
+    using IOstate = std::map<const uint8_t, uint16_t>;
+    using ExtInterruptCb = std::function<void(const uint32_t)>;
+
+    struct io_t
+    {
+        uint8_t addr;
+        uint8_t pin;
+    };
+
+public:
+    ExternalIO(TwoWire &i2c, std::mutex &i2c_mutex, const uint8_t int_pin);
+    ~ExternalIO();
+
+    void extDigitalWrite(const uint32_t mappedPin, const bool val);
+    const bool extDigitalRead(const uint32_t mappedPin);
+    void extAttachInterrupt(ExtInterruptCb cb = nullptr);
+    void extDetachInterrupt();
+    void extReadInterrupt();
+
+private:
+    const io_t map2pin(const uint32_t mappedIO);
+    const uint32_t stat2map(const uint8_t addr, const uint16_t stat);
+
+private:
+    const uint8_t m_intPin;
+    IOmap m_inMap;
+    IOmap m_outMap;
+    uint8_t m_intPinChanged;
+    IOstate m_lastInputState;
+    ExtInterruptCb m_extInterruptCb = nullptr;
+    std::mutex &m_i2cMutex;
+    TwoWire &m_i2c;
+};

RotaxMonitor/src/main.cpp

@@ -17,12 +17,13 @@
 #include <led.h>
 
 // Defines to enable channel B
-#define CH_B_ENABLE
+// #define CH_B_ENABLE
-// #define TEST
 
 // Debug Defines
 #define WIFI_SSID "AstroRotaxMonitor"
 #define WIFI_PASSWORD "maledettirotax"
+#define PSRAM_MAX 4096
+#define QUEUE_MAX 256
 
 void setup()
 {
@@ -31,7 +32,7 @@ void setup()
 
     // Setup Logger
     LOG_ATTACH_SERIAL(Serial);
-    LOG_SET_LEVEL(DebugLogLevel::LVL_DEBUG);
+    LOG_SET_LEVEL(DebugLogLevel::LVL_INFO);
 
     // Print Processor Info
     LOG_DEBUG("ESP32 Chip:", ESP.getChipModel());
@@ -52,7 +53,7 @@ void setup()
     IPAddress gateway(10, 11, 12, 1);
     IPAddress subnet(255, 255, 255, 0);
     WiFi.softAPConfig(local_IP, gateway, subnet);
-    WiFi.setTxPower(WIFI_POWER_13dBm); // reduce wifi power
+    WiFi.setTxPower(WIFI_POWER_5dBm); // reduce wifi power
     if (WiFi.softAP(WIFI_SSID, WIFI_PASSWORD))
     {
         LOG_INFO("WiFi AP Mode Started");
@@ -79,23 +80,30 @@ void loop()
 {
     // global variables
     RGBled led;
+    led.setBrightness(0.025f);
     led.setStatus(RGBled::LedStatus::INIT);
+
+    std::shared_ptr<Devices> dev = std::make_shared<Devices>();
     bool running = true;
     std::mutex fs_mutex;
     LITTLEFSGuard fsGuard;
 
-    //////// INIT SPI PORTS ////////
+    //////// INIT SPI INTERFACES ////////
     bool spiA_ok = true;
     bool spiB_ok = true;
-    // Init 2 SPI interfaces
+    LOG_DEBUG("Init SPI Interfaces");
-//     SPIClass SPI_A(FSPI);
+    SPIClass SPI_A(FSPI);
-//     spiA_ok = SPI_A.begin(SPI_A_SCK, SPI_A_MISO, SPI_A_MOSI);
+    spiA_ok = SPI_A.begin(SPI_A_SCK, SPI_A_MISO, SPI_A_MOSI);
-//     SPI_A.setDataMode(SPI_MODE1); // ADS1256 requires SPI mode 1
+    SPI_A.setDataMode(SPI_MODE1); // ADS1256 requires SPI mode 1
-// #ifdef CH_B_ENABLE
+    LOG_DEBUG("Init SPI A ok");
-//     SPIClass SPI_B(HSPI);
+#ifdef CH_B_ENABLE
-//     spiB_ok = SPI_B.begin(SPI_B_SCK, SPI_B_MISO, SPI_B_MOSI);
+    delay(50);
-//     SPI_B.setDataMode(SPI_MODE1); // ADS1256 requires SPI mode 1
+    SPIClass SPI_B(HSPI);
-// #endif
+    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");
+#endif
+
     if (!spiA_ok || !spiB_ok)
     {
         LOG_ERROR("Unable to Initialize SPI Busses");
@@ -103,25 +111,42 @@ void loop()
         vTaskDelay(pdMS_TO_TICKS(5000));
         esp_restart();
     }
+    dev->m_spi_a.reset(&SPI_A);
+#ifdef CH_B_ENABLE
+    dev->m_spi_b.reset(&SPI_B);
+#endif
+    // Init ADCs
+    dev->m_adc_a = std::make_unique<ADS1256>(ADC_A_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_A_CS, 2.5, &SPI_A);
+#ifdef CH_B_ENABLE
+    dev->m_adc_b = std::make_unique<ADS1256>(ADC_B_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_B_CS, 2.5, &SPI_B);
+#endif
+    // Configure ADCs
+    dev->m_adc_a->InitializeADC();
+    dev->m_adc_a->setPGA(PGA_1);
+    dev->m_adc_a->setDRATE(DRATE_7500SPS);
+#ifdef CH_B_ENABLE
+    dev->m_adc_b->InitializeADC();
+    dev->m_adc_b->setPGA(PGA_1);
+    dev->m_adc_b->setDRATE(DRATE_30000SPS);
+#endif
     LOG_DEBUG("Init SPI OK");
 
-    // Resources Initialization
+    //////// INIT I2C INTERFACES ////////
-    std::shared_ptr<Devices> dev = std::make_shared<Devices>();
+    LOG_DEBUG("Init I2C Interfaces");
-    // dev->m_spi_a = std::make_unique<SPIClass>(SPI_A);
+    bool i2c_ok = true;
-    // dev->m_spi_b = std::make_unique<SPIClass>(SPI_B);
+    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();
+    }
 
-    // // Init ADC_A
+    // Init IO Expanders
-    // dev->m_adc_a = std::make_unique<ADS1256>(ADC_A_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_A_CS, 2.5, &SPI_A);
+    // dev->m_ext_io = std::make_unique<ExternalIO>(Wire, dev->m_i2c_mutex, EXPANDER_ALL_INTERRUPT);
-    // dev->m_adc_b = std::make_unique<ADS1256>(ADC_B_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_B_CS, 2.5, &SPI_B);
-
-    // dev->m_adc_a->InitializeADC();
-    // dev->m_adc_a->setPGA(PGA_1);
-    // dev->m_adc_a->setDRATE(DRATE_7500SPS);
-
-    // dev->m_adc_b->InitializeADC();
-    // dev->m_adc_b->setPGA(PGA_1);
-    // dev->m_adc_b->setDRATE(DRATE_7500SPS);
 
+    //////// INIT REALTIME TASKS PARAMETERS ////////
     const rtIgnitionTask::rtTaskParams taskA_params{
         .rt_running = true,
         .name = "rtIgnTask_A",
@@ -184,9 +209,10 @@ void loop()
         .rt_queue = nullptr,
         .dev = dev};
 
-    auto task_A = rtIgnitionTask(taskA_params, 4096, 256, CORE_0, fs_mutex);
+    //////// SPAWN REALTIME TASKS ////////
+    auto task_A = rtIgnitionTask(taskA_params, PSRAM_MAX, QUEUE_MAX, CORE_0, fs_mutex);
     delay(50);
-    auto task_B = rtIgnitionTask(taskB_params, 4096, 256, CORE_1, fs_mutex);
+    auto task_B = rtIgnitionTask(taskB_params, PSRAM_MAX, QUEUE_MAX, CORE_1, fs_mutex);
 
     // Ignition A on Core 0
     auto ignA_task_success = task_A.getStatus() == rtIgnitionTask::OK ? pdPASS : pdFAIL;
@@ -206,22 +232,26 @@ void loop()
     {
         led.setStatus(RGBled::LedStatus::ERROR);
         LOG_ERROR("Unable to start realtime tasks");
-    } else 
+    }
+    else
+    {
         LOG_DEBUG("Real Time Tasks A & B initialized");
         led.setStatus(RGBled::LedStatus::OK);
+    }
 
-    AstroWebServer webPage(80, LittleFS); // Initialize webserver and Websocket
+    //////// SPAWN WEBSERVER and WEBSOCKET ////////
+    AstroWebServer webPage(80, LittleFS);
     ArduinoJson::JsonDocument json_data;
     bool data_a, data_b;
-    task_A.onMessage([&webPage, &json_data, &data_a](ignitionBoxStatusFiltered sts){
+    task_A.onMessage([&webPage, &json_data, &data_a](ignitionBoxStatusFiltered sts)
+                     {
         json_data["box_a"] = sts.toJson();
-        data_a = true;
+        data_a = true; });
-    });
 
-    task_B.onMessage([&webPage, &json_data, &data_b](ignitionBoxStatusFiltered sts){
+    task_B.onMessage([&webPage, &json_data, &data_b](ignitionBoxStatusFiltered sts)
+                     {
         json_data["box_b"] = sts.toJson();
-        data_b = true;
+        data_b = true; });
-    });
 
     // task_A.enableSave(true, "ignitionA_test.csv");
     // task_B.enableSave(true, "ignitionB_test.csv");
@@ -238,7 +268,8 @@ void loop()
             printRunningTasksMod(Serial);
             monitor_loop = millis();
         }
-        if ((data_a && data_b) || (this_loop - data_loop > 500)) {
+        if ((data_a && data_b) || (this_loop - data_loop > 500))
+        {
             webPage.sendWsData(json_data.as<String>());
             json_data.clear();
             data_a = data_b = false;

RotaxMonitor/src/pins.h

@@ -53,12 +53,6 @@
 #define ADC_B_CS 21
 #define ADC_B_DRDY 47
 
-// =====================
-// DIGITAL POT
-// =====================
-#define POT_A_CS 18
-#define POT_B_CS 35
-
 // =====================
 // TRIGGER INPUT INTERRUPTS
 // =====================
@@ -79,86 +73,87 @@
 #define SPARK_PIN_B12 1
 #define SPARK_PIN_B34 2
 
-// =====================
+// +++++++++++++++++++++
-// PCA9555 I/O EXPANDER BOX_A
+// MACRO TO COMBINE PIN NUMBER AND ADDRESS
-// =====================
+#define PIN2ADDR(p, a) ((1UL << p) | ((uint32_t)(a) << 16))
+// +++++++++++++++++++++
 
-#define EXPANDER_A_ADDR 0x010101
+// =====================
+// PCA9555 I/O EXPANDER INTERRUPT (Common)
+// =====================
+#define EXPANDER_ALL_INTERRUPT 17
+
+// =====================
+// PCA9555 I/O EXPANDER BOX_A (OUT)
+// =====================
+#define EXPANDER_A_OUT_ADDR 0xFF
 
 // --- DIGITAL POT CHIP SELECT LINES ---
-#define POT_CS_A12 0
+#define POT_CS_A12 PIN2ADDR(0, EXPANDER_A_OUT_ADDR)
-#define POT_CS_A34 1
+#define POT_CS_A34 PIN2ADDR(1, EXPANDER_A_OUT_ADDR)
 
 // --- SOFT START FORCE LINES ---
-#define SS_FORCE_A 2
+#define SS_FORCE_A PIN2ADDR(2, EXPANDER_A_OUT_ADDR)
-#define SS_INIBHIT_A12 3
+#define SS_INIBHIT_A12 PIN2ADDR(3, EXPANDER_A_OUT_ADDR)
-#define SS_INHIBIT_A34 4
+#define SS_INHIBIT_A34 PIN2ADDR(4, EXPANDER_A_OUT_ADDR)
 
 // --- SAMPLE AND HOLD ARM AND DISCHARGE ---
-#define SH_DISCH_A12 5
+#define SH_DISCH_A12 PIN2ADDR(5, EXPANDER_A_OUT_ADDR)
-#define SH_DISCH_A34 6
+#define SH_DISCH_A34 PIN2ADDR(6, EXPANDER_A_OUT_ADDR)
-#define SH_ARM_A12 7
+#define SH_ARM_A12 PIN2ADDR(7, EXPANDER_A_OUT_ADDR)
-#define SH_ARM_A34 8
+#define SH_ARM_A34 PIN2ADDR(8, EXPANDER_A_OUT_ADDR)
 
 // --- RELAY ---
-#define RELAY_IN_A12 9
+#define RELAY_IN_A12 PIN2ADDR(9, EXPANDER_A_OUT_ADDR)
-#define RELAY_OUT_A12 10
+#define RELAY_OUT_A12 PIN2ADDR(10, EXPANDER_A_OUT_ADDR)
-#define RELAY_IN_A34 11
+#define RELAY_IN_A34 PIN2ADDR(11, EXPANDER_A_OUT_ADDR)
-#define RELAY_OUT_A34 12
+#define RELAY_OUT_A34 PIN2ADDR(12, EXPANDER_A_OUT_ADDR)
-
-// --- STATUS / BUTTON ---
-#define STA_2 13
-#define STA_3 14
-#define STA_4 15
 
 // =====================
-// PCA9555 I/O EXPANDER BOX_B
+// PCA9555 I/O EXPANDER BOX_A (IN)
 // =====================
+#define EXPANDER_A_IN_ADDR 0xFF
 
-#define EXPANDER_B_ADDR 0x101010
+#define SS_A12_ON PIN2ADDR(0, EXPANDER_A_IN_ADDR)
+#define SS_A12_OFF PIN2ADDR(1, EXPANDER_A_IN_ADDR)
+#define SS_A34_ON PIN2ADDR(2, EXPANDER_A_IN_ADDR)
+#define SS_A34_OFF PIN2ADDR(3, EXPANDER_A_IN_ADDR)
+
+// =====================
+// PCA9555 I/O EXPANDER BOX_B (OUT)
+// =====================
+#define EXPANDER_B_OUT_ADDR 0xFF
 
 // --- DIGITAL POT CHIP SELECT LINES ---
-#define POT_CS_B12 0
+#define POT_CS_B12 PIN2ADDR(0, EXPANDER_B_OUT_ADDR)
-#define POT_CS_B34 1
+#define POT_CS_B34 PIN2ADDR(1, EXPANDER_B_OUT_ADDR)
 
 // --- SOFT START FORCE LINES ---
-#define SS_FORCE_B 2
+#define SS_FORCE_B PIN2ADDR(2, EXPANDER_B_OUT_ADDR)
-#define SS_INIBHIT_B12 3
+#define SS_INIBHIT_B12 PIN2ADDR(3, EXPANDER_B_OUT_ADDR)
-#define SS_INHIBIT_B34 4
+#define SS_INHIBIT_B34 PIN2ADDR(4, EXPANDER_B_OUT_ADDR)
 
 // --- SAMPLE AND HOLD ARM AND DISCHARGE ---
-#define SH_DISCH_B12 5
+#define SH_DISCH_B12 PIN2ADDR(5, EXPANDER_B_OUT_ADDR)
-#define SH_DISCH_B34 6
+#define SH_DISCH_B34 PIN2ADDR(6, EXPANDER_B_OUT_ADDR)
-#define SH_ARM_B12 7
+#define SH_ARM_B12 PIN2ADDR(7, EXPANDER_B_OUT_ADDR)
-#define SH_ARM_B34 8
+#define SH_ARM_B34 PIN2ADDR(8, EXPANDER_B_OUT_ADDR)
 
 // --- RELAY ---
-#define RELAY_IN_B12 9
+#define RELAY_IN_B12 PIN2ADDR(9, EXPANDER_B_OUT_ADDR)
-#define RELAY_OUT_B12 10
+#define RELAY_OUT_B12 PIN2ADDR(10, EXPANDER_B_OUT_ADDR)
-#define RELAY_IN_B34 11
+#define RELAY_IN_B34 PIN2ADDR(11, EXPANDER_B_OUT_ADDR)
-#define RELAY_OUT_B34 12
+#define RELAY_OUT_B34 PIN2ADDR(12, EXPANDER_B_OUT_ADDR)
-
-// --- STATUS / BUTTON ---
-#define STA_2 13
-#define STA_3 14
-#define STA_4 15
 
 // =====================
-// PCA9555 I/O EXPANDER INPUTS A+B
+// PCA9555 I/O EXPANDER BOX_B (IN)
 // =====================
+#define EXPANDER_B_IN_ADDR 0xFF
 
-#define EXPANDER_IN_ADDR 0x0a0a0a
+#define SS_B12_ON PIN2ADDR(0, EXPANDER_B_IN_ADDR)
-
+#define SS_B12_OFF PIN2ADDR(1, EXPANDER_B_IN_ADDR)
-#define SS_A12_ON
+#define SS_B34_ON PIN2ADDR(2, EXPANDER_B_IN_ADDR)
-#define SS_A12_OFF
+#define SS_B34_OFF PIN2ADDR(3, EXPANDER_B_IN_ADDR)
-#define SS_A34_ON
-#define SS_A34_OFF
-
-#define SS_B12_ON
-#define SS_B12_OFF
-#define SS_B34_ON
-#define SS_B34_OFF
-
 
 // Init Pin Functions
 inline void initTriggerPinsInputs()

RotaxMonitor/src/tasks.cpp

@@ -1,6 +1,7 @@
 #include "tasks.h"
 #include <esp_timer.h>
 #include <datasave.h>
+#include <mutex>
 
 //// GLOBAL STATIC FUNCTIONS
 
@@ -38,14 +39,14 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
     const rtTaskIOParams rt_rst = params->rt_io;         // copy to avoid external override
     QueueHandle_t rt_queue = params->rt_queue;
     Devices *dev = params->dev.get();
-    ADS1256 *adc = dev->m_adc_a.get();
+    ADS1256 *adc = params->name == "rtIgnTask_A" ? dev->m_adc_a.get() : dev->m_adc_b.get();
-    PCA9555 *io = dev->m_expander_a.get();
+    std::mutex &spi_mutex = params->name == "rtIgnTask_A" ? dev->m_spi_a_mutex : dev->m_spi_b_mutex;
+    ExternalIO *io = dev->m_ext_io.get();
 
     TaskStatus_t rt_task_info;
     vTaskGetInfo(NULL, &rt_task_info, pdFALSE, eInvalid);
 
-    const auto rt_task_name = pcTaskGetName(rt_task_info.xHandle);
+    LOG_INFO("rtTask Params OK [", params->name.c_str(), "]");
-    LOG_INFO("rtTask Params OK [", rt_task_name, "]");
 
     ignitionBoxStatus ign_box_sts;
 
@@ -96,7 +97,7 @@ 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 [", rt_task_name, "]");
+    LOG_INFO("rtTask ISR Attach OK [", params->name.c_str(), "]");
 
     // Global rt_task_ptr variables
     bool first_cycle = true;
@@ -234,17 +235,19 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
             //  read adc channels: pickup12, out12 [ pos + neg ]
             if (adc) // read only if adc initialized
             {
+                std::lock_guard<std::mutex> lock(spi_mutex);
                 uint32_t start_adc_read = esp_timer_get_time();
                 // from peak detector circuits
-                ign_box_sts.coils12.peak_p_in = adcReadChannel(adc, ADC_CH_PEAK_12P_IN);
+                ign_box_sts.coils12.peak_p_in = adc->convertToVoltage(adc->cycleSingle());
-                ign_box_sts.coils12.peak_n_in = adcReadChannel(adc, ADC_CH_PEAK_12N_IN);
+                ign_box_sts.coils12.peak_n_in = adc->convertToVoltage(adc->cycleSingle());
-                ign_box_sts.coils34.peak_p_in = adcReadChannel(adc, ADC_CH_PEAK_34P_IN);
+                ign_box_sts.coils34.peak_p_in = adc->convertToVoltage(adc->cycleSingle());
-                ign_box_sts.coils34.peak_n_in = adcReadChannel(adc, ADC_CH_PEAK_34N_IN);
+                ign_box_sts.coils34.peak_n_in = adc->convertToVoltage(adc->cycleSingle());
-                ign_box_sts.coils12.peak_p_out = adcReadChannel(adc, ADC_CH_PEAK_12P_OUT);
+                ign_box_sts.coils12.peak_p_out =adc->convertToVoltage(adc->cycleSingle());
-                ign_box_sts.coils12.peak_n_out = adcReadChannel(adc, ADC_CH_PEAK_12N_OUT);
+                ign_box_sts.coils12.peak_n_out =adc->convertToVoltage(adc->cycleSingle());
-                ign_box_sts.coils34.peak_p_out = adcReadChannel(adc, ADC_CH_PEAK_34P_OUT);
+                ign_box_sts.coils34.peak_p_out =adc->convertToVoltage(adc->cycleSingle());
-                ign_box_sts.coils34.peak_n_out = adcReadChannel(adc, ADC_CH_PEAK_34N_OUT);
+                ign_box_sts.coils34.peak_n_out =adc->convertToVoltage(adc->cycleSingle());
                 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(c_adc_time));
@@ -253,10 +256,23 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
             // outputs on io expander
             if (io)
             {
-                // [TODO] code to reset sample and hold and arm trigger level detectors
+                // Discharge Pulse
+                io->extDigitalWrite(rt_rst.sh_disch_12, true);
+                io->extDigitalWrite(rt_rst.sh_disch_34, true);
+                delayMicroseconds(250);
+                io->extDigitalWrite(rt_rst.sh_disch_12, false);
+                io->extDigitalWrite(rt_rst.sh_disch_34, false);
+                // Safety delay
+                delayMicroseconds(500);
+                // Re-Arm Pulse
+                io->extDigitalWrite(rt_rst.sh_arm_12, true);
+                io->extDigitalWrite(rt_rst.sh_arm_34, true);
+                delayMicroseconds(250);
+                io->extDigitalWrite(rt_rst.sh_arm_12, false);
+                io->extDigitalWrite(rt_rst.sh_arm_34, false);
             }
             else
-                vTaskDelay(pdMS_TO_TICKS(1));
+                vTaskDelay(pdMS_TO_TICKS(c_io_time));
 
             // send essage to main loop with ignition info, by copy so local static variable is ok
             if (rt_queue)
@@ -269,7 +285,7 @@ void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
     }
     // Delete the timeout timer
     esp_timer_delete(timeout_timer);
-    LOG_WARN("rtTask Ending [", rt_task_name, "]");
+    LOG_WARN("rtTask Ending [", params->name.c_str(), "]");
     // Ignition A Interrupts DETACH
     detachInterrupt(rt_int.trig_pin_12p);
     detachInterrupt(rt_int.trig_pin_12n);

RotaxMonitor/src/tasks.h

@@ -59,19 +59,19 @@ public:
     struct rtTaskIOParams
     {
         const uint32_t expander_addr;
-        const uint8_t pot_cs_12;
+        const uint32_t pot_cs_12;
-        const uint8_t pot_cs_34;
+        const uint32_t pot_cs_34;
-        const uint8_t ss_force;
+        const uint32_t ss_force;
-        const uint8_t ss_inhibit_12;
+        const uint32_t ss_inhibit_12;
-        const uint8_t ss_inhibit_34;
+        const uint32_t ss_inhibit_34;
-        const uint8_t sh_disch_12;
+        const uint32_t sh_disch_12;
-        const uint8_t sh_disch_34;
+        const uint32_t sh_disch_34;
-        const uint8_t sh_arm_12;
+        const uint32_t sh_arm_12;
-        const uint8_t sh_arm_34;
+        const uint32_t sh_arm_34;
-        const uint8_t relay_in_12;
+        const uint32_t relay_in_12;
-        const uint8_t relay_in_34;
+        const uint32_t relay_in_34;
-        const uint8_t relay_out_12;
+        const uint32_t relay_out_12;
-        const uint8_t relay_out_34;
+        const uint32_t relay_out_34;
     };
 
     // RT task parameters

RotaxMonitorTester/platformio.ini

@@ -22,7 +22,7 @@ build_type = release
 [env:esp32-devtest-debug]
 board = esp32dev
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
-
+framework = arduino
 lib_deps = 
 	hideakitai/DebugLog@^0.8.4
 board_build.flash_size = 4MB

RotaxMonitorTester/src/colors.h

@@ -0,0 +1,12 @@
+#pragma once
+
+// ANSI colors
+#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"

RotaxMonitorTester/src/main.cpp

@@ -4,6 +4,8 @@
 #include <DebugLog.h>
 
 #include "timer.h"
+#include "colors.h"
+
 #include <map>
 
 static hw_timer_t *timerA = NULL;
@@ -17,6 +19,12 @@ static uint32_t count = 0;
 #define SPARK_DLY_MIN 10
 #define SPARK_DLY_MAX 490
 
+#define COIL_PULSE_MIN 100
+#define COIL_PULSE_MAX 1000
+
+#define SPARK_PULSE_MIN 10
+#define SPARK_PULSE_MAX 500
+
 #define PAUSE_LONG_MIN 5000
 #define PAUSE_LONG_MAX PAUSE_LONG_MIN * 100
 
@@ -30,7 +38,8 @@ void clearScreen()
   Serial.flush();
 }
 
-static double filtered_rpm = 0;
+static uint32_t set_rpm = 500;
+static uint32_t set_delay = 100;
 
 static const std::map<const uint32_t, const char *> pin2Name = {
     {PIN_TRIG_A12P, "HIGH_PIN_TRIG_A12P"},
@@ -68,7 +77,7 @@ static timerStatus stsB = {
     .clock_period_us = (uint32_t)PERIOD_US,
     .pause_long_us = 10000,
     .pause_short_us = 1000,
-    .coil_pulse_us = 1000,
+    .coil_pulse_us = 500,
     .spark_pulse_us = 100,
     .spark_delay_us = 50,
     .pins = {
@@ -83,11 +92,14 @@ static timerStatus stsB = {
 static bool isEnabled_A = false;
 static bool isEnabled_B = false;
 
+static String last_command;
+
 void setup()
 {
 
   Serial.begin(115200);
   delay(1000);
+  Serial.setTimeout(100);
   LOG_ATTACH_SERIAL(Serial);
 
   pinMode(PIN_TRIG_A12P, OUTPUT);
@@ -133,9 +145,89 @@ void setup()
 
 void loop()
 {
-  LOG_INFO("Loop: ", count++);
+  clearScreen();
-  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;
+  Serial.printf("\t++++ Loop: %u ++++\n", count++);
+
+  if (isEnabled_A)
+    Serial.println("==== System A is" COLOR_GREEN " ENABLED" COLOR_RESET " ====");
+  else
+    Serial.println("==== System A is" COLOR_RED " DISABLED" COLOR_RESET " ====");
+
+  if (isEnabled_B)
+    Serial.println("==== System B is" COLOR_GREEN " ENABLED" COLOR_RESET " ====");
+  else
+    Serial.println("==== System B is" COLOR_RED " DISABLED" COLOR_RESET " ====");
+
+  Serial.printf("Spark Delay uS: %u\n", stsA.spark_delay_us);
+  Serial.printf("Soft Start: %s\n", stsA.soft_start ? "ENABLED" : "DISABLED");
+  Serial.printf("Engine Rpm: %u\n", (uint32_t)(set_rpm));
+  Serial.printf("Coil Pulse: %u uS\n", stsA.coil_pulse_us);
+  Serial.printf("Spark Pulse: %u uS\n", stsA.spark_pulse_us);
+  Serial.println(COLOR_CYAN "-------------------------------------");
+  Serial.println("E[a/b] > Enable Box a/b | D[a/b]  > Disable a/b");
+  Serial.println("S[ddd] > Spark Delay    | R[dddd] > Engine RPM");
+  Serial.println("C[ddd] > Spark Pulse    | P[ddd]  > Coil Pulse");
+  Serial.println("-------------------------------------" COLOR_RESET);
+  Serial.printf("Last Command: %s\n", last_command.c_str());
+
+  auto str = Serial.readStringUntil('\n');
+  if (!str.isEmpty())
+  {
+    last_command = str;
+    const auto cmd = str.charAt(0);
+    char c;
+    switch (cmd)
+    {
+    case 'E':
+    {
+      char box;
+      sscanf(str.c_str(), "%c%c\n", &c, &box);
+      if (box == 'a' && !isEnabled_A)
+      {
+        timerStart(timerA);
+        isEnabled_A = true;
+      }
+      else if (box == 'b' && !isEnabled_B)
+      {
+        timerStart(timerB);
+        isEnabled_B = true;
+      }
+      break;
+    }
+    case 'D':
+    {
+      char c;
+      char box;
+      sscanf(str.c_str(), "%c%c\n", &c, &box);
+      if (box == 'a' && isEnabled_A)
+      {
+        timerStop(timerA);
+        isEnabled_A = false;
+      }
+      else if (box == 'b' && isEnabled_B)
+      {
+        timerStop(timerB);
+        isEnabled_B = false;
+      }
+      break;
+    }
+    case 'R':
+    {
+      int new_rpm;
+      sscanf(str.c_str(), "%c%d\n", &c, &new_rpm);
+      new_rpm = min(RPM_MAX, max(RPM_MIN, new_rpm));
+      stsA.pause_long_us = (uint32_t)(60000000.0f / (float)new_rpm / 2.0f);
+      stsB.pause_long_us = stsA.pause_long_us;
+      set_rpm = (uint32_t)new_rpm;
+      break;
+    }
+    case 'S':
+    {
+      int new_delay;
+      sscanf(str.c_str(), "%c%d\n", &c, &new_delay);
+      new_delay = min(SPARK_DLY_MAX, max(SPARK_DLY_MIN, new_delay));
+      stsA.spark_delay_us = (uint32_t)(new_delay);
       if (stsA.spark_delay_us > (SPARK_DLY_MIN + SPARK_DLY_MAX) / 2)
       {
         stsA.soft_start = true;
@@ -147,49 +239,30 @@ void loop()
       }
       stsB.soft_start = stsA.soft_start;
       stsB.spark_delay_us = stsA.spark_delay_us;
-
+      break;
-  double new_rpm = (double)(map(analogRead(FREQ_POT), 0, 4096, RPM_MIN, RPM_MAX));
+    }
-  filtered_rpm = filtered_rpm + 0.1 * (new_rpm - filtered_rpm);
+    case 'P':
-  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 ====");
-
-  LOG_INFO("Spark Delay uS: ", stsA.spark_delay_us, "\tSoft Start: ", stsA.soft_start ? "TRUE" : "FALSE");
-  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);
+      int new_pulse;
-    isEnabled_A = true;
+      sscanf(str.c_str(), "%c%d\n", &c, &new_pulse);
+      new_pulse = min(COIL_PULSE_MAX, max(COIL_PULSE_MIN, new_pulse));
+      stsA.coil_pulse_us = stsB.coil_pulse_us = (uint32_t)new_pulse;
+      break;
     }
-  else if (digitalRead(ENABLE_PIN_A) == HIGH && isEnabled_A)
+    case 'C':
     {
-    timerStop(timerA);
+      int new_pulse;
-    isEnabled_A = false;
+      sscanf(str.c_str(), "%c%d\n", &c, &new_pulse);
+      new_pulse = min(SPARK_PULSE_MAX, max(SPARK_PULSE_MIN, new_pulse));
+      stsA.spark_pulse_us = stsB.spark_pulse_us = (uint32_t)new_pulse;
+      break;
+    }
+    default:
+      break;
+    }
+    Serial.read();
   }
 
-  if (digitalRead(ENABLE_PIN_B) == LOW && !isEnabled_B)
+  str.clear();
-  {
+  delay(1000);
-    timerStart(timerB);
-    isEnabled_B = true;
-  }
-  else if (digitalRead(ENABLE_PIN_B) == HIGH && isEnabled_B)
-  {
-    timerStop(timerB);
-    isEnabled_B = false;
-  }
-
-  delay(100);
-  clearScreen();
 }