fix graph

Set time from browser
webpage chats
2026-04-12 14:42:40 +02:00 · 2026-04-12 14:40:58 +02:00 · 2026-04-12 02:38:27 +02:00 · 2026-04-12 01:45:32 +02:00 · 2026-04-11 16:39:59 +02:00 · 2026-04-11 15:49:40 +02:00
49 changed files with 3458 additions and 555 deletions
--- a/Datasheet/be729405d0b0e6411fd7e01e69acec34184d17a9e57c43ec413389783c890f71_optim.pdf
+++ b/Datasheet/be729405d0b0e6411fd7e01e69acec34184d17a9e57c43ec413389783c890f71_optim.pdf
--- a/RotaxMonitor/.gitignore
+++ b/RotaxMonitor/.gitignore
@@ -3,3 +3,4 @@
 .vscode/c_cpp_properties.json
 .vscode/launch.json
 .vscode/ipch
 unpacked_fs
--- a/RotaxMonitor/.vscode/extensions.json
+++ b/RotaxMonitor/.vscode/extensions.json
@@ -1,8 +1,7 @@
 {
    // See http://go.microsoft.com/fwlink/?LinkId=827846
    // for the documentation about the extensions.json format
    "recommendations": [
-        "platformio.platformio-ide"
+        "Jason2866.esp-decoder",
        "pioarduino.pioarduino-ide"
    ],
    "unwantedRecommendations": [
        "ms-vscode.cpptools-extension-pack"
--- a/RotaxMonitor/boards/esp32-s3-n16r8.json
+++ b/RotaxMonitor/boards/esp32-s3-n16r8.json
@@ -11,8 +11,8 @@
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1",
      "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_USB_MODE=0",
-      "-DARDUINO_USB_CDC_ON_BOOT=0"
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
    ],
    "f_cpu": "240000000L",
    "f_flash": "80000000L",
--- a/RotaxMonitor/data/chart.js
+++ b/RotaxMonitor/data/chart.js
--- a/RotaxMonitor/data/config.json
+++ b/RotaxMonitor/data/config.json
@@ -0,0 +1,3 @@
 {
 }
--- a/RotaxMonitor/data/index.html
+++ b/RotaxMonitor/data/index.html
@@ -0,0 +1,206 @@
 <!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>
    <!-- TAB BUTTONS -->
    <div class="tabs">
        <button class="tab-button active" onclick="openTab('tab1')">Monitor</button>
        <button class="tab-button" onclick="openTab('tab2')">Grafico</button>
    </div>
    <!-- TAB 1 (contenuto attuale) -->
    <div id="tab1" class="tab-content active">
        <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> <!-- END TAB1 -->
    <!-- TAB 2 (grafico) -->
    <div id="tab2" class="tab-content">
        <canvas id="chart" height="100"></canvas>
    </div>
    <script src="chart.js"></script>
    <script src="script.js"></script>
 </body>
 <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>
--- a/RotaxMonitor/data/logo_astro_dev.svg
+++ b/RotaxMonitor/data/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>
--- a/RotaxMonitor/data/script.js
+++ b/RotaxMonitor/data/script.js
@@ -0,0 +1,261 @@
 let ws;
 let lastMessageTimestamp = 0;
 const IDLE_THRESHOLD_MS = 1000;
 const loadingIndicator = document.getElementById("loadingIndicator");
 let chart;
 let chartData = {
    labels: [],
    datasets: [
        { label: "BoxA RPM", data: [] },
        { label: "BoxB RPM", data: [] },
        { label: "Coils12A Delay", data: [] },
        { label: "Coils34A Delay", data: [] },
        { label: "Coils12B Delay", data: [] },
        { label: "Coils34B Delay", data: [] }
    ]
 };
 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.send(JSON.stringify({
            cmd: "setTime",
            time: Math.floor(Date.now() / 1000)
        }));
    };
    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);
        updateChart(data)
        // 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 updateChart(data) {
    const time = new Date().toLocaleTimeString();
    chartData.labels.push(time);
    if (data.box_a) {
        const boxA = data.box_a;
        const coils12A = boxA.coils12 || {};
        const coils34A = boxA.coils34 || {};
        chartData.datasets[0].data.push(boxA.eng_rpm / 10);
        chartData.datasets[2].data.push(coils12A.spark_delay);
        chartData.datasets[3].data.push(coils34A.spark_delay);
        chartData.datasets[1].data.push(0);
        chartData.datasets[4].data.push(0);
        chartData.datasets[5].data.push(0);
    }
    if (data.box_b) {
        const boxB = data.box_b;
        const coils12B = boxB.coils12 || {};
        const coils34B = boxB.coils34 || {};
        chartData.datasets[1].data.push(boxB.eng_rpm / 10);
        chartData.datasets[4].data.push(coils12B.spark_delay);
        chartData.datasets[5].data.push(coils34B.spark_delay);
        chartData.datasets[0].data.push(0);
        chartData.datasets[2].data.push(0);
        chartData.datasets[3].data.push(0);
    }
    // limite punti (tipo buffer)
    if (chartData.labels.length > 100) {
        chartData.labels.shift();
        chartData.datasets.forEach(d => d.data.shift());
    }
    chart.update();
 }
 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;
        });
 }
 function openTab(tabId) {
    document.querySelectorAll('.tab-content').forEach(tab => {
        tab.classList.remove('active');
    });
    document.querySelectorAll('.tab-button').forEach(btn => {
        btn.classList.remove('active');
    });
    document.getElementById(tabId).classList.add('active');
    event.target.classList.add('active');
 }
 function initChart() {
    const ctx = document.getElementById('chart').getContext('2d');
    chart = new Chart(ctx, {
        type: 'line',
        data: chartData,
        options: {
            animation: false,
            responsive: true,
            scales: {
                x: {
                    display: true
                },
                y: {
                    beginAtZero: true
                }
            }
        }
    });
 }
 window.onload = () => {
    initChart();
 };
 setInterval(updateLoadingState, 200);
 connectWS();
--- a/RotaxMonitor/data/style.css
+++ b/RotaxMonitor/data/style.css
@@ -0,0 +1,250 @@
 :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);
 }
 /* TABS */
 .tabs {
    display: flex;
    justify-content: center;
    margin: 20px;
 }
 .tab-button {
    padding: 10px 20px;
    margin: 0 5px;
    border: none;
    cursor: pointer;
    background: var(--border-color);
    border-radius: 4px;
 }
 .tab-button.active {
    background: var(--primary-blue);
    color: white;
 }
 .tab-content {
    display: none;
 }
 .tab-content.active {
    display: block;
 }
--- a/RotaxMonitor/lib/ADS1256/ADS1256.cpp
+++ b/RotaxMonitor/lib/ADS1256/ADS1256.cpp
@@ -120,14 +120,14 @@ void ADS1256::setDRATE(uint8_t drate) //Setting DRATE (sampling frequency)
 {		
 	writeRegister(DRATE_REG, drate);
 	_DRATE = drate;
-	delay(200);
+	delayMicroseconds(500);
 }
 void ADS1256::setMUX(uint8_t mux) //Setting MUX (input channel)
 {	
 	writeRegister(MUX_REG, mux);
 	_MUX = mux;
-	delay(200);
+	//delayMicroseconds(500);
 }
 void ADS1256::setPGA(uint8_t pga) //Setting PGA (input voltage range)
@@ -138,7 +138,7 @@ void ADS1256::setPGA(uint8_t pga) //Setting PGA (input voltage range)
 	_ADCON = (_ADCON & 0b11111000) | (_PGA & 0b00000111); // Clearing and then setting bits 2-0 based on pga
 	writeRegister(ADCON_REG, _ADCON);	
-	delay(200);
+	delayMicroseconds(1000); //Delay to allow the PGA to settle after changing its value
 	updateConversionParameter(); //Update the multiplier according top the new PGA value
 }
@@ -501,8 +501,6 @@ void ADS1256::writeRegister(uint8_t registerAddress, uint8_t registerValueToWrit
  CS_HIGH();
  _spi->endTransaction();
  delay(100);
 }
 long ADS1256::readRegister(uint8_t registerAddress) //Reading a register
@@ -524,7 +522,7 @@ long ADS1256::readRegister(uint8_t registerAddress) //Reading a register
  CS_HIGH();
  _spi->endTransaction();
-  delay(100);
+
  return regValue;
 }
--- a/RotaxMonitor/lib/ADS1256/ADS1256.h
+++ b/RotaxMonitor/lib/ADS1256/ADS1256.h
--- a/RotaxMonitor/lib/ADS5292/AD5292.cpp
+++ b/RotaxMonitor/lib/ADS5292/AD5292.cpp
--- a/RotaxMonitor/lib/ADS5292/AD5292.h
+++ b/RotaxMonitor/lib/ADS5292/AD5292.h
--- a/RotaxMonitor/lib/led/led.cpp
+++ b/RotaxMonitor/lib/led/led.cpp
@@ -0,0 +1,32 @@
 #include <led.h>
 RGBled::RGBled(const uint8_t pin) : m_led(pin)
 {
    pinMode(m_led, OUTPUT);
    writeStatus(RGBled::ERROR);
 }
 RGBled::~RGBled()
 {
    pinMode(m_led, INPUT);
 }
 void RGBled::setStatus(const LedStatus s)
 {
    if (m_status == s)
        return;
    std::lock_guard<std::mutex> lock(m_mutex);
    m_status = s;
    writeStatus(m_status);
 }
 const RGBled::LedStatus RGBled::getSatus(void)
 {
    return m_status;
 }
 void RGBled::writeStatus(const RGBled::LedStatus s)
 {
    RGBled::color_u u{.status = s};
    rgbLedWrite(m_led, u.color.r, u.color.g, u.color.b);
 }
--- a/RotaxMonitor/lib/led/led.h
+++ b/RotaxMonitor/lib/led/led.h
@@ -0,0 +1,63 @@
 #pragma once
 // System Inlcudes
 #include <Arduino.h>
 #include <mutex>
 #define RED 0x00FF00
 #define GREEN 0xFF0000
 #define BLUE 0x0000FF
 #define WHITE 0xFFFFFF
 #define YELLOW 0xFFFF00
 #define CYAN 0xFF00FF
 #define MAGENTA 0x00FFFF
 #define ORANGE 0xA5FF00
 #define PURPLE 0x008080
 #define PINK 0x69FFB4
 #define LIME 0xCD3232
 #define SKY_BLUE 0xCE87EB
 #define GOLD 0xD7FF00
 #define TURQUOISE 0xE040D0
 #define INDIGO 0x004B82
 #define GRAY 0x808080
 class RGBled
 {
 public:
    enum LedStatus
    {
        OK = GREEN,
        ERROR = RED,
        INIT = YELLOW,
        DATA_A = CYAN,
        DATA_B = MAGENTA,
        DATA_ALL = ORANGE,
        IDLE = GRAY
    };
    struct color_t
    {
        uint8_t a, r, g, b;
    };
    union color_u
    {
        uint32_t status;
        color_t color;
    };
 public:
    RGBled(const uint8_t pin = 48);
    ~RGBled();
    void setStatus(const LedStatus s);
    const LedStatus getSatus(void);
 private:
    void writeStatus(const LedStatus s);
 private:
    LedStatus m_status = LedStatus::IDLE;
    std::mutex m_mutex;
    const uint8_t m_led;
 };
--- a/RotaxMonitor/partitions/default_16MB.csv
+++ b/RotaxMonitor/partitions/default_16MB.csv
@@ -1,6 +0,0 @@
 # Name, Type, SubType, Offset, Size, Flags
 nvs,      data, nvs,      0x9000,  0x5000,
 otadata,  data, ota,      0xe000,  0x2000,
 app0,     app,  ota_0,    0x10000, 0x700000,
 app1,     app,  ota_1,    0x710000,0x700000,
 spiffs,   data, spiffs,   0xE10000,0x1F0000,
--- a/RotaxMonitor/partitions/no_ota_10mb_littlefs.csv
+++ b/RotaxMonitor/partitions/no_ota_10mb_littlefs.csv
@@ -0,0 +1,6 @@
 # ESP32 Partition Table
 # Name, Type, SubType, Offset, Size
 nvs,      data, nvs,     0x9000,  0x4000
 phy_init, data, phy,     0xd000,  0x1000
 factory,  app,  factory, 0x10000, 0x300000
 littlefs, data, littlefs, 0x310000, 0xCF0000
--- a/RotaxMonitor/partitions/no_ota_10mb_spiffs.csv
+++ b/RotaxMonitor/partitions/no_ota_10mb_spiffs.csv
@@ -0,0 +1,6 @@
 # ESP32 Partition Table
 # Name, Type, SubType, Offset, Size
 nvs,      data, nvs,     0x9000,  0x4000
 phy_init, data, phy,     0xd000,  0x1000
 factory,  app,  factory, 0x10000, 0x300000
 spiffs,   data, spiffs,  0x310000, 0xCF0000
--- a/RotaxMonitor/platformio.ini
+++ b/RotaxMonitor/platformio.ini
@@ -8,61 +8,63 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
-[env:esp32-s3-n16r8]
+[env:esp32-s3-devkitc1-n16r8]
-board = esp32-s3-n16r8
+board = esp32-s3-devkitc1-n16r8
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
+board_build.partitions = partitions/no_ota_10mb_littlefs.csv
 board_build.filesystem = littlefs
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
 framework = arduino
 lib_deps = 
 	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
-board_build.partitions = partitions/default_16MB.csv
+	adafruit/Adafruit NeoPixel@^1.15.4
-board_build.psram = enabled
+upload_protocol = esptool
-monitor_speed = 115200
+upload_port = /dev/ttyACM1
 upload_speed = 921600
 monitor_port = /dev/ttyACM0
 monitor_speed = 921600
 build_type = release
 [env:esp32-s3-n16r8-debug]
 board = ${env:esp32-s3-n16r8.board}
 platform = ${env:esp32-s3-n16r8.platform}
 framework = ${env:esp32-s3-n16r8.framework}
 lib_deps = ${env:esp32-s3-n16r8.lib_deps}
 board_build.partitions = partitions/default_16MB.csv
 board_build.psram = enabled
 monitor_speed = 115200
 upload_speed = 921600
 build_type = debug
 build_flags = 
-	-O0
+	-DCORE_DEBUG_LEVEL=1
-	-g3
+	-DARDUINO_USB_CDC_ON_BOOT=0
-	-ggdb
+	-DARDUINO_USB_MODE=0
-	-fno-inline
+	-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=5000
-	-fno-ipa-sra
+	-DCONFIG_ASYNC_TCP_PRIORITY=21
-	-fno-tree-sra
+	-DCONFIG_ASYNC_TCP_QUEUE_SIZE=64
-	-fno-builtin
+	-DCONFIG_ASYNC_TCP_RUNNING_CORE=1
 	-DCONFIG_ASYNC_TCP_STACK_SIZE=4096
 	-fstack-protector-all
