Obbart/AstroRotaxMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated interface to show Box A+B

Browse Source
This commit is contained in:
Emanuele Trabattoni
2026-04-10 09:27:41 +02:00
parent 575730a340
commit 2083119d79
3 changed files with 261 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

218
RotaxMonitor/data/index.html
View File

@@ -13,6 +13,7 @@
<img src="logo_astro_dev.svg" alt="Astro Tecnologie" class="logo"> <img src="logo_astro_dev.svg" alt="Astro Tecnologie" class="logo">
</div> </div>
<div> <div>
<h1>Rotax Ignition Box Monitor</h1> <h1>Rotax Ignition Box Monitor</h1>
</div> </div>
</header> </header>
@@ -21,75 +22,156 @@
<span class="spinner"></span> Waiting for data... <span class="spinner"></span> Waiting for data...
</div> </div>
<div style="max-width: 900px; margin: 0 auto; text-align: left;"> <div class="tables-container">
<p><strong>Timestamp:</strong> <span id="timestamp">-</span></p> <div class="box">
<p><strong>Data Valid:</strong> <span id="datavalid">-</span></p> <h2>Box_A</h2>
<p><strong>Generator voltage:</strong> <span id="volts_gen">-</span></p> <div class="box-data">
<p><strong>Engine RPM:</strong> <span id="eng_rpm">-</span></p> <p><strong>Timestamp:</strong> <span id="timestamp">-</span></p>
<p><strong>ADC read time:</strong> <span id="adc_read_time">-</span></p> <p><strong>Data Valid:</strong> <span id="datavalid">-</span></p>
<p><strong>Queue errors:</strong> <span id="n_queue_errors">-</span></p> <p><strong>Generator voltage:</strong> <span id="volts_gen">-</span></p>
<p><strong>ADC read time:</strong> <span id="adc_read_time">-</span></p>
<p><strong>Queue errors:</strong> <span id="n_queue_errors">-</span></p>
</div>
<div class="rpm-highlight">
<strong>Engine RPM:</strong> <span id="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="coils12_spark_delay">-</td>
<td id="coils34_spark_delay">-</td>
</tr>
<tr>
<td>Spark status</td>
<td id="coils12_spark_status">-</td>
<td id="coils34_spark_status">-</td>
</tr>
<tr>
<td>Soft start status</td>
<td id="coils12_sstart_status">-</td>
<td id="coils34_sstart_status">-</td>
</tr>
<tr>
<td>Peak P in</td>
<td id="coils12_peak_p_in">-</td>
<td id="coils34_peak_p_in">-</td>
</tr>
<tr>
<td>Peak N in</td>
<td id="coils12_peak_n_in">-</td>
<td id="coils34_peak_n_in">-</td>
</tr>
<tr>
<td>Peak P out</td>
<td id="coils12_peak_p_out">-</td>
<td id="coils34_peak_p_out">-</td>
</tr>
<tr>
<td>Peak N out</td>
<td id="coils12_peak_n_out">-</td>
<td id="coils34_peak_n_out">-</td>
</tr>
<tr>
<td>Level spark</td>
<td id="coils12_level_spark">-</td>
<td id="coils34_level_spark">-</td>
</tr>
<tr>
<td>Spark Events</td>
<td id="coils12_n_events">-</td>
<td id="coils34_n_events">-</td>
</tr>
<tr>
<td>Missed Events</td>
<td id="coils12_n_missed_firing">-</td>
<td id="coils34_n_missed_firing">-</td>
</tr>
</tbody>
</table>
</div>
<table> <div class="box">
<thead> <h2>Box_B</h2>
<tr> <div class="box-data">
<th>Property</th> <p><strong>Timestamp:</strong> <span id="b_timestamp">-</span></p>
<th>Pickup 12</th> <p><strong>Data Valid:</strong> <span id="b_datavalid">-</span></p>
<th>Pickup 34</th> <p><strong>Generator voltage:</strong> <span id="b_volts_gen">-</span></p>
</tr> <p><strong>ADC read time:</strong> <span id="b_adc_read_time">-</span></p>
</thead> <p><strong>Queue errors:</strong> <span id="b_n_queue_errors">-</span></p>
<tbody> </div>
<tr> <div class="rpm-highlight">
<td>Spark delay</td> <strong>Engine RPM:</strong> <span id="b_eng_rpm">-</span>
<td id="coils12_spark_delay">-</td> </div>
<td id="coils34_spark_delay">-</td> <table>
</tr> <thead>
<tr> <tr>
<td>Spark status</td> <th>Property</th>
<td id="coils12_spark_status">-</td> <th>Pickup 12</th>
<td id="coils34_spark_status">-</td> <th>Pickup 34</th>
</tr> </tr>
<tr> </thead>
<td>Soft start status</td> <tbody>
<td id="coils12_sstart_status">-</td> <tr>
<td id="coils34_sstart_status">-</td> <td>Spark delay</td>
</tr> <td id="b_coils12_spark_delay">-</td>
<tr> <td id="b_coils34_spark_delay">-</td>
<td>Peak P in</td> </tr>
<td id="coils12_peak_p_in">-</td> <tr>
<td id="coils34_peak_p_in">-</td> <td>Spark status</td>
</tr> <td id="b_coils12_spark_status">-</td>
<tr> <td id="b_coils34_spark_status">-</td>
<td>Peak N in</td> </tr>
<td id="coils12_peak_n_in">-</td> <tr>
<td id="coils34_peak_n_in">-</td> <td>Soft start status</td>
</tr> <td id="b_coils12_sstart_status">-</td>
<tr> <td id="b_coils34_sstart_status">-</td>
<td>Peak P out</td> </tr>
<td id="coils12_peak_p_out">-</td> <tr>
<td id="coils34_peak_p_out">-</td> <td>Peak P in</td>
</tr> <td id="b_coils12_peak_p_in">-</td>
<tr> <td id="b_coils34_peak_p_in">-</td>
<td>Peak N out</td> </tr>
<td id="coils12_peak_n_out">-</td> <tr>
<td id="coils34_peak_n_out">-</td> <td>Peak N in</td>
</tr> <td id="b_coils12_peak_n_in">-</td>
<tr> <td id="b_coils34_peak_n_in">-</td>
<td>Level spark</td> </tr>
<td id="coils12_level_spark">-</td> <tr>
<td id="coils34_level_spark">-</td> <td>Peak P out</td>
</tr> <td id="b_coils12_peak_p_out">-</td>
<tr> <td id="b_coils34_peak_p_out">-</td>
<td>Spark Events</td> </tr>
<td id="coils12_n_events">-</td> <tr>
<td id="coils34_n_events">-</td> <td>Peak N out</td>
</tr> <td id="b_coils12_peak_n_out">-</td>
<tr> <td id="b_coils34_peak_n_out">-</td>
<td>Missed Events</td> </tr>
<td id="coils12_n_missed_firing">-</td> <tr>
<td id="coils34_n_missed_firing">-</td> <td>Level spark</td>
</tr> <td id="b_coils12_level_spark">-</td>
</tbody> <td id="b_coils34_level_spark">-</td>
</table> </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>
<div class="upload-section"> <div class="upload-section">

