Skip to content

Commit

Permalink
Add all 8 debug values in sensors tab
Browse files Browse the repository at this point in the history
  • Loading branch information
@haslinghuis
haslinghuis committed Jul 20, 2023
1 parent 2ebaa33 commit 30de63b
Show file tree
Hide file tree
Showing 4 changed files with 116 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/js/msp/MSPHelper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ MspHelper.prototype.process_data = function(dataHandler) {
console.log('Voltage config saved');
break;
case MSPCodes.MSP_DEBUG:
for (let i = 0; i < 4; i++) {
for (let i = 0; i < 8; i++) {
FC.SENSOR_DATA.debug[i] = data.read16();
}
break;
Expand Down
2 changes: 2 additions & 0 deletions src/js/tabs/onboard_logging.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ onboard_logging.initialize = function (callback) {
{text: "GPS_RESCUE_VELOCITY"},
{text: "GPS_RESCUE_HEADING"},
{text: "GPS_RESCUE_TRACKING"},
{text: "GPS_UNIT_CONNECTION"},
{text: "ATTITUDE"},
{text: "VTX_MSP"},
{text: "GPS_DOP"},
Expand All @@ -329,6 +330,7 @@ onboard_logging.initialize = function (callback) {
{text: "ANGLE_TARGET"},
{text: "CURRENT_ANGLE"},
{text: "DSHOT_TELEMETRY_COUNTS"},
{text: "RPM_LIMIT"},
];

for (let i = 0; i < FC.PID_ADVANCED_CONFIG.debugModeCount; i++) {
Expand Down
24 changes: 18 additions & 6 deletions src/js/tabs/sensors.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ sensors.initialize = function (callback) {
FC.SENSOR_DATA.magnetometer[i] = 0;
FC.SENSOR_DATA.sonar = 0;
FC.SENSOR_DATA.altitude = 0;
}

// we now have 8 debug values
for (let i = 0; i < 8; i++) {
FC.SENSOR_DATA.debug[i] = 0;
}
}
Expand Down Expand Up @@ -262,22 +266,30 @@ sensors.initialize = function (callback) {
altitude_data = initDataArray(1),
sonar_data = initDataArray(1),
debug_data = [
initDataArray(1),
initDataArray(1),
initDataArray(1),
initDataArray(1),
];
initDataArray(1),
initDataArray(1),
initDataArray(1),
initDataArray(1),
initDataArray(1),
initDataArray(1),
initDataArray(1),
initDataArray(1),
];

let gyroHelpers = initGraphHelpers('#gyro', samples_gyro_i, [-2000, 2000]);
let accelHelpers = initGraphHelpers('#accel', samples_accel_i, [-2, 2]);
let magHelpers = initGraphHelpers('#mag', samples_mag_i, [-1, 1]);
const altitudeHelpers = initGraphHelpers('#altitude', samples_altitude_i);
const sonarHelpers = initGraphHelpers('#sonar', samples_sonar_i);
const debugHelpers = [
initGraphHelpers('#debug0', samples_debug_i),
initGraphHelpers('#debug1', samples_debug_i),
initGraphHelpers('#debug2', samples_debug_i),
initGraphHelpers('#debug3', samples_debug_i),
initGraphHelpers('#debug4', samples_debug_i),
initGraphHelpers('#debug5', samples_debug_i),
initGraphHelpers('#debug6', samples_debug_i),
initGraphHelpers('#debug7', samples_debug_i),
];

const raw_data_text_ements = {
Expand Down Expand Up @@ -417,7 +429,7 @@ sensors.initialize = function (callback) {
}

function update_debug_graphs() {
for (let i = 0; i < 4; i++) {
for (let i = 0; i < 8; i++) {
updateGraphHelperSize(debugHelpers[i]);

addSampleToData(debug_data[i], samples_debug_i, [FC.SENSOR_DATA.debug[i]]);
Expand Down
122 changes: 95 additions & 27 deletions src/tabs/sensors.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,13 +258,13 @@
<dd class="x">0</dd>
</dl>
</div>
<svg id="debug1">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<svg id="debug0">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title"><span i18n="sensorsDebugTitle"></span> 1</div>
Expand All @@ -273,13 +273,13 @@
<dd class="x">blue</dd>
</dl>
</div>
<svg id="debug2">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<svg id="debug1">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title"><span i18n="sensorsDebugTitle"></span> 2</div>
Expand All @@ -288,13 +288,13 @@
<dd class="x">0</dd>
</dl>
</div>
<svg id="debug3">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<svg id="debug2">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title"><span i18n="sensorsDebugTitle"></span> 3</div>
Expand All @@ -303,13 +303,81 @@
<dd class="x">0</dd>
</dl>
</div>
<svg id="debug3">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title"><span i18n="sensorsDebugTitle"></span> 4</div>
<dl>
<dt>X:</dt>
<dd class="x">0</dd>
</dl>
</div>
<svg id="debug4">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title"><span i18n="sensorsDebugTitle"></span> 5</div>
<dl>
<dt>X:</dt>
<dd class="x">0</dd>
</dl>
</div>
<svg id="debug5">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title"><span i18n="sensorsDebugTitle"></span> 6</div>
<dl>
<dt>X:</dt>
<dd class="x">0</dd>
</dl>
</div>
<svg id="debug6">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title"><span i18n="sensorsDebugTitle"></span> 7</div>
<dl>
<dt>X:</dt>
<dd class="x">0</dd>
</dl>
</div>
<svg id="debug7">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<!-- <div class="clear-both"></div>
<div class="plot_control">
<div class="title"><span i18n="sensorsDebugTitle"></span> 7</div>
<dl>
<dt>X:</dt>
<dd class="x">0</dd>
</dl>
</div> -->
</div>
</div>
</div>
Expand Down

0 comments on commit 30de63b

Please sign in to comment.