-
+[env:esp32-s3-devkitc1-n16r8-debug]
-[env:esp32-devtest-debug]
+board = ${env:esp32-s3-devkitc1-n16r8.board}
-board = esp32dev
+board_build.partitions = ${env:esp32-s3-devkitc1-n16r8.board_build.partitions}
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
+board_build.filesystem = ${env:esp32-s3-devkitc1-n16r8.board_build.filesystem}
-framework = arduino
+platform = ${env:esp32-s3-devkitc1-n16r8.platform}
 framework = ${env:esp32-s3-devkitc1-n16r8.framework}
 lib_deps = 
-	hideakitai/DebugLog@^0.8.4
+	${env:esp32-s3-devkitc1-n16r8.lib_deps}
-	bblanchon/ArduinoJson@^7.4.2
+	adafruit/Adafruit NeoPixel@^1.15.4
-	hideakitai/PCA95x5@^0.1.3
+upload_protocol = esptool
-	adafruit/Adafruit SSD1306@^2.5.16
+upload_port = /dev/ttyACM1
-	garfius/Menu-UI@^1.2.0
+upload_speed = 921600
-board_build.flash_size = 4MB
+monitor_port = /dev/ttyACM0
-board_build.partitions = default.csv
+monitor_speed = 921600
-monitor_speed = 115200
+debug_tool = esp-builtin
 debug_speed = 15000
 build_type = debug
 build_flags = 
 	-O0
 	-g3
-	-ggdb
+	-ggdb3
-	-fno-inline
+	-DCORE_DEBUG_LEVEL=3
-	-fno-ipa-sra
+	-DARDUINO_USB_CDC_ON_BOOT=0
-	-fno-tree-sra
+	-DARDUINO_USB_MODE=0
-	-fno-builtin
+	-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
 	-fstack-protector-all
--- a/RotaxMonitor/src/channels.h
+++ b/RotaxMonitor/src/channels.h
@@ -1,11 +0,0 @@
 // ADC Channels
 #define A1_RAW  0
 #define A2_RAW  1
 #define B1_RAW  2
 #define B2_RAW  3
 #define A1_COND 4
 #define A2_COND 5
 #define B1_COND 6
 #define B2_COND 7
--- a/RotaxMonitor/src/datasave.cpp
+++ b/RotaxMonitor/src/datasave.cpp
@@ -0,0 +1,127 @@
 #include "datasave.h"
 #include <math.h>
 LITTLEFSGuard::LITTLEFSGuard()
 {
    if (!LittleFS.begin(true, "/littlefs", 10, "littlefs"))
    {
        LOG_ERROR("Failed to mount LittleFS");
    }
    else
    {
        LOG_INFO("LittleFS mounted successfully");
        LOG_INFO("LittleFS Free KBytes:", (LittleFS.totalBytes() - LittleFS.usedBytes()) /1024);
    }
 }
 LITTLEFSGuard::~LITTLEFSGuard()
 {
    LittleFS.end();
    LOG_INFO("LittleFS unmounted successfully");
 }
 void ignitionBoxStatusFiltered::filter(int32_t &old, const int32_t value, const uint32_t k)
 {
    float alpha = 1.0f / (float)k;
    old = old + (int32_t)(alpha * (float)(value - old));
 }
 void ignitionBoxStatusFiltered::filter(float &old, const float value, const uint32_t k)
 {
    float alpha = 1.0f / (float)k;
    old = old + (float)(alpha * (float)(value - old));
 }
 void ignitionBoxStatusFiltered::reset()
 {
    m_last = ignitionBoxStatus();
    m_count = 0;
    m_data_valid = false;
 }
 void ignitionBoxStatusFiltered::update(const ignitionBoxStatus &new_status)
 {
    if (m_count == 0 && !m_data_valid)
    {
        m_last = new_status;
    }
    m_count++;
    // simple moving average calculation
    m_last.timestamp = new_status.timestamp; // keep timestamp of latest status
    m_last.coils12.n_events = new_status.coils12.n_events;                           // sum events instead of averaging
    m_last.coils12.n_missed_firing = new_status.coils12.n_missed_firing;             // sum missed firings instead of averaging
    m_last.coils12.spark_status = new_status.coils12.spark_status;                   // take latest spark status
    m_last.coils12.sstart_status = new_status.coils12.sstart_status;                 // take latest soft start status
    filter(m_last.coils12.spark_delay, new_status.coils12.spark_delay, m_max_count); // incremental average calculation
    filter(m_last.coils12.peak_p_in, new_status.coils12.peak_p_in, m_max_count);     // incremental average calculation
    filter(m_last.coils12.peak_n_in, new_status.coils12.peak_n_in, m_max_count);     // incremental average calculation
    filter(m_last.coils12.peak_p_out, new_status.coils12.peak_p_out, m_max_count);   // incremental average calculation
    filter(m_last.coils12.peak_n_out, new_status.coils12.peak_n_out, m_max_count);   // incremental average calculation
    m_last.coils34.n_events = new_status.coils34.n_events;                           // sum events instead of averaging
    m_last.coils34.n_missed_firing = new_status.coils34.n_missed_firing;             // sum missed firings instead of averaging
    m_last.coils34.spark_status = new_status.coils34.spark_status;                   // take latest spark status
    m_last.coils34.sstart_status = new_status.coils34.sstart_status;                 // take latest soft start status
    filter(m_last.coils34.spark_delay, new_status.coils34.spark_delay, m_max_count); // incremental average calculation
    filter(m_last.coils34.peak_p_in, new_status.coils34.peak_p_in, m_max_count);     // incremental average calculation
    filter(m_last.coils34.peak_n_in, new_status.coils34.peak_n_in, m_max_count);     // incremental average calculation
    filter(m_last.coils34.peak_p_out, new_status.coils34.peak_p_out, m_max_count);   // incremental average calculation
    filter(m_last.coils34.peak_n_out, new_status.coils34.peak_n_out, m_max_count);   // incremental average calculation
    filter(m_last.eng_rpm, new_status.eng_rpm, m_max_count);                         // incremental average calculation                   // incremental average calculation
    filter(m_last.adc_read_time, m_last.adc_read_time, m_max_count);                 // incremental average calculation
    m_last.n_queue_errors = new_status.n_queue_errors;                               // take last of queue errors since it's a cumulative count of errors in the queue, not an average value
    if (m_count >= m_max_count)
    {
        m_count = 0;         // reset count after reaching max samples to average
        m_data_valid = true; // set data valid flag after first average is calculated
    }
 }
 const bool ignitionBoxStatusFiltered::get(ignitionBoxStatus &status) const
 {
    if (m_data_valid)
    {
        status = m_last;
    }
    return m_data_valid;
 }
 const ArduinoJson::JsonDocument ignitionBoxStatusFiltered::toJson() const
 {
    ArduinoJson::JsonDocument doc;
    if (m_data_valid)
    {
        doc["timestamp"] = m_last.timestamp;
        doc["datavalid"] = m_data_valid ? "TRUE" : "FALSE";
        doc["coils12"]["n_events"] = m_last.coils12.n_events;
        doc["coils12"]["n_missed_firing"] = m_last.coils12.n_missed_firing;
        doc["coils12"]["spark_delay"] = m_last.coils12.spark_delay;
        doc["coils12"]["spark_status"] = sparkStatusNames.at(m_last.coils12.spark_status);
        doc["coils12"]["peak_p_in"] = m_last.coils12.peak_p_in;
        doc["coils12"]["peak_n_in"] = m_last.coils12.peak_n_in;
        doc["coils12"]["peak_p_out"] = m_last.coils12.peak_p_out;
        doc["coils12"]["peak_n_out"] = m_last.coils12.peak_n_out;
        doc["coils12"]["sstart_status"] = softStartStatusNames.at(m_last.coils12.sstart_status);
        doc["coils34"]["n_events"] = m_last.coils34.n_events;
        doc["coils34"]["n_missed_firing"] = m_last.coils34.n_missed_firing;
        doc["coils34"]["spark_delay"] = m_last.coils34.spark_delay;
        doc["coils34"]["spark_status"] = sparkStatusNames.at(m_last.coils34.spark_status);
        doc["coils34"]["peak_p_in"] = m_last.coils34.peak_p_in;
        doc["coils34"]["peak_n_in"] = m_last.coils34.peak_n_in;
        doc["coils34"]["peak_p_out"] = m_last.coils34.peak_p_out;
        doc["coils34"]["peak_n_out"] = m_last.coils34.peak_n_out;
        doc["coils34"]["sstart_status"] = softStartStatusNames.at(m_last.coils34.sstart_status);
        doc["eng_rpm"] = m_last.eng_rpm;
        doc["adc_read_time"] = m_last.adc_read_time;
        doc["n_queue_errors"] = m_last.n_queue_errors;
    }
    return doc;
 }
--- a/RotaxMonitor/src/datasave.h
+++ b/RotaxMonitor/src/datasave.h
@@ -0,0 +1,50 @@
 #pragma once
 #define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
 // System Includes
 #include <Arduino.h>
 #include <DebugLog.h>
 #include <string>
 #include <fstream>
 #include <ArduinoJson.h>
 #include <filesystem>
 #include <LittleFS.h>
 // Project Includes
 #include "isr.h"
 #include "psvector.h"
 const uint32_t max_history = 256;
 class LITTLEFSGuard
 {
 public:
    LITTLEFSGuard();
    ~LITTLEFSGuard();
 };
 class ignitionBoxStatusFiltered
 {
 private:
    ignitionBoxStatus m_last;
    uint32_t m_count = 0;
    uint32_t m_max_count = 100; // number of samples to average before resetting
    bool m_data_valid = false;  // flag to indicate if the average data is valid (i.e. at least one sample has been added)
 public:
    ignitionBoxStatusFiltered() = default;
    ignitionBoxStatusFiltered(const uint32_t max_count) : m_max_count(max_count)
    {
        m_data_valid = false;
        m_count = 0;
    }
    void reset();
    void update(const ignitionBoxStatus &new_status);
    const bool get(ignitionBoxStatus &status) const;
    const ArduinoJson::JsonDocument toJson() const;
 private:
    void filter(int32_t &old, const int32_t value, const uint32_t k);
    void filter(float &old, const float value, const uint32_t k);
 };
--- a/RotaxMonitor/src/datastruct.h
+++ b/RotaxMonitor/src/datastruct.h
@@ -0,0 +1,95 @@
 #pragma once
 #include <Arduino.h>
 #include <map>
 #include <psvector.h>
 // =====================
 // Event Flags (bitmask)
 // =====================
 static const uint32_t TRIG_FLAG_12P = (1 << 0);
 static const uint32_t TRIG_FLAG_12N = (1 << 1);
 static const uint32_t TRIG_FLAG_34P = (1 << 2);
 static const uint32_t TRIG_FLAG_34N = (1 << 3);
 static const uint32_t SPARK_FLAG_TIMEOUT = (1 << 8);
 static const uint32_t SPARK_FLAG_12 = (1 << 9);
 static const uint32_t SPARK_FLAG_34 = (1 << 10);
 // Spark Status
 enum sparkStatus
 {
    SPARK_POS_OK,
    SPARK_NEG_OK,
    SPARK_POS_SKIP,
    SPARK_NEG_SKIP,
    SPARK_POS_WAIT,
    SPARK_NEG_WAIT,
    SPARK_POS_FAIL,
    SPARK_NEG_FAIL,
    SPARK_POS_UNEXPECTED,
    SPARK_NEG_UNEXPECTED,
    SPARK_SYNC_FAIL,
 };
 static const std::map<const sparkStatus, const char *> sparkStatusNames = {
    {SPARK_POS_OK, "SPARK_POS_OK"},
    {SPARK_NEG_OK, "SPARK_NEG_OK"},
    {SPARK_POS_SKIP, "SPARK_POS_SKIP"},
    {SPARK_NEG_SKIP, "SPARK_NEG_SKIP"},
    {SPARK_POS_WAIT, "SPARK_POS_WAIT"},
    {SPARK_NEG_WAIT, "SPARK_NEG_WAIT"},
    {SPARK_POS_FAIL, "SPARK_POS_FAIL"},
    {SPARK_NEG_FAIL, "SPARK_NEG_FAIL"},
    {SPARK_POS_UNEXPECTED, "SPARK_POS_UNEXPECTED"},
    {SPARK_NEG_UNEXPECTED, "SPARK_NEG_UNEXPECTED"},
    {SPARK_SYNC_FAIL, "SPARK_SYNC_FAIL"},
 };
 enum softStartStatus
 {
    NORMAL,
    SOFT_START,
    ERROR,
 };
 const std::map<const softStartStatus, const char *> softStartStatusNames = {
    {NORMAL, "NORMAL"},
    {SOFT_START, "SOFT_START"},
    {ERROR, "ERROR"},
 };
 struct coilsStatus
 {
    int64_t trig_time = 0;
    int64_t spark_time = 0;
    int32_t spark_delay = 0; // in microseconds
    sparkStatus spark_status = sparkStatus::SPARK_POS_OK;
    softStartStatus sstart_status = softStartStatus::NORMAL;
    float peak_p_in = 0.0;
    float peak_n_in = 0.0;
    float peak_p_out = 0.0;
    float peak_n_out = 0.0;
    float level_spark = 0.0;
    uint32_t n_events = 0;
    uint32_t n_missed_firing = 0;
 };
 // Task internal Status
 struct ignitionBoxStatus
 {
    int64_t timestamp = 0;
    // coils pairs for each ignition
    coilsStatus coils12;
    coilsStatus coils34;
    // voltage from generator
    float volts_gen = 0.0;
    // enine rpm
    int32_t eng_rpm = 0;
    // debug values
    uint32_t n_queue_errors = 0;
    int32_t adc_read_time = 0;
 };
 template <typename T>
 using PSRAMVector = std::vector<T, PSRAMAllocator<T>>;
--- a/RotaxMonitor/src/devices.h
+++ b/RotaxMonitor/src/devices.h
@@ -1,34 +1,55 @@
 #pragma once
 // Library defines
 #define ADS1256_SPI_ALREADY_STARTED
 // System Includes
 #include <memory>
 // Device Libraries
 #include <ADS1256.h>
 #include <AD5292.h>
 #include <Adafruit_SSD1306.h>
 #include <PCA95x5.h>
 // ADC Channel mapping