95
RotaxMonitor/data/script.js
View File

@@ -46,36 +46,75 @@ function connectWS() {
lastMessageTimestamp = Date.now(); lastMessageTimestamp = Date.now();
setLoadingIndicator(false); setLoadingIndicator(false);
document.getElementById("datavalid").textContent = data.datavalid ?? "-"; // Update Box_A
document.getElementById("timestamp").textContent = data.timestamp ?? "-"; if (data.box_a) {
document.getElementById("volts_gen").textContent = data.volts_gen ?? "-"; const boxA = data.box_a;
document.getElementById("eng_rpm").textContent = data.eng_rpm ?? "-"; document.getElementById("datavalid").textContent = boxA.datavalid ?? "-";
document.getElementById("adc_read_time").textContent = data.adc_read_time ?? "-"; document.getElementById("timestamp").textContent = boxA.timestamp ?? "-";
document.getElementById("n_queue_errors").textContent = data.n_queue_errors ?? "-"; document.getElementById("volts_gen").textContent = boxA.volts_gen ?? "-";
document.getElementById("eng_rpm").textContent = boxA.eng_rpm ?? "-";
document.getElementById("adc_read_time").textContent = boxA.adc_read_time ?? "-";
document.getElementById("n_queue_errors").textContent = boxA.n_queue_errors ?? "-";
const coils12 = data.coils12 || {}; const coils12A = boxA.coils12 || {};
const coils34 = data.coils34 || {}; const coils34A = boxA.coils34 || {};
document.getElementById("coils12_spark_delay").textContent = coils12.spark_delay ?? "-"; document.getElementById("coils12_spark_delay").textContent = coils12A.spark_delay ?? "-";
document.getElementById("coils34_spark_delay").textContent = coils34.spark_delay ?? "-"; document.getElementById("coils34_spark_delay").textContent = coils34A.spark_delay ?? "-";
document.getElementById("coils12_spark_status").textContent = coils12.spark_status ?? "-"; document.getElementById("coils12_spark_status").textContent = coils12A.spark_status ?? "-";
document.getElementById("coils34_spark_status").textContent = coils34.spark_status ?? "-"; document.getElementById("coils34_spark_status").textContent = coils34A.spark_status ?? "-";
document.getElementById("coils12_sstart_status").textContent = coils12.sstart_status ?? "-"; document.getElementById("coils12_sstart_status").textContent = coils12A.sstart_status ?? "-";
document.getElementById("coils34_sstart_status").textContent = coils34.sstart_status ?? "-"; document.getElementById("coils34_sstart_status").textContent = coils34A.sstart_status ?? "-";
document.getElementById("coils12_peak_p_in").textContent = coils12.peak_p_in ?? "-"; document.getElementById("coils12_peak_p_in").textContent = coils12A.peak_p_in ?? "-";
document.getElementById("coils34_peak_p_in").textContent = coils34.peak_p_in ?? "-"; document.getElementById("coils34_peak_p_in").textContent = coils34A.peak_p_in ?? "-";
document.getElementById("coils12_peak_n_in").textContent = coils12.peak_n_in ?? "-"; document.getElementById("coils12_peak_n_in").textContent = coils12A.peak_n_in ?? "-";
document.getElementById("coils34_peak_n_in").textContent = coils34.peak_n_in ?? "-"; document.getElementById("coils34_peak_n_in").textContent = coils34A.peak_n_in ?? "-";
document.getElementById("coils12_peak_p_out").textContent = coils12.peak_p_out ?? "-"; document.getElementById("coils12_peak_p_out").textContent = coils12A.peak_p_out ?? "-";
document.getElementById("coils34_peak_p_out").textContent = coils34.peak_p_out ?? "-"; document.getElementById("coils34_peak_p_out").textContent = coils34A.peak_p_out ?? "-";
document.getElementById("coils12_peak_n_out").textContent = coils12.peak_n_out ?? "-"; document.getElementById("coils12_peak_n_out").textContent = coils12A.peak_n_out ?? "-";
document.getElementById("coils34_peak_n_out").textContent = coils34.peak_n_out ?? "-"; document.getElementById("coils34_peak_n_out").textContent = coils34A.peak_n_out ?? "-";
document.getElementById("coils12_level_spark").textContent = coils12.level_spark ?? "-"; document.getElementById("coils12_level_spark").textContent = coils12A.level_spark ?? "-";
document.getElementById("coils34_level_spark").textContent = coils34.level_spark ?? "-"; document.getElementById("coils34_level_spark").textContent = coils34A.level_spark ?? "-";
document.getElementById("coils12_n_events").textContent = coils12.n_events ?? "-"; document.getElementById("coils12_n_events").textContent = coils12A.n_events ?? "-";
document.getElementById("coils34_n_events").textContent = coils34.n_events ?? "-"; document.getElementById("coils34_n_events").textContent = coils34A.n_events ?? "-";
document.getElementById("coils12_n_missed_firing").textContent = coils12.n_missed_firing ?? "-"; document.getElementById("coils12_n_missed_firing").textContent = coils12A.n_missed_firing ?? "-";
document.getElementById("coils34_n_missed_firing").textContent = coils34.n_missed_firing ?? "-"; document.getElementById("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 ?? "-";
}
}; };
} }

49
RotaxMonitor/data/style.css
View File

@@ -35,10 +35,13 @@ body {
.logo { .logo {
height: 50px; height: 50px;
width: auto; width: auto;
margin: auto;
} }
.page-header h1 { .page-header h1 {
margin: 5px; margin: auto;
margin-top: 20px;
text-align: center;
font-size: 28px; font-size: 28px;
font-weight: 600; font-weight: 600;
} }
@@ -159,21 +162,57 @@ button:hover {
} }
} }
/* Data section */ .tables-container {
div[style*="max-width: 900px"] { display: flex;
gap: 20px;
max-width: 1800px;
margin: 0 auto;
padding: 0 20px;
}
.box {
flex: 1;
background: white; background: white;
padding: 20px; padding: 20px;
border-radius: 6px; border-radius: 6px;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08); 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; margin-bottom: 20px;
} }
div[style*="max-width: 900px"] p { .box-data p {
margin: 8px 0; margin: 8px 0;
font-size: 14px; font-size: 14px;
} }
div[style*="max-width: 900px"] strong { .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); color: var(--primary-blue);
} }