Skip to content

Add debug modes to blackbox tab #1566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 15, 2019
Merged

Add debug modes to blackbox tab #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2bae18
Add debug modes to blackbox tab
IvoFPV Aug 8, 2019
2c42243
Add unknown i18n
IvoFPV Aug 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4819,6 +4819,12 @@
"onboardLoggingRateOfLogging": {
"message": "Blackbox logging rate"
},
"onboardLoggingDebugMode": {
"message": "Blackbox debug mode"
},
"onboardLoggingDebugModeUnknown": {
"message": "UNKNOWN"
},
"onboardLoggingSerialLogger": {
"message": "Outboard serial logging device"
},
Expand Down
1 change: 1 addition & 0 deletions src/css/tabs-dark/onboard_logging-dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
}

.tab-onboard_logging .blackboxRate select,
.tab-onboard_logging .blackboxDebugMode select,
.tab-onboard_logging .blackboxDevice select {
border: 1px solid #9c9c9c;
background-color: #3a3a3a;
Expand Down
2 changes: 2 additions & 0 deletions src/css/tabs/onboard_logging.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@
clear: left;
}
.tab-onboard_logging .blackboxRate select,
.tab-onboard_logging .blackboxDebugMode select,
.tab-onboard_logging .blackboxDevice select {
float: left;
width: 180px;
Expand All @@ -300,6 +301,7 @@
border: 1px solid silver;
}
.tab-onboard_logging .blackboxRate span,
.tab-onboard_logging .blackboxDebugMode span,
.tab-onboard_logging .blackboxDevice span {
line-height: 20px;
}
Expand Down
9 changes: 9 additions & 0 deletions src/js/fc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,15 @@ var FC = {
motor_pwm_rate: 0,
digitalIdlePercent: 0,
gyroUse32kHz: 0,
motorPwmInversion: 0,
gyroToUse: 0,
gyroHighFsr: 0,
gyroMovementCalibThreshold: 0,
gyroCalibDuration: 0,
gyroOffsetYaw: 0,
gyroCheckOverflow: 0,
debugMode: 0,
debugModeCount: 0,
};

FILTER_CONFIG = {
Expand Down
22 changes: 22 additions & 0 deletions src/js/msp/MSPHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,17 @@ MspHelper.prototype.process_data = function(dataHandler) {
let gyroUse32kHz = data.readU8();
if (semver.lt(CONFIG.apiVersion, "1.41.0")) {
PID_ADVANCED_CONFIG.gyroUse32kHz = gyroUse32kHz;
}
if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
PID_ADVANCED_CONFIG.motorPwmInversion = data.readU8();
PID_ADVANCED_CONFIG.gyroToUse = data.readU8();
PID_ADVANCED_CONFIG.gyroHighFsr = data.readU8();
PID_ADVANCED_CONFIG.gyroMovementCalibThreshold = data.readU8();
PID_ADVANCED_CONFIG.gyroCalibDuration = data.readU16();
PID_ADVANCED_CONFIG.gyroOffsetYaw = data.readU16();
PID_ADVANCED_CONFIG.gyroCheckOverflow = data.readU8();
PID_ADVANCED_CONFIG.debugMode = data.readU8();
PID_ADVANCED_CONFIG.debugModeCount = data.readU8();
}
}
}
Expand Down Expand Up @@ -1236,6 +1247,7 @@ MspHelper.prototype.process_data = function(dataHandler) {
BLACKBOX.blackboxRateDenom = data.readU8();
if (semver.gte(CONFIG.apiVersion, "1.36.0")) {
BLACKBOX.blackboxPDenom = data.readU16();

}
break;
case MSPCodes.MSP_SET_BLACKBOX_CONFIG:
Expand Down Expand Up @@ -1704,6 +1716,16 @@ MspHelper.prototype.crunch = function(code) {
gyroUse32kHz = PID_ADVANCED_CONFIG.gyroUse32kHz;
}
buffer.push8(gyroUse32kHz);
if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
buffer.push8(PID_ADVANCED_CONFIG.motorPwmInversion)
.push8(PID_ADVANCED_CONFIG.gyroToUse)
.push8(PID_ADVANCED_CONFIG.gyroHighFsr)
.push8(PID_ADVANCED_CONFIG.gyroMovementCalibThreshold)
.push16(PID_ADVANCED_CONFIG.gyroCalibDuration)
.push16(PID_ADVANCED_CONFIG.gyroOffsetYaw)
.push8(PID_ADVANCED_CONFIG.gyroCheckOverflow)
.push8(PID_ADVANCED_CONFIG.debugMode);
}
}
}
break;
Expand Down
91 changes: 89 additions & 2 deletions src/js/tabs/onboard_logging.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ TABS.onboard_logging.initialize = function (callback) {

var deviceSelect = $(".blackboxDevice select");
var loggingRatesSelect = $(".blackboxRate select");
var debugModeSelect = $(".blackboxDebugMode select");

if (BLACKBOX.supported) {
$(".tab-onboard_logging a.save-settings").click(function() {
Expand All @@ -110,15 +111,18 @@ TABS.onboard_logging.initialize = function (callback) {
BLACKBOX.blackboxRateNum = parseInt(rate[0], 10);
BLACKBOX.blackboxRateDenom = parseInt(rate[1], 10);
}

BLACKBOX.blackboxDevice = parseInt(deviceSelect.val(), 10);

if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
PID_ADVANCED_CONFIG.debugMode = parseInt(debugModeSelect.val());
MSP.send_message(MSPCodes.MSP_SET_ADVANCED_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_ADVANCED_CONFIG), false, save_to_eeprom);
}
MSP.send_message(MSPCodes.MSP_SET_BLACKBOX_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_BLACKBOX_CONFIG), false, save_to_eeprom);
});
}