-#define ADC_CH_PEAK_12P_IN      SING_0
+#define ADC_CH_PEAK_12P_IN SING_0
-#define ADC_CH_PEAK_12N_IN      SING_1
+#define ADC_CH_PEAK_12N_IN SING_1
-#define ADC_CH_PEAK_34P_IN      SING_2
+#define ADC_CH_PEAK_34P_IN SING_2
-#define ADC_CH_PEAK_34N_IN      SING_3
+#define ADC_CH_PEAK_34N_IN SING_3
-#define ADC_CH_PEAK_12P_OUT     SING_4
+#define ADC_CH_PEAK_12P_OUT SING_4
-#define ADC_CH_PEAK_12N_OUT     SING_5
+#define ADC_CH_PEAK_12N_OUT SING_5
-#define ADC_CH_PEAK_34P_OUT     SING_6
+#define ADC_CH_PEAK_34P_OUT SING_6
-#define ADC_CH_PEAK_34N_OUT     SING_7
+#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; 
+    std::unique_ptr<SPIClass> m_spi_a = nullptr;
-  Adafruit_SSD1306* lcd = NULL;
+    std::unique_ptr<SPIClass> m_spi_b = nullptr;
-  PCA9555* io = NULL;
+
    std::unique_ptr<AD5292> m_pot_a = nullptr;
    std::unique_ptr<AD5292> m_pot_b = nullptr;
    std::unique_ptr<ADS1256> m_adc_a = nullptr;
    std::unique_ptr<ADS1256> m_adc_b = nullptr;
    std::unique_ptr<PCA9555> m_expander_a = nullptr;
    std::unique_ptr<PCA9555> m_expander_b = nullptr;
    std::unique_ptr<PCA9555> m_expander_inputs_ab = nullptr;
    std::mutex m_spi_a_mutex;
    std::mutex m_spi_b_mutex;
    std::mutex m_i2c_mutex;
 };
 // Adc read channel wrapper to selet mux before reading
-inline float adcReadChannel(ADS1256* adc, const uint8_t ch){
+inline float adcReadChannel(ADS1256 *adc, const uint8_t ch)
 {
    adc->setMUX(ch);
    // scarta 3 conversioni
-    for (int i = 0; i < 3; i++) {
+    for (int i = 0; i < 3; i++)
    {
        adc->readSingle();
    }
    // ora lettura valida a 30kSPS → ~100 µs di settling
--- a/RotaxMonitor/src/isr.cpp
+++ b/RotaxMonitor/src/isr.cpp
@@ -4,57 +4,99 @@
 // ISR (Pass return bitmask to ISR management function)
 // one function for each wake up pin conncted to a trigger
 // =====================
-void trig_isr(void *arg)
+void trig_isr_A(void *arg)
 {
    const int64_t time_us = esp_timer_get_time();
    // exit if invalid args
    if (!arg)
        return;
    // FOR TESTING ONLY    
    digitalWrite(POT_A_CS, HIGH);
    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
    isrParams *params = (isrParams *)arg;
    ignitionBoxStatus *box = params->ign_stat;
-    TaskHandle_t task_handle = *params->rt_handle_ptr;
+    TaskHandle_t task_handle = params->rt_handle_ptr;
    // exit if task not running
    if (!task_handle)
        return;
    // reset spark flags, cannot be same time as trigger flags
    box->coils12.spark_ok = false;
    box->coils34.spark_ok = false;
    switch (params->flag)
    {
    case TRIG_FLAG_12P:
    case TRIG_FLAG_12N:
        // only on first trigger to avoid multiple firing due to noise, to be fixed with hardware debounce
        box->coils12.trig_time = time_us;
        xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
        break;
    case TRIG_FLAG_34P:
    case TRIG_FLAG_34N:
        // only on first trigger to avoid multiple firing due to noise, to be fixed with hardware debounce
        box->coils34.trig_time = time_us;
        xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
        break;
    case SPARK_FLAG_12:
-        box->coils12.spark_ok = true;
+
        box->coils12.spark_time = time_us;
-        vTaskNotifyGiveFromISR(task_handle, &xHigherPriorityTaskWoken);
+        xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
        break;
    case SPARK_FLAG_34:
        box->coils34.spark_ok = true;
        box->coils34.spark_time = time_us;
-        vTaskNotifyGiveFromISR(task_handle, &xHigherPriorityTaskWoken);
+        xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
        break;
    default:
        break;
    }
    // FOR TESTING ONLY
    digitalWrite(POT_A_CS, LOW);
    if (xHigherPriorityTaskWoken)
        portYIELD_FROM_ISR();
-}
+}
 void trig_isr_B(void *arg)
 {
    const int64_t time_us = esp_timer_get_time();
    // exit if invalid args
    if (!arg)
        return;
    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
    isrParams *params = (isrParams *)arg;
    ignitionBoxStatus *box = params->ign_stat;
    TaskHandle_t task_handle = params->rt_handle_ptr;
    // exit if task not running
    if (!task_handle)
        return;
    switch (params->flag)
    {
    case TRIG_FLAG_12P:
    case TRIG_FLAG_12N:
        // only on first trigger to avoid multiple firing due to noise, to be fixed with hardware debounce
        box->coils12.trig_time = time_us;
        xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
        break;
    case TRIG_FLAG_34P:
    case TRIG_FLAG_34N:
        // only on first trigger to avoid multiple firing due to noise, to be fixed with hardware debounce
        box->coils34.trig_time = time_us;
        xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
        break;
    case SPARK_FLAG_12:
        box->coils12.spark_time = time_us;
        xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
        break;
    case SPARK_FLAG_34:
        box->coils34.spark_time = time_us;
        xTaskNotifyFromISR(task_handle, params->flag, eSetValueWithOverwrite, &xHigherPriorityTaskWoken);
        break;
    default:
        break;
    }
    if (xHigherPriorityTaskWoken)
        portYIELD_FROM_ISR();
 }
--- a/RotaxMonitor/src/isr.h
+++ b/RotaxMonitor/src/isr.h
@@ -1,85 +1,30 @@
 #pragma once
 // Test device Flag
-#define TEST
+// #define TEST
 // Arduino Libraries
 #include <Arduino.h>
 #include "soc/gpio_struct.h"
 #include <map>
 #ifndef TEST
 #include "pins.h"
 #else
 #include "pins_test.h"
 #endif
 #include "datastruct.h"
 #define CORE_0 0
 #define CORE_1 1
-#define TASK_STACK 4096                          // in words
+#define RT_TASK_STACK 2048                          // in words
-#define TASK_PRIORITY (configMAX_PRIORITIES - 4) // highest priority after wifi tasks
+#define RT_TASK_PRIORITY (configMAX_PRIORITIES - 5) // highest priority after wifi tasks
-// =====================
+struct isrParams
 // Event Flags (bitmask)
 // =====================
 #define TRIG_FLAG_12P (1 << 0)
 #define TRIG_FLAG_12N (1 << 2)
 #define TRIG_FLAG_34P (1 << 1)
 #define TRIG_FLAG_34N (1 << 3)
 #define SPARK_FLAG_NIL (1 << 8)
 #define SPARK_FLAG_12 (1 << 9)
 #define SPARK_FLAG_34 (1 << 10)
 // Spark Status
 enum sparkStatus
 {
    SPARK_POS_OK,
    SPARK_NEG_OK,
    SPARK_POS_SKIP,
    SPARK_NEG_SKIP,
    SPARK_POS_WAIT,
    SPARK_NEG_WAIT,
    SPARK_POS_FAIL,
    SPARK_NEG_FAIL,
    SPARK_POS_UNEXPECTED,
    SPARK_NEG_UNEXPECTED,
    SPARK_SYNC_FAIL,
 };
 enum softStartStatus
 {
    NORMAL,
    SOFT_START
 };
 struct coilsStatus
 {
    int64_t trig_time;
    int64_t spark_time;
    int64_t spark_delay;
    sparkStatus spark_status;
    softStartStatus sstart_status;
    float peak_p_in, peak_n_in;
    float peak_p_out, peak_n_out;
    float trigger_spark;
    bool spark_ok;
 };
 // Task internal Status
 struct ignitionBoxStatus
 {
    int64_t timestamp;
    // coils pairs for each ignition
    coilsStatus coils12;
    coilsStatus coils34;
    // voltage from generator
    float volts_gen = 0.0;
 };
 struct isrParams {
    const uint32_t flag;
-    ignitionBoxStatus* ign_stat;
+    ignitionBoxStatus *ign_stat;
-    TaskHandle_t* rt_handle_ptr;
+    TaskHandle_t rt_handle_ptr;
 };
-
+void IRAM_ATTR trig_isr_A(void *arg);
-void IRAM_ATTR trig_isr(void *arg);
+void IRAM_ATTR trig_isr_B(void *arg);
--- a/RotaxMonitor/src/main.cpp
+++ b/RotaxMonitor/src/main.cpp
@@ -1,45 +1,72 @@
-#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_DEBUG
 // Arduino Libraries
 #include <Arduino.h>
 #include <DebugLog.h>
 #include <DebugLogEnable.h>
 #include <SPI.h>
 #include <WiFi.h>
 #include <ArduinoJson.h>
 // Definitions
 #include <tasks.h>
 #include <channels.h>
 #include <devices.h>
 #include <datasave.h>
 #include <webserver.h>
 #include <ui.h>
 #include <led.h>
-void printTaskList()
+// Defines to enable channel B
-{
+#define CH_B_ENABLE
-    char buffer[1024];
+// #define TEST
-    Serial.println("Task Name\tState\tPrio\tStack\tNum");
+
-    vTaskList(buffer);
+// Debug Defines
-    Serial.println(buffer);
+#define WIFI_SSID "AstroRotaxMonitor"
-}
+#define WIFI_PASSWORD "maledettirotax"
 void setup()
 {
    Serial.begin(921600);
    delay(250);
    Serial.begin(115200);
    // Setup Logger
    LOG_ATTACH_SERIAL(Serial);
-    LOG_SET_LEVEL(DebugLogLevel::LVL_INFO);
+    LOG_SET_LEVEL(DebugLogLevel::LVL_DEBUG);
    // Print Processor Info
-    LOG_INFO("ESP32 Chip:", ESP.getChipModel());
+    LOG_DEBUG("ESP32 Chip:", ESP.getChipModel());
    if (psramFound())
    {
-        LOG_INFO("ESP32 PSram Found");
+        LOG_DEBUG("ESP32 PSram Found");
-        LOG_INFO("ESP32 PSram:", ESP.getPsramSize());
+        LOG_DEBUG("ESP32 PSram:", ESP.getPsramSize());
        psramInit();
    }
-    LOG_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
    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();
    }
    // Initialize Interrupt pins on PICKUP detectors
    initTriggerPinsInputs();
@@ -47,61 +74,28 @@ void setup()
    initSparkPinInputs();
 }
 ////////////////////// MAIN LOOP //////////////////////
 void loop()
 {
    // global variables
    RGBled led;
    led.setStatus(RGBled::LedStatus::INIT);
    bool running = true;
-    Devices dev;
+    std::mutex fs_mutex;
-
+    LITTLEFSGuard fsGuard;
    // Task handle
    TaskHandle_t trigA_TaskHandle = NULL;
    TaskHandle_t trigB_TaskHandle = NULL;
    QueueHandle_t rt_taskA_queue = xQueueCreate(10, sizeof(ignitionBoxStatus));
    QueueHandle_t rt_taskB_queue = xQueueCreate(10, sizeof(ignitionBoxStatus));
    rtTaskParams taskA_params{
        .rt_running = true,
        .dev = &dev,
        .rt_handle_ptr = &trigA_TaskHandle,
        .rt_queue = rt_taskA_queue,
        .rt_int = rtTaskInterrupts{
            .isr_ptr = trig_isr,
            .trig_pin_12p = TRIG_PIN_A12P,
            .trig_pin_12n = TRIG_PIN_A12N,
            .trig_pin_34p = TRIG_PIN_A34P,
            .trig_pin_34n = TRIG_PIN_A34N,
            .spark_pin_12 = SPARK_PIN_A12,
            .spark_pin_34 = SPARK_PIN_A34},
        .rt_resets = rtTaskResets{.rst_io_12p = RST_EXT_A12P, .rst_io_12n = RST_EXT_A12N, .rst_io_34p = RST_EXT_A34P, .rst_io_34n = RST_EXT_A34N}};
    LOG_INFO("Task Variables OK");
 #ifndef TEST
    QueueHandle_t rt_taskB_queue = xQueueCreate(10, sizeof(ignitionBoxStatus));
    rtTaskParams taskB_params{
        .rt_running = true,
        .dev = &dev,
        .rt_queue = rt_taskB_queue,
        .rt_handle_ptr = &trigB_TaskHandle,
        .rt_int = rtTaskInterrupts{
            .isr_ptr = trig_isr,
            .trig_pin_12p = TRIG_PIN_B12P,
            .trig_pin_12n = TRIG_PIN_B12N,
            .trig_pin_34p = TRIG_PIN_B34P,
            .trig_pin_34n = TRIG_PIN_B34N,
            .spark_pin_12 = SPARK_PIN_B12,
            .spark_pin_34 = SPARK_PIN_B34},
        .rt_resets = rtTaskResets{.rst_io_12p = RST_EXT_B12P, .rst_io_12n = RST_EXT_B12N, .rst_io_34p = RST_EXT_B34P, .rst_io_34n = RST_EXT_B34N}};
 #endif
    //////// INIT SPI PORTS ////////
    bool spiA_ok = true;
    bool spiB_ok = true;
 #ifndef TEST
    // Init 2 SPI interfaces
-    SPIClass SPI_A(FSPI);
+//     SPIClass SPI_A(FSPI);
-    spiA_ok = SPI_A.begin(SPI_A_SCK, SPI_A_MISO, SPI_A_MOSI);
+//     spiA_ok = SPI_A.begin(SPI_A_SCK, SPI_A_MISO, SPI_A_MOSI);
-    SPIClass SPI_B(HSPI);
+//     SPI_A.setDataMode(SPI_MODE1); // ADS1256 requires SPI mode 1
-    spiB_ok = SPI_B.begin(SPI_B_SCK, SPI_B_MISO, SPI_B_MOSI);
+// #ifdef CH_B_ENABLE
-#endif
+//     SPIClass SPI_B(HSPI);
 //     spiB_ok = SPI_B.begin(SPI_B_SCK, SPI_B_MISO, SPI_B_MOSI);
 //     SPI_B.setDataMode(SPI_MODE1); // ADS1256 requires SPI mode 1
 // #endif
    if (!spiA_ok || !spiB_ok)
    {
        LOG_ERROR("Unable to Initialize SPI Busses");
@@ -109,108 +103,143 @@ void loop()
        vTaskDelay(pdMS_TO_TICKS(5000));
        esp_restart();
    }
-    LOG_INFO("Init SPI OK");
+    LOG_DEBUG("Init SPI OK");
-#ifndef TEST
+    // Resources Initialization
-    // Init ADC_A
+    std::shared_ptr<Devices> dev = std::make_shared<Devices>();
-    dev.adc_a = new ADS1256(ADC_A_DRDY, ADC_A_RST, ADC_A_SYNC, ADC_A_CS, 2.5, &SPI_A);
+    // dev->m_spi_a = std::make_unique<SPIClass>(SPI_A);
-    dev.adc_a->InitializeADC();
+    // dev->m_spi_b = std::make_unique<SPIClass>(SPI_B);
    dev.adc_a->setPGA(PGA_1);
    dev.adc_a->setDRATE(DRATE_1000SPS);
-    // Init ADC_B
+    // // Init ADC_A
-    dev.adc_a = new ADS1256(ADC_B_DRDY, ADC_B_RST, ADC_B_SYNC, ADC_B_CS, 2.5, &SPI_B);
+    // dev->m_adc_a = std::make_unique<ADS1256>(ADC_A_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_A_CS, 2.5, &SPI_A);
-    dev.adc_a->InitializeADC();
+    // dev->m_adc_b = std::make_unique<ADS1256>(ADC_B_DRDY, ADS1256::PIN_UNUSED, ADS1256::PIN_UNUSED, ADC_B_CS, 2.5, &SPI_B);
    dev.adc_a->setPGA(PGA_1);
    dev.adc_a->setDRATE(DRATE_1000SPS);
 #endif
-    LOG_INFO("Init ADC OK");
+    // dev->m_adc_a->InitializeADC();
    // dev->m_adc_a->setPGA(PGA_1);
    // dev->m_adc_a->setDRATE(DRATE_7500SPS);
    // dev->m_adc_b->InitializeADC();
    // dev->m_adc_b->setPGA(PGA_1);
    // dev->m_adc_b->setDRATE(DRATE_7500SPS);
    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};
    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};
    auto task_A = rtIgnitionTask(taskA_params, 4096, 256, CORE_1, fs_mutex);
    delay(50);
    auto task_B = rtIgnitionTask(taskB_params, 4096, 256, CORE_1, fs_mutex);
    // Ignition A on Core 0
