Merged for debug

RotaxMonitor/lib/ADS1256/ADS1256.cpp

@@ -0,0 +1,801 @@
+// 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"
+#include <DebugLog.h>
+
+#define convertSigned24BitToLong(value) ((value) & (1l << 23) ? (value) - 0x1000000 : value)
+
+void IRAM_ATTR 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),
+																																		 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(m_DRDY_pin, INPUT);
+
+	if (RESET_pin != PIN_UNUSED)
+	{
+		pinMode(m_RESET_pin, OUTPUT);
+	}
+
+	if (SYNC_pin != PIN_UNUSED)
+	{
+		pinMode(m_SYNC_pin, OUTPUT);
+	}
+
+	if (CS_pin != PIN_UNUSED)
+	{
+		pinMode(m_CS_pin, OUTPUT);
+	}
+
+	updateConversionParameter();
+
+	// m_drdyHigh = xSemaphoreCreateBinary();
+	// m_drdyLow = xSemaphoreCreateBinary();
+	// if (!m_drdyHigh || !m_drdyLow) {
+	// 	LOG_ERROR("ADC Unable to create interrupt semaphores");
+	// 	return;
+	// }
+	
+	// xSemaphoreGive(m_drdyHigh);
+	// xSemaphoreGive(m_drdyLow);
+	//attachInterruptArg(DRDY_pin, drdyCallback, (void *)this, CHANGE);
+}
+
+// Initialization
+void ADS1256::InitializeADC()
+{
+	// Chip select LOW
+	CS_LOW();
+
+	// We do a manual chip reset on the ADS1256 - Datasheet Page 27/ RESET
+	if (m_RESET_pin != PIN_UNUSED)
+	{
+		digitalWrite(m_RESET_pin, LOW);
+		delay(200);
+		digitalWrite(m_RESET_pin, HIGH); // RESET is set to high
+		delay(1000);
+	}
+
+	// Sync pin is also treated if it is defined
+	if (m_SYNC_pin != PIN_UNUSED)
+	{
+		digitalWrite(m_SYNC_pin, HIGH); // RESET is set to high
+	}
+
+	// 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);
+
+	m_STATUS = 0b00110110; // BUFEN and ACAL enabled, Order is MSB, rest is read only
+	writeRegister(STATUS_REG, m_STATUS);
+	delay(200);
+
+	m_MUX = DIFF_0_1; // MUX AIN0+AIN1
+	writeRegister(MUX_REG, m_MUX);
+	delay(200);
+
+	m_ADCON = WAKEUP; // ADCON - CLK: OFF, SDCS: OFF, PGA = 0 (+/- 5 V)
+	writeRegister(ADCON_REG, m_ADCON);
+	delay(200);
+
+	updateConversionParameter();
+
+	m_DRATE = DRATE_100SPS; // 100SPS
+	writeRegister(DRATE_REG, m_DRATE);
+	delay(200);
+
+	sendDirectCommand(SELFCAL); // Offset and self-gain calibration
+	delay(200);
+
+	m_isAcquisitionRunning = false; // MCU will be waiting to start a continuous acquisition
+}
+
+void ADS1256::waitForLowDRDY()
+{
+	while(digitalRead(m_DRDY_pin) == HIGH) {vTaskDelay(1);};
+	// xSemaphoreTake(m_drdyLow, pdMS_TO_TICKS(10));
+	// xSemaphoreGive(m_drdyLow);
+}
+
+void ADS1256::waitForHighDRDY()
+{
+	while(digitalRead(m_DRDY_pin) == LOW) {vTaskDelay(1);};
+	// xSemaphoreTake(m_drdyHigh, pdMS_TO_TICKS(10));
+	// xSemaphoreGive(m_drdyHigh);
+}
+
+void ADS1256::stopConversion() // Sending SDATAC to stop the continuous conversion
+{
+	waitForLowDRDY();		// SDATAC should be called after DRDY goes LOW (p35. Figure 33)
+	_spi->transfer(SDATAC); // Send SDATAC to the ADC
+	CS_HIGH();				// We finished the command sequence, so we switch it back to HIGH
+	_spi->endTransaction();
+
+	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);
+	m_DRATE = drate;
+	delay(200);
+}
+
+void ADS1256::setMUX(uint8_t mux) // Setting MUX (input channel)
+{
+	writeRegister(MUX_REG, mux);
+	m_MUX = mux;
+	delay(200);
+}
+
+void ADS1256::setPGA(uint8_t pga) // Setting PGA (input voltage range)
+{
+	m_PGA = pga;
+	m_ADCON = readRegister(ADCON_REG); // Read the most recent value of the register
+
+	m_ADCON = (m_ADCON & 0b11111000) | (m_PGA & 0b00000111); // Clearing and then setting bits 2-0 based on pga
+
+	writeRegister(ADCON_REG, m_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
+{
+	m_ADCON = readRegister(ADCON_REG); // Read the most recent value of the register
+
+	// Values: 0, 1, 2, 3
+
+	if (clkout == 0)
+	{
+		// 00
+		bitWrite(m_ADCON, 6, 0);
+		bitWrite(m_ADCON, 5, 0);
+	}
+	else if (clkout == 1)
+	{
+		// 01 (default)
+		bitWrite(m_ADCON, 6, 0);
+		bitWrite(m_ADCON, 5, 1);
+	}
+	else if (clkout == 2)
+	{
+		// 10
+		bitWrite(m_ADCON, 6, 1);
+		bitWrite(m_ADCON, 5, 0);
+	}
+	else if (clkout == 3)
+	{
+		// 11
+		bitWrite(m_ADCON, 6, 1);
+		bitWrite(m_ADCON, 5, 1);
+	}
+	else
+	{
+	}
+
+	writeRegister(ADCON_REG, m_ADCON);
+	delay(100);
+}
+
+void ADS1256::setSDCS(uint8_t sdcs) // Setting SDCS
+{
+	m_ADCON = readRegister(ADCON_REG); // Read the most recent value of the register
+
+	// Values: 0, 1, 2, 3
+
+	if (sdcs == 0)
+	{
+		// 00 (default)
+		bitWrite(m_ADCON, 4, 0);
+		bitWrite(m_ADCON, 3, 0);
+	}
+	else if (sdcs == 1)
+	{
+		// 01
+		bitWrite(m_ADCON, 4, 0);
+		bitWrite(m_ADCON, 3, 1);
+	}
+	else if (sdcs == 2)
+	{
+		// 10
+		bitWrite(m_ADCON, 4, 1);
+		bitWrite(m_ADCON, 3, 0);
+	}
+	else if (sdcs == 3)
+	{
+		// 11
+		bitWrite(m_ADCON, 4, 1);
+		bitWrite(m_ADCON, 3, 1);
+	}
+	else
+	{
+	}
+
+	writeRegister(ADCON_REG, m_ADCON);
+	delay(100);
+}
+
+void ADS1256::setByteOrder(uint8_t byteOrder) // Setting byte order (MSB/LSB)
+{
+	m_STATUS = readRegister(STATUS_REG); // Read the most recent value of the register
+
+	if (byteOrder == 0)
+	{
+		// Byte order is MSB (default)
+		bitWrite(m_STATUS, 3, 0);
+		// Set value of _STATUS at the third bit to 0
+	}
+	else if (byteOrder == 1)
+	{
+		// Byte order is LSB
+		bitWrite(m_STATUS, 3, 1);
+		// Set value of _STATUS at the third bit to 1
+	}
+	else
+	{
+	}
+
+	writeRegister(STATUS_REG, m_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)
+{
+	m_STATUS = readRegister(STATUS_REG); // Read the most recent value of the register
+
+	if (acal == 0)
+	{
+		// Auto-calibration is disabled (default)
+		bitWrite(m_STATUS, 2, 0);
+		//_STATUS |= B00000000;
+	}
+	else if (acal == 1)
+	{
+		// Auto-calibration is enabled
+		bitWrite(m_STATUS, 2, 1);
+		//_STATUS |= B00000100;
+	}
+	else
+	{
+	}
+
+	writeRegister(STATUS_REG, m_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)
+{
+	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(m_STATUS, 1, 0);
+	}
+	else if (bufen == 1)
+	{
+		// Analog input buffer is enabled (recommended)
+		//_STATUS |= B00000010;
+		bitWrite(m_STATUS, 1, 1);
+	}
+	else
+	{
+	}
+
+	writeRegister(STATUS_REG, m_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
+{
+	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
+	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(m_GPIO, 7, GPIO_bit7);
+	//-----------------------------------------------------
+	// Bit6: DIR2
+	if (dir2 == 1)
+	{
+		GPIO_bit6 = 1; // D2 is input (default)
+	}
+	else
+	{
+		GPIO_bit6 = 0; // D2 is output
+	}
+	bitWrite(m_GPIO, 6, GPIO_bit6);
+	//-----------------------------------------------------
+	// Bit5: DIR1
+	if (dir1 == 1)
+	{
+		GPIO_bit5 = 1; // D1 is input (default)
+	}
+	else
+	{
+		GPIO_bit5 = 0; // D1 is output
+	}
+	bitWrite(m_GPIO, 5, GPIO_bit5);
+	//-----------------------------------------------------
+	// Bit4: DIR0
+	if (dir0 == 1)
+	{
+		GPIO_bit4 = 1; // D0 is input
+	}
+	else
+	{
+		GPIO_bit4 = 0; // D0 is output (default)
+	}
+	bitWrite(m_GPIO, 4, GPIO_bit4);
+	//-----------------------------------------------------
+
+	writeRegister(IO_REG, m_GPIO);
+	delay(100);
+}
+
+void ADS1256::writeGPIO(uint8_t dir0value, uint8_t dir1value, uint8_t dir2value, uint8_t dir3value) // Writing GPIO
+{
+	m_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(m_GPIO, 3, GPIO_bit3);
+	//-----------------------------------------------------
+	// Bit2: DIR2
+	if (dir2value == 1)
+	{
+		GPIO_bit2 = 1;
+	}
+	else
+	{
+		GPIO_bit2 = 0;
+	}
+	bitWrite(m_GPIO, 2, GPIO_bit2);
+	//-----------------------------------------------------
+	// Bit1: DIR1
+	if (dir1value == 1)
+	{
+		GPIO_bit1 = 1;
+	}
+	else
+	{
+		GPIO_bit1 = 0;
+	}
+	bitWrite(m_GPIO, 1, GPIO_bit1);
+	//-----------------------------------------------------
+	// Bit0: DIR0
+	if (dir0value == 1)
+	{
+		GPIO_bit0 = 1;
+	}
+	else
+	{
+		GPIO_bit0 = 0;
+	}
+	bitWrite(m_GPIO, 0, GPIO_bit0);
+	//-----------------------------------------------------
+
+	writeRegister(IO_REG, m_GPIO);
+	delay(100);
+}
+
+uint8_t ADS1256::readGPIO(uint8_t gpioPin) // Reading GPIO
+{
+	uint8_t GPIO_bit3, GPIO_bit2, GPIO_bit1, GPIO_bit0, GPIO_return;
+
+	m_GPIO = readRegister(IO_REG); // Read the GPIO register
+
+	// Save each bit values in a variable
+	GPIO_bit3 = bitRead(m_GPIO, 3);
+	GPIO_bit2 = bitRead(m_GPIO, 2);
+	GPIO_bit1 = bitRead(m_GPIO, 1);
+	GPIO_bit0 = bitRead(m_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(SPI_FREQ, 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 (m_conversionParameter * rawData);
+}
+
+void ADS1256::writeRegister(uint8_t registerAddress, uint8_t registerValueToWrite)
+{
+	waitForLowDRDY();
+
+	_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(WREG | 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(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(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(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(SPI_FREQ, MSBFIRST, SPI_MODE1));
+	CS_LOW(); // REF: P34: "CS must stay low during the entire command sequence"
+	waitForLowDRDY();
+	_spi->transfer(RDATA); // Issue RDATA (0000 0001) command
+	delayMicroseconds(7);  // Wait t6 time (~6.51 us) REF: P34, FIG:30.
+
+	m_outputBuffer[0] = _spi->transfer(0); // MSB
+	m_outputBuffer[1] = _spi->transfer(0); // Mid-byte
+	m_outputBuffer[2] = _spi->transfer(0); // LSB
+
+	// Shifting and combining the above three items into a single, 24-bit number
+	m_outputValue = ((long)m_outputBuffer[0] << 16) | ((long)m_outputBuffer[1] << 8) | (m_outputBuffer[2]);
+	m_outputValue = convertSigned24BitToLong(m_outputValue);
+
+	CS_HIGH(); // We finished the command sequence, so we set CS to HIGH
+	_spi->endTransaction();
+
+	return (m_outputValue);
+}
+
+long ADS1256::readSingleContinuous() // Reads the recently selected input channel using RDATAC
+{
+	if (m_isAcquisitionRunning == false)
+	{
+		m_isAcquisitionRunning = true;
+		_spi->beginTransaction(SPISettings(SPI_FREQ, MSBFIRST, SPI_MODE1));
+		CS_LOW(); // REF: P34: "CS must stay low during the entire command sequence"
+		waitForLowDRDY();
+		_spi->transfer(RDATAC); // Issue RDATAC (0000 0011)
+		delayMicroseconds(7);	// Wait t6 time (~6.51 us) REF: P34, FIG:30.
+	}
+	else
+	{
+		waitForLowDRDY();
+	}
+
+	m_outputBuffer[0] = _spi->transfer(0); // MSB
+	m_outputBuffer[1] = _spi->transfer(0); // Mid-byte
+	m_outputBuffer[2] = _spi->transfer(0); // LSB
+
+	m_outputValue = ((long)m_outputBuffer[0] << 16) | ((long)m_outputBuffer[1] << 8) | (m_outputBuffer[2]);
+	m_outputValue = convertSigned24BitToLong(m_outputValue);
+
+	waitForHighDRDY();
+
+	return m_outputValue;
+}
+
+long ADS1256::cycleSingle()
+{
+	if (m_isAcquisitionRunning == false)
+	{
+		m_isAcquisitionRunning = true;
+		m_cycle = 0;
+		_spi->beginTransaction(SPISettings(SPI_FREQ, MSBFIRST, SPI_MODE1));
+		CS_LOW();						// CS must stay LOW during the entire sequence [Ref: P34, T24]
+		_spi->transfer(WREG | MUX_REG); // 0x50 = WREG //1 = MUX
+		_spi->transfer(0x00);
+		_spi->transfer(SING_0); // AIN0+AINCOM
+		delayMicroseconds(250);
+	}
+	else
+	{
+	}
+
+	if (m_cycle < 8)
+	{
+		m_outputValue = 0;
+		waitForLowDRDY();
+		// Step 1. - Updating MUX
+		switch (m_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(SYNC);	// SYNC
+		delayMicroseconds(4);	// t11 delay 24*tau = 3.125 us //delay should be larger, so we delay by 4 us
+		_spi->transfer(WAKEUP); // WAKEUP
+
+		// Step 3.
+		// Issue RDATA (0000 0001) command
+		_spi->transfer(RDATA);
+		delayMicroseconds(7); // Wait t6 time (~6.51 us) REF: P34, FIG:30.
+
+		m_outputBuffer[0] = _spi->transfer(0); // MSB
+		m_outputBuffer[1] = _spi->transfer(0); // Mid-byte
+		m_outputBuffer[2] = _spi->transfer(0); // LSB
+
+		m_outputValue = ((long)m_outputBuffer[0] << 16) | ((long)m_outputBuffer[1] << 8) | (m_outputBuffer[2]);
+		m_outputValue = convertSigned24BitToLong(m_outputValue);
+
+		m_cycle++; // Increase cycle - This will move to the next MUX input channel
+		if (m_cycle == 8)
+		{
+			m_cycle = 0; // Reset to 0 - Restart conversion from the 1st input channel
+		}
+	}
+
+	return m_outputValue;
+}
+
+long ADS1256::cycleDifferential()
+{
+	if (m_isAcquisitionRunning == false)
+	{
+		m_cycle = 0;
+		m_isAcquisitionRunning = true;
+		_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(WREG | MUX_REG); // 0x50 = WREG //1 = MUX
+		_spi->transfer(0x00);
+		_spi->transfer(DIFF_0_1); // AIN0+AIN1
+		delayMicroseconds(250);
+	}
+	else
+	{
+	}
+
+	if (m_cycle < 4)
+	{
+		m_outputValue = 0;
+		// DRDY has to go low
+		waitForLowDRDY();
+
+		// Step 1. - Updating MUX
+		switch (m_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(SYNC);	// SYNC
+		delayMicroseconds(4);	// t11 delay 24*tau = 3.125 us //delay should be larger, so we delay by 4 us
+		_spi->transfer(WAKEUP); // WAKEUP
+
+		// Step 3.
+		_spi->transfer(RDATA); // Issue RDATA (0000 0001) command
+		delayMicroseconds(7);  // Wait t6 time (~6.51 us) REF: P34, FIG:30.
+
+		m_outputBuffer[0] = _spi->transfer(0); // MSB
+		m_outputBuffer[1] = _spi->transfer(0); // Mid-byte
+		m_outputBuffer[2] = _spi->transfer(0); // LSB
+
+		m_outputValue = ((long)m_outputBuffer[0] << 16) | ((long)m_outputBuffer[1] << 8) | (m_outputBuffer[2]);
+		m_outputValue = convertSigned24BitToLong(m_outputValue);
+
+		m_cycle++;
+		if (m_cycle == 4)
+		{
+			m_cycle = 0;
+			// After the 4th cycle, we reset to zero so the next iteration reads the 1st MUX again
+		}
+	}
+
+	return m_outputValue;
+}
+
+void ADS1256::updateConversionParameter()
+{
+	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(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 (m_CS_pin != PIN_UNUSED) // Sets CS LOW if it is not an unused pin
+	{
+		digitalWrite(m_CS_pin, LOW);
+	}
+}
+
+inline void ADS1256::CS_HIGH()
+{
+	if (m_CS_pin != PIN_UNUSED) // Sets CS HIGH if it is not an unused pin
+	{
+		digitalWrite(m_CS_pin, HIGH);
+	}
+}

RotaxMonitor/platformio.ini

@@ -16,10 +16,8 @@ lib_deps =
 	hideakitai/DebugLog@^0.8.4
 	bblanchon/ArduinoJson@^7.4.2
 	hideakitai/PCA95x5@^0.1.3
-	adafruit/Adafruit SSD1306@^2.5.16
+	me-no-dev/AsyncTCP@^3.3.2
-	garfius/Menu-UI@^1.2.0
+	me-no-dev/ESPAsyncWebServer@^3.6.0
-
-;Upload protocol configuration
 upload_protocol = esptool
 upload_port = /dev/ttyACM2
 upload_speed = 921600
@@ -31,19 +29,21 @@ monitor_port = /dev/ttyACM2
 ; Build configuration
 build_type = release
 build_flags = 
+	-DCORE_DEBUG_LEVEL=3
 	-DARDUINO_USB_CDC_ON_BOOT=0
 	-DARDUINO_USB_MODE=0
-    -fstack-protector-all
+	-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=5000
-    -DCONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=1
+	-DCONFIG_ASYNC_TCP_PRIORITY=21
-    -DCONFIG_FREERTOS_USE_TRACE_FACILITY=1
+	-DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
+	-DCONFIG_ASYNC_TCP_RUNNING_CORE=1
+	-DCONFIG_ASYNC_TCP_STACK_SIZE=8192
 
 [env:esp32-s3-devkitc1-n16r8-debug]
 board = ${env:esp32-s3-devkitc1-n16r8.board}
 platform = ${env:esp32-s3-devkitc1-n16r8.platform}
 framework = ${env:esp32-s3-devkitc1-n16r8.framework}
-lib_deps = ${env:esp32-s3-devkitc1-n16r8.lib_deps}
+lib_deps = 
-
+	${env:esp32-s3-devkitc1-n16r8.lib_deps}
-;Upload protocol configuration
 upload_protocol = esptool
 upload_port = /dev/ttyACM2
 upload_speed = 921600
@@ -62,7 +62,11 @@ build_flags =
 	-O0
 	-g3
 	-ggdb3
-    -DCORE_DEBUG_LEVEL=5
+	-DCORE_DEBUG_LEVEL=3
 	-DARDUINO_USB_CDC_ON_BOOT=0
 	-DARDUINO_USB_MODE=0
-    -fstack-protector-all
+	-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=5000
+	-DCONFIG_ASYNC_TCP_PRIORITY=21
+	-DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
+	-DCONFIG_ASYNC_TCP_RUNNING_CORE=1
+	-DCONFIG_ASYNC_TCP_STACK_SIZE=8192

RotaxMonitor/src/devices.h

@@ -3,7 +3,6 @@
 // Device Libraries
 #include <ADS1256.h>
 #include <AD5292.h>
-#include <Adafruit_SSD1306.h>
 #include <PCA95x5.h>
 
 // ADC Channel mapping
@@ -17,11 +16,26 @@
 #define ADC_CH_PEAK_34N_OUT     SING_7
 
 // Device Pointer structs for tasks
-struct Devices {
+struct Devices
-  AD5292 *pot_a = NULL, *pot_b = NULL;
+{
-  ADS1256 *adc_a = NULL, *adc_b = NULL; 
+    // Busses
-  Adafruit_SSD1306* lcd = 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/main.cpp

@@ -12,23 +12,24 @@
 #include <devices.h>
 #include <ui.h>
 
-// FreeRTOS directives
+#define CH_A_ENABLE
-#include "freertos/FreeRTOS.h"
+#define CH_B_ENABLE
-#include "freertos/task.h"
+#define CH_A_RT_ENABLE
+#define CH_B_RT_ENABLE
+// #define I2C_ENABLE
+// #define WEB_ENABLE
 
-// #define CH_B_ENABLE
+// Debug Defines
-#define TEST
+#define WIFI_SSID "AstroRotaxMonitor"
-
+#define WIFI_PASSWORD "maledettirotax"
-void printTaskStats() {
+#define PSRAM_MAX 1024
-    char buffer[1024];
+#define QUEUE_MAX 32
-    vTaskGetRunTimeStats(buffer);
-    Serial.println(buffer);
-}
 
 void setup()
 {
     Serial.begin(921600);
     delay(250);
+    Serial.setTimeout(5000);
 
     // Setup Logger
     LOG_ATTACH_SERIAL(Serial);
@@ -42,9 +43,34 @@ void setup()
         LOG_INFO("ESP32 PSram:", ESP.getPsramSize());
         psramInit();
     }
-    LOG_INFO("ESP32 Flash:", ESP.getFlashChipSize());
+    LOG_DEBUG("ESP32 Flash:", ESP.getFlashChipSize());
-    LOG_INFO("ESP32 Heap:", ESP.getHeapSize());
+    LOG_DEBUG("ESP32 Heap:", ESP.getHeapSize());
-    LOG_INFO("ESP32 Sketch:", ESP.getFreeSketchSpace());
+    LOG_DEBUG("ESP32 Sketch:", ESP.getFreeSketchSpace());
+
+// 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");
+        LOG_INFO("Wifi SSID:", WIFI_SSID);
+        LOG_INFO("Wifi Password:", WIFI_PASSWORD);
+        LOG_INFO("WiFi IP:" + WiFi.softAPIP().toString());
+    }
+    else
+    {
+        LOG_ERROR("Failed to start WiFi AP Mode");
+        LOG_ERROR("5 seconds to restart...");
+        vTaskDelay(pdMS_TO_TICKS(5000));
+        esp_restart();
+    }
+#endif
 
     // Initialize Interrupt pins on PICKUP detectors
     initTriggerPinsInputs();
@@ -55,6 +81,11 @@ void setup()
 void loop()
 {
     // global variables
+    RGBled led;
+    led.setBrightness(0.025f);
+    led.setStatus(RGBled::LedStatus::INIT);
+
+    Devices dev;
     bool running = true;
     static Devices dev;
 
@@ -101,13 +132,42 @@ void loop()
 
     bool spiA_ok = true;
     bool spiB_ok = true;
-
+    //////// INIT SPI INTERFACES ////////
-#ifndef TEST
+    LOG_DEBUG("Init SPI Interfaces");
-    // Init 2 SPI interfaces
+#ifdef CH_A_ENABLE
-    SPIClass SPI_A(FSPI);
+    LOG_DEBUG("Begin Init SPI_A");
+    SPIClass SPI_A(HSPI);
     spiA_ok = SPI_A.begin(SPI_A_SCK, SPI_A_MISO, SPI_A_MOSI);
-    SPIClass SPI_B(HSPI);
+    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)
@@ -119,86 +179,181 @@ void loop()
     }
     LOG_INFO("Init SPI OK");
 
-#ifndef TEST
+    LOG_DEBUG("Init SPI -> OK");
-    // Init ADC_A
-    dev.adc_a = new ADS1256(ADC_A_DRDY, ADC_A_RST, ADC_A_SYNC, ADC_A_CS, 2.5, &SPI_A);
-    dev.adc_a->InitializeADC();
-    dev.adc_a->setPGA(PGA_1);
-    dev.adc_a->setDRATE(DRATE_1000SPS);
 
-    // Init ADC_B
+//////// INIT I2C INTERFACES ////////
-    dev.adc_a = new ADS1256(ADC_B_DRDY, ADC_B_RST, ADC_B_SYNC, ADC_B_CS, 2.5, &SPI_B);
+#ifdef I2C_ENABLE
-    dev.adc_a->InitializeADC();
+    LOG_DEBUG("Init I2C Interfaces");
-    dev.adc_a->setPGA(PGA_1);
+    bool i2c_ok = true;
-    dev.adc_a->setDRATE(DRATE_1000SPS);
+    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
 
-    LOG_INFO("Init ADC OK");
+//////// 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,
+            .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_io = rtIgnitionTask::rtTaskIOParams{
+            .pot_cs_12 = POT_CS_A12,
+            .pot_cs_34 = POT_CS_A34,
+            .ss_force = SS_FORCE_A,
+            .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",
+        .rt_stack_size = RT_TASK_STACK,
+        .rt_priority = RT_TASK_PRIORITY,
+        .rt_int = rtIgnitionTask::rtTaskInterruptParams{
+            .isr_ptr = &trig_isr_B,
+            .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_io = rtIgnitionTask::rtTaskIOParams{
+            .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 ////////
+    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
-    auto ignA_task_success = pdPASS;
+    if (ignA_task_success != pdPASS || ignB_task_success != pdPASS)
-    ignA_task_success = xTaskCreatePinnedToCore(
-        rtIgnitionTask,
-        "rtIgnitionTask_boxA",
-        TASK_STACK,
-        (void *)&taskA_params,
-        TASK_PRIORITY,
-        &trigA_TaskHandle,
-        CORE_0);
-
-    // Ignition B on Core 1
-    auto ignB_task_success = pdPASS;
-#ifdef CH_B_ENABLE
-    ignB_task_success = xTaskCreatePinnedToCore(
-        rtIgnitionTask,
-        "rtIgnitionTask_boxB",
-        TASK_STACK,
-        (void *)&taskB_params,
-        TASK_PRIORITY, // priorità leggermente più alta
-        &trigB_TaskHandle,
-        CORE_1);
-#endif
-
-    if ((ignA_task_success && ignB_task_success) != pdPASS)
     {
         LOG_ERROR("Unble to initialize ISR task");
         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("Real Time Tasks A & B initialized");
+        led.setStatus(RGBled::LedStatus::OK);
+    }
 
-    LOG_INFO("Real Time Tasks A & B initialized");
+    //////// SPAWN WEBSERVER and WEBSOCKET ////////
+    ArduinoJson::JsonDocument json_data;
+    bool data_a = false, data_b = false;
+#ifdef WEB_ENABLE
+    AstroWebServer webPage(80, LittleFS);
+    delay(1000);
+    task_A.onMessage([&webPage, &json_data, &data_a](ignitionBoxStatusFiltered sts)
+                     {
+    json_data["box_a"] = sts.toJson();
+    data_a = true; });
 
-    ////////////////////// MAIN LOOP //////////////////////
+    #ifdef CH_B_RT_ENABLE
-    clearScreen();
+    task_B.onMessage([&webPage, &json_data, &data_b](ignitionBoxStatusFiltered sts)
-    setCursor(0, 0);
+                     {
-    ignitionBoxStatus ignA;
+    json_data["box_b"] = sts.toJson();
-    int64_t last = esp_timer_get_time();
+    data_b = true; });
-    uint32_t missed_firings12 = 0;
+    #endif
-    uint32_t missed_firings34 = 0;
+#endif
-    uint32_t counter = 0;
 
+    // task_A.enableSave(true, "ignitionA_test.csv");
+    // task_B.enableSave(true, "ignitionB_test.csv");
+
+    uint32_t monitor_loop = millis();
+    uint32_t data_loop = monitor_loop;
+    //////////////// INNER LOOP /////////////////////
     while (running)
     {
-        if (xQueueReceive(rt_taskA_queue, &ignA, pdMS_TO_TICKS(1000)) == pdTRUE)
+        uint32_t this_loop = millis();
+        if (this_loop - monitor_loop > 5000)
         {
             if (ignA.coils12.spark_status == sparkStatus::SPARK_NEG_FAIL || ignA.coils12.spark_status == sparkStatus::SPARK_POS_FAIL)
                 missed_firings12++;
             if (ignA.coils34.spark_status == sparkStatus::SPARK_POS_FAIL || ignA.coils34.spark_status == sparkStatus::SPARK_NEG_FAIL)
                 missed_firings34++; 
             clearScreen();
-            setCursor(0, 0);
+            printRunningTasksMod(Serial);
-            printField("++ Timestamp", (uint32_t)ignA.timestamp, 0, 0);
+            monitor_loop = millis();
-            Serial.println("========== Coils 12 =============");
+        }
-            printField("Events", (uint32_t)ignA.coils12.n_events, 0, 1);
+        vTaskDelay(pdMS_TO_TICKS(10));
-            printField("Missed Firing", missed_firings12, 0, 2);
+#ifdef WEB_ENABLE
-            printField("Spark Dly", (uint32_t)ignA.coils12.spark_delay, 0, 3);
+        if ((data_a && data_b) || (this_loop - data_loop > 500))
-            printField("Spark Sts", sparkStatusNames.at(ignA.coils12.spark_status), 0, 4);
+        {
-            // printField("Peak P_IN", ignA.coils12.peak_p_in, 0, 5);
+            webPage.sendWsData(json_data.as<String>());
-            // printField("Peak P_OUT", ignA.coils12.peak_p_out, 0, 6);
+            json_data.clear();
-            // printField("Peak N_IN", ignA.coils12.peak_n_in, 0, 7);
+            data_a = data_b = false;
-            // printField("Peak N_OUT", ignA.coils12.peak_n_out, 0, 8);
+            data_loop = millis();
-            printField("Soft Start ", softStartStatusNames.at(ignA.coils12.sstart_status), 0, 9);
+        }
+#endif
+    } //////////////// INNER LOOP /////////////////////
 
             Serial.println("========== Coils 34 =============");
             printField("Events", (uint32_t)ignA.coils34.n_events, 0, 11);

RotaxMonitor/src/tasks.cpp

@@ -7,7 +7,25 @@ void spark_timeout_callback(void* arg) {
     xTaskNotify(handle, SPARK_FLAG_TIMEOUT, eSetValueWithOverwrite);
 }
 
-void rtIgnitionTask(void *pvParameters)
+// Manages queue receive, save data and callback to external tasks for communication
+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
@@ -23,10 +41,17 @@ void rtIgnitionTask(void *pvParameters)
     const rtTaskInterrupts rt_int = params->rt_int; // copy to avoid external override
     const rtTaskResets rt_rst = params->rt_resets;  // copy to avoid external override
     QueueHandle_t rt_queue = params->rt_queue;
-    TaskHandle_t rt_handle_ptr = *params->rt_handle_ptr;
     Devices *dev = params->dev;
-    ADS1256 *adc = dev->adc_a;
+    ExternalIO *io = dev->m_ext_io;
-    PCA9555 *io = dev->io;
+    // ADS1256 *adc = params->name == "rtIgnTask_A" ? dev->m_adc_a : dev->m_adc_b;
+    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(), "]");
 
     ignitionBoxStatus ign_box_sts;
 
@@ -54,9 +79,7 @@ void rtIgnitionTask(void *pvParameters)
     static isrParams isr_params_sp34{
         .flag = SPARK_FLAG_34,
         .ign_stat = &ign_box_sts,
-        .rt_handle_ptr = rt_handle_ptr};
+        .rt_handle_ptr = rt_task_info.xHandle};
-        
-    LOG_INFO("rtTask ISR Params OK");
 
     // Create esp_timer for microsecond precision timeout
     esp_timer_handle_t timeout_timer;
@@ -64,9 +87,12 @@ void rtIgnitionTask(void *pvParameters)
         .callback = spark_timeout_callback,
         .arg = (void*)rt_handle_ptr,
         .dispatch_method = ESP_TIMER_TASK,
-        .name = "spark_timeout"
+        .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);
@@ -254,14 +280,16 @@ void rtIgnitionTask(void *pvParameters)
             if (adc) // read only if adc initialized
             {
                 // 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(1));
@@ -301,3 +329,254 @@ void rtIgnitionTask(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,6 +34,13 @@ 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;
@@ -41,6 +48,110 @@ struct rtTaskInterrupts
         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

RotaxMonitor/src/utils.cpp

@@ -1,6 +1,26 @@
 #include "utils.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)
+{
+>>>>>>> Stashed changes
     std::string result;
     for (int i = 31; i >= 0; i--) {
         // ottieni il singolo bit
@@ -12,3 +32,159 @@ 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"};
+
+    static uint32_t ulRunTimeCounters[FREERTOS_TASK_NUMBER_MAX_NUM];
+    static uint32_t ulLastRunTime = 0;
+    uint32_t ulCurrentRunTime = 0, ulTaskRunTime = 0;
+    uint32_t ulTotalRunTime = 0;
+
+    std::vector<TaskStatus_t> pxTaskStatusArray;
+    UBaseType_t uxArraySize = 0;
+
+    // Take a snapshot of the number of tasks in case it changes while this function is executing.
+    uxArraySize = uxTaskGetNumberOfTasks();
+    pxTaskStatusArray.resize(uxArraySize);
+
+    // Generate raw status information about each task.
+    uxArraySize = uxTaskGetSystemState(pxTaskStatusArray.data(), uxArraySize, &ulTotalRunTime);
+
+    if (orderBy == nullptr)
+        std::sort(pxTaskStatusArray.begin(), pxTaskStatusArray.end(), [](const TaskStatus_t &a, const TaskStatus_t &b)
+                  { return a.xTaskNumber < b.xTaskNumber; });
+    else
+        std::sort(pxTaskStatusArray.begin(), pxTaskStatusArray.end(), orderBy);
+
+    // 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);
+
+    // Print Task Headers
+    printer.printf("Num\t            Name\tLoad\tPrio\t Free\tCore\tState\r\n");
+    for (const auto &task : pxTaskStatusArray)
+    {
+
+        ulTaskRunTime = (task.ulRunTimeCounter - ulRunTimeCounters[task.xTaskNumber]);
+        ulRunTimeCounters[task.xTaskNumber] = task.ulRunTimeCounter;
+        ulTaskRunTime = (ulTaskRunTime * 100) / ulCurrentRunTime; // in percentage
+
+        printer.printf(
+            "%3u\t%16s"
+            "\t%3lu%%"
+            "\t%4u\t%5lu"
+            "\t%4c"
+            "\t%s\r\n",
+            task.xTaskNumber, task.pcTaskName,
+            ulTaskRunTime,
+            task.uxCurrentPriority, task.usStackHighWaterMark,
+            (task.xCoreID == tskNO_AFFINITY) ? '*' : ('0' + task.xCoreID),
+            taskStates[task.eCurrentState]);
+    }
+    printer.println();
+}

RotaxMonitor/unpacked_fs/config.json

@@ -0,0 +1,3 @@
+{
+    
+}

RotaxMonitor/unpacked_fs/index.html

@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <title>Astro Rotax Monitor</title>
+    <link rel="stylesheet" href="style.css">
+</head>
+
+<body>
+    <header class="page-header">
+        <div class="header-content">
+            <img src="logo_astro_dev.svg" alt="Astro Tecnologie" class="logo">
+        </div>
+        <div>
+
+            <h1>Rotax Ignition Box Monitor</h1>
+        </div>
+    </header>
+
+    <div id="loadingIndicator" class="loading-indicator">
+        <span class="spinner"></span> Waiting for data...
+    </div>
+
+    <div class="tables-container">
+        <div class="box">
+            <h2>Box_A</h2>
+            <div class="box-data">
+                <p><strong>Timestamp:</strong> <span id="a_timestamp">-</span></p>
+                <p><strong>Data Valid:</strong> <span id="a_datavalid">-</span></p>
+                <p><strong>Generator voltage:</strong> <span id="a_volts_gen">-</span></p>
+                <p><strong>ADC read time:</strong> <span id="a_adc_read_time">-</span></p>
+                <p><strong>Queue errors:</strong> <span id="a_n_queue_errors">-</span></p>
+            </div>
+            <div class="rpm-highlight">
+                <strong>Engine RPM:</strong> <span id="a_eng_rpm">-</span>
+            </div>
+            <table>
+                <thead>
+                    <tr>
+                        <th>Property</th>
+                        <th>Pickup 12</th>
+                        <th>Pickup 34</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Spark delay</td>
+                        <td id="a_coils12_spark_delay">-</td>
+                        <td id="a_coils34_spark_delay">-</td>
+                    </tr>
+                    <tr>
+                        <td>Spark status</td>
+                        <td id="a_coils12_spark_status">-</td>
+                        <td id="a_coils34_spark_status">-</td>
+                    </tr>
+                    <tr>
+                        <td>Soft start status</td>
+                        <td id="a_coils12_sstart_status">-</td>
+                        <td id="a_coils34_sstart_status">-</td>
+                    </tr>
+                    <tr>
+                        <td>Peak P in</td>
+                        <td id="a_coils12_peak_p_in">-</td>
+                        <td id="a_coils34_peak_p_in">-</td>
+                    </tr>
+                    <tr>
+                        <td>Peak N in</td>
+                        <td id="a_coils12_peak_n_in">-</td>
+                        <td id="a_coils34_peak_n_in">-</td>
+                    </tr>
+                    <tr>
+                        <td>Peak P out</td>
+                        <td id="a_coils12_peak_p_out">-</td>
+                        <td id="a_coils34_peak_p_out">-</td>
+                    </tr>
+                    <tr>
+                        <td>Peak N out</td>
+                        <td id="a_coils12_peak_n_out">-</td>
+                        <td id="a_coils34_peak_n_out">-</td>
+                    </tr>
+                    <tr>
+                        <td>Level spark</td>
+                        <td id="a_coils12_level_spark">-</td>
+                        <td id="a_coils34_level_spark">-</td>
+                    </tr>
+                    <tr>
+                        <td>Spark Events</td>
+                        <td id="a_coils12_n_events">-</td>
+                        <td id="a_coils34_n_events">-</td>
+                    </tr>
+                    <tr>
+                        <td>Missed Events</td>
+                        <td id="a_coils12_n_missed_firing">-</td>
+                        <td id="a_coils34_n_missed_firing">-</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+
+        <div class="box">
+            <h2>Box_B</h2>
+            <div class="box-data">
+                <p><strong>Timestamp:</strong> <span id="b_timestamp">-</span></p>
+                <p><strong>Data Valid:</strong> <span id="b_datavalid">-</span></p>
+                <p><strong>Generator voltage:</strong> <span id="b_volts_gen">-</span></p>
+                <p><strong>ADC read time:</strong> <span id="b_adc_read_time">-</span></p>
+                <p><strong>Queue errors:</strong> <span id="b_n_queue_errors">-</span></p>
+            </div>
+            <div class="rpm-highlight">
+                <strong>Engine RPM:</strong> <span id="b_eng_rpm">-</span>
+            </div>
+            <table>
+                <thead>
+                    <tr>
+                        <th>Property</th>
+                        <th>Pickup 12</th>
+                        <th>Pickup 34</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Spark delay</td>
+                        <td id="b_coils12_spark_delay">-</td>
+                        <td id="b_coils34_spark_delay">-</td>
+                    </tr>
+                    <tr>
+                        <td>Spark status</td>
+                        <td id="b_coils12_spark_status">-</td>
+                        <td id="b_coils34_spark_status">-</td>
+                    </tr>
+                    <tr>
+                        <td>Soft start status</td>
+                        <td id="b_coils12_sstart_status">-</td>
+                        <td id="b_coils34_sstart_status">-</td>
+                    </tr>
+                    <tr>
+                        <td>Peak P in</td>
+                        <td id="b_coils12_peak_p_in">-</td>
+                        <td id="b_coils34_peak_p_in">-</td>
+                    </tr>
+                    <tr>
+                        <td>Peak N in</td>
+                        <td id="b_coils12_peak_n_in">-</td>
+                        <td id="b_coils34_peak_n_in">-</td>
+                    </tr>
+                    <tr>
+                        <td>Peak P out</td>
+                        <td id="b_coils12_peak_p_out">-</td>
+                        <td id="b_coils34_peak_p_out">-</td>
+                    </tr>
+                    <tr>
+                        <td>Peak N out</td>
+                        <td id="b_coils12_peak_n_out">-</td>
+                        <td id="b_coils34_peak_n_out">-</td>
+                    </tr>
+                    <tr>
+                        <td>Level spark</td>
+                        <td id="b_coils12_level_spark">-</td>
+                        <td id="b_coils34_level_spark">-</td>
+                    </tr>
+                    <tr>
+                        <td>Spark Events</td>
+                        <td id="b_coils12_n_events">-</td>
+                        <td id="b_coils34_n_events">-</td>
+                    </tr>
+                    <tr>
+                        <td>Missed Events</td>
+                        <td id="b_coils12_n_missed_firing">-</td>
+                        <td id="b_coils34_n_missed_firing">-</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="upload-section">
+        <h3>Upload file to Flash</h3>
+        <p>Select a file and upload it to Flash.</p>
+        <input type="file" id="littlefsFile">
+        <button onclick="uploadLittleFS()">Upload</button>
+        <div id="uploadStatus" class="upload-status">No file uploaded yet.</div>
+    </div>
+
+    <script src="script.js"></script>
+</body>
+
+</html>

RotaxMonitor/unpacked_fs/logo_astro_dev.svg

@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="e_astro_logo_negativo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 374 56" style="enable-background:new 0 0 374 56;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<polygon class="st0" points="53.9,46 59.2,46 59.2,44.8 55.3,44.8 55.3,42.4 59,42.4 59,41.2 55.3,41.2 55.3,38.8 59.2,38.8 
+		59.2,37.6 53.9,37.6 	"/>
+	<rect x="61.5" y="37.1" class="st0" width="1.4" height="8.9"/>
+	<path class="st0" d="M70.3,41.8c-0.1-0.4-0.2-0.8-0.4-1.2c-0.2-0.3-0.5-0.6-0.9-0.8c-0.4-0.2-0.8-0.3-1.3-0.3c-0.5,0-1,0.1-1.5,0.4
+		c-0.4,0.3-0.8,0.6-1.1,1.1c-0.3,0.5-0.4,1.1-0.4,1.8c0,0.7,0.1,1.2,0.4,1.7c0.3,0.5,0.6,0.9,1.1,1.2c0.4,0.3,0.9,0.4,1.5,0.4
+		c0.5,0,0.9-0.1,1.3-0.3c0.4-0.2,0.7-0.4,0.9-0.7c0.2-0.3,0.4-0.7,0.5-1.1h-1.4c-0.1,0.3-0.2,0.5-0.4,0.7c-0.2,0.2-0.5,0.2-0.8,0.2
+		c-0.3,0-0.6-0.1-0.9-0.3c-0.2-0.2-0.4-0.4-0.5-0.7c-0.1-0.3-0.2-0.6-0.2-1h4.2C70.4,42.6,70.4,42.2,70.3,41.8z M66.2,42.3
+		c0-0.3,0.1-0.5,0.2-0.8c0.1-0.3,0.3-0.5,0.5-0.7c0.2-0.2,0.5-0.3,0.9-0.3c0.3,0,0.5,0.1,0.7,0.2c0.2,0.1,0.3,0.3,0.4,0.4
+		c0.1,0.2,0.2,0.4,0.2,0.6c0,0.2,0,0.3,0,0.5H66.2z"/>
+	<path class="st0" d="M73.8,41c0.2-0.1,0.5-0.2,0.7-0.2c0.3,0,0.6,0.1,0.8,0.3c0.2,0.2,0.4,0.4,0.4,0.7l1.4-0.1
+		c0-0.3-0.1-0.5-0.3-0.8c-0.1-0.3-0.3-0.5-0.5-0.7c-0.2-0.2-0.5-0.4-0.8-0.5c-0.3-0.1-0.7-0.2-1.1-0.2c-0.5,0-1,0.1-1.5,0.4
+		c-0.4,0.3-0.8,0.6-1.1,1.1c-0.3,0.5-0.4,1.1-0.4,1.8c0,0.7,0.1,1.3,0.4,1.8c0.3,0.5,0.6,0.9,1.1,1.2c0.5,0.3,0.9,0.4,1.5,0.4
+		c0.6,0,1-0.1,1.4-0.3c0.4-0.2,0.7-0.5,0.9-0.9c0.2-0.4,0.3-0.8,0.3-1.2h-1.4c0,0.3-0.1,0.6-0.3,0.8c-0.2,0.2-0.5,0.3-0.9,0.3
+		c-0.3,0-0.5-0.1-0.8-0.2c-0.2-0.2-0.4-0.4-0.6-0.7c-0.1-0.3-0.2-0.7-0.2-1.1c0-0.5,0.1-0.9,0.2-1.2C73.4,41.4,73.6,41.1,73.8,41z"
+		/>
+	<path class="st0" d="M81.8,45c-0.2,0-0.3,0.1-0.5,0.1c-0.5,0-0.8-0.3-0.8-0.8v-3.6h1.8v-0.9h-1.8V38h-1.4v1.7h-0.9v0.9h0.9v3.7
+		c0,0.4,0.1,0.8,0.3,1.1c0.2,0.3,0.4,0.5,0.7,0.6c0.3,0.1,0.6,0.2,1,0.2c0.2,0,0.5,0,0.7-0.1c0.2-0.1,0.5-0.1,0.7-0.2l-0.2-1
+		C82.2,44.9,82,45,81.8,45z"/>
+	<path class="st0" d="M87.3,39.6c-0.4,0-0.7,0.1-1.1,0.4c-0.3,0.2-0.5,0.6-0.6,1v-1.3h-1.4V46h1.4v-2.8h0c0-0.5,0.1-0.9,0.2-1.2
+		c0.1-0.3,0.3-0.6,0.5-0.8c0.2-0.2,0.5-0.3,0.9-0.3c0.1,0,0.2,0,0.4,0c0.1,0,0.3,0,0.4,0.1l0-1.4c-0.1,0-0.2-0.1-0.3-0.1
+		C87.5,39.6,87.4,39.6,87.3,39.6z"/>
+	<path class="st0" d="M93.1,39.9c-0.5-0.2-1-0.4-1.5-0.4c-0.6,0-1.1,0.1-1.5,0.4c-0.5,0.2-0.8,0.6-1.1,1.1c-0.3,0.5-0.4,1.1-0.4,1.9
+		c0,0.7,0.1,1.3,0.4,1.8c0.3,0.5,0.6,0.9,1.1,1.1c0.5,0.2,1,0.4,1.5,0.4c0.6,0,1.1-0.1,1.5-0.4c0.5-0.2,0.8-0.6,1.1-1.1
+		c0.3-0.5,0.4-1.1,0.4-1.8c0-0.7-0.1-1.4-0.4-1.9C94,40.5,93.6,40.1,93.1,39.9z M93,44c-0.1,0.3-0.3,0.6-0.6,0.7
+		c-0.3,0.2-0.5,0.2-0.9,0.2c-0.5,0-0.9-0.2-1.2-0.5C90.1,44,90,43.5,90,42.9c0-0.5,0.1-0.9,0.2-1.2c0.1-0.3,0.3-0.6,0.6-0.7
+		c0.3-0.2,0.5-0.2,0.9-0.2c0.5,0,0.9,0.2,1.2,0.5c0.3,0.4,0.4,0.9,0.4,1.6C93.2,43.3,93.2,43.7,93,44z"/>
+	<path class="st0" d="M101.2,39.9c-0.4-0.2-0.8-0.3-1.3-0.3c-0.5,0-1,0.1-1.3,0.4c-0.3,0.2-0.5,0.5-0.7,0.9l-0.2-1.1h-1.2V46h1.4
+		v-2.9c0-0.5,0.1-0.9,0.2-1.3c0.1-0.4,0.3-0.6,0.6-0.8c0.2-0.2,0.5-0.3,0.9-0.3c0.4,0,0.7,0.1,1,0.4c0.2,0.3,0.4,0.6,0.4,1.2V46h1.4
+		v-3.7c0-0.6-0.1-1.1-0.3-1.5C101.8,40.4,101.5,40.1,101.2,39.9z"/>
+	<rect x="104.7" y="39.7" class="st0" width="1.4" height="6.3"/>
+	<path class="st0" d="M105.4,36.8c-0.3,0-0.5,0.1-0.6,0.2c-0.2,0.1-0.2,0.3-0.2,0.6c0,0.3,0.1,0.5,0.2,0.6c0.2,0.1,0.4,0.2,0.6,0.2
+		c0.3,0,0.5-0.1,0.6-0.2c0.2-0.1,0.2-0.4,0.2-0.6c0-0.2-0.1-0.4-0.2-0.6C105.9,36.9,105.6,36.8,105.4,36.8z"/>
+	<path class="st0" d="M110.3,41c0.2-0.1,0.5-0.2,0.7-0.2c0.3,0,0.6,0.1,0.8,0.3c0.2,0.2,0.4,0.4,0.4,0.7l1.4-0.1
+		c0-0.3-0.1-0.5-0.3-0.8c-0.1-0.3-0.3-0.5-0.5-0.7c-0.2-0.2-0.5-0.4-0.8-0.5c-0.3-0.1-0.7-0.2-1.1-0.2c-0.5,0-1,0.1-1.5,0.4
+		c-0.5,0.3-0.8,0.6-1.1,1.1c-0.3,0.5-0.4,1.1-0.4,1.8c0,0.7,0.1,1.3,0.4,1.8c0.3,0.5,0.6,0.9,1.1,1.2c0.4,0.3,0.9,0.4,1.5,0.4
+		c0.6,0,1-0.1,1.4-0.3c0.4-0.2,0.7-0.5,0.9-0.9c0.2-0.4,0.3-0.8,0.3-1.2h-1.4c0,0.3-0.1,0.6-0.3,0.8c-0.2,0.2-0.5,0.3-0.9,0.3
+		c-0.3,0-0.5-0.1-0.8-0.2c-0.2-0.2-0.4-0.4-0.6-0.7c-0.1-0.3-0.2-0.7-0.2-1.1c0-0.5,0.1-0.9,0.2-1.2C109.9,41.4,110.1,41.1,110.3,41
+		z"/>
+	<path class="st0" d="M123.7,38.1c-0.6-0.3-1.4-0.5-2.2-0.5h-2.6V46h2.6c0.9,0,1.6-0.2,2.2-0.5c0.6-0.3,1.1-0.8,1.5-1.5
+		c0.4-0.6,0.5-1.4,0.5-2.2c0-0.9-0.2-1.6-0.5-2.2C124.9,38.9,124.4,38.5,123.7,38.1z M123.9,43.3c-0.2,0.4-0.5,0.8-1,1.1
+		c-0.4,0.3-0.9,0.4-1.5,0.4h-1.3v-5.9h1.3c0.6,0,1.1,0.1,1.5,0.4c0.4,0.3,0.7,0.6,1,1c0.2,0.4,0.3,1,0.3,1.5
+		C124.2,42.4,124.1,42.9,123.9,43.3z"/>
+	<path class="st0" d="M132.6,41.8c-0.1-0.4-0.2-0.8-0.4-1.2c-0.2-0.3-0.5-0.6-0.9-0.8c-0.4-0.2-0.8-0.3-1.3-0.3
+		c-0.5,0-1,0.1-1.5,0.4c-0.4,0.3-0.8,0.6-1.1,1.1c-0.3,0.5-0.4,1.1-0.4,1.8c0,0.7,0.1,1.2,0.4,1.7c0.3,0.5,0.6,0.9,1.1,1.2
+		c0.4,0.3,0.9,0.4,1.5,0.4c0.5,0,0.9-0.1,1.3-0.3c0.4-0.2,0.7-0.4,0.9-0.7c0.2-0.3,0.4-0.7,0.5-1.1h-1.4c-0.1,0.3-0.2,0.5-0.4,0.7
+		c-0.2,0.2-0.5,0.2-0.8,0.2c-0.3,0-0.6-0.1-0.9-0.3c-0.2-0.2-0.4-0.4-0.5-0.7c-0.1-0.3-0.2-0.6-0.2-1h4.2
+		C132.7,42.6,132.7,42.2,132.6,41.8z M128.5,42.3c0-0.3,0.1-0.5,0.2-0.8c0.1-0.3,0.3-0.5,0.5-0.7c0.2-0.2,0.5-0.3,0.9-0.3
+		c0.3,0,0.5,0.1,0.7,0.2c0.2,0.1,0.3,0.3,0.4,0.4c0.1,0.2,0.2,0.4,0.2,0.6c0,0.2,0,0.3,0,0.5H128.5z"/>
+	<path class="st0" d="M137.9,42.6l-1.4-0.5c-0.6-0.2-0.9-0.4-0.9-0.8c0-0.2,0.1-0.4,0.3-0.5c0.2-0.1,0.5-0.2,0.8-0.2
+		c0.4,0,0.7,0.1,0.9,0.2c0.2,0.1,0.3,0.3,0.3,0.5h1.3c0-0.5-0.2-1-0.7-1.3c-0.4-0.3-1.1-0.5-1.9-0.5c-0.8,0-1.4,0.2-1.9,0.5
+		c-0.5,0.3-0.7,0.7-0.7,1.3c0,0.4,0.1,0.8,0.4,1c0.3,0.3,0.7,0.5,1.2,0.7l1.3,0.5c0.3,0.1,0.5,0.2,0.7,0.3c0.1,0.1,0.2,0.3,0.2,0.5
+		c0,0.2-0.1,0.3-0.2,0.4c-0.1,0.1-0.3,0.2-0.4,0.3c-0.2,0.1-0.4,0.1-0.6,0.1c-0.4,0-0.8-0.1-1-0.2c-0.3-0.2-0.4-0.4-0.4-0.7H134
+		c0,0.4,0.1,0.8,0.4,1.1c0.2,0.3,0.6,0.6,1,0.7c0.4,0.2,0.9,0.3,1.6,0.3c0.5,0,1-0.1,1.4-0.3c0.4-0.2,0.7-0.4,0.9-0.7
+		c0.2-0.3,0.3-0.6,0.3-0.9c0-0.4-0.1-0.7-0.4-1C138.8,43,138.4,42.8,137.9,42.6z"/>
+	<rect x="141.6" y="39.7" class="st0" width="1.4" height="6.3"/>
+	<path class="st0" d="M142.3,36.8c-0.3,0-0.5,0.1-0.6,0.2c-0.2,0.1-0.2,0.3-0.2,0.6c0,0.3,0.1,0.5,0.2,0.6c0.2,0.1,0.4,0.2,0.6,0.2
+		c0.3,0,0.5-0.1,0.6-0.2c0.2-0.1,0.2-0.4,0.2-0.6c0-0.2-0.1-0.4-0.2-0.6C142.7,36.9,142.5,36.8,142.3,36.8z"/>
+	<path class="st0" d="M151.1,45.5c-0.4-0.2-0.9-0.4-1.5-0.4h-2.2c-0.4,0-0.7-0.1-0.8-0.2c-0.2-0.1-0.2-0.3-0.2-0.4
+		c0-0.2,0-0.3,0.1-0.4c0.1-0.1,0.2-0.2,0.3-0.2c0.1,0,0.1,0,0.2,0c0.4,0.1,0.7,0.2,1.2,0.2c0.5,0,0.9-0.1,1.3-0.3
+		c0.4-0.2,0.7-0.5,1-0.8c0.2-0.3,0.4-0.7,0.4-1.2c0-0.5-0.1-0.9-0.4-1.2c0,0-0.1-0.1-0.1-0.1c0-0.3,0.1-0.5,0.3-0.6
+		c0.2-0.1,0.5-0.2,0.9-0.2l0.1-1.3c-0.4,0-0.7,0.1-1,0.2c-0.3,0.2-0.5,0.4-0.7,0.7c-0.1,0.2-0.2,0.5-0.2,0.8
+		c-0.1-0.1-0.2-0.1-0.2-0.2c-0.4-0.2-0.8-0.3-1.3-0.3c-0.5,0-0.9,0.1-1.4,0.3c-0.4,0.2-0.7,0.5-1,0.8c-0.2,0.3-0.4,0.7-0.4,1.2
+		c0,0.5,0.1,0.9,0.4,1.2c0.1,0.2,0.3,0.3,0.4,0.4c-0.1,0-0.2,0-0.2,0.1c-0.3,0.1-0.4,0.2-0.6,0.4c-0.1,0.2-0.2,0.4-0.2,0.7
+		c0,0.3,0.1,0.5,0.3,0.7c0.1,0.2,0.3,0.3,0.5,0.4c-0.3,0.1-0.6,0.1-0.8,0.3c-0.3,0.2-0.5,0.6-0.5,1.1c0,0.4,0.1,0.7,0.4,1
+		c0.3,0.3,0.7,0.6,1.2,0.8c0.5,0.2,1.1,0.3,1.8,0.3c0.8,0,1.4-0.1,2-0.4c0.5-0.3,1-0.6,1.3-1c0.3-0.4,0.4-0.8,0.4-1.3
+		C151.7,46.1,151.5,45.8,151.1,45.5z M147.1,40.9c0.2-0.2,0.5-0.4,1-0.4c0.4,0,0.7,0.1,1,0.4c0.2,0.2,0.3,0.6,0.3,0.9
+		c0,0.4-0.1,0.7-0.3,0.9c-0.2,0.3-0.5,0.4-1,0.4c-0.4,0-0.7-0.1-1-0.4c-0.2-0.3-0.3-0.6-0.3-0.9C146.8,41.4,146.9,41.1,147.1,40.9z
+		 M150,47.4c-0.2,0.2-0.5,0.4-0.8,0.5c-0.3,0.1-0.7,0.2-1.2,0.2c-0.6,0-1.1-0.1-1.5-0.3c-0.4-0.2-0.5-0.4-0.5-0.8
+		c0-0.3,0.1-0.5,0.4-0.7c0.2-0.2,0.6-0.3,1-0.3h2.2c0.2,0,0.4,0.1,0.5,0.2c0.1,0.1,0.2,0.3,0.2,0.4C150.3,47,150.2,47.2,150,47.4z"
+		/>
+	<path class="st0" d="M157.9,39.9c-0.3-0.2-0.8-0.3-1.3-0.3c-0.5,0-1,0.1-1.3,0.4c-0.3,0.2-0.5,0.5-0.7,0.9l-0.2-1.1h-1.2V46h1.4
+		v-2.9c0-0.5,0.1-0.9,0.2-1.3c0.1-0.4,0.3-0.6,0.6-0.8c0.2-0.2,0.5-0.3,0.9-0.3c0.4,0,0.7,0.1,1,0.4c0.2,0.3,0.4,0.6,0.4,1.2V46h1.4
+		v-3.7c0-0.6-0.1-1.1-0.3-1.5C158.5,40.4,158.2,40.1,157.9,39.9z"/>
+	<path class="st0" d="M166.7,37c-0.3,0-0.7,0.1-0.9,0.2c-0.3,0.1-0.5,0.3-0.7,0.6c-0.2,0.3-0.3,0.6-0.3,1.1v0.8h-1v0.9h1V46h1.4
+		v-5.4h1.2v-0.9h-1.2v-0.8c0-0.2,0-0.4,0.1-0.5c0.1-0.1,0.2-0.2,0.3-0.3c0.1,0,0.2-0.1,0.4-0.1c0.1,0,0.2,0,0.3,0
+		c0.1,0,0.2,0.1,0.3,0.1l0.3-1.1c-0.2,0-0.4-0.1-0.6-0.1C167.1,37,166.9,37,166.7,37z"/>
+	<path class="st0" d="M173.1,39.9c-0.5-0.2-1-0.4-1.5-0.4c-0.6,0-1.1,0.1-1.5,0.4c-0.5,0.2-0.8,0.6-1.1,1.1
+		c-0.3,0.5-0.4,1.1-0.4,1.9c0,0.7,0.1,1.3,0.4,1.8c0.3,0.5,0.6,0.9,1.1,1.1c0.5,0.2,1,0.4,1.5,0.4c0.6,0,1.1-0.1,1.5-0.4
+		c0.5-0.2,0.8-0.6,1.1-1.1c0.3-0.5,0.4-1.1,0.4-1.8c0-0.7-0.1-1.4-0.4-1.9C173.9,40.5,173.6,40.1,173.1,39.9z M173,44
+		c-0.1,0.3-0.3,0.6-0.6,0.7c-0.3,0.2-0.5,0.2-0.9,0.2c-0.5,0-0.9-0.2-1.2-0.5c-0.3-0.4-0.4-0.9-0.4-1.6c0-0.5,0.1-0.9,0.2-1.2
+		c0.1-0.3,0.3-0.6,0.6-0.7c0.3-0.2,0.5-0.2,0.9-0.2c0.5,0,0.9,0.2,1.2,0.5c0.3,0.4,0.4,0.9,0.4,1.6C173.2,43.3,173.2,43.7,173,44z"
+		/>
+	<path class="st0" d="M179.6,39.6c-0.4,0-0.7,0.1-1.1,0.4c-0.3,0.2-0.5,0.6-0.6,1v-1.3h-1.4V46h1.4v-2.8h0c0-0.5,0.1-0.9,0.2-1.2
+		c0.1-0.3,0.3-0.6,0.5-0.8c0.2-0.2,0.5-0.3,0.9-0.3c0.1,0,0.2,0,0.4,0c0.1,0,0.3,0,0.4,0.1l0-1.4c-0.1,0-0.2-0.1-0.3-0.1
+		C179.8,39.6,179.7,39.6,179.6,39.6z"/>
+	<path class="st0" d="M188.9,41.4l-1.8-0.7c-0.4-0.1-0.6-0.3-0.8-0.4c-0.2-0.1-0.3-0.4-0.3-0.6c0-0.3,0.1-0.5,0.4-0.7
+		c0.3-0.2,0.6-0.3,1.1-0.3c0.5,0,0.9,0.1,1.1,0.3c0.3,0.2,0.4,0.5,0.5,0.8h1.4c-0.1-0.7-0.4-1.3-0.9-1.8c-0.5-0.4-1.2-0.6-2.1-0.6
+		c-1,0-1.7,0.2-2.2,0.6c-0.5,0.4-0.8,1-0.8,1.6c0,0.6,0.2,1.1,0.5,1.4c0.3,0.3,0.9,0.6,1.5,0.9l1.6,0.6c0.4,0.1,0.7,0.3,0.9,0.5
+		c0.2,0.2,0.3,0.4,0.3,0.7c0,0.2-0.1,0.4-0.2,0.6c-0.1,0.2-0.3,0.3-0.6,0.4c-0.3,0.1-0.6,0.1-0.9,0.1c-0.3,0-0.6-0.1-0.9-0.2
+		c-0.3-0.1-0.5-0.3-0.7-0.5c-0.2-0.2-0.3-0.5-0.3-0.8h-1.4c0,0.6,0.2,1.1,0.5,1.6c0.3,0.4,0.7,0.7,1.2,0.9c0.5,0.2,1,0.3,1.6,0.3
+		c0.7,0,1.3-0.1,1.8-0.3c0.5-0.2,0.8-0.5,1.1-0.9c0.3-0.4,0.4-0.8,0.4-1.3c0-0.6-0.2-1-0.5-1.4C190,42,189.5,41.7,188.9,41.4z"/>
+	<path class="st0" d="M197.5,39.9c-0.4-0.3-0.9-0.4-1.4-0.4c-0.4,0-0.8,0.1-1.1,0.3c-0.3,0.2-0.5,0.4-0.7,0.8l-0.1-0.9h-1.1v9.4h1.4
+		v-3.7c0.1,0.2,0.3,0.3,0.5,0.5c0.3,0.2,0.7,0.3,1.2,0.3c0.5,0,1-0.1,1.4-0.4c0.4-0.3,0.8-0.6,1.1-1.1c0.3-0.5,0.4-1.1,0.4-1.8
+		c0-0.7-0.1-1.3-0.4-1.8C198.3,40.6,197.9,40.2,197.5,39.9z M197.3,44c-0.2,0.3-0.4,0.5-0.6,0.7c-0.3,0.2-0.5,0.2-0.8,0.2
+		c-0.3,0-0.5-0.1-0.7-0.2c-0.2-0.1-0.4-0.3-0.6-0.5c-0.1-0.2-0.2-0.5-0.2-0.8v-1.1c0-0.3,0.1-0.6,0.2-0.9c0.1-0.2,0.3-0.4,0.6-0.5
+		c0.2-0.1,0.5-0.2,0.8-0.2c0.3,0,0.6,0.1,0.9,0.2c0.3,0.2,0.5,0.4,0.6,0.7c0.1,0.3,0.2,0.7,0.2,1.1C197.5,43.3,197.4,43.7,197.3,44z
+		"/>
+	<path class="st0" d="M205.7,41.8c-0.1-0.4-0.2-0.8-0.4-1.2c-0.2-0.3-0.5-0.6-0.9-0.8c-0.4-0.2-0.8-0.3-1.3-0.3
+		c-0.5,0-1,0.1-1.5,0.4c-0.4,0.3-0.8,0.6-1.1,1.1c-0.3,0.5-0.4,1.1-0.4,1.8c0,0.7,0.1,1.2,0.4,1.7c0.3,0.5,0.6,0.9,1.1,1.2
+		c0.4,0.3,0.9,0.4,1.5,0.4c0.5,0,0.9-0.1,1.3-0.3c0.4-0.2,0.7-0.4,0.9-0.7c0.2-0.3,0.4-0.7,0.5-1.1h-1.4c-0.1,0.3-0.2,0.5-0.4,0.7
+		c-0.2,0.2-0.5,0.2-0.8,0.2c-0.3,0-0.6-0.1-0.9-0.3c-0.2-0.2-0.4-0.4-0.5-0.7c-0.1-0.3-0.2-0.6-0.2-1h4.2
+		C205.8,42.6,205.8,42.2,205.7,41.8z M201.6,42.3c0-0.3,0.1-0.5,0.2-0.8c0.1-0.3,0.3-0.5,0.5-0.7c0.2-0.2,0.5-0.3,0.9-0.3
+		c0.3,0,0.5,0.1,0.7,0.2c0.2,0.1,0.3,0.3,0.4,0.4c0.1,0.2,0.2,0.4,0.2,0.6c0,0.2,0,0.3,0,0.5H201.6z"/>
+	<path class="st0" d="M209.3,41c0.2-0.1,0.5-0.2,0.7-0.2c0.3,0,0.6,0.1,0.8,0.3c0.2,0.2,0.4,0.4,0.4,0.7l1.4-0.1
+		c0-0.3-0.1-0.5-0.3-0.8c-0.1-0.3-0.3-0.5-0.5-0.7c-0.2-0.2-0.5-0.4-0.8-0.5c-0.3-0.1-0.7-0.2-1.1-0.2c-0.5,0-1,0.1-1.5,0.4
+		c-0.5,0.3-0.8,0.6-1.1,1.1c-0.3,0.5-0.4,1.1-0.4,1.8c0,0.7,0.1,1.3,0.4,1.8c0.3,0.5,0.6,0.9,1.1,1.2c0.4,0.3,0.9,0.4,1.5,0.4
+		c0.6,0,1-0.1,1.4-0.3c0.4-0.2,0.7-0.5,0.9-0.9c0.2-0.4,0.3-0.8,0.3-1.2h-1.4c0,0.3-0.1,0.6-0.3,0.8c-0.2,0.2-0.5,0.3-0.9,0.3
+		c-0.3,0-0.5-0.1-0.8-0.2c-0.2-0.2-0.4-0.4-0.6-0.7c-0.1-0.3-0.2-0.7-0.2-1.1c0-0.5,0.1-0.9,0.2-1.2C208.8,41.4,209,41.1,209.3,41z"
+		/>
+	<path class="st0" d="M215.3,36.8c-0.3,0-0.5,0.1-0.6,0.2c-0.2,0.1-0.2,0.3-0.2,0.6c0,0.3,0.1,0.5,0.2,0.6c0.2,0.1,0.4,0.2,0.6,0.2
+		c0.3,0,0.5-0.1,0.6-0.2c0.2-0.1,0.2-0.4,0.2-0.6c0-0.2-0.1-0.4-0.2-0.6C215.8,36.9,215.6,36.8,215.3,36.8z"/>
+	<rect x="214.6" y="39.7" class="st0" width="1.4" height="6.3"/>
+	<path class="st0" d="M222.6,39.8c-0.4-0.2-0.9-0.3-1.4-0.3c-0.6,0-1.1,0.1-1.5,0.2c-0.4,0.1-0.7,0.4-1,0.6
+		c-0.2,0.3-0.3,0.7-0.3,1.2h1.5c0-0.2,0.1-0.4,0.2-0.5c0.1-0.1,0.3-0.3,0.5-0.3c0.2-0.1,0.4-0.1,0.7-0.1c0.4,0,0.8,0.1,1,0.3
+		c0.2,0.2,0.3,0.6,0.3,1.1v0.7c-0.3-0.1-0.5-0.1-0.8-0.2c-0.3-0.1-0.6-0.1-1-0.1c-0.5,0-0.9,0.1-1.3,0.2c-0.4,0.1-0.7,0.3-0.9,0.6
+		c-0.2,0.3-0.3,0.6-0.3,1c0,0.3,0.1,0.7,0.3,1c0.2,0.3,0.4,0.6,0.8,0.7c0.4,0.2,0.8,0.3,1.3,0.3c0.5,0,0.9-0.1,1.2-0.3
+		c0.3-0.2,0.6-0.5,0.7-0.9l0.1,1h1.2v-4c0-0.6-0.1-1-0.3-1.4C223.3,40.2,223,39.9,222.6,39.8z M222.5,43.7c0,0.2-0.1,0.4-0.2,0.7
+		c-0.1,0.2-0.3,0.4-0.5,0.5c-0.2,0.1-0.5,0.2-0.8,0.2c-0.4,0-0.8-0.1-1-0.3c-0.2-0.2-0.3-0.4-0.3-0.7c0-0.3,0.1-0.6,0.4-0.7
+		c0.2-0.1,0.6-0.2,0.9-0.2c0.3,0,0.5,0,0.8,0.1c0.2,0,0.5,0.1,0.7,0.2V43.7z"/>
+	<rect x="226.2" y="37.1" class="st0" width="1.4" height="8.9"/>
+	<polygon class="st0" points="233.3,46 238.7,46 238.7,44.8 234.7,44.8 234.7,42.4 238.4,42.4 238.4,41.2 234.7,41.2 234.7,38.8 
+		238.7,38.8 238.7,37.6 233.3,37.6 	"/>
+	<path class="st0" d="M246.4,47.6c-0.1-0.2-0.1-0.4-0.1-0.6v-7.3h-0.9l-0.3,1c-0.2-0.4-0.5-0.7-0.8-0.9c-0.3-0.2-0.7-0.3-1.1-0.3
+		c-0.5,0-1,0.1-1.4,0.4c-0.4,0.3-0.8,0.6-1.1,1.1c-0.3,0.5-0.4,1.1-0.4,1.8c0,0.7,0.1,1.3,0.4,1.8c0.3,0.5,0.6,0.9,1.1,1.1
+		c0.4,0.3,0.9,0.4,1.4,0.4c0.5,0,0.8-0.1,1.1-0.3c0.2-0.2,0.4-0.4,0.5-0.8v1.8c0,0.7,0.1,1.2,0.4,1.5c0.3,0.4,0.8,0.6,1.4,0.8l0.4-1
+		c-0.2-0.1-0.4-0.2-0.5-0.2C246.5,47.9,246.4,47.8,246.4,47.6z M244.9,43.4c0,0.3-0.1,0.6-0.2,0.8c-0.1,0.2-0.3,0.4-0.6,0.5
+		c-0.2,0.1-0.5,0.2-0.7,0.2c-0.3,0-0.5-0.1-0.8-0.2c-0.3-0.2-0.5-0.4-0.6-0.7c-0.2-0.3-0.3-0.7-0.3-1.2c0-0.4,0.1-0.8,0.2-1.1
+		c0.1-0.3,0.3-0.6,0.6-0.7c0.3-0.2,0.5-0.2,0.9-0.2c0.3,0,0.5,0.1,0.7,0.2c0.2,0.1,0.4,0.3,0.5,0.5c0.1,0.2,0.2,0.5,0.2,0.9V43.4z"
+		/>
+	<path class="st0" d="M253,42.7c0,0.5-0.1,0.9-0.2,1.2c-0.2,0.3-0.4,0.6-0.6,0.7c-0.3,0.2-0.6,0.3-0.9,0.3c-0.4,0-0.7-0.1-0.9-0.3
+		c-0.2-0.2-0.3-0.6-0.3-1v-3.9h-1.4v4c0,0.6,0.1,1,0.3,1.4c0.2,0.4,0.5,0.6,0.9,0.8c0.4,0.2,0.8,0.2,1.2,0.2c0.5,0,0.9-0.1,1.2-0.4
+		c0.3-0.2,0.5-0.5,0.7-0.9V46h1.4v-6.3H253V42.7z"/>
+	<path class="st0" d="M257.7,36.8c-0.3,0-0.5,0.1-0.6,0.2c-0.2,0.1-0.2,0.3-0.2,0.6c0,0.3,0.1,0.5,0.2,0.6c0.2,0.1,0.4,0.2,0.6,0.2
+		c0.3,0,0.5-0.1,0.6-0.2c0.2-0.1,0.2-0.4,0.2-0.6c0-0.2-0.1-0.4-0.2-0.6C258.2,36.9,258,36.8,257.7,36.8z"/>
+	<rect x="257" y="39.7" class="st0" width="1.4" height="6.3"/>
+	<path class="st0" d="M265.6,39.9c-0.4-0.3-0.9-0.4-1.4-0.4c-0.4,0-0.8,0.1-1.1,0.3c-0.3,0.2-0.5,0.4-0.7,0.8l-0.1-0.9h-1.1v9.4h1.4
+		v-3.7c0.1,0.2,0.3,0.3,0.5,0.5c0.3,0.2,0.7,0.3,1.2,0.3c0.5,0,1-0.1,1.4-0.4c0.4-0.3,0.8-0.6,1.1-1.1c0.3-0.5,0.4-1.1,0.4-1.8
+		c0-0.7-0.1-1.3-0.4-1.8C266.4,40.6,266,40.2,265.6,39.9z M265.4,44c-0.2,0.3-0.4,0.5-0.6,0.7c-0.3,0.2-0.5,0.2-0.8,0.2
+		c-0.3,0-0.5-0.1-0.7-0.2c-0.2-0.1-0.4-0.3-0.6-0.5c-0.1-0.2-0.2-0.5-0.2-0.8v-1.1c0-0.3,0.1-0.6,0.2-0.9c0.1-0.2,0.3-0.4,0.6-0.5
+		c0.2-0.1,0.5-0.2,0.8-0.2c0.3,0,0.6,0.1,0.9,0.2c0.3,0.2,0.5,0.4,0.6,0.7c0.1,0.3,0.2,0.7,0.2,1.1C265.6,43.3,265.6,43.7,265.4,44z
+		"/>
+	<path class="st0" d="M277.9,39.9c-0.3-0.2-0.8-0.3-1.3-0.3c-0.4,0-0.7,0.1-1,0.2c-0.3,0.1-0.6,0.3-0.8,0.6
+		c-0.1,0.2-0.2,0.4-0.3,0.6c0,0,0-0.1,0-0.1c-0.2-0.4-0.4-0.7-0.8-1c-0.4-0.2-0.8-0.3-1.3-0.3c-0.5,0-0.9,0.1-1.2,0.3
+		c-0.3,0.2-0.6,0.5-0.8,1l-0.2-1.1h-1.2V46h1.4v-2.9c0-0.5,0.1-0.9,0.2-1.3c0.1-0.4,0.3-0.6,0.6-0.8c0.2-0.2,0.5-0.3,0.9-0.3
+		c0.4,0,0.7,0.1,1,0.4c0.2,0.3,0.4,0.6,0.4,1.2V46h1.4v-2.9c0-0.8,0.1-1.3,0.4-1.7c0.3-0.4,0.7-0.6,1.2-0.6c0.4,0,0.7,0.1,1,0.4
+		c0.2,0.3,0.4,0.6,0.4,1.2V46h1.4v-3.7c0-0.6-0.1-1.1-0.3-1.5C278.5,40.4,278.3,40.1,277.9,39.9z"/>
+	<path class="st0" d="M286.2,41.8c-0.1-0.4-0.2-0.8-0.4-1.2c-0.2-0.3-0.5-0.6-0.9-0.8c-0.4-0.2-0.8-0.3-1.3-0.3
+		c-0.5,0-1,0.1-1.5,0.4c-0.4,0.3-0.8,0.6-1.1,1.1c-0.3,0.5-0.4,1.1-0.4,1.8c0,0.7,0.1,1.2,0.4,1.7c0.3,0.5,0.6,0.9,1.1,1.2
+		c0.4,0.3,0.9,0.4,1.5,0.4c0.5,0,0.9-0.1,1.3-0.3c0.4-0.2,0.7-0.4,0.9-0.7c0.2-0.3,0.4-0.7,0.5-1.1h-1.4c-0.1,0.3-0.2,0.5-0.4,0.7
+		c-0.2,0.2-0.5,0.2-0.8,0.2c-0.3,0-0.6-0.1-0.9-0.3c-0.2-0.2-0.4-0.4-0.5-0.7c-0.1-0.3-0.2-0.6-0.2-1h4.2
+		C286.3,42.6,286.2,42.2,286.2,41.8z M282,42.3c0-0.3,0.1-0.5,0.2-0.8c0.1-0.3,0.3-0.5,0.5-0.7c0.2-0.2,0.5-0.3,0.9-0.3
+		c0.3,0,0.5,0.1,0.7,0.2c0.2,0.1,0.3,0.3,0.4,0.4c0.1,0.2,0.2,0.4,0.2,0.6c0,0.2,0,0.3,0,0.5H282z"/>
+	<path class="st0" d="M292.8,39.9c-0.3-0.2-0.8-0.3-1.3-0.3c-0.5,0-1,0.1-1.3,0.4c-0.3,0.2-0.5,0.5-0.7,0.9l-0.2-1.1h-1.2V46h1.4
+		v-2.9c0-0.5,0.1-0.9,0.2-1.3c0.1-0.4,0.3-0.6,0.6-0.8c0.2-0.2,0.5-0.3,0.9-0.3c0.4,0,0.7,0.1,1,0.4c0.2,0.3,0.4,0.6,0.4,1.2V46h1.4
+		v-3.7c0-0.6-0.1-1.1-0.3-1.5C293.4,40.4,293.2,40.1,292.8,39.9z"/>
+	<path class="st0" d="M298.9,45c-0.2,0-0.3,0.1-0.5,0.1c-0.5,0-0.8-0.3-0.8-0.8v-3.6h1.8v-0.9h-1.8V38h-1.4v1.7h-0.9v0.9h0.9v3.7
+		c0,0.4,0.1,0.8,0.3,1.1c0.2,0.3,0.4,0.5,0.7,0.6c0.3,0.1,0.6,0.2,1,0.2c0.2,0,0.5,0,0.7-0.1c0.2-0.1,0.5-0.1,0.7-0.2l-0.2-1
+		C299.3,44.9,299.1,45,298.9,45z"/>
+	<path class="st0" d="M58.3,21.7H65l1.3,4h3.1L63.5,8.1h-3.6l-6,17.5H57L58.3,21.7z M61.7,11.6l2.6,7.9h-5.2L61.7,11.6z"/>
+	<path class="st0" d="M80.4,23.1c-0.5,0.2-1.2,0.3-1.9,0.3c-0.7,0-1.3-0.1-1.9-0.3c-0.6-0.2-1.1-0.6-1.4-1c-0.4-0.5-0.5-1.1-0.5-1.8
+		h-2.8c0,1.3,0.4,2.4,1,3.2c0.6,0.9,1.4,1.5,2.4,1.9c1,0.4,2.1,0.6,3.3,0.6c1.4,0,2.7-0.2,3.7-0.6c1-0.4,1.8-1,2.3-1.8
+		c0.5-0.8,0.8-1.7,0.8-2.7c0-1.2-0.4-2.1-1.1-2.9c-0.7-0.8-1.7-1.4-3-1.9l-3.8-1.4c-0.7-0.3-1.3-0.6-1.6-0.9
+		c-0.3-0.3-0.5-0.7-0.5-1.3c0-0.6,0.3-1.1,0.8-1.6c0.6-0.4,1.3-0.6,2.3-0.6c1.1,0,1.9,0.2,2.4,0.6c0.5,0.4,0.9,1,1,1.7h2.8
+		c-0.1-1.6-0.7-2.8-1.8-3.7c-1.1-0.9-2.5-1.3-4.4-1.3c-2,0-3.5,0.4-4.6,1.3c-1.1,0.9-1.7,2-1.7,3.4c0,1.2,0.4,2.2,1.1,2.9
+		c0.7,0.7,1.8,1.3,3.2,1.8l3.4,1.3c0.8,0.3,1.4,0.6,1.8,1c0.4,0.4,0.6,0.9,0.6,1.5c0,0.5-0.2,0.9-0.5,1.2
+		C81.3,22.6,80.9,22.9,80.4,23.1z"/>
+	<polygon class="st0" points="92.7,25.6 95.7,25.6 95.7,10.6 101.2,10.6 101.2,8.1 87.2,8.1 87.2,10.6 92.7,10.6 	"/>
+	<path class="st0" d="M106.8,18.7h2.6l4,6.9h3.8l-4.8-7.2c1-0.2,1.9-0.6,2.5-1.2c1.1-1,1.6-2.2,1.6-3.8c0-1.6-0.5-2.9-1.6-3.9
+		c-1.1-1-2.7-1.5-4.7-1.5h-6.4v17.5h2.9V18.7z M106.8,10.6h3.5c1.1,0,2,0.3,2.6,0.8c0.6,0.6,0.9,1.3,0.9,2.2c0,0.9-0.3,1.6-0.9,2.2
+		c-0.6,0.6-1.5,0.9-2.8,0.9h-3.2V10.6z"/>
+	<path class="st0" d="M123.7,25c1.2,0.7,2.5,1,4.1,1c1.5,0,2.9-0.3,4.1-1c1.2-0.7,2.1-1.7,2.8-3c0.7-1.4,1-3.1,1-5.1
+		c0-2-0.3-3.7-1-5c-0.7-1.3-1.6-2.4-2.8-3c-1.2-0.7-2.5-1-4.1-1c-1.5,0-2.9,0.3-4.1,1c-1.2,0.7-2.1,1.7-2.8,3s-1,3-1,5.1
+		c0,2,0.3,3.7,1,5.1C121.6,23.3,122.5,24.3,123.7,25z M124.2,12.1c0.9-1.1,2-1.7,3.5-1.7c1.5,0,2.7,0.6,3.5,1.7s1.3,2.7,1.3,4.8
+		c0,2.1-0.4,3.7-1.3,4.8c-0.9,1.1-2.1,1.7-3.5,1.7c-1.5,0-2.6-0.6-3.5-1.7c-0.9-1.1-1.3-2.7-1.3-4.8
+		C122.9,14.8,123.4,13.2,124.2,12.1z"/>
+	<polygon class="st0" points="149.4,25.6 152.3,25.6 152.3,10.6 157.8,10.6 157.8,8.1 143.9,8.1 143.9,10.6 149.4,10.6 	"/>
+	<polygon class="st0" points="171.6,23.1 163.4,23.1 163.4,18.1 171.1,18.1 171.1,15.6 163.4,15.6 163.4,10.6 171.6,10.6 171.6,8.1 
+		160.5,8.1 160.5,25.6 171.6,25.6 	"/>
+	<path class="st0" d="M178.6,24.9c1.1,0.7,2.5,1.1,4,1.1c1.4,0,2.7-0.2,3.7-0.7c1-0.5,1.8-1.2,2.4-2.1c0.6-0.9,0.8-2,0.8-3.3h-3.1
+		c0,1-0.3,1.8-1,2.5c-0.7,0.6-1.6,1-2.8,1c-1,0-1.8-0.3-2.4-0.8c-0.7-0.5-1.2-1.3-1.5-2.3c-0.3-1-0.5-2.1-0.5-3.4
+		c0-1.4,0.2-2.6,0.6-3.6c0.4-1,0.9-1.7,1.6-2.1c0.7-0.5,1.4-0.7,2.2-0.7c0.9,0,1.7,0.3,2.4,0.9c0.7,0.6,1.1,1.4,1.5,2.3l3.1-0.6
+		c-0.4-1.6-1.1-2.8-2.2-3.8c-1.1-1-2.7-1.5-4.7-1.5c-1.5,0-2.8,0.3-3.9,1c-1.1,0.7-2,1.7-2.7,3c-0.7,1.3-1,3-1,5
+		c0,1.9,0.3,3.5,0.9,4.9C176.6,23.1,177.5,24.1,178.6,24.9z"/>
+	<polygon class="st0" points="196.3,12.7 204.5,25.6 207.5,25.6 207.5,8.1 204.6,8.1 204.6,20.8 196.6,8.1 193.4,8.1 193.4,25.6 
+		196.3,25.6 	"/>
+	<path class="st0" d="M215.2,25c1.2,0.7,2.5,1,4.1,1c1.5,0,2.9-0.3,4.1-1c1.2-0.7,2.1-1.7,2.8-3c0.7-1.4,1-3.1,1-5.1
+		c0-2-0.3-3.7-1-5c-0.7-1.3-1.6-2.4-2.8-3c-1.2-0.7-2.5-1-4.1-1c-1.5,0-2.9,0.3-4.1,1c-1.2,0.7-2.1,1.7-2.8,3c-0.7,1.3-1,3-1,5.1
+		c0,2,0.3,3.7,1,5.1C213.1,23.3,214,24.3,215.2,25z M215.7,12.1c0.9-1.1,2-1.7,3.5-1.7c1.5,0,2.7,0.6,3.5,1.7
+		c0.9,1.1,1.3,2.7,1.3,4.8c0,2.1-0.4,3.7-1.3,4.8c-0.9,1.1-2.1,1.7-3.5,1.7c-1.5,0-2.6-0.6-3.5-1.7c-0.9-1.1-1.3-2.7-1.3-4.8
+		C214.4,14.8,214.9,13.2,215.7,12.1z"/>
+	<polygon class="st0" points="241.3,23.1 233.9,23.1 233.9,8.1 231,8.1 231,25.6 241.3,25.6 	"/>
+	<path class="st0" d="M246.8,25c1.2,0.7,2.5,1,4.1,1c1.5,0,2.9-0.3,4.1-1c1.2-0.7,2.1-1.7,2.8-3c0.7-1.4,1-3.1,1-5.1
+		c0-2-0.3-3.7-1-5c-0.7-1.3-1.6-2.4-2.8-3c-1.2-0.7-2.5-1-4.1-1c-1.5,0-2.9,0.3-4.1,1c-1.2,0.7-2.1,1.7-2.8,3c-0.7,1.3-1,3-1,5.1
+		c0,2,0.3,3.7,1,5.1C244.7,23.3,245.6,24.3,246.8,25z M247.3,12.1c0.9-1.1,2-1.7,3.5-1.7c1.5,0,2.7,0.6,3.5,1.7
+		c0.9,1.1,1.3,2.7,1.3,4.8c0,2.1-0.4,3.7-1.3,4.8c-0.9,1.1-2.1,1.7-3.5,1.7c-1.5,0-2.6-0.6-3.5-1.7c-0.9-1.1-1.3-2.7-1.3-4.8
+		C246,14.8,246.4,13.2,247.3,12.1z"/>
+	<path class="st0" d="M265.1,24.9c1.2,0.7,2.4,1.1,3.8,1.1c1.2,0,2.1-0.3,2.9-0.9c0.7-0.6,1.2-1.4,1.6-2.4l0.3,2.9h2.4v-8.9h-6.9
+		v1.9l4.1,0.1v0.1c0,1-0.2,1.8-0.5,2.5c-0.4,0.7-0.8,1.2-1.5,1.5c-0.6,0.4-1.3,0.5-2.1,0.5c-0.9,0-1.8-0.3-2.5-0.8
+		c-0.7-0.5-1.3-1.3-1.7-2.2c-0.4-1-0.6-2.1-0.6-3.3c0-1.4,0.2-2.5,0.7-3.5c0.5-1,1.1-1.7,1.8-2.3c0.8-0.5,1.6-0.8,2.5-0.8
+		c0.8,0,1.5,0.2,2.1,0.6c0.6,0.4,1.2,1,1.7,1.7l2.9-0.7c-0.7-1.4-1.5-2.5-2.6-3.2c-1.1-0.7-2.4-1-4-1c-1.2,0-2.2,0.2-3.2,0.6
+		c-1,0.4-1.9,1-2.6,1.8c-0.8,0.8-1.3,1.8-1.8,2.9c-0.4,1.1-0.6,2.4-0.6,3.9c0,1.8,0.3,3.4,1,4.7C263,23.1,263.9,24.1,265.1,24.9z"/>
+	<rect x="280.8" y="8.1" class="st0" width="2.9" height="17.5"/>
+	<polygon class="st0" points="300,23.1 291.8,23.1 291.8,18.1 299.5,18.1 299.5,15.6 291.8,15.6 291.8,10.6 300,10.6 300,8.1 
+		288.9,8.1 288.9,25.6 300,25.6 	"/>
+	<path class="st0" d="M40.6,6.7H0v40.6h40.6V32.2H300v-1.2H40.6V6.7z M7.9,36.7H3.3c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7
+		h4.7c0.4,0,0.7,0.3,0.7,0.7C8.7,36.4,8.3,36.7,7.9,36.7z M7.9,32.2H3.3c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7h4.7
+		c0.4,0,0.7,0.3,0.7,0.7C8.7,31.9,8.3,32.2,7.9,32.2z M7.9,27.7H3.3c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7h4.7
+		c0.4,0,0.7,0.3,0.7,0.7C8.7,27.4,8.3,27.7,7.9,27.7z M7.9,23.3H3.3c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7h4.7
+		c0.4,0,0.7,0.3,0.7,0.7C8.7,22.9,8.3,23.3,7.9,23.3z M7.9,18.8H3.3c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7h4.7
+		c0.4,0,0.7,0.3,0.7,0.7C8.7,18.4,8.3,18.8,7.9,18.8z M12.1,43.5c0,0.4-0.3,0.7-0.7,0.7c-0.4,0-0.7-0.3-0.7-0.7v-4.7
+		c0-0.4,0.3-0.7,0.7-0.7c0.4,0,0.7,0.3,0.7,0.7V43.5z M12.1,15.2c0,0.4-0.3,0.7-0.7,0.7c-0.4,0-0.7-0.3-0.7-0.7v-4.7
+		c0-0.4,0.3-0.7,0.7-0.7c0.4,0,0.7,0.3,0.7,0.7V15.2z M16.6,43.5c0,0.4-0.3,0.7-0.7,0.7c-0.4,0-0.7-0.3-0.7-0.7v-4.7
+		c0-0.4,0.3-0.7,0.7-0.7c0.4,0,0.7,0.3,0.7,0.7V43.5z M16.6,15.2c0,0.4-0.3,0.7-0.7,0.7c-0.4,0-0.7-0.3-0.7-0.7v-4.7
+		c0-0.4,0.3-0.7,0.7-0.7c0.4,0,0.7,0.3,0.7,0.7V15.2z M21.1,43.5c0,0.4-0.3,0.7-0.7,0.7c-0.4,0-0.7-0.3-0.7-0.7v-4.7
+		c0-0.4,0.3-0.7,0.7-0.7c0.4,0,0.7,0.3,0.7,0.7V43.5z M21.1,15.2c0,0.4-0.3,0.7-0.7,0.7c-0.4,0-0.7-0.3-0.7-0.7v-4.7
+		c0-0.4,0.3-0.7,0.7-0.7c0.4,0,0.7,0.3,0.7,0.7V15.2z M25.5,43.5c0,0.4-0.3,0.7-0.7,0.7c-0.4,0-0.7-0.3-0.7-0.7v-4.7
+		c0-0.4,0.3-0.7,0.7-0.7c0.4,0,0.7,0.3,0.7,0.7V43.5z M25.5,15.2c0,0.4-0.3,0.7-0.7,0.7c-0.4,0-0.7-0.3-0.7-0.7v-4.7
+		c0-0.4,0.3-0.7,0.7-0.7c0.4,0,0.7,0.3,0.7,0.7V15.2z M30,43.5c0,0.4-0.3,0.7-0.7,0.7s-0.7-0.3-0.7-0.7v-4.7c0-0.4,0.3-0.7,0.7-0.7
+		s0.7,0.3,0.7,0.7V43.5z M30,15.2c0,0.4-0.3,0.7-0.7,0.7s-0.7-0.3-0.7-0.7v-4.7c0-0.4,0.3-0.7,0.7-0.7s0.7,0.3,0.7,0.7V15.2z
+		 M37.3,36.7h-4.7c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7h4.7c0.4,0,0.7,0.3,0.7,0.7C38.1,36.4,37.7,36.7,37.3,36.7z
+		 M37.3,32.2h-4.7c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7h4.7c0.4,0,0.7,0.3,0.7,0.7C38.1,31.9,37.7,32.2,37.3,32.2z
+		 M37.3,27.7h-4.7c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7h4.7c0.4,0,0.7,0.3,0.7,0.7C38.1,27.4,37.7,27.7,37.3,27.7z
+		 M37.3,23.3h-4.7c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7h4.7c0.4,0,0.7,0.3,0.7,0.7C38.1,22.9,37.7,23.3,37.3,23.3z
+		 M37.3,18.8h-4.7c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7h4.7c0.4,0,0.7,0.3,0.7,0.7C38.1,18.4,37.7,18.8,37.3,18.8z"/>
+	<path class="st0" d="M360.9,50.7v0.7c0.3,0,0.6-0.1,0.9-0.3v4.6h0.7v-5.3h-0.5C361.6,50.5,361.3,50.7,360.9,50.7z"/>
+	<rect x="341" y="52.9" class="st0" width="2.3" height="0.6"/>
+	<path class="st0" d="M332.1,50.4c-0.3-0.1-0.5-0.2-0.8-0.2c-0.6,0-1,0.1-1.3,0.4c-0.3,0.3-0.5,0.7-0.5,1.2c0,0.5,0.2,0.9,0.5,1.2
+		c0.3,0.3,0.7,0.5,1.1,0.5c0.4,0,0.8-0.1,1.1-0.3c0.3-0.2,0.4-0.6,0.5-1c0,0.2,0,0.4,0,0.6c0,1.1-0.3,1.9-0.8,2.2
+		c-0.2,0.1-0.4,0.2-0.7,0.2c-0.3,0-0.5-0.1-0.7-0.3c-0.2-0.2-0.3-0.4-0.3-0.8h-0.7c0,0.5,0.2,0.9,0.5,1.2c0.3,0.3,0.8,0.5,1.4,0.5
+		c0.3,0,0.6-0.1,0.9-0.2c0.8-0.4,1.2-1.3,1.2-2.7c0-0.8-0.2-1.4-0.6-1.9C332.6,50.7,332.3,50.5,332.1,50.4z M332,52.6
+		c-0.2,0.2-0.5,0.3-0.8,0.3s-0.6-0.1-0.8-0.3c-0.2-0.2-0.3-0.4-0.3-0.8c0-0.3,0.1-0.6,0.3-0.8c0.2-0.2,0.5-0.3,0.8-0.3
+		c0.3,0,0.6,0.1,0.8,0.3c0.2,0.2,0.3,0.4,0.3,0.7C332.3,52.2,332.2,52.4,332,52.6z"/>
+	<path class="st0" d="M347,54.2c0.1-0.1,0.3-0.3,0.6-0.4l1.1-0.4c0.4-0.2,0.7-0.4,0.9-0.6c0.2-0.3,0.3-0.6,0.3-1
+		c0-0.4-0.2-0.8-0.5-1.1c-0.3-0.3-0.8-0.4-1.3-0.4c-0.5,0-1,0.1-1.3,0.4c-0.3,0.2-0.5,0.6-0.6,1.1h0.7c0-0.3,0.2-0.5,0.4-0.6
+		c0.2-0.1,0.5-0.2,0.8-0.2c0.3,0,0.6,0.1,0.8,0.3c0.2,0.2,0.3,0.4,0.3,0.7c0,0.5-0.3,0.8-0.8,1.1l-1.1,0.4c-0.2,0.1-0.4,0.2-0.5,0.3
+		c-0.5,0.3-0.7,0.8-0.7,1.4v0.8h3.8V55h-3.1v-0.3C346.8,54.5,346.9,54.4,347,54.2z"/>
+	<path class="st0" d="M336.5,52.4c-0.4,0-0.8,0.1-1.1,0.4c-0.3,0.2-0.4,0.6-0.5,1.1c0-0.2,0-0.4,0-0.7c0-0.7,0.1-1.3,0.4-1.7
+		c0.3-0.4,0.7-0.6,1.2-0.6c0.5,0,0.8,0.3,0.9,0.8h0.7c0-0.4-0.2-0.8-0.5-1c-0.3-0.3-0.7-0.4-1.2-0.4c-0.7,0-1.2,0.3-1.6,0.8
+		c-0.4,0.5-0.6,1.2-0.6,2s0.2,1.5,0.6,2c0.4,0.5,0.9,0.8,1.5,0.8c0.5,0,1-0.2,1.3-0.5c0.3-0.3,0.5-0.7,0.5-1.2
+		c0-0.5-0.2-0.9-0.5-1.2C337.3,52.6,337,52.4,336.5,52.4z M337.1,54.9c-0.2,0.2-0.5,0.3-0.8,0.3s-0.6-0.1-0.8-0.3
+		c-0.2-0.2-0.3-0.4-0.3-0.7c0-0.3,0.1-0.6,0.3-0.8c0.2-0.2,0.5-0.3,0.8-0.3c0.3,0,0.6,0.1,0.8,0.3c0.2,0.2,0.3,0.4,0.3,0.8
+		C337.5,54.4,337.3,54.7,337.1,54.9z"/>
+	<path class="st0" d="M353.1,50.2c-0.6,0-1.2,0.2-1.5,0.7c-0.4,0.5-0.6,1.2-0.6,2.1c0,0.9,0.2,1.6,0.6,2.1c0.4,0.5,0.9,0.7,1.5,0.7
+		c0.6,0,1.2-0.2,1.5-0.7c0.4-0.5,0.6-1.2,0.6-2c0-0.9-0.2-1.6-0.6-2C354.2,50.5,353.7,50.2,353.1,50.2z M354.1,54.6
+		c-0.2,0.4-0.6,0.6-1,0.6c-0.5,0-0.8-0.2-1-0.6c-0.2-0.4-0.4-0.9-0.4-1.6c0-0.7,0.1-1.2,0.4-1.6c0.2-0.4,0.6-0.6,1-0.6
+		c0.5,0,0.8,0.2,1,0.6c0.2,0.4,0.4,0.9,0.4,1.6C354.5,53.7,354.3,54.2,354.1,54.6z"/>
+	<path class="st0" d="M327.1,50.4c-0.3-0.1-0.5-0.2-0.8-0.2c-0.6,0-1,0.1-1.3,0.4c-0.3,0.3-0.5,0.7-0.5,1.2c0,0.5,0.2,0.9,0.5,1.2
+		c0.3,0.3,0.7,0.5,1.1,0.5c0.4,0,0.8-0.1,1.1-0.3c0.3-0.2,0.4-0.6,0.5-1c0,0.2,0,0.4,0,0.6c0,1.1-0.3,1.9-0.8,2.2
+		c-0.2,0.1-0.4,0.2-0.7,0.2c-0.3,0-0.5-0.1-0.7-0.3c-0.2-0.2-0.3-0.4-0.3-0.8h-0.7c0,0.5,0.2,0.9,0.5,1.2c0.3,0.3,0.8,0.5,1.4,0.5
+		c0.3,0,0.6-0.1,0.9-0.2c0.8-0.4,1.2-1.3,1.2-2.7c0-0.8-0.2-1.4-0.6-1.9C327.6,50.7,327.4,50.5,327.1,50.4z M327.1,52.6
+		c-0.2,0.2-0.5,0.3-0.8,0.3c-0.3,0-0.6-0.1-0.8-0.3c-0.2-0.2-0.3-0.4-0.3-0.8c0-0.3,0.1-0.6,0.3-0.8c0.2-0.2,0.5-0.3,0.8-0.3
+		c0.3,0,0.6,0.1,0.8,0.3c0.2,0.2,0.3,0.4,0.3,0.7C327.4,52.2,327.3,52.4,327.1,52.6z"/>
+	<path class="st0" d="M321.5,50.7v0.7c0.3,0,0.6-0.1,0.9-0.3v4.6h0.7v-5.3h-0.5C322.3,50.5,321.9,50.7,321.5,50.7z"/>
+	<path class="st0" d="M357,54.2c0.1-0.1,0.3-0.3,0.6-0.4l1.1-0.4c0.4-0.2,0.7-0.4,0.9-0.6c0.2-0.3,0.3-0.6,0.3-1
+		c0-0.4-0.2-0.8-0.5-1.1c-0.3-0.3-0.8-0.4-1.3-0.4c-0.5,0-1,0.1-1.3,0.4c-0.3,0.2-0.5,0.6-0.6,1.1h0.7c0-0.3,0.2-0.5,0.4-0.6
+		c0.2-0.1,0.5-0.2,0.8-0.2c0.3,0,0.6,0.1,0.8,0.3c0.2,0.2,0.3,0.4,0.3,0.7c0,0.5-0.3,0.8-0.8,1.1l-1.1,0.4c-0.2,0.1-0.4,0.2-0.5,0.3
+		c-0.5,0.3-0.7,0.8-0.7,1.4v0.8h3.8V55h-3.1v-0.3C356.8,54.5,356.9,54.4,357,54.2z"/>
+	<rect x="350.4" y="41" class="st0" width="1" height="5.5"/>
+	<polygon class="st0" points="342.8,46.5 342.8,41 341.8,41 341.8,44.9 339.4,41 338.3,41 338.3,46.5 339.3,46.5 339.3,42.5 
+		341.8,46.5 	"/>
+	<polygon class="st0" points="348.9,46.5 348.9,41 347.9,41 347.9,44.9 345.4,41 344.4,41 344.4,46.5 345.4,46.5 345.4,42.5 
+		347.9,46.5 	"/>
+	<path class="st0" d="M336.3,46.5h1.1l-1.8-5.5h-1.3l-1.9,5.5h1.1l0.4-1.2h2L336.3,46.5z M334.1,44.6l0.8-2.4l0.8,2.4H334.1z"/>
+	<path class="st0" d="M373.5,33.6c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.2-0.2-0.3-0.4c-0.1-0.1-0.3-0.3-0.4-0.4c0,0-0.1-0.1-0.1-0.1
+		c0,0-0.1-0.1-0.1-0.1c-0.1-0.1-0.2-0.2-0.2-0.2c-0.1-0.1-0.2-0.2-0.3-0.2c0,0-0.1-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1
+		c-0.2-0.2-0.4-0.3-0.6-0.5c-0.2-0.2-0.5-0.4-0.7-0.6c-0.1-0.1-0.2-0.2-0.4-0.3c-0.1,0-0.1-0.1-0.2-0.1c-0.1,0-0.1-0.1-0.2-0.1
+		c-1.1-0.8-2.4-1.5-3.9-2.2c-0.2-0.1-0.4-0.2-0.6-0.3c-0.1,0-0.2-0.1-0.3-0.1c-0.1,0-0.2-0.1-0.3-0.1c-0.2-0.1-0.4-0.2-0.6-0.2
+		c-0.2-0.1-0.4-0.1-0.6-0.2c-0.1,0-0.2-0.1-0.3-0.1c-0.1,0-0.2-0.1-0.3-0.1c-0.2-0.1-0.4-0.1-0.7-0.2l-0.1,0l-0.1,0
+		c-0.1,0-0.1,0-0.2,0c-0.1,0-0.2-0.1-0.3-0.1c-0.2-0.1-0.5-0.1-0.7-0.2c-0.2,0-0.5-0.1-0.7-0.1c-0.1,0-0.2,0-0.4-0.1
+		c-0.1,0-0.2,0-0.4-0.1c-0.5-0.1-1-0.1-1.5-0.2c-0.3,0-0.5,0-0.8-0.1c-0.1,0-0.3,0-0.4,0c0.1,0,0.1,0,0.2,0c1.1-1.6,1.8-3.5,1.8-5.7
+		c0-2.8-0.9-5.1-2.6-6.8c-1.7-1.8-3.9-2.7-6.5-2.7c-0.3,0-0.6,0-0.9,0.1c-0.3,0-0.6,0.1-1,0.2l1.2-5.2h9.4V0.2h-13.5l-2.1,9.7
+		c-0.2-0.7-0.5-1.4-0.9-2c-0.8-1.4-1.9-2.5-3.2-3.2c-1.3-0.7-2.9-1.1-4.7-1.1c-2.9,0-5.2,0.9-7,2.7c-1.8,1.8-2.8,4.3-2.9,7.4h5.4
+		c0.1-1.5,0.5-2.7,1.3-3.6c0.8-0.9,1.8-1.3,3-1.3c1.2,0,2.1,0.4,2.9,1.1c0.7,0.7,1.1,1.7,1.1,2.8c0,1.1-0.4,2.3-1.1,3.6
+		c-0.7,1.3-2.2,3.1-4.3,5.3l-9,9.1v2.6c-0.1,0-0.2,0-0.3,0c-0.8,0-1.6,0-2.4-0.1c-1.5-0.1-2.9-0.4-4.1-0.8c-0.6-0.2-1.2-0.4-1.7-0.5
+		c-0.1,0-0.3-0.1-0.4-0.1c-0.1,0-0.1,0-0.2-0.1c-0.1,0-0.1,0-0.2-0.1c-0.1,0-0.2-0.1-0.3-0.1c-0.1,0-0.2-0.1-0.3-0.1
+		c-0.1,0-0.2-0.1-0.3-0.1c-0.1,0-0.2-0.1-0.3-0.1c-0.2-0.1-0.4-0.2-0.5-0.3c-0.2-0.1-0.3-0.2-0.4-0.2c-0.1-0.1-0.3-0.1-0.4-0.2
+		c-0.2-0.1-0.4-0.2-0.5-0.3c-0.1-0.1-0.2-0.1-0.2-0.1c0,0,0.1,0.1,0.1,0.1c0,0,0.1,0.1,0.2,0.2c0,0,0.1,0.1,0.1,0.1
+		c0,0,0.1,0.1,0.1,0.1c0.1,0.1,0.2,0.2,0.3,0.3c0.1,0.1,0.2,0.2,0.4,0.3c0.1,0.1,0.3,0.2,0.4,0.4c0.1,0.1,0.2,0.1,0.3,0.2
+		c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0,0.1,0.1,0.2,0.1c0.1,0,0.1,0.1,0.2,0.1
+		c0.1,0.1,0.2,0.2,0.4,0.2c0.1,0.1,0.2,0.2,0.4,0.2c0.1,0.1,0.3,0.2,0.4,0.2c0.1,0.1,0.3,0.2,0.4,0.2c0.1,0,0.1,0.1,0.2,0.1
+		c0.1,0,0.1,0.1,0.2,0.1c1.2,0.6,2.6,1.2,4.2,1.6c0.8,0.2,1.7,0.4,2.5,0.5c0.9,0.1,1.8,0.2,2.8,0.2c1.9,0.1,3.9-0.1,6-0.4
+		c2-0.3,4.1-0.8,6.2-1.5c2.1-0.6,4.1-1.4,6.1-2.3c0.1-0.1,0.2-0.1,0.4-0.2l0.3-0.2c0.2-0.1,0.5-0.2,0.7-0.3l0.1,0l0.1,0l0.2-0.1
+		l0.3-0.1l0.2-0.1c0.1,0,0.1,0,0.2-0.1l0.3-0.1c0.9-0.3,1.9-0.6,2.8-0.9c0.1,0,0.1,0,0.2,0l0.2,0c0.1,0,0.2-0.1,0.4-0.1
+		c0.2-0.1,0.5-0.1,0.7-0.2c0.1,0,0.2-0.1,0.4-0.1c0.1,0,0.1,0,0.2,0l0.2,0c0.1,0,0.2,0,0.4-0.1l0.2,0c0.1,0,0.1,0,0.2,0
+		c0.2,0,0.5-0.1,0.7-0.1c0.1,0,0.2,0,0.4,0c0.1,0,0.2,0,0.4,0c0.1,0,0.2,0,0.4,0c0.1,0,0.2,0,0.4,0c0.1,0,0.2,0,0.3,0
+		c0.1,0,0.2,0,0.3,0c0.9-0.1,1.8-0.1,2.7-0.1c0.2,0,0.4,0,0.7,0c0.1,0,0.1,0,0.2,0l0.1,0l0.1,0c0.1,0,0.2,0,0.3,0c0.1,0,0.2,0,0.3,0
+		c0.1,0,0.2,0,0.3,0c0.2,0,0.4,0,0.6,0.1c0.2,0,0.4,0,0.6,0.1c0.1,0,0.2,0,0.3,0c0.1,0,0.1,0,0.2,0l0.1,0l0.1,0
+		c0.2,0,0.4,0.1,0.6,0.1c0.1,0,0.2,0,0.3,0c0.1,0,0.2,0,0.3,0.1c0.2,0,0.4,0.1,0.6,0.1c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0
+		c0.1,0,0.2,0,0.3,0.1c0.1,0,0.2,0,0.3,0.1c0.1,0,0.2,0,0.3,0.1c0.2,0.1,0.4,0.1,0.6,0.2c1.5,0.4,2.8,0.9,3.9,1.4
+		c0.1,0,0.1,0.1,0.2,0.1c0.1,0,0.1,0.1,0.2,0.1c0.1,0.1,0.3,0.1,0.4,0.2c0.1,0.1,0.3,0.1,0.4,0.2c0.1,0.1,0.3,0.1,0.4,0.2
+		c0.2,0.1,0.5,0.3,0.7,0.4c0.1,0,0.1,0.1,0.2,0.1c0.1,0,0.1,0.1,0.2,0.1c0.1,0.1,0.2,0.1,0.3,0.2c0.1,0.1,0.2,0.1,0.3,0.2
+		c0,0,0.1,0.1,0.1,0.1c0,0,0.1,0.1,0.1,0.1c0.2,0.1,0.3,0.2,0.5,0.3c0.2,0.1,0.3,0.2,0.4,0.3c0.1,0.1,0.2,0.2,0.3,0.2
+		c0.4,0.3,0.6,0.4,0.6,0.4C374,34.2,373.8,34,373.5,33.6z M335.8,24.8c2.6-2.7,4.4-5,5.4-7c0.2-0.4,0.4-0.9,0.6-1.3l3.6,0.8
+		c0.6-0.6,1.1-1,1.7-1.3c0.6-0.3,1.2-0.4,1.8-0.4c1.1,0,2.1,0.4,2.9,1.3c0.8,0.9,1.2,1.9,1.2,3.3c0,1.4-0.4,2.5-1.3,3.4
+		c-0.8,0.9-1.9,1.3-3.1,1.3c-0.9,0-1.7-0.2-2.4-0.7c-0.7-0.5-1.3-1.1-1.7-2h-5.7c0.5,2.4,1.7,4.3,3.5,5.7c0.2,0.1,0.3,0.2,0.5,0.4
+		c0,0,0,0,0,0c-0.2,0.1-0.3,0.1-0.5,0.2c0,0,0,0,0,0h-9.6L335.8,24.8z"/>
+</g>
+</svg>

RotaxMonitor/unpacked_fs/script.js

@@ -0,0 +1,164 @@
+let ws;
+let lastMessageTimestamp = 0;
+const IDLE_THRESHOLD_MS = 1000;
+const loadingIndicator = document.getElementById("loadingIndicator");
+
+function setLoadingIndicator(visible) {
+    if (!loadingIndicator) {
+        return;
+    }
+
+    loadingIndicator.classList.toggle("hidden", !visible);
+}
+
+function updateLoadingState() {
+    const isConnected = ws && ws.readyState === WebSocket.OPEN;
+    const idle = Date.now() - lastMessageTimestamp >= IDLE_THRESHOLD_MS;
+
+    setLoadingIndicator(isConnected && idle);
+}
+
+function connectWS() {
+    ws = new WebSocket("ws://" + location.host + "/ws");
+
+    ws.onopen = () => {
+        console.log("WebSocket connesso");
+        lastMessageTimestamp = Date.now();
+        setLoadingIndicator(false);
+    };
+
+    ws.onclose = () => {
+        console.log("WebSocket disconnesso, retry...");
+        setLoadingIndicator(false);
+        setTimeout(connectWS, 5000);
+    };
+
+    ws.onmessage = (event) => {
+        let data;
+
+        try {
+            data = JSON.parse(event.data);
+        } catch (e) {
+            console.error("Invalid JSON received", e);
+            return;
+        }
+
+        lastMessageTimestamp = Date.now();
+        setLoadingIndicator(false);
+
+        // Update Box_A
+        if (data.box_a) {
+            const boxA = data.box_a;
+            document.getElementById("a_datavalid").textContent = boxA.datavalid ?? "-";
+            document.getElementById("a_timestamp").textContent = boxA.timestamp ?? "-";
+            document.getElementById("a_volts_gen").textContent = boxA.volts_gen ?? "-";
+            document.getElementById("a_eng_rpm").textContent = boxA.eng_rpm ?? "-";
+            document.getElementById("a_adc_read_time").textContent = boxA.adc_read_time ?? "-";
+            document.getElementById("a_n_queue_errors").textContent = boxA.n_queue_errors ?? "-";
+
+            const coils12A = boxA.coils12 || {};
+            const coils34A = boxA.coils34 || {};
+
+            document.getElementById("a_coils12_spark_delay").textContent = coils12A.spark_delay ?? "-";
+            document.getElementById("a_coils34_spark_delay").textContent = coils34A.spark_delay ?? "-";
+            document.getElementById("a_coils12_spark_status").textContent = coils12A.spark_status ?? "-";
+            document.getElementById("a_coils34_spark_status").textContent = coils34A.spark_status ?? "-";
+            document.getElementById("a_coils12_sstart_status").textContent = coils12A.sstart_status ?? "-";
+            document.getElementById("a_coils34_sstart_status").textContent = coils34A.sstart_status ?? "-";
+            document.getElementById("a_coils12_peak_p_in").textContent = coils12A.peak_p_in ?? "-";
+            document.getElementById("a_coils34_peak_p_in").textContent = coils34A.peak_p_in ?? "-";
+            document.getElementById("a_coils12_peak_n_in").textContent = coils12A.peak_n_in ?? "-";
+            document.getElementById("a_coils34_peak_n_in").textContent = coils34A.peak_n_in ?? "-";
+            document.getElementById("a_coils12_peak_p_out").textContent = coils12A.peak_p_out ?? "-";
+            document.getElementById("a_coils34_peak_p_out").textContent = coils34A.peak_p_out ?? "-";
+            document.getElementById("a_coils12_peak_n_out").textContent = coils12A.peak_n_out ?? "-";
+            document.getElementById("a_coils34_peak_n_out").textContent = coils34A.peak_n_out ?? "-";
+            document.getElementById("a_coils12_level_spark").textContent = coils12A.level_spark ?? "-";
+            document.getElementById("a_coils34_level_spark").textContent = coils34A.level_spark ?? "-";
+            document.getElementById("a_coils12_n_events").textContent = coils12A.n_events ?? "-";
+            document.getElementById("a_coils34_n_events").textContent = coils34A.n_events ?? "-";
+            document.getElementById("a_coils12_n_missed_firing").textContent = coils12A.n_missed_firing ?? "-";
+            document.getElementById("a_coils34_n_missed_firing").textContent = coils34A.n_missed_firing ?? "-";
+        }
+
+        // Update Box_B
+        if (data.box_b) {
+            const boxB = data.box_b;
+            document.getElementById("b_datavalid").textContent = boxB.datavalid ?? "-";
+            document.getElementById("b_timestamp").textContent = boxB.timestamp ?? "-";
+            document.getElementById("b_volts_gen").textContent = boxB.volts_gen ?? "-";
+            document.getElementById("b_eng_rpm").textContent = boxB.eng_rpm ?? "-";
+            document.getElementById("b_adc_read_time").textContent = boxB.adc_read_time ?? "-";
+            document.getElementById("b_n_queue_errors").textContent = boxB.n_queue_errors ?? "-";
+
+            const coils12B = boxB.coils12 || {};
+            const coils34B = boxB.coils34 || {};
+
+            document.getElementById("b_coils12_spark_delay").textContent = coils12B.spark_delay ?? "-";
+            document.getElementById("b_coils34_spark_delay").textContent = coils34B.spark_delay ?? "-";
+            document.getElementById("b_coils12_spark_status").textContent = coils12B.spark_status ?? "-";
+            document.getElementById("b_coils34_spark_status").textContent = coils34B.spark_status ?? "-";
+            document.getElementById("b_coils12_sstart_status").textContent = coils12B.sstart_status ?? "-";
+            document.getElementById("b_coils34_sstart_status").textContent = coils34B.sstart_status ?? "-";
+            document.getElementById("b_coils12_peak_p_in").textContent = coils12B.peak_p_in ?? "-";
+            document.getElementById("b_coils34_peak_p_in").textContent = coils34B.peak_p_in ?? "-";
+            document.getElementById("b_coils12_peak_n_in").textContent = coils12B.peak_n_in ?? "-";
+            document.getElementById("b_coils34_peak_n_in").textContent = coils34B.peak_n_in ?? "-";
+            document.getElementById("b_coils12_peak_p_out").textContent = coils12B.peak_p_out ?? "-";
+            document.getElementById("b_coils34_peak_p_out").textContent = coils34B.peak_p_out ?? "-";
+            document.getElementById("b_coils12_peak_n_out").textContent = coils12B.peak_n_out ?? "-";
+            document.getElementById("b_coils34_peak_n_out").textContent = coils34B.peak_n_out ?? "-";
+            document.getElementById("b_coils12_level_spark").textContent = coils12B.level_spark ?? "-";
+            document.getElementById("b_coils34_level_spark").textContent = coils34B.level_spark ?? "-";
+            document.getElementById("b_coils12_n_events").textContent = coils12B.n_events ?? "-";
+            document.getElementById("b_coils34_n_events").textContent = coils34B.n_events ?? "-";
+            document.getElementById("b_coils12_n_missed_firing").textContent = coils12B.n_missed_firing ?? "-";
+            document.getElementById("b_coils34_n_missed_firing").textContent = coils34B.n_missed_firing ?? "-";
+        }
+    };
+}
+
+function start() {
+    fetch("/start");
+}
+
+function stop() {
+    fetch("/stop");
+}
+
+function uploadLittleFS() {
+    const fileInput = document.getElementById("littlefsFile");
+    const status = document.getElementById("uploadStatus");
+
+    if (!fileInput || fileInput.files.length === 0) {
+        if (status) status.textContent = "Select a file first.";
+        return;
+    }
+
+    const file = fileInput.files[0];
+    const formData = new FormData();
+    formData.append("file", file, file.name);
+
+    if (status) status.textContent = "Uploading...";
+
+    fetch("/upload", {
+        method: "POST",
+        body: formData,
+    })
+        .then((resp) => {
+            if (!resp.ok) {
+                throw new Error("Upload failed: " + resp.status + " " + resp.statusText);
+            }
+            return resp.text();
+        })
+        .then(() => {
+            if (status) status.textContent = "Uploaded: " + file.name;
+            fileInput.value = "";
+        })
+        .catch((err) => {
+            if (status) status.textContent = err.message;
+        });
+}
+
+setInterval(updateLoadingState, 200);
+connectWS();

RotaxMonitor/unpacked_fs/style.css

@@ -0,0 +1,221 @@
+:root {
+    --primary-dark: #0a1929;
+    --primary-blue: #003585;
+    --accent-blue: #1e88e5;
+    --light-bg: #f5f7fa;
+    --border-color: #d0d6dd;
+    --text-dark: #1a1a1a;
+    --text-muted: #666666;
+}
+
+body {
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+    margin: 0;
+    padding: 0;
+    background-color: var(--light-bg);
+    color: var(--text-dark);
+}
+
+.page-header {
+    background: linear-gradient(135deg, var(--primary-dark) 0%, #1a3a52 100%);
+    color: white;
+    padding: 30px 20px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+    margin-bottom: 30px;
+}
+
+.header-content {
+    max-width: 900px;
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+    gap: 20px;
+}
+
+.logo {
+    height: 50px;
+    width: auto;
+    margin: auto;
+}
+
+.page-header h1 {
+    margin: auto;
+    margin-top: 20px;
+    text-align: center;
+    font-size: 28px;
+    font-weight: 600;
+}
+
+table {
+    margin: auto;
+    border-collapse: collapse;
+    width: 100%;
+    max-width: 900px;
+    background: white;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
+    border-radius: 6px;
+    overflow: hidden;
+}
+
+th, td {
+    border: 1px solid var(--border-color);
+    padding: 12px;
+    font-size: 14px;
+    text-align: center;
+}
+
+th {
+    background-color: var(--primary-blue);
+    color: white;
+    font-weight: 600;
+}
+
+tr:hover {
+    background-color: #f9fbfc;
+}
+
+button {
+    margin: 10px;
+    padding: 10px 20px;
+    font-size: 16px;
+    background-color: var(--primary-blue);
+    color: white;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: background-color 0.2s;
+}
+
+button:hover {
+    background-color: var(--accent-blue);
+}
+
+.upload-section {
+    margin: 30px auto 20px;
+    max-width: 900px;
+    text-align: left;
+    padding: 20px;
+    border: 1px solid var(--border-color);
+    border-radius: 6px;
+    background: white;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
+}
+
+.upload-section h3 {
+    margin-top: 0;
+    margin-bottom: 8px;
+    color: var(--primary-blue);
+    font-size: 16px;
+}
+
+.upload-section p {
+    margin: 8px 0;
+    color: var(--text-muted);
+    font-size: 14px;
+}
+
+.upload-section input[type="file"] {
+    margin-top: 8px;
+    margin-bottom: 12px;
+}
+
+.upload-status {
+    margin-top: 10px;
+    font-size: 14px;
+    color: var(--text-muted);
+}
+
+.loading-indicator {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    margin: 0;
+    padding: 16px 20px;
+    font-size: 20px;
+    color: var(--primary-blue);
+    border-bottom: 1px solid var(--border-color);
+    background: white;
+    width: 100%;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
+}
+
+.loading-indicator.hidden {
+    display: none;
+}
+
+.spinner {
+    width: 16px;
+    height: 16px;
+    border: 2px solid transparent;
+    border-top-color: var(--primary-blue);
+    border-radius: 50%;
+    animation: spin 0.8s linear infinite;
+}
+
+@keyframes spin {
+    from {
+        transform: rotate(0deg);
+    }
+    to {
+        transform: rotate(360deg);
+    }
+}
+
+.tables-container {
+    display: flex;
+    gap: 20px;
+    max-width: 1800px;
+    margin: 0 auto;
+    padding: 0 20px;
+}
+
+.box {
+    flex: 1;
+    background: white;
+    padding: 20px;
+    border-radius: 6px;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
+}
+
+.box h2 {
+    margin-top: 0;
+    margin-bottom: 16px;
+    color: var(--primary-blue);
+    font-size: 18px;
+    font-weight: 700;
+    text-align: center;
+}
+
+.box-data {
+    margin-bottom: 20px;
+}
+
+.box-data p {
+    margin: 8px 0;
+    font-size: 14px;
+}
+
+.box-data strong {
+    color: var(--primary-blue);
+}
+
+.rpm-highlight {
+    background: #c6e4fa;
+    border: 3px double var(--primary-blue);
+    border-radius: 8px;
+    padding: 12px 16px;
+    margin-bottom: 20px;
+    text-align: center;
+    font-size: 18px;
+    font-weight: bold;
+    color: var(--text-dark);
+}
+
+.rpm-highlight strong {
+    color: var(--primary-blue);
+}
+
+span {
+    color: var(--text-dark);
+}