Skip to content

Commit 30de63b

Browse files
haslinghuishaslinghuis
committed
Add all 8 debug values in sensors tab
1 parent 2ebaa33 commit 30de63b

File tree

4 files changed

+116
-34
lines changed

4 files changed

+116
-34
lines changed

‎src/js/msp/MSPHelper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ MspHelper.prototype.process_data = function(dataHandler) {
668668
console.log('Voltage config saved');
669669
break;
670670
case MSPCodes.MSP_DEBUG:
671-
for (let i = 0; i < 4; i++) {
671+
for (let i = 0; i < 8; i++) {
672672
FC.SENSOR_DATA.debug[i] = data.read16();
673673
}
674674
break;

‎src/js/tabs/onboard_logging.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ onboard_logging.initialize = function (callback) {
320320
{text: "GPS_RESCUE_VELOCITY"},
321321
{text: "GPS_RESCUE_HEADING"},
322322
{text: "GPS_RESCUE_TRACKING"},
323+
{text: "GPS_UNIT_CONNECTION"},
323324
{text: "ATTITUDE"},
324325
{text: "VTX_MSP"},
325326
{text: "GPS_DOP"},
@@ -329,6 +330,7 @@ onboard_logging.initialize = function (callback) {
329330
{text: "ANGLE_TARGET"},
330331
{text: "CURRENT_ANGLE"},
331332
{text: "DSHOT_TELEMETRY_COUNTS"},
333+
{text: "RPM_LIMIT"},
332334
];
333335

334336
for (let i = 0; i < FC.PID_ADVANCED_CONFIG.debugModeCount; i++) {

‎src/js/tabs/sensors.js

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ sensors.initialize = function (callback) {
2222
FC.SENSOR_DATA.magnetometer[i] = 0;
2323
FC.SENSOR_DATA.sonar = 0;
2424
FC.SENSOR_DATA.altitude = 0;
25+
}
26+
27+
// we now have 8 debug values
28+
for (let i = 0; i < 8; i++) {
2529
FC.SENSOR_DATA.debug[i] = 0;
2630
}
2731
}
@@ -262,22 +266,30 @@ sensors.initialize = function (callback) {
262266
altitude_data = initDataArray(1),
263267
sonar_data = initDataArray(1),
264268
debug_data = [
265-
initDataArray(1),
266-
initDataArray(1),
267-
initDataArray(1),
268-
initDataArray(1),
269-
];
269+
initDataArray(1),
270+
initDataArray(1),
271+
initDataArray(1),
272+
initDataArray(1),
273+
initDataArray(1),
274+
initDataArray(1),
275+
initDataArray(1),
276+
initDataArray(1),
277+
];
270278

271279
let gyroHelpers = initGraphHelpers('#gyro', samples_gyro_i, [-2000, 2000]);
272280
let accelHelpers = initGraphHelpers('#accel', samples_accel_i, [-2, 2]);
273281
let magHelpers = initGraphHelpers('#mag', samples_mag_i, [-1, 1]);
274282
const altitudeHelpers = initGraphHelpers('#altitude', samples_altitude_i);
275283
const sonarHelpers = initGraphHelpers('#sonar', samples_sonar_i);
276284
const debugHelpers = [
285+
initGraphHelpers('#debug0', samples_debug_i),
277286
initGraphHelpers('#debug1', samples_debug_i),
278287
initGraphHelpers('#debug2', samples_debug_i),
279288
initGraphHelpers('#debug3', samples_debug_i),
280289
initGraphHelpers('#debug4', samples_debug_i),
290+
initGraphHelpers('#debug5', samples_debug_i),
291+
initGraphHelpers('#debug6', samples_debug_i),
292+
initGraphHelpers('#debug7', samples_debug_i),
281293
];
282294

283295
const raw_data_text_ements = {
@@ -417,7 +429,7 @@ sensors.initialize = function (callback) {
417429
}
418430

419431
function update_debug_graphs() {
420-
for (let i = 0; i < 4; i++) {
432+
for (let i = 0; i < 8; i++) {
421433
updateGraphHelperSize(debugHelpers[i]);
422434

423435
addSampleToData(debug_data[i], samples_debug_i, [FC.SENSOR_DATA.debug[i]]);

‎src/tabs/sensors.html

Lines changed: 95 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,13 @@
258258
<dd class="x">0</dd>
259259
</dl>
260260
</div>
261-
<svg id="debug1">
262-
<g class="grid x" transform="translate(40, 120)"></g>
263-
<g class="grid y" transform="translate(40, 10)"></g>
264-
<g class="data" transform="translate(41, 10)"></g>
265-
<g class="axis x" transform="translate(40, 120)"></g>
266-
<g class="axis y" transform="translate(40, 10)"></g>
267-
</svg>
261+
<svg id="debug0">
262+
<g class="grid x" transform="translate(40, 120)"></g>
263+
<g class="grid y" transform="translate(40, 10)"></g>
264+
<g class="data" transform="translate(41, 10)"></g>
265+
<g class="axis x" transform="translate(40, 120)"></g>
266+
<g class="axis y" transform="translate(40, 10)"></g>
267+
</svg>
268268
<div class="clear-both"></div>
269269
<div class="plot_control">
270270
<div class="title"><span i18n="sensorsDebugTitle"></span> 1</div>
@@ -273,13 +273,13 @@
273273
<dd class="x">blue</dd>
274274
</dl>
275275
</div>
276-
<svg id="debug2">
277-
<g class="grid x" transform="translate(40, 120)"></g>
278-
<g class="grid y" transform="translate(40, 10)"></g>
279-
<g class="data" transform="translate(41, 10)"></g>
280-
<g class="axis x" transform="translate(40, 120)"></g>
281-
<g class="axis y" transform="translate(40, 10)"></g>
282-
</svg>
276+
<svg id="debug1">
277+
<g class="grid x" transform="translate(40, 120)"></g>
278+
<g class="grid y" transform="translate(40, 10)"></g>
279+
<g class="data" transform="translate(41, 10)"></g>
280+
<g class="axis x" transform="translate(40, 120)"></g>
281+
<g class="axis y" transform="translate(40, 10)"></g>
282+
</svg>
283283
<div class="clear-both"></div>
284284
<div class="plot_control">
285285
<div class="title"><span i18n="sensorsDebugTitle"></span> 2</div>
@@ -288,13 +288,13 @@
288288
<dd class="x">0</dd>
289289
</dl>
290290
</div>
291-
<svg id="debug3">
292-
<g class="grid x" transform="translate(40, 120)"></g>
293-
<g class="grid y" transform="translate(40, 10)"></g>
294-
<g class="data" transform="translate(41, 10)"></g>
295-
<g class="axis x" transform="translate(40, 120)"></g>
296-
<g class="axis y" transform="translate(40, 10)"></g>
297-
</svg>
291+
<svg id="debug2">
292+
<g class="grid x" transform="translate(40, 120)"></g>
293+
<g class="grid y" transform="translate(40, 10)"></g>
294+
<g class="data" transform="translate(41, 10)"></g>
295+
<g class="axis x" transform="translate(40, 120)"></g>
296+
<g class="axis y" transform="translate(40, 10)"></g>
297+
</svg>
298298
<div class="clear-both"></div>
299299
<div class="plot_control">
300300
<div class="title"><span i18n="sensorsDebugTitle"></span> 3</div>
@@ -303,13 +303,81 @@
303303
<dd class="x">0</dd>
304304
</dl>
305305
</div>
306+
<svg id="debug3">
307+
<g class="grid x" transform="translate(40, 120)"></g>
308+
<g class="grid y" transform="translate(40, 10)"></g>
309+
<g class="data" transform="translate(41, 10)"></g>
310+
<g class="axis x" transform="translate(40, 120)"></g>
311+
<g class="axis y" transform="translate(40, 10)"></g>
312+
</svg>
313+
<div class="clear-both"></div>
314+
<div class="plot_control">
315+
<div class="title"><span i18n="sensorsDebugTitle"></span> 4</div>
316+
<dl>
317+
<dt>X:</dt>
318+
<dd class="x">0</dd>
319+
</dl>
320+
</div>
306321
<svg id="debug4">
307-
<g class="grid x" transform="translate(40, 120)"></g>
308-
<g class="grid y" transform="translate(40, 10)"></g>
309-
<g class="data" transform="translate(41, 10)"></g>
310-
<g class="axis x" transform="translate(40, 120)"></g>
311-
<g class="axis y" transform="translate(40, 10)"></g>
312-
</svg>
322+
<g class="grid x" transform="translate(40, 120)"></g>
323+
<g class="grid y" transform="translate(40, 10)"></g>
324+
<g class="data" transform="translate(41, 10)"></g>
325+
<g class="axis x" transform="translate(40, 120)"></g>
326+
<g class="axis y" transform="translate(40, 10)"></g>
327+
</svg>
328+
<div class="clear-both"></div>
329+
<div class="plot_control">
330+
<div class="title"><span i18n="sensorsDebugTitle"></span> 5</div>
331+
<dl>
332+
<dt>X:</dt>
333+
<dd class="x">0</dd>
334+
</dl>
335+
</div>
336+
<svg id="debug5">
337+
<g class="grid x" transform="translate(40, 120)"></g>
338+
<g class="grid y" transform="translate(40, 10)"></g>
339+
<g class="data" transform="translate(41, 10)"></g>
340+
<g class="axis x" transform="translate(40, 120)"></g>
341+
<g class="axis y" transform="translate(40, 10)"></g>
342+
</svg>
343+
<div class="clear-both"></div>
344+
<div class="plot_control">
345+
<div class="title"><span i18n="sensorsDebugTitle"></span> 6</div>
346+
<dl>
347+
<dt>X:</dt>
348+
<dd class="x">0</dd>
349+
</dl>
350+
</div>
351+
<svg id="debug6">
352+
<g class="grid x" transform="translate(40, 120)"></g>
353+
<g class="grid y" transform="translate(40, 10)"></g>
354+
<g class="data" transform="translate(41, 10)"></g>
355+
<g class="axis x" transform="translate(40, 120)"></g>
356+
<g class="axis y" transform="translate(40, 10)"></g>
357+
</svg>
358+
<div class="clear-both"></div>
359+
<div class="plot_control">
360+
<div class="title"><span i18n="sensorsDebugTitle"></span> 7</div>
361+
<dl>
362+
<dt>X:</dt>
363+
<dd class="x">0</dd>
364+
</dl>
365+
</div>
366+
<svg id="debug7">
367+
<g class="grid x" transform="translate(40, 120)"></g>
368+
<g class="grid y" transform="translate(40, 10)"></g>
369+
<g class="data" transform="translate(41, 10)"></g>
370+
<g class="axis x" transform="translate(40, 120)"></g>
371+
<g class="axis y" transform="translate(40, 10)"></g>
372+
</svg>
373+
<!-- <div class="clear-both"></div>
374+
<div class="plot_control">
375+
<div class="title"><span i18n="sensorsDebugTitle"></span> 7</div>
376+
<dl>
377+
<dt>X:</dt>
378+
<dd class="x">0</dd>
379+
</dl>
380+
</div> -->
313381
</div>
314382
</div>
315383
</div>

0 commit comments

Comments
 (0)