-    auto ignA_task_success = pdPASS;
+    auto ignA_task_success = task_A.getStatus() == rtIgnitionTask::OK ? pdPASS : pdFAIL;
-    ignA_task_success = xTaskCreatePinnedToCore(
+    auto ignB_task_success = task_B.getStatus() == rtIgnitionTask::OK ? pdPASS : pdFAIL;
-        rtIgnitionTask,
+    if (ignA_task_success != pdPASS || ignB_task_success != pdPASS)
        "rtIgnitionTask_boxA",
        TASK_STACK,
        (void *)&taskA_params,
        TASK_PRIORITY,
        &trigA_TaskHandle,
        CORE_0);
    // Ignition B on Core 1
    auto ignB_task_success = pdPASS;
 #ifndef TEST
    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("Unable to initialize ISR task");
        LOG_ERROR("5 seconds to restart...");
        vTaskDelay(pdMS_TO_TICKS(5000));
        esp_restart();
    }
-    LOG_INFO("Real Time Tasks A & B initialized");
+    const bool tasK_A_rt = task_A.start();
    delay(50);
    const bool task_B_rt = task_B.start();
    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);
-    ////////////////////// MAIN LOOP //////////////////////
+    AstroWebServer webPage(80, LittleFS); // Initialize webserver and Websocket
    uint32_t count(0);
    clearScreen();
    setCursor(0, 0);
    task_A.onMessage([&webPage](ignitionBoxStatusFiltered sts){
        ArduinoJson::JsonDocument doc;
        doc["box_a"] = sts.toJson();
        doc["box_b"] = ArduinoJson::JsonDocument();
        webPage.sendWsData(doc.as<String>());
    });
    task_B.onMessage([&webPage](ignitionBoxStatusFiltered sts){
        ArduinoJson::JsonDocument doc;
        doc["box_a"] = ArduinoJson::JsonDocument();
        doc["box_b"] = sts.toJson();
        webPage.sendWsData(doc.as<String>());
    });
    task_A.enableSave(true, "ignitionA_test.csv");
    task_B.enableSave(true, "ignitionB_test.csv");
    uint32_t last_loop = millis();
    //////////////// INNER LOOP /////////////////////
    while (running)
    {
-        ignitionBoxStatus ignA;
+        if ((millis() - last_loop) > 2000)
        if (xQueueReceive(rt_taskA_queue, &ignA, pdMS_TO_TICKS(100)) == pdTRUE)
        {
-            printField("++ Timestamp", (uint32_t)ignA.timestamp, 0, 0);
+            clearScreen();
-            if (firstRun)
+            printRunningTasksMod(Serial);
-                Serial.println("========== Coils 12 =============");
+            delay(100);
-            printField("Pickup Tim", (uint32_t)ignA.coils12.trig_time, 0, 1);
+            last_loop = millis();
            printField("Spark Tim", (uint32_t)ignA.coils12.spark_time, 0, 2);
            printField("Spark Dly", (uint32_t)ignA.coils12.spark_delay, 0, 3);
            printField("Spark Sts", (uint32_t)ignA.coils12.spark_status, 0, 4);
            printField("Peak P_IN", ignA.coils12.peak_p_in, 0, 5);
            printField("Peak P_OUT", ignA.coils12.peak_p_out, 0, 6);
            printField("Peak N_IN", ignA.coils12.peak_n_in, 0, 7);
            printField("Peak N_OUT", ignA.coils12.peak_n_out, 0, 8);
            printField("SoftStart ", (uint32_t)ignA.coils12.sstart_status, 0, 9);
            if (firstRun)
                Serial.println("========== Coils 34 =============");
            printField("Pickup Tim", (uint32_t)ignA.coils34.trig_time, 0, 11);
            printField("Spark Tim", (uint32_t)ignA.coils34.spark_time, 0, 12);
            printField("Spark Dly", (uint32_t)ignA.coils34.spark_delay, 0, 13);
            printField("Spark Sts", (uint32_t)ignA.coils34.spark_delay, 0, 14);
            printField("Peak P_IN", ignA.coils34.peak_p_in, 0, 15);
            printField("Peak P_OUT", ignA.coils34.peak_p_out, 0, 16);
            printField("Peak N_IN", ignA.coils34.peak_n_in, 0, 17);
            printField("Peak N_OUT", ignA.coils34.peak_n_out, 0, 18);
            printField("SoftStart ", (uint32_t)ignA.coils34.sstart_status, 0, 19);
            if (firstRun)
                Serial.println("========== END =============");
            if (count++ % 10 == 0)
            {
                firstRun = true;
                clearScreen();
                setCursor(0, 0);
            }
            else
                firstRun = false;
        }
-    }
+    } //////////////// INNER LOOP /////////////////////
-    if (trigA_TaskHandle)
+} ////////////////////// MAIN LOOP //////////////////////
        vTaskDelete(trigA_TaskHandle);
    if (trigB_TaskHandle)
        vTaskDelete(trigB_TaskHandle);
    ////////////////////// MAIN LOOP //////////////////////
 }
--- a/RotaxMonitor/src/pins.h
+++ b/RotaxMonitor/src/pins.h
@@ -4,19 +4,19 @@
 // =====================
 // USB (RISERVATA)
 // =====================
-#define USB_DM      19
+#define USB_DM 19
-#define USB_DP      20
+#define USB_DP 20
 // =====================
 // UART DEBUG (RISERVATA)
 // =====================
-#define UART_TX     43
+#define UART_TX 43
-#define UART_RX     44
+#define UART_RX 44
 // =====================
 // RGB Led
 // =====================
-#define LED         48
+#define LED 48
 // =====================
 // STRAPPING CRITICI (NON USARE)
@@ -26,87 +26,139 @@
 // =====================
 // SPI BUS ADC1 (VSPI)
 // =====================
-#define SPI_A_MOSI   11
+#define SPI_A_MOSI 10
-#define SPI_A_MISO   13
+#define SPI_A_SCK 11
-#define SPI_A_SCK    12
+#define SPI_A_MISO 12
 // =====================
 // SPI BUS ADC2 (HSPI)
 // =====================
-#define SPI_B_MOSI   35
+#define SPI_B_MOSI 36
-#define SPI_B_MISO   37
+#define SPI_B_SCK 37
-#define SPI_B_SCK    36
+#define SPI_B_MISO 38
 // =====================
 // I2C BUS (PCA9555)
 // =====================
-#define SDA         8
+#define SDA 8
-#define SCL         9
+#define SCL 9
 #define I2C_INT 17
 // =====================
 // ADC CONTROL
 // =====================
-#define ADC_A_CS     4
+#define ADC_A_CS 14
-#define ADC_A_DRDY   5
+#define ADC_A_DRDY 13
 #define ADC_A_RST    6
 #define ADC_A_SYNC   7
-#define ADC_B_CS     14
+#define ADC_B_CS 21
-#define ADC_B_DRDY   15
+#define ADC_B_DRDY 47
 #define ADC_B_RST    16
 #define ADC_B_SYNC   17
 // =====================
 // DIGITAL POT
 // =====================
-#define POT_A_CS    1
+#define POT_A_CS 18
-#define POT_B_CS    2
+#define POT_B_CS 35
 // =====================
 // TRIGGER INPUT INTERRUPTS
 // =====================
-#define TRIG_PIN_A12P   18
+#define TRIG_PIN_A12P 6
-#define TRIG_PIN_A12N   21
+#define TRIG_PIN_A12N 7
-#define TRIG_PIN_A34P   33
+#define TRIG_PIN_A34P 15
-#define TRIG_PIN_A34N   34
+#define TRIG_PIN_A34N 16
-#define TRIG_PIN_B12P   38
+#define TRIG_PIN_B12P 42
-#define TRIG_PIN_B12N   39
+#define TRIG_PIN_B12N 41
-#define TRIG_PIN_B34P   40
+#define TRIG_PIN_B34P 40
-#define TRIG_PIN_B34N   41
+#define TRIG_PIN_B34N 39
 // =====================
 // SPARK DETECT INPUTS
 // =====================
-#define SPARK_PIN_A12   42
+#define SPARK_PIN_A12 4
-#define SPARK_PIN_A34   45   // OK (strapping ma consentito)
+#define SPARK_PIN_A34 5
-#define SPARK_PIN_B12   46   // OK (strapping ma consentito)
+#define SPARK_PIN_B12 1
-#define SPARK_PIN_B34   47
+#define SPARK_PIN_B34 2
 // =====================
-// PCA9555 (I2C EXPANDER)
+// PCA9555 I/O EXPANDER BOX_A
 // =====================
-// --- RESET LINES ---
+#define EXPANDER_A_ADDR 0x010101
-#define RST_EXT_A12P    0
+
-#define RST_EXT_A12N    1
+// --- DIGITAL POT CHIP SELECT LINES ---
-#define RST_EXT_A34P    2
+#define POT_CS_A12 0
-#define RST_EXT_A34N    3
+#define POT_CS_A34 1
-#define RST_EXT_B12P    4
+
-#define RST_EXT_B12N    5
+// --- SOFT START FORCE LINES ---
-#define RST_EXT_B34P    6
+#define SS_FORCE_A 2
-#define RST_EXT_B34N    7
+#define SS_INIBHIT_A12 3
 #define SS_INHIBIT_A34 4
 // --- SAMPLE AND HOLD ARM AND DISCHARGE ---
 #define SH_DISCH_A12 5
 #define SH_DISCH_A34 6
 #define SH_ARM_A12 7
 #define SH_ARM_A34 8
 // --- RELAY ---
-#define A_EXT_RELAY     8
+#define RELAY_IN_A12 9
-#define B_EXT_RELAY     9
+#define RELAY_OUT_A12 10
 #define RELAY_IN_A34 11
 #define RELAY_OUT_A34 12
 // --- STATUS / BUTTON ---
-#define BTN_3       10
+#define STA_2 13
-#define BTN_4       11
+#define STA_3 14
-#define STA_1       12
+#define STA_4 15
-#define STA_2       13
+
-#define STA_3       14
+// =====================
-#define STA_4       15
+// PCA9555 I/O EXPANDER BOX_B
 // =====================
 #define EXPANDER_B_ADDR 0x101010
 // --- DIGITAL POT CHIP SELECT LINES ---
 #define POT_CS_B12 0
 #define POT_CS_B34 1
 // --- SOFT START FORCE LINES ---
 #define SS_FORCE_B 2
 #define SS_INIBHIT_B12 3
 #define SS_INHIBIT_B34 4
 // --- SAMPLE AND HOLD ARM AND DISCHARGE ---
 #define SH_DISCH_B12 5
 #define SH_DISCH_B34 6
 #define SH_ARM_B12 7
 #define SH_ARM_B34 8
 // --- RELAY ---
 #define RELAY_IN_B12 9
 #define RELAY_OUT_B12 10
 #define RELAY_IN_B34 11
 #define RELAY_OUT_B34 12
 // --- STATUS / BUTTON ---
 #define STA_2 13
 #define STA_3 14
 #define STA_4 15
 // =====================
 // PCA9555 I/O EXPANDER INPUTS A+B
 // =====================
 #define EXPANDER_IN_ADDR 0x0a0a0a
 #define SS_A12_ON
 #define SS_A12_OFF
 #define SS_A34_ON
 #define SS_A34_OFF
 #define SS_B12_ON
 #define SS_B12_OFF
 #define SS_B34_ON
 #define SS_B34_OFF
 // Init Pin Functions
 inline void initTriggerPinsInputs()
--- a/RotaxMonitor/src/pins_test.h
+++ b/RotaxMonitor/src/pins_test.h
@@ -65,7 +65,7 @@
 #define RST_EXT_A34N    3
 // --- RELAY ---
-#define A_EXT_RELAY     8
+#define SH_ARM_A34     8
 // Init Pin Functions
--- a/RotaxMonitor/src/psvector.h
+++ b/RotaxMonitor/src/psvector.h
@@ -0,0 +1,27 @@
 #pragma once
 #include <vector>
 #include "esp_heap_caps.h"
 // Allocator custom per PSRAM
 template <typename T>
 struct PSRAMAllocator {
    using value_type = T;
    PSRAMAllocator() noexcept {}
    template <typename U>
    PSRAMAllocator(const PSRAMAllocator<U>&) noexcept {}
    T* allocate(std::size_t n) {
        void* ptr = heap_caps_malloc(n * sizeof(T), MALLOC_CAP_SPIRAM);
        if (!ptr) {
            throw std::bad_alloc();
        }
        return static_cast<T*>(ptr);
    }
    void deallocate(T* p, std::size_t) noexcept {
        heap_caps_free(p);
    }
 };
--- a/RotaxMonitor/src/tasks.cpp
+++ b/RotaxMonitor/src/tasks.cpp
@@ -1,6 +1,28 @@
 #include "tasks.h"
 #include <esp_timer.h>
 #include <datasave.h>
-void rtIgnitionTask(void *pvParameters)
+//// GLOBAL STATIC FUNCTIONS
 // Timeout callback for microsecond precision
 void spark_timeout_callback(void *arg)
 {
    TaskHandle_t handle = (TaskHandle_t)arg;
    xTaskNotify(handle, SPARK_FLAG_TIMEOUT, eSetValueWithOverwrite);
 }
 // Manages queue receive, save data and callback to external tasks for communication
 void rtIgnitionTask::rtIgnitionTask_manager(void *pvParameters)
 {
    rtIgnitionTask *cls = (rtIgnitionTask *)pvParameters;
    while (cls->m_running)
    {
        cls->run();
    }
 }
 // Static task function
 void rtIgnitionTask::rtIgnitionTask_realtime(void *pvParameters)
 {
    // Invalid real time rt_task_ptr parameters, exit immediate
@@ -9,48 +31,62 @@ void rtIgnitionTask(void *pvParameters)
        LOG_ERROR("Null rt_task_ptr parameters");
        vTaskDelete(NULL);
    }
    LOG_INFO("rtTask Params OK");
    // Task Parameters and Devices
    rtTaskParams *params = (rtTaskParams *)pvParameters;
-    const rtTaskInterrupts rt_int = params->rt_int; // copy to avoid external override
+    const rtTaskInterruptParams rt_int = params->rt_int; // copy to avoid external override
-    const rtTaskResets rt_rst = params->rt_resets;  // copy to avoid external override
+    const rtTaskIOParams rt_rst = params->rt_io;         // 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.get();
-    Devices *dev = params->dev;
+    ADS1256 *adc = dev->m_adc_a.get();
-    ADS1256 *adc = dev->adc_a;
+    PCA9555 *io = dev->m_expander_a.get();
-    PCA9555 *io = dev->io;
+
    TaskStatus_t rt_task_info;
    vTaskGetInfo(NULL, &rt_task_info, pdFALSE, eInvalid);
    const auto rt_task_name = pcTaskGetName(rt_task_info.xHandle);
    LOG_INFO("rtTask Params OK [", rt_task_name, "]");
    ignitionBoxStatus ign_box_sts;
    // Variables for ISR, static to be fixed in memory locations
-    static ignitionBoxStatus ign_box_sts; // common for all ISR calls
+    isrParams isr_params_t12p{
    static isrParams isr_params_t12p{
        .flag = TRIG_FLAG_12P,
        .ign_stat = &ign_box_sts,
-        .rt_handle_ptr = rt_handle_ptr};
+        .rt_handle_ptr = rt_task_info.xHandle};
-    static isrParams isr_params_t12n{
+    isrParams isr_params_t12n{
        .flag = TRIG_FLAG_12N,
        .ign_stat = &ign_box_sts,
-        .rt_handle_ptr = rt_handle_ptr};
+        .rt_handle_ptr = rt_task_info.xHandle};
-    static isrParams isr_params_t34p{
+    isrParams isr_params_t34p{
        .flag = TRIG_FLAG_34P,
        .ign_stat = &ign_box_sts,
-        .rt_handle_ptr = rt_handle_ptr};
+        .rt_handle_ptr = rt_task_info.xHandle};
-    static isrParams isr_params_t34n{
+    isrParams isr_params_t34n{
        .flag = TRIG_FLAG_34N,
        .ign_stat = &ign_box_sts,
-        .rt_handle_ptr = rt_handle_ptr};
+        .rt_handle_ptr = rt_task_info.xHandle};
-    static isrParams isr_params_sp12{
+    isrParams isr_params_sp12{
        .flag = SPARK_FLAG_12,
        .ign_stat = &ign_box_sts,
-        .rt_handle_ptr = rt_handle_ptr};
+        .rt_handle_ptr = rt_task_info.xHandle};
-    static isrParams isr_params_sp34{
+    isrParams isr_params_sp34{
        .flag = SPARK_FLAG_34,
        .ign_stat = &ign_box_sts,
-        .rt_handle_ptr = rt_handle_ptr};
+        .rt_handle_ptr = rt_task_info.xHandle};
-    LOG_INFO("rtTask ISR Params OK");
+    LOG_DEBUG("rtTask HDL Params OK, HDL* [", (uint32_t)rt_task_info.xHandle, "]");
    LOG_DEBUG("rtTask ISR Params OK, ISR* [", (uint32_t)rt_int.isr_ptr, "]");
    LOG_DEBUG("rtTask QUE Params OK, QUE* [", (uint32_t)rt_queue, "]");
-    pinMode(POT_A_CS, OUTPUT);
+    // Create esp_timer for microsecond precision timeout
    esp_timer_handle_t timeout_timer;
    esp_timer_create_args_t timer_args = {
        .callback = spark_timeout_callback,
        .arg = (void *)rt_task_info.xHandle,
        .dispatch_method = ESP_TIMER_TASK,
        .name = "spark_timeout"};
    esp_timer_create(&timer_args, &timeout_timer);
    // Attach Pin Interrupts
    attachInterruptArg(digitalPinToInterrupt(rt_int.trig_pin_12p), rt_int.isr_ptr, (void *)&isr_params_t12p, RISING);
@@ -60,18 +96,14 @@ void rtIgnitionTask(void *pvParameters)
    attachInterruptArg(digitalPinToInterrupt(rt_int.spark_pin_12), rt_int.isr_ptr, (void *)&isr_params_sp12, RISING);
    attachInterruptArg(digitalPinToInterrupt(rt_int.spark_pin_34), rt_int.isr_ptr, (void *)&isr_params_sp34, RISING);
-    LOG_INFO("rtTask ISR Attach OK");
+    LOG_INFO("rtTask ISR Attach OK [", rt_task_name, "]");
    // Compute Reset Pin Bitmask
    const uint16_t rst_bitmask = (1 << rt_rst.rst_io_12p) |
                                 (1 << rt_rst.rst_io_12n) |
                                 (1 << rt_rst.rst_io_34p) |
                                 (1 << rt_rst.rst_io_34n);
    LOG_WARN("rtTask Init Correct");
    // Global rt_task_ptr variables
-    uint32_t it = 0;
+    bool first_cycle = true;
-    uint32_t q_fail_count = 0;
+    bool cycle12 = false;
    bool cycle34 = false;
    int64_t last_cycle_time = 0;
    uint32_t n_errors = 0;
    while (params->rt_running)
    {
@@ -80,58 +112,49 @@ void rtIgnitionTask(void *pvParameters)
        // WAIT FOR PICKUP SIGNAL
        xTaskNotifyWait(
-            ULONG_MAX,    // non pulire all'ingresso
+            0x00,         // non pulire all'ingresso
            ULONG_MAX,    // pulisci i primi 8 bit
            &pickup_flag, // valore ricevuto
            portMAX_DELAY);
-#ifdef DEBUG
+        if (first_cycle && pickup_flag != TRIG_FLAG_12P) // skip first cycle because of possible initial noise on pickup signals at startu
        LOG_INFO("Iteration [", it++, "]");
        Serial.print("\033[2J"); // clear screen
        Serial.print("\033[H");  // cursor home
        LOG_INFO("Pickup Flags: ", printBits(pickup_flag).c_str());
        if (!names.contains(pickup_flag))
        {
            LOG_ERROR("Wrong Pickup Flag");
            continue;
        }
        else
        {
            LOG_INFO("Pickup Trigger: ", names.at(pickup_flag));
        }
 #endif
-        // WAIT FOR SPARK TO HAPPEN
+        // Start microsecond precision timeout timer
-        auto spark_timeout = ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(spark_timeout_max));
+        esp_timer_stop(timeout_timer); // stop timer in case it was running from previous cycle
-        if (ign_box_sts.coils12.spark_ok || ign_box_sts.coils34.spark_ok) // otherwise timeout if none is set in the ISR
+        esp_timer_start_once(timeout_timer, spark_timeout_max);
            spark_flag = ign_box_sts.coils12.spark_ok ? SPARK_FLAG_12 : SPARK_FLAG_34;
        else
            spark_flag == SPARK_FLAG_NIL;
-        xTaskNotifyStateClear(NULL);
+        // WAIT FOR SPARK TO HAPPEN OR TIMEOUT
-        ulTaskNotifyValueClear(NULL, 0xFFFFFFFF);
+        xTaskNotifyWait(
            0x00,           // non pulire all'ingresso
            ULONG_MAX,      // pulisci i primi 8 bit
            &spark_flag,    // valore ricevuto
            portMAX_DELAY); // wait indefinitely, timeout handled by esp_timer
-#ifdef DEBUG
+        // Handle timeout or spark event
-        LOG_INFO("Spark Flags: ", printBits(spark_flag).c_str());
+        if (spark_flag != SPARK_FLAG_TIMEOUT)
-        if (!names.contains(spark_flag))
+            esp_timer_stop(timeout_timer);
            LOG_ERROR("No Spark");
        else
            LOG_INFO("Spark Trigger:", names.at(spark_flag));
 #endif
        // A trigger from pickup 12 is followed by a spark event on 34 or vice versa pickup 34 triggers spark on 12
-        if ((pickup_flag == TRIG_FLAG_12P || pickup_flag == TRIG_FLAG_12N) && spark_flag != SPARK_FLAG_12)
+        if ((pickup_flag == TRIG_FLAG_12P || pickup_flag == TRIG_FLAG_12N) && (spark_flag != SPARK_FLAG_12 && spark_flag != SPARK_FLAG_TIMEOUT))
        {
            ign_box_sts.coils12.spark_status = ign_box_sts.coils34.spark_status = sparkStatus::SPARK_SYNC_FAIL;
            // Save error on circular buffer and skip to next cycle //
            LOG_ERROR("Spark Mismatch");
            continue;
        }
        // Select coil status reference based on pickup_flag
        coilsStatus *coils;
        switch (pickup_flag)
        {
        case TRIG_FLAG_12P:
        {
            first_cycle = false;
            // compute engine rpm from cycle time
            auto current_time = esp_timer_get_time();
            auto cycle_time = current_time - last_cycle_time;
            last_cycle_time = current_time;
            ign_box_sts.eng_rpm = (int32_t)(60.0f / (cycle_time / 1000000.0f));
        }
        case TRIG_FLAG_12N:
            coils = &ign_box_sts.coils12;
            break;
@@ -141,79 +164,77 @@ void rtIgnitionTask(void *pvParameters)
            break;
        }
-        bool new_data = false;
+        // Select logic based on pickup and spark flags
        switch (pickup_flag)
        {
        case TRIG_FLAG_12P:
        case TRIG_FLAG_34P:
        {
            // Timeout not occourred, expected POSITIVE edge spark OCCOURRED
-            if (spark_flag != SPARK_FLAG_NIL)
+            if (spark_flag != SPARK_FLAG_TIMEOUT)
            {
-                coils->spark_delay = coils->spark_time - coils->trig_time;
+                coils->spark_delay = (int32_t)(coils->spark_time - coils->trig_time);
                coils->sstart_status = softStartStatus::NORMAL;  // because spark on positive edge
                coils->spark_status = sparkStatus::SPARK_POS_OK; // do not wait for spark on negative edge
 #ifdef DEBUG
                LOG_INFO("Trigger Spark POSITIVE");
                LOG_INFO("Spark12 Delay Timer: ", (int)coils->spark_delay);
 #endif
            }
            // Timeout occourred, expected POSITIVE edge spark NOT OCCOURRED
-            else if (spark_flag == SPARK_FLAG_NIL)
+            else if (spark_flag == SPARK_FLAG_TIMEOUT)
            {
                coils->spark_status = sparkStatus::SPARK_NEG_WAIT;
                coils->sstart_status = softStartStatus::NORMAL;
            }
-            new_data = true;
+            continue; // Do nothing more on positive pulse
            break; // Do nothing more on positive pulse
        }
        // CASES for NEGATIVE cycle triggering of pickup and sparks 12 & 34
        case TRIG_FLAG_12N:
        case TRIG_FLAG_34N:
        {
-            const bool expected_negative12 = coils->spark_status == sparkStatus::SPARK_NEG_WAIT;
+            const bool expected_negative = coils->spark_status == sparkStatus::SPARK_NEG_WAIT;
            // Timeout not occourred, expected NEGATIVE edge spark OCCOURRED
-            if (spark_flag != SPARK_FLAG_NIL && expected_negative12)
+            if (spark_flag != SPARK_FLAG_TIMEOUT && expected_negative)
            {
-                coils->spark_delay = coils->spark_time - coils->trig_time;
+                coils->spark_delay = (int32_t)(coils->spark_time - coils->trig_time);
                coils->sstart_status = softStartStatus::SOFT_START;
-                coils->spark_status == sparkStatus::SPARK_NEG_OK;
+                coils->spark_status = sparkStatus::SPARK_NEG_OK;
 #ifdef DEBUG
                LOG_INFO("Trigger Spark NEGATIVE");
                LOG_INFO("Spark12 Delay Timer: ", (int)ign_box_sts.coils12.spark_delay);
 #endif
            }
            // Timeout occourred, expected POSITIVE edge spark NOT OCCOURRED
-            else if (spark_flag == SPARK_FLAG_NIL && expected_negative12)
+            else if (spark_flag == SPARK_FLAG_TIMEOUT && expected_negative)
            {
-                coils->sstart_status = softStartStatus::NORMAL;
+                coils->sstart_status = softStartStatus::ERROR;
                coils->spark_status = sparkStatus::SPARK_NEG_FAIL;
            }
            // Timeout not occouured, unexpected negative edge spark
-            else if (spark_flag != SPARK_FLAG_NIL && !expected_negative12)
+            else if (spark_flag != SPARK_FLAG_TIMEOUT && !expected_negative)
            {
                coils->sstart_status = softStartStatus::SOFT_START;
                coils->spark_status = sparkStatus::SPARK_NEG_UNEXPECTED;
            }
            // Wait for finish of negative pulse to save data to buffer
-            new_data = true;
+            coils->n_events++;
            if (pickup_flag == TRIG_FLAG_12N)
                cycle12 = true;
            else
                cycle34 = true;
            break;
        }
        default:
 #ifdef DEUG
            LOG_ERROR("Invalid Interrupt");
            LOG_ERROR("Pickup Flags: ", printBits(pickup_flag).c_str());
            LOG_ERROR("Spark Flags: ", printBits(spark_flag).c_str());
 #endif
            break;
        }