populateLoggingRates(loggingRatesSelect);
populateDevices(deviceSelect);
populateDebugModes(debugModeSelect);

deviceSelect.change(function() {
if ($(this).val() === "0") {
Expand Down Expand Up @@ -250,6 +254,89 @@ TABS.onboard_logging.initialize = function (callback) {
loggingRatesSelect.val(BLACKBOX.blackboxRateNum + '/' + BLACKBOX.blackboxRateDenom);
}
}

function populateDebugModes(debugModeSelect) {
var debugModes = [];

if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
$('.blackboxDebugMode').show();

debugModes = [
{text: "NONE"},
{text: "CYCLETIME"},
{text: "BATTERY"},
{text: "GYRO_FILTERED"},
{text: "ACCELEROMETER"},
{text: "PIDLOOP"},
{text: "GYRO_SCALED"},
{text: "RC_INTERPOLATION"},
{text: "ANGLERATE"},
{text: "ESC_SENSOR"},
{text: "SCHEDULER"},
{text: "STACK"},
{text: "ESC_SENSOR_RPM"},
{text: "ESC_SENSOR_TMP"},
{text: "ALTITUDE"},
{text: "FFT"},
{text: "FFT_TIME"},
{text: "FFT_FREQ"},
{text: "RX_FRSKY_SPI"},
{text: "RX_SFHSS_SPI"},
{text: "GYRO_RAW"},
{text: "DUAL_GYRO"},
{text: "DUAL_GYRO_RAW"},
{text: "DUAL_GYRO_COMBINE"},
{text: "DUAL_GYRO_DIFF"},
{text: "MAX7456_SIGNAL"},
{text: "MAX7456_SPICLOCK"},
{text: "SBUS"},
{text: "FPORT"},
{text: "RANGEFINDER"},
{text: "RANGEFINDER_QUALITY"},
{text: "LIDAR_TF"},
{text: "ADC_INTERNAL"},
{text: "RUNAWAY_TAKEOFF"},
{text: "SDIO"},
{text: "CURRENT_SENSOR"},
{text: "USB"},
{text: "SMARTAUDIO"},
{text: "RTH"},
{text: "ITERM_RELAX"},
{text: "ACRO_TRAINER"},
{text: "RC_SMOOTHING"},
{text: "RX_SIGNAL_LOSS"},
{text: "RC_SMOOTHING_RATE"},
{text: "ANTI_GRAVITY"},
{text: "DYN_LPF"},
{text: "RX_SPEKTRUM_SPI"},
{text: "DSHOT_RPM_TELEMETRY"},
{text: "RPM_FILTER"},
{text: "D_MIN"},
{text: "AC_CORRECTION"},
{text: "AC_ERROR"},
{text: "DUAL_GYRO_SCALED"},
{text: "DSHOT_RPM_ERRORS"},
{text: "CRSF_LINK_STATISTICS_UPLINK"},
{text: "CRSF_LINK_STATISTICS_PWR"},
{text: "CRSF_LINK_STATISTICS_DOWN"},
{text: "BARO"},
{text: "GPS_RESCUE_THROTTLE_PID"},
{text: "DYN_IDLE"},
];

for (var i = 0; i < PID_ADVANCED_CONFIG.debugModeCount; i++) {
if (i < debugModes.length) {
debugModeSelect.append(new Option(debugModes[i].text, i));
} else {
debugModeSelect.append(new Option(i18n.getMessage('onboardLoggingDebugModeUnknown'), i));
}
}

debugModeSelect.val(PID_ADVANCED_CONFIG.debugMode);
} else {
$('.blackboxDebugMode').hide();
}
}

function formatFilesizeKilobytes(kilobytes) {
if (kilobytes < 1024) {
Expand Down
5 changes: 5 additions & 0 deletions src/tabs/onboard_logging.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
</select>
<span i18n="onboardLoggingRateOfLogging"></span>
</div>
<div class="line blackboxDebugMode">
<select name="blackboxDebugMode">
</select>
<span i18n="onboardLoggingDebugMode"></span>
</div>
<div class="line">
<a href="#" class="save-settings regular-button" i18n="blackboxButtonSave"></a>
</div>
Expand Down