-        if (new_data)
+        if (cycle12 && cycle34) // wait for both 12 and 34 cycles to complete before sending data to main loop and resetting peak detectors
        {
-            vTaskDelay(pdMS_TO_TICKS(1)); // delay 1ms to allow peak detectors to charge for negative cycle
+            cycle12 = false;
-            // read adc channels: pickup12, out12 [ pos + neg ]
+            cycle34 = false;
            if (ign_box_sts.coils12.spark_status == sparkStatus::SPARK_POS_FAIL || ign_box_sts.coils12.spark_status == sparkStatus::SPARK_NEG_FAIL)
                ign_box_sts.coils12.n_missed_firing++;
            if (ign_box_sts.coils34.spark_status == sparkStatus::SPARK_POS_FAIL || ign_box_sts.coils34.spark_status == sparkStatus::SPARK_NEG_FAIL)
                ign_box_sts.coils34.n_missed_firing++;
            //  read adc channels: pickup12, out12 [ pos + neg ]
            if (adc) // read only if adc initialized
            {
                uint32_t start_adc_read = esp_timer_get_time();
                // from peak detector circuits
                ign_box_sts.coils12.peak_p_in = adcReadChannel(adc, ADC_CH_PEAK_12P_IN);
                ign_box_sts.coils12.peak_n_in = adcReadChannel(adc, ADC_CH_PEAK_12N_IN);
@@ -223,33 +244,32 @@ void rtIgnitionTask(void *pvParameters)
                ign_box_sts.coils12.peak_n_out = adcReadChannel(adc, ADC_CH_PEAK_12N_OUT);
                ign_box_sts.coils34.peak_p_out = adcReadChannel(adc, ADC_CH_PEAK_34P_OUT);
                ign_box_sts.coils34.peak_n_out = adcReadChannel(adc, ADC_CH_PEAK_34N_OUT);
                ign_box_sts.adc_read_time = (int32_t)(esp_timer_get_time() - start_adc_read);
            }
            else // simulate adc read timig
-                vTaskDelay(pdMS_TO_TICKS(6));
+                vTaskDelay(pdMS_TO_TICKS(c_adc_time));
            // reset peak detectors + sample and hold
            // outputs on io expander
            if (io)
            {
-                const uint16_t iostat = io->read();
+                // [TODO] code to reset sample and hold and arm trigger level detectors
                io->write(iostat | rst_bitmask);
                vTaskDelay(pdMS_TO_TICKS(1));
                io->write(iostat & ~rst_bitmask);
            }
            else
-                vTaskDelay(pdMS_TO_TICKS(2));
+                vTaskDelay(pdMS_TO_TICKS(1));
            // send essage to main loop with ignition info, by copy so local static variable is ok
            if (rt_queue)
                ign_box_sts.timestamp = esp_timer_get_time(); // update data timestamp
            if (xQueueSendToBack(rt_queue, (void *)&ign_box_sts, pdMS_TO_TICKS(1)) != pdPASS)
            {
-                q_fail_count++;
+                ign_box_sts.timestamp = esp_timer_get_time(); // update data timestamp
-                LOG_ERROR("Failed to send to rt_queue");
+                if (xQueueSendToBack(rt_queue, (void *)&ign_box_sts, 0) != pdPASS)
                    ign_box_sts.n_queue_errors = ++n_errors;
            }
        }
    }
-    LOG_WARN("Ending realTime Task");
+    // Delete the timeout timer
    esp_timer_delete(timeout_timer);
    LOG_WARN("rtTask Ending [", rt_task_name, "]");
    // Ignition A Interrupts DETACH
    detachInterrupt(rt_int.trig_pin_12p);
    detachInterrupt(rt_int.trig_pin_12n);
@@ -260,3 +280,253 @@ 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)
 {
    // 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);
    LOG_WARN("Starting Manager for [", m_params.name.c_str(), "]");
    // auto task_success = pdPASS;
    auto task_success = xTaskCreatePinnedToCore(
        rtIgnitionTask_manager,
        (std::string("man_") + m_params.name).c_str(),
        8192,
        (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_active_history->size())
        {
            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
        }
        // 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)
        {
            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;
        }
        delay(5); // yeld to another task
    }
 }
 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());
 }
--- a/RotaxMonitor/src/tasks.h
+++ b/RotaxMonitor/src/tasks.h
@@ -8,6 +8,13 @@
 #include <Arduino.h>
 #include <DebugLog.h>
 #include "utils.h"
 #include <memory>
 #include <mutex>
 #include <filesystem>
 #include <FS.h>
 #include <LittleFS.h>
 #include <datasave.h>
 #include <functional>
 // ISR
 #include "isr.h"
@@ -16,7 +23,7 @@
 #include "devices.h"
 // Global Variables and Flags
-const uint8_t spark_timeout_max = 2; // in milliseconds
+const uint32_t spark_timeout_max = 500; // in microseconds
 // Debug Variables
 #ifdef DEBUG
@@ -27,39 +34,126 @@ static const std::map<const uint32_t, const char *> names = {
    {TRIG_FLAG_34N, "TRIG_FLAG_34N"},
    {SPARK_FLAG_12, "SPARK_FLAG_12"},
    {SPARK_FLAG_34, "SPARK_FLAG_34"},
    {SPARK_FLAG_TIMEOUT, "SPARK_FLAG_TIMEOUT"},
 };
 #endif
-// RT task Interrupt parameters
+class rtIgnitionTask
 struct rtTaskInterrupts
 {
-    void (*isr_ptr)(void *);
+    using PSHistory = PSRAMVector<ignitionBoxStatus>;
    const uint8_t trig_pin_12p;
    const uint8_t trig_pin_12n;
    const uint8_t trig_pin_34p;
    const uint8_t trig_pin_34n;
    const uint8_t spark_pin_12;
    const uint8_t spark_pin_34;
 };
-// RT Task Peak Detector Reset pins
+public:
-struct rtTaskResets
+    // RT task Interrupt parameters
-{
+    struct rtTaskInterruptParams
-    const uint8_t rst_io_12p;
+    {
-    const uint8_t rst_io_12n;
+        void (*isr_ptr)(void *);
-    const uint8_t rst_io_34p;
+        const uint8_t trig_pin_12p;
-    const uint8_t rst_io_34n;
+        const uint8_t trig_pin_12n;
-};
+        const uint8_t trig_pin_34p;
        const uint8_t trig_pin_34n;
        const uint8_t spark_pin_12;
        const uint8_t spark_pin_34;
    };
-// RT task parameters
+    // RT Task Peak Detector Reset pins
-struct rtTaskParams
+    struct rtTaskIOParams
-{
+    {
-    bool rt_running; // run flag, false to terminate
+        const uint32_t expander_addr;
-    Devices *dev;
+        const uint8_t pot_cs_12;
-    TaskHandle_t* rt_handle_ptr;
+        const uint8_t pot_cs_34;
-    const QueueHandle_t rt_queue;
+        const uint8_t ss_force;
-    const rtTaskInterrupts rt_int; // interrupt pins to attach
+        const uint8_t ss_inhibit_12;
-    const rtTaskResets rt_resets;  // reset ping for peak detectors
+        const uint8_t ss_inhibit_34;
-};
+        const uint8_t sh_disch_12;
        const uint8_t sh_disch_34;
        const uint8_t sh_arm_12;
        const uint8_t sh_arm_34;
        const uint8_t relay_in_12;
        const uint8_t relay_in_34;
        const uint8_t relay_out_12;
        const uint8_t relay_out_34;
    };
-void rtIgnitionTask(void *pvParameters);
+    // 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
        const std::shared_ptr<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;
    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
 };
--- a/RotaxMonitor/src/ui.cpp
+++ b/RotaxMonitor/src/ui.cpp
@@ -0,0 +1,73 @@
 #include <ui.h>
 void clearScreen()
 {
    Serial.print("\033[2J"); // clear screen
    Serial.print("\033[H");  // cursor home
    Serial.flush();
 }
 void setCursor(const uint8_t x, const uint8_t y)
 {
    Serial.printf("\033[%d;%d", y, x + 1);
    Serial.flush();
 }
 void printField(const char name[], const uint32_t val)
 {
    Serial.printf("%15s: %06u\n", name, val);
 }
 void printField(const char name[], const int32_t val)
 {
    Serial.printf("%15s: %06d\n", name, val);
 }
 void printField(const char name[], const int64_t val)
 {
    Serial.printf("%15s: %06u\n", name, (uint64_t)val);
 }
 void printField(const char name[], const float val)
 {
    Serial.printf("%15s: %4.2f\n", name, val);
 }
 void printField(const char name[], const char *val)
 {
    Serial.printf("%15s: %s\n", name, val);
 }
 void printInfo(const ignitionBoxStatus &info)
 {
    clearScreen();
    setCursor(0, 0);
    printField("++ Timestamp ++", (uint32_t)info.timestamp);
    Serial.println("========== Coils 12 =============");
    printField("Events", info.coils12.n_events);
    printField("Events Missed", info.coils12.n_missed_firing);
    printField("Spark Dly", (uint32_t)info.coils12.spark_delay);
    printField("Spark Sts", sparkStatusNames.at(info.coils12.spark_status));
    printField("Peak P_IN", info.coils12.peak_p_in);
    printField("Peak N_IN", info.coils12.peak_n_in);
    printField("Peak P_OUT", info.coils12.peak_p_out);
    printField("Peak N_OUT", info.coils12.peak_n_out);
    printField("Soft Start ", softStartStatusNames.at(info.coils12.sstart_status));
    Serial.println("========== Coils 34 =============");
    printField("Events", info.coils34.n_events);
    printField("Events Missed", info.coils34.n_missed_firing);
    printField("Spark Dly", (uint32_t)info.coils34.spark_delay);
    printField("Spark Sts", sparkStatusNames.at(info.coils34.spark_status));
    printField("Peak P_IN", info.coils34.peak_p_in);
    printField("Peak N_IN", info.coils34.peak_n_in);
    printField("Peak P_OUT", info.coils34.peak_p_out);
    printField("Peak N_OUT", info.coils34.peak_n_out);
    printField("Soft Start ", softStartStatusNames.at(info.coils34.sstart_status));
    Serial.println("============ END ===============");
    Serial.println();
    printField("Engine RPM", info.eng_rpm);
    printField("ADC Read Time", info.adc_read_time);
    printField("Queue Errors", info.n_queue_errors);
 }
--- a/RotaxMonitor/src/ui.h
+++ b/RotaxMonitor/src/ui.h
@@ -1,48 +1,16 @@
 #pragma once
 #include <Arduino.h>
 #include <datastruct.h>
 #include <string>
-static bool firstRun = true;
+void clearScreen();
 void setCursor(const uint8_t x, const uint8_t y);
 void printField(const char name[], const uint32_t val);
 void printField(const char name[], const int32_t val);
 void printField(const char name[], const int64_t val);
 void printField(const char name[], const float val);
 void printField(const char name[], const char *val);
-void clearScreen(){
+void printInfo(const ignitionBoxStatus &info);
    Serial.print("\033[2J"); // clear screen
    Serial.print("\033[H");  // cursor home
    Serial.flush();
 }
 void setCursor(const uint8_t x, const uint8_t y) {
    Serial.printf("\033[%d;%d", y, x+1);
    Serial.flush();
 }
 void printField(const char name[], const uint32_t val, const uint8_t x, const uint8_t y) {
    if (firstRun) {
        setCursor(x,y);
        Serial.printf("%15s: %06d\n", name, val);
        return;
    }
    setCursor(x+16, y);
    Serial.print(val);
 }
 void printField(const char name[], const int64_t val, const uint8_t x, const uint8_t y) {
    if (firstRun) {
        setCursor(x,y);
        Serial.printf("%15s: %06u\n", name, (uint64_t)val);
        return;
    }
    setCursor(x+16, y);
    Serial.print((uint64_t)val);
    Serial.flush();
 }
 void printField(const char name[], const float val, const uint8_t x, const uint8_t y) {
    if (firstRun) {
        setCursor(x,y);
        Serial.printf("%15s: %4.2f\n", name, val);
        return;
    }
    setCursor(x+16, y);
    Serial.print(val);
    Serial.flush();
 }
--- a/RotaxMonitor/src/utils.cpp
+++ b/RotaxMonitor/src/utils.cpp
@@ -1,14 +1,194 @@
 #include "utils.h"
 #include "freertos_stats.h"
 #include "sdkconfig.h"
-std::string printBits(uint32_t value) {
+#include "freertos/FreeRTOS.h"
 #include "freertos/portable.h"
 #include "esp_heap_caps.h"
 #include "esp_system.h"
 #include "esp_spi_flash.h"
 #include "esp_partition.h"
 #include "LittleFS.h"
 #include <vector>
 #include <algorithm>
 #include <functional>
 #define FREERTOS_TASK_NUMBER_MAX_NUM 256 // RunTime stats for how many Tasks to be stored
 std::string printBits(uint32_t value)
 {
    std::string result;
-    for (int i = 31; i >= 0; i--) {
+    for (int i = 31; i >= 0; i--)
    {
        // ottieni il singolo bit
        result += ((value >> i) & 1) ? '1' : '0';
        // aggiungi uno spazio ogni 8 bit, tranne dopo l'ultimo
-        if (i % 8 == 0 && i != 0) {
+        if (i % 8 == 0 && i != 0)
        {
            result += ' ';
        }
    }
    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;
    printer.printf("%s%-12s [" COLOR_RESET, color, label);
    for (int i = 0; i < BAR_WIDTH; i++)
    {
        if (i < filled)
            printer.printf("%s#%s", color, COLOR_RESET);
        else
            printer.printf("-");
    }
    printer.printf("] %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));
 }
 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;
    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);
    if (app_partition)
    {
        size_t totalAPP = app_partition->size; // dimensione reale partizione
        size_t sketchSize = ESP.getSketchSize();
        printBar(printer, "FLASH APP", sketchSize, totalAPP, COLOR_CYAN);
    }
    else
    {
        printer.printf(COLOR_YELLOW "%-12s [NOT FOUND]\n" COLOR_RESET, "FLASH APP");
    }
    // ===== 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\n", COLOR_RED, COLOR_RESET, minHeap / 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();
 }
--- a/RotaxMonitor/src/utils.h
+++ b/RotaxMonitor/src/utils.h
@@ -2,5 +2,14 @@
 #include <Arduino.h>
 #include <string>
 #include <datastruct.h>
 std::string printBits(uint32_t value);
 void printRunningTasksMod(Print &printer, std::function<bool(const TaskStatus_t &a, const TaskStatus_t &b)> orderBy = nullptr);
 inline void swapHistory(PSRAMVector<ignitionBoxStatus>* active, PSRAMVector<ignitionBoxStatus>* writable) {
    auto *temp = active;
    active = writable; // switch active and writable buffers
    writable = temp;   // ensure writable_history points to the buffer we just filled
 }
--- a/RotaxMonitor/src/webserver.cpp
+++ b/RotaxMonitor/src/webserver.cpp
@@ -0,0 +1,150 @@
 #include <webserver.h>
 #include <ArduinoJson.h>
 static const std::map<const std::string, AstroWebServer::c_commandEnum> s_webserverCommands = {
    {"setTime", AstroWebServer::SET_TIME},
 };
 AstroWebServer::AstroWebServer(const uint8_t port, fs::FS &filesystem) : m_port(port), m_webserver(AsyncWebServer(port)), m_websocket(AsyncWebSocket("/ws")), m_filesystem(filesystem)
 {
    LOG_DEBUG("Initializing Web Server");
    m_websocket.onEvent([this](AsyncWebSocket *server, AsyncWebSocketClient *client,
                               AwsEventType type, void *arg, uint8_t *data, size_t len)
                        { onWsEvent(server, client, type, arg, data, len); });
    m_webserver.addHandler(&m_websocket);
    m_webserver.serveStatic("/", m_filesystem, "/").setDefaultFile("index.html");
    m_webserver.on("/upload", HTTP_POST, [this](AsyncWebServerRequest *request)
                   { onUploadRequest(request); }, [this](AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final)
                   { onUploadHandler(request, filename, index, data, len, final); });
    m_webserver.begin();
    LOG_DEBUG("Webserver Init OK");
 }
 AstroWebServer::~AstroWebServer()
 {
    m_webserver.removeHandler(&m_websocket);
    m_webserver.end();
 }
 void AstroWebServer::sendWsData(const String &data)
 {
    if (m_websocket.count())
    {
        m_websocket.textAll(data);
    }
 }
 void AstroWebServer::onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len)
 {
    switch (type)
    {
    case WS_EVT_CONNECT:
        LOG_DEBUG("WS client IP[", client->remoteIP().toString().c_str(), "]-ID[", client->id(), "] CONNECTED");
        break;
    case WS_EVT_DISCONNECT:
        LOG_DEBUG("WS client IP[", client->remoteIP().toString().c_str(), "]-ID[", client->id(), "] DISCONNECTED");
        break;
    case WS_EVT_DATA:
    {
        AwsFrameInfo *info = (AwsFrameInfo *)arg;
        if (info->final && info->index == 0 && info->len == len)
        {
            std::string data_str((char *)data, len);
            ArduinoJson::JsonDocument doc;
            if (auto rv = ArduinoJson::deserializeJson(doc, data_str) != ArduinoJson::DeserializationError::Ok)
            {
                LOG_ERROR("WS Client unable to deserialize Json");
                return;
            }
            if (!doc["cmd"].is<std::string>() || !s_webserverCommands.contains(doc["cmd"]))
            {
                LOG_WARN("WS Client Invalid Json command [", doc["cmd"].as<std::string>().c_str(), "]");
                return;
            }
            std::string buffer;
            switch (s_webserverCommands.at(doc["cmd"]))
            {
            case SET_TIME:
            {
                auto epoch = doc["time"].as<time_t>();
                timeval te{
                    .tv_sec = epoch,
                    .tv_usec = 0,
                };
                timezone tz{
                    .tz_minuteswest = 0,
                    .tz_dsttime = DST_MET,
                };
                settimeofday(&te, &tz);
                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);
                LOG_DEBUG("WS Client set Datetime to: ", buffer.c_str());
                break;
            }
            default:
                // call external command callback
                break;
            }
        }
    }
    }
 }
 void AstroWebServer::onUploadRequest(AsyncWebServerRequest *request)
 {
    if (m_uploadFailed)
        request->send(500, "text/plain", "Upload failed");
    else
        request->send(200, "text/plain", "Upload successful");
 }
 void AstroWebServer::onUploadHandler(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final)
 {
    if (index == 0) // only on first iteration to open file
    {
        m_uploadFailed = false;
        String safeName = filename;
        int slashIndex = safeName.lastIndexOf('/');
        if (slashIndex >= 0)
            safeName = safeName.substring(slashIndex + 1);
        if (safeName.length() == 0)
        {
            m_uploadFailed = true;
            LOG_ERROR("Invalid file name");
            return;
        }
        const std::filesystem::path filePath = std::filesystem::path(m_filesystem.mountpoint()) / safeName.c_str();
        if (m_filesystem.exists(filePath.c_str()))
            m_filesystem.remove(filePath.c_str());
        m_uploadFile = m_filesystem.open(filePath.c_str(), FILE_WRITE);
        if (!m_uploadFile)
        {
            m_uploadFailed = true;
            LOG_ERROR("Failed to open upload file:", filePath.c_str());
            return;
        }
    }
    // Actual write of file data
    if (!m_uploadFailed && m_uploadFile)
    {
        if (m_uploadFile.write(data, len) != len)
            m_uploadFailed = true;
    }
    // close the file and save on final call
    if (final && m_uploadFile)
    {
        m_uploadFile.close();
        if (!m_uploadFailed)
            LOG_INFO("Uploaded file to LittleFS:", filename.c_str());
    }
 }
--- a/RotaxMonitor/src/webserver.h
+++ b/RotaxMonitor/src/webserver.h
@@ -0,0 +1,47 @@
 #pragma once
 #define DEBUGLOG_DEFAULT_LOG_LEVEL_DEBUG
 // System includes
 #include <Arduino.h>
 #include <DebugLog.h>
 #include <ESPAsyncWebServer.h>
 #include <AsyncTCP.h>
 #include <filesystem>
 #include <map>
 #include <FS.h>
 class AstroWebServer
 {
 public:
    AstroWebServer(const uint8_t port, fs::FS &filesystem);
    ~AstroWebServer();
    void sendWsData(const String &data);
 private:
    void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client,
                   AwsEventType type, void *arg, uint8_t *data, size_t len);
    void onUploadRequest(AsyncWebServerRequest *request);
    void onUploadHandler(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final);
    void onStart(AsyncWebServerRequest *request);
    void onStop(AsyncWebServerRequest *request);
    void onDownload(AsyncWebServerRequest *request);
 private:
    const uint8_t m_port = 80;
    fs::FS &m_filesystem;
    AsyncWebServer m_webserver;
    AsyncWebSocket m_websocket;
    bool m_uploadFailed = false;
    fs::File m_uploadFile;
 public:
    enum c_commandEnum
    {
        SET_TIME
    };
 };
--- a/RotaxMonitorTester/.gitignore
+++ b/RotaxMonitorTester/.gitignore
@@ -0,0 +1,5 @@
 .pio
 .vscode/.browse.c_cpp.db*
 .vscode/c_cpp_properties.json
 .vscode/launch.json
 .vscode/ipch
--- a/RotaxMonitorTester/.vscode/extensions.json
+++ b/RotaxMonitorTester/.vscode/extensions.json
@@ -0,0 +1,9 @@
 {
    "recommendations": [
        "Jason2866.esp-decoder",
        "pioarduino.pioarduino-ide"
    ],
    "unwantedRecommendations": [
        "ms-vscode.cpptools-extension-pack"
    ]
 }
--- a/RotaxMonitorTester/include/README
+++ b/RotaxMonitorTester/include/README
@@ -0,0 +1,37 @@
 This directory is intended for project header files.
 A header file is a file containing C declarations and macro definitions
 to be shared between several project source files. You request the use of a
 header file in your project source file (C, C++, etc) located in `src` folder
 by including it, with the C preprocessing directive `#include'.
 ```src/main.c
 #include "header.h"
 int main (void)
 {
 ...
 }
 ```
 Including a header file produces the same results as copying the header file
 into each source file that needs it. Such copying would be time-consuming
 and error-prone. With a header file, the related declarations appear
 in only one place. If they need to be changed, they can be changed in one
 place, and programs that include the header file will automatically use the
 new version when next recompiled. The header file eliminates the labor of
 finding and changing all the copies as well as the risk that a failure to
 find one copy will result in inconsistencies within a program.
 In C, the convention is to give header files names that end with `.h'.
 Read more about using header files in official GCC documentation:
 * Include Syntax
 * Include Operation
 * Once-Only Headers
 * Computed Includes
 https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html
--- a/RotaxMonitorTester/lib/README
+++ b/RotaxMonitorTester/lib/README
@@ -0,0 +1,46 @@
 This directory is intended for project specific (private) libraries.
 PlatformIO will compile them to static libraries and link into the executable file.
 The source code of each library should be placed in a separate directory
 ("lib/your_library_name/[Code]").
 For example, see the structure of the following example libraries `Foo` and `Bar`:
 |--lib
 |  |
 |  |--Bar
 |  |  |--docs
 |  |  |--examples
 |  |  |--src
 |  |     |- Bar.c
 |  |     |- Bar.h
 |  |  |- library.json (optional. for custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
 |  |
 |  |--Foo
 |  |  |- Foo.c
 |  |  |- Foo.h
 |  |
 |  |- README --> THIS FILE
 |
 |- platformio.ini
 |--src
   |- main.c
 Example contents of `src/main.c` using Foo and Bar:
 ```
 #include <Foo.h>
 #include <Bar.h>
 int main (void)
 {
  ...
 }
 ```
 The PlatformIO Library Dependency Finder will find automatically dependent
 libraries by scanning project source files.
 More information about PlatformIO Library Dependency Finder
 - https://docs.platformio.org/page/librarymanager/ldf.html
--- a/RotaxMonitorTester/platformio.ini
+++ b/RotaxMonitorTester/platformio.ini
@@ -0,0 +1,39 @@
 ; PlatformIO Project Configuration File
 ;
 ;   Build options: build flags, source filter
 ;   Upload options: custom upload port, speed and extra flags
 ;   Library options: dependencies, extra library storages
 ;   Advanced options: extra scripting
 ;
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 [env:esp32-devtest-release]
 board = esp32dev
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
 framework = arduino
 lib_deps = 
 	hideakitai/DebugLog@^0.8.4
 board_build.flash_size = 4MB
 board_build.partitions = default.csv
 monitor_speed = 921600
 build_type = release
 [env:esp32-devtest-debug]
 board = esp32dev
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
 lib_deps = 
 	hideakitai/DebugLog@^0.8.4
 board_build.flash_size = 4MB
 board_build.partitions = default.csv
 monitor_speed = 921600
 build_type = debug
 build_flags = 
 	-O0
 	-g3
 	-ggdb
 	-fno-inline
 	-fno-ipa-sra
 	-fno-tree-sra
 	-fno-builtin
--- a/RotaxMonitorTester/src/main.cpp
+++ b/RotaxMonitorTester/src/main.cpp
@@ -0,0 +1,195 @@
 #define DEBUGLOG_DEFAULT_LOG_LEVEL_DEBUG
 #include <Arduino.h>
 #include <DebugLog.h>
 #include "timer.h"
 #include <map>
 static hw_timer_t *timerA = NULL;
 static hw_timer_t *timerB = NULL;
 TaskHandle_t main_t = NULL;
 static uint32_t count = 0;
 #define FREQUENCY 100000 // 100 KHz
 #define PERIOD_US 10
 #define SPARK_DLY_MIN 10
 #define SPARK_DLY_MAX 490
 #define PAUSE_LONG_MIN 5000
 #define PAUSE_LONG_MAX PAUSE_LONG_MIN * 100
 #define RPM_MIN 250
 #define RPM_MAX 5500
 void clearScreen()
 {
  Serial.print("\033[2J"); // clear screen
  Serial.print("\033[H");  // cursor home
  Serial.flush();
 }
 static double filtered_rpm = 0;
 static const std::map<const uint32_t, const char *> pin2Name = {
    {PIN_TRIG_A12P, "HIGH_PIN_TRIG_A12P"},
    {~PIN_TRIG_A12P, "LOW_PIN_TRIG_A12P"},
    {PIN_TRIG_A12N, "HIGH_PIN_TRIG_A12N"},
    {~PIN_TRIG_A12N, "LOW_PIN_TRIG_A12N"},
    {PIN_TRIG_A34P, "HIGH_PIN_TRIG_A34P"},
    {~PIN_TRIG_A34P, "LOW_PIN_TRIG_A34P"},
    {PIN_TRIG_A34N, "HIGH_PIN_TRIG_A34N"},
    {~PIN_TRIG_A34N, "LOW_PIN_TRIG_A34N"},
    {SPARK_A12, "HIGH_SPARK_A12"},
    {~SPARK_A12, "LOW_SPARK_A12"},
    {SPARK_A34, "HIGH_SPARK_A34"},
    {~SPARK_A34, "LOW_SPARK_A34"},
    {State::S_WAIT_10MS_END, "S_WAIT_10MS_END"},
    {State::S_WAIT_10MS, "S_WAIT_10MS"}};
 static timerStatus stsA = {
    .clock_period_us = (uint32_t)PERIOD_US,
    .pause_long_us = 10000,
    .pause_short_us = 1000,
    .coil_pulse_us = 1000,
    .spark_pulse_us = 100,
    .spark_delay_us = 50,
    .pins = {
        .pin_trig_12p = PIN_TRIG_A12P,
        .pin_trig_12n = PIN_TRIG_A12N,
        .pin_trig_34p = PIN_TRIG_A34P,
        .pin_trig_34n = PIN_TRIG_A34N,
        .pin_spark_12 = SPARK_A12,
        .pin_spark_34 = SPARK_A34},
    .main_task = NULL};
 static timerStatus stsB = {
    .clock_period_us = (uint32_t)PERIOD_US,
    .pause_long_us = 10000,
    .pause_short_us = 1000,
    .coil_pulse_us = 1000,
    .spark_pulse_us = 100,
    .spark_delay_us = 50,
    .pins = {
        .pin_trig_12p = PIN_TRIG_B12P,
        .pin_trig_12n = PIN_TRIG_B12N,
        .pin_trig_34p = PIN_TRIG_B34P,
        .pin_trig_34n = PIN_TRIG_B34N,
        .pin_spark_12 = SPARK_B12,
        .pin_spark_34 = SPARK_B34},
    .main_task = NULL};
 static bool isEnabled_A = false;
 static bool isEnabled_B = false;
 void setup()
 {
  Serial.begin(115200);
  delay(1000);
  LOG_ATTACH_SERIAL(Serial);
  pinMode(PIN_TRIG_A12P, OUTPUT);
  pinMode(PIN_TRIG_A12N, OUTPUT);
  pinMode(PIN_TRIG_A34P, OUTPUT);
  pinMode(PIN_TRIG_A34N, OUTPUT);
  pinMode(SPARK_A12, OUTPUT);
  pinMode(SPARK_A34, OUTPUT);
  pinMode(PIN_TRIG_B12P, OUTPUT);
  pinMode(PIN_TRIG_B12N, OUTPUT);
  pinMode(PIN_TRIG_B34P, OUTPUT);
  pinMode(PIN_TRIG_B34N, OUTPUT);
  pinMode(SPARK_B12, OUTPUT);
  pinMode(SPARK_B34, OUTPUT);
  pinMode(SPARK_DELAY_POT, ANALOG);
  pinMode(FREQ_POT, ANALOG);
  pinMode(ENABLE_PIN_A, INPUT_PULLUP);
  pinMode(ENABLE_PIN_B, INPUT_PULLUP);
  // get the task handle for the main loop
  stsA.main_task = xTaskGetCurrentTaskHandleForCore(1);
  stsB.main_task = xTaskGetCurrentTaskHandleForCore(1);
  // Begin timer with preset fixed frequency
  timerA = timerBegin(FREQUENCY);
  timerB = timerBegin(FREQUENCY);
  // Stop timers because of autostart
  timerStop(timerA);
  timerStop(timerB);
  // Attach interrupts and call callback every timer expiry
  timerAttachInterruptArg(timerA, &onTimer, (void *)&stsA);
  timerAttachInterruptArg(timerB, &onTimer, (void *)&stsB);
  timerAlarm(timerA, 1, true, 0); // infinite number of reloads
  timerAlarm(timerB, 1, true, 0);
  LOG_INFO("Setup Complete");
 }
 void loop()
 {
  LOG_INFO("Loop: ", count++);
  uint32_t spark_delay = (uint32_t)(map(analogRead(SPARK_DELAY_POT), 0, 4096, SPARK_DLY_MIN, SPARK_DLY_MAX) / PERIOD_US);
  stsA.spark_delay_us = spark_delay * PERIOD_US;
  if (stsA.spark_delay_us > (SPARK_DLY_MIN + SPARK_DLY_MAX) / 2)
  {
    stsA.soft_start = true;
    stsA.spark_delay_us -= (SPARK_DLY_MIN + SPARK_DLY_MAX) / 2;
  }
  else
  {
    stsA.soft_start = false;
  }
  stsB.soft_start = stsA.soft_start;
  stsB.spark_delay_us = stsA.spark_delay_us;
  double new_rpm = (double)(map(analogRead(FREQ_POT), 0, 4096, RPM_MIN, RPM_MAX));
  filtered_rpm = filtered_rpm + 0.1 * (new_rpm - filtered_rpm);
  stsA.pause_long_us = (uint32_t)(60000000.0f / filtered_rpm / 2.0f);
  stsB.pause_long_us = stsA.pause_long_us;
  if (isEnabled_A)
    LOG_INFO("==== System A is ENABLED ====");
  else
    LOG_INFO("==== System A is DISABLED ====");
  if (isEnabled_B)
    LOG_INFO("==== System B is ENABLED ====");
  else
    LOG_INFO("==== System B is DISABLED ====");
  LOG_INFO("Spark Delay uS: ", stsA.spark_delay_us, "\tSoft Start: ", stsA.soft_start ? "TRUE" : "FALSE");
  LOG_INFO("Engine Rpm: ", (uint32_t)(filtered_rpm));
  LOG_INFO("Coil Pulse: ", stsA.coil_pulse_us, "us");
  LOG_INFO("Spark Pulse: ", stsA.spark_pulse_us, "us");
  if (digitalRead(ENABLE_PIN_A) == LOW && !isEnabled_A)
  {
    timerStart(timerA);
    isEnabled_A = true;
  }
  else if (digitalRead(ENABLE_PIN_A) == HIGH && isEnabled_A)
  {
    timerStop(timerA);
    isEnabled_A = false;
  }
  if (digitalRead(ENABLE_PIN_B) == LOW && !isEnabled_B)
  {
    timerStart(timerB);
    isEnabled_B = true;
  }
  else if (digitalRead(ENABLE_PIN_B) == HIGH && isEnabled_B)
  {
    timerStop(timerB);
    isEnabled_B = false;
  }
  delay(100);
  clearScreen();
 }
--- a/RotaxMonitorTester/src/pins.h
+++ b/RotaxMonitorTester/src/pins.h
@@ -0,0 +1,27 @@
 #pragma once
 // Enable Pin
 #define ENABLE_PIN_A 16
 #define ENABLE_PIN_B 15
 ///// Ignition Box A /////
 #define PIN_TRIG_A12P 18
 #define PIN_TRIG_A12N 19
 #define PIN_TRIG_A34P 21
 #define PIN_TRIG_A34N 22
 #define SPARK_A12 23
 #define SPARK_A34 25
 ///// Ignition Box  /////
 #define PIN_TRIG_B12P 26
 #define PIN_TRIG_B12N 27
 #define PIN_TRIG_B34P 32
 #define PIN_TRIG_B34N 33
 #define SPARK_B12 4
 #define SPARK_B34 5
 // Pot
 #define SPARK_DELAY_POT 13
 #define FREQ_POT 14
--- a/RotaxMonitorTester/src/timer.cpp
+++ b/RotaxMonitorTester/src/timer.cpp
@@ -0,0 +1,171 @@
 #include "timer.h"
 volatile static bool wait_sent = false;
 void onTimer(void *arg)
 {
    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
    timerStatus *params = (timerStatus *)(arg);
    TaskHandle_t task = params->main_task;
    const timerPins pins = params->pins;
    // increment state time
    params->state_time += params->clock_period_us;
    switch (params->state)
    {
    case S_12P:
        if (params->state_time == params->clock_period_us && !params->coil12p_high)
        {
            digitalWrite(pins.pin_trig_12p, HIGH);
            params->coil12p_high = true;
            wait_sent = false;
        }
        if (!params->soft_start)
        {
            if (params->state_time == params->spark_delay_us)
            {
                digitalWrite(pins.pin_spark_12, HIGH);
            }
            if (params->state_time == (params->spark_delay_us + params->spark_pulse_us))
            {
                digitalWrite(pins.pin_spark_12, LOW);
            }
        }
        if (params->state_time >= params->coil_pulse_us && params->coil12p_high)
        {
            digitalWrite(pins.pin_trig_12p, LOW);
            params->coil12p_high = false;
        }
        if (params->state_time >= params->pause_short_us)
        {
            params->state = S_12N;
            params->state_time = 0;
        }
        break;
    case S_12N:
        if (params->state_time == params->clock_period_us && !params->coil12n_high)
        {
            digitalWrite(pins.pin_trig_12n, HIGH);
            params->coil12n_high = true;
        }
        if (params->soft_start)
        {
            if (params->state_time == params->spark_delay_us)
            {
                digitalWrite(pins.pin_spark_12, HIGH);
            }
            if (params->state_time == (params->spark_delay_us + params->spark_pulse_us))
            {
                digitalWrite(pins.pin_spark_12, LOW);
            }
        }
        if (params->state_time >= params->coil_pulse_us && params->coil12n_high)
        {
            digitalWrite(pins.pin_trig_12n, LOW);
            params->coil12n_high = false;
            params->state = S_WAIT_10MS;
            params->state_time = 0;
        }
        break;
    case S_WAIT_10MS:
        if (!wait_sent)
        {
            wait_sent = true;
        }
        if (params->state_time >= params->pause_long_us)
        {
            params->state = S_34P;
            params->state_time = 0;
        }
        break;
    case S_34P:
        if (params->state_time == params->clock_period_us && !params->coil34p_high)
        {
            digitalWrite(pins.pin_trig_34p, HIGH);
            params->coil34p_high = true;;
            wait_sent = false;
        }
        if (!params->soft_start)
        {
            if (params->state_time == params->spark_delay_us)
            {
                digitalWrite(pins.pin_spark_34, HIGH);
            }
            if (params->state_time == params->spark_delay_us + params->spark_pulse_us)
            {
                digitalWrite(pins.pin_spark_34, LOW);
            }
        }
        if (params->state_time >= params->coil_pulse_us && params->coil34p_high)
        {
            digitalWrite(pins.pin_trig_34p, LOW);
            params->coil34p_high = false;
        }
        if (params->state_time >= params->pause_short_us)
        {
            params->state = S_34N;
            params->state_time = 0;
        }
        break;
    case S_34N:
        if (params->state_time == params->clock_period_us && !params->coil34n_high)
        {
            digitalWrite(pins.pin_trig_34n, HIGH);
            params->coil34n_high = true;
        }
        if (params->soft_start)
        {
            if (params->state_time == params->spark_delay_us)
            {
                digitalWrite(pins.pin_spark_34, HIGH);
            }
            if (params->state_time == params->spark_delay_us + params->spark_pulse_us)
            {
                digitalWrite(pins.pin_spark_34, LOW);
            }
        }
        if (params->state_time >= params->coil_pulse_us && params->coil34n_high)
        {
            digitalWrite(pins.pin_trig_34n, LOW);
            params->coil34n_high = false;
            params->state = S_WAIT_10MS_END;
            params->state_time = 0;
        }
        break;
    case S_WAIT_10MS_END:
        if (!wait_sent)
        {
            wait_sent = true;
        }
        if (params->state_time >= params->pause_long_us)
        {
            params->state = S_12P;
            params->state_time = 0;
        }
        break;
    }
    if (xHigherPriorityTaskWoken)
        portYIELD_FROM_ISR();
 }
--- a/RotaxMonitorTester/src/timer.h
+++ b/RotaxMonitorTester/src/timer.h
@@ -0,0 +1,52 @@
 #pragma once
 #define DEBUGLOG_DEFAULT_LOG_LEVEL_DEBUG
 #include <Arduino.h>
 #include <DebugLog.h>
 #include "pins.h"
 #include "driver/gpio.h"
 enum State
 {
    S_12P,
    S_12N_DELAY,
    S_12N,
    S_WAIT_10MS,
    S_34P,
    S_34N_DELAY,
    S_34N,
    S_WAIT_1MS,
    S_WAIT_10MS_END
 };
 struct timerPins {
    const uint8_t pin_trig_12p;
    const uint8_t pin_trig_12n;
    const uint8_t pin_trig_34p;
    const uint8_t pin_trig_34n;
    const uint8_t pin_spark_12;
    const uint8_t pin_spark_34;
 };
 struct timerStatus
 {
    State state = State::S_12P;
    uint32_t state_time = 0;
    uint32_t clock_period_us;
    uint32_t pause_long_us;
    uint32_t pause_short_us;
    uint32_t coil_pulse_us;
    uint32_t spark_pulse_us;
    uint32_t spark_delay_us;
    bool soft_start = false;
    bool coil12p_high = false;
    bool coil34p_high = false;
    bool coil12n_high = false;
    bool coil34n_high = false;
    timerPins pins;
    TaskHandle_t main_task;
 };
 void IRAM_ATTR onTimer(void *arg);
--- a/RotaxMonitorTester/test/README
+++ b/RotaxMonitorTester/test/README
@@ -0,0 +1,11 @@
 This directory is intended for PlatformIO Test Runner and project tests.
 Unit Testing is a software testing method by which individual units of
 source code, sets of one or more MCU program modules together with associated
 control data, usage procedures, and operating procedures, are tested to
 determine whether they are fit for use. Unit testing finds problems early
 in the development cycle.
 More information about PlatformIO Unit Testing:
 - https://docs.platformio.org/en/latest/advanced/unit-testing/index.html
Author	SHA1	Message	Date
Emanuele Trabattoni	f8c3c69e80	fix graph	2026-04-12 14:42:40 +02:00
Emanuele Trabattoni	7da58c8a49	Set time from browser	2026-04-12 14:40:58 +02:00
Emanuele Trabattoni	a153402d28	webpage chats	2026-04-12 02:38:27 +02:00
Emanuele Trabattoni	095aa59f36	task refactoring working, sometimes misses events, check priorities	2026-04-12 01:45:32 +02:00
Emanuele Trabattoni	fdba6d5ad5	refactor continued, at least it compiles	2026-04-11 16:39:59 +02:00
Emanuele Trabattoni	d1b96e932c	task refactoring work in progress	2026-04-11 15:49:40 +02:00
Emanuele Trabattoni	684c34e209	adding pins and task class	2026-04-11 12:27:19 +02:00
Emanuele Trabattoni	37fa6a686f	Merge branch 'datasave'	2026-04-11 11:40:20 +02:00
Emanuele Trabattoni	9c012efef1	refactor led class	2026-04-11 11:37:40 +02:00
Emanuele Trabattoni	d41a99ee88	rgb led	2026-04-11 00:40:33 +02:00
Emanuele Trabattoni	eaeb515074	Modified Task display to order based on task number or arbitraruy function	2026-04-10 23:33:22 +02:00
Emanuele Trabattoni	246ba7eeb2	Task A+B concurrency <check ok without ADC	2026-04-10 22:03:09 +02:00
Emanuele Trabattoni	736a8d8bd5	modified to also read channel B	2026-04-10 12:12:28 +02:00
Emanuele Trabattoni	2083119d79	Updated interface to show Box A+B	2026-04-10 09:27:41 +02:00
Emanuele Trabattoni	575730a340	Finalized PINMAP	2026-04-09 15:54:59 +02:00
Emanuele Trabattoni	155f58a347	refactored webserver code	2026-04-09 14:42:13 +02:00
Emanuele Trabattoni	1e068476af	LittleFS mount OK, updated interface, upload to littlefs from browser	2026-04-09 13:41:50 +02:00
Emanuele Trabattoni	de9ffe40e5	refactor variables and LittleFS mount	2026-04-09 10:23:57 +02:00
Emanuele Trabattoni	97bce90ba6	changed partition to littlefs, not working yet	2026-04-08 17:10:30 +02:00
Emanuele Trabattoni	12e1e8e7a4	Fixed Filters, split file in html, script and css	2026-04-08 16:55:03 +02:00
Emanuele Trabattoni	4dc45954e9	Webpage is OK, html in memory since SPIFFS is to slow. Moving average to be fixed	2026-04-08 15:23:21 +02:00
Emanuele Trabattoni	07eb06f67b	Save History Sync on flash, still some issues in deleting previous file	2026-04-08 10:27:18 +02:00
Emanuele Trabattoni	481f12f526	Enable/Disable pickup simulation	2026-04-08 10:26:44 +02:00
Emanuele Trabattoni	7c96101cdd	SPIFFS mount sometimes fail	2026-04-07 17:33:08 +02:00
Emanuele Trabattoni	877236ee4e	Save files appending on same session and new file on new session	2026-04-07 15:53:52 +02:00
Emanuele Trabattoni	668b590d7c	CSV file save on SPIFF filesystem, 10MB on internal flash	2026-04-07 13:21:27 +02:00
Emanuele Trabattoni	f36cb96f21	Improved task code	2026-04-07 10:51:53 +02:00
Emanuele Trabattoni	dc44decd64	Moved files in libraries	2026-04-07 10:19:28 +02:00
Emanuele Trabattoni	0d0db29bba	Merge branch 'adc'	2026-04-07 10:12:50 +02:00
Emanuele Trabattoni	5c9ef7e93b	Fast ADC readings ok, to verify timing and settling time	2026-04-05 17:05:10 +02:00
Emanuele Trabattoni	a2d0afa0c9	adc read ok, very slow	2026-04-05 11:16:10 +02:00
Emanuele Trabattoni	1109681eb5	Merge branch 'debug'	2026-04-05 10:32:08 +02:00
Emanuele Trabattoni	c5d80052e5	Thans to copilot, microsecond resolution to wait for spark. no missing firings detected	2026-04-04 22:12:53 +02:00
Emanuele Trabattoni	38c595fd7b	revert on double task wait, normal and soft start working	2026-04-04 20:00:30 +02:00
Emanuele Trabattoni	b0842aadef	Sync 12 and 34 working	2026-04-04 16:27:52 +02:00
Emanuele Trabattoni	0dc5d1ce79	Debug Config OK, ready to realtime debugging	2026-04-04 03:25:33 +02:00
Emanuele Trabattoni	941a2b4eaa	debug testing commit	2026-04-04 03:11:44 +02:00
Emanuele Trabattoni	48df6a509d	Test OK Channel A	2026-04-01 12:31:29 +02:00
Emanuele Trabattoni	ebff6281af	Test Softs start working	2026-04-01 12:00:07 +02:00
Emanuele Trabattoni	d7e0990e36	Test working at 100Khz	2026-04-01 11:43:44 +02:00
Emanuele Trabattoni	21e50bdca8	Tester first iteration	2026-03-31 17:44:00 +02:00