Merge pull request #175 from KiteAnton/blackbox_rate
Blackbox rate simplification10.3.x-maintenance
commit
be29373d5c
|
@ -1788,7 +1788,7 @@
|
||||||
"message": "Blackbox logging device"
|
"message": "Blackbox logging device"
|
||||||
},
|
},
|
||||||
"onboardLoggingRateOfLogging": {
|
"onboardLoggingRateOfLogging": {
|
||||||
"message": "Portion of PID loop iterations to log (logging rate)"
|
"message": "Blackbox logging rate"
|
||||||
},
|
},
|
||||||
"onboardLoggingSerialLogger": {
|
"onboardLoggingSerialLogger": {
|
||||||
"message": "Outboard serial logging device"
|
"message": "Outboard serial logging device"
|
||||||
|
@ -1798,6 +1798,9 @@
|
||||||
},
|
},
|
||||||
"onboardLoggingEraseInProgress": {
|
"onboardLoggingEraseInProgress": {
|
||||||
"message": "Erase in progress, please wait..."
|
"message": "Erase in progress, please wait..."
|
||||||
|
},
|
||||||
|
"onboardLoggingOnboardSDCard": {
|
||||||
|
"message": "Onboard SD card"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -108,8 +108,7 @@
|
||||||
<div class="require-sdcard-supported">
|
<div class="require-sdcard-supported">
|
||||||
<div class="gui_box grey">
|
<div class="gui_box grey">
|
||||||
<div class="gui_box_titlebar" align="left">
|
<div class="gui_box_titlebar" align="left">
|
||||||
<div class="spacer_box_title">
|
<div class="spacer_box_title" i18n="onboardLoggingOnboardSDCard">
|
||||||
Onboard SD card
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="spacer_box">
|
<div class="spacer_box">
|
||||||
|
|
|
@ -29,7 +29,9 @@ TABS.onboard_logging.initialize = function (callback) {
|
||||||
MSP.send_message(MSP_codes.MSP_DATAFLASH_SUMMARY, false, false, function() {
|
MSP.send_message(MSP_codes.MSP_DATAFLASH_SUMMARY, false, false, function() {
|
||||||
if (semver.gte(CONFIG.flightControllerVersion, "1.11.0")) {
|
if (semver.gte(CONFIG.flightControllerVersion, "1.11.0")) {
|
||||||
MSP.send_message(MSP_codes.MSP_SDCARD_SUMMARY, false, false, function() {
|
MSP.send_message(MSP_codes.MSP_SDCARD_SUMMARY, false, false, function() {
|
||||||
MSP.send_message(MSP_codes.MSP_BLACKBOX_CONFIG, false, false, load_html);
|
MSP.send_message(MSP_codes.MSP_BLACKBOX_CONFIG, false, false, function() {
|
||||||
|
MSP.send_message(MSP_codes.MSP_ADVANCED_CONFIG, false, false, load_html);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
load_html();
|
load_html();
|
||||||
|
@ -162,45 +164,38 @@ TABS.onboard_logging.initialize = function (callback) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function populateLoggingRates() {
|
function populateLoggingRates() {
|
||||||
var
|
|
||||||
userRateGCD = gcd(BLACKBOX.blackboxRateNum, BLACKBOX.blackboxRateDenom),
|
|
||||||
userRate = {num: BLACKBOX.blackboxRateNum / userRateGCD, denom: BLACKBOX.blackboxRateDenom / userRateGCD};
|
|
||||||
|
|
||||||
// Offer a reasonable choice of logging rates (if people want weird steps they can use CLI)
|
// Offer a reasonable choice of logging rates (if people want weird steps they can use CLI)
|
||||||
var
|
var
|
||||||
loggingRates = [
|
loggingRates = [
|
||||||
{num: 1, denom: 32},
|
|
||||||
{num: 1, denom: 16},
|
|
||||||
{num: 1, denom: 8},
|
|
||||||
{num: 1, denom: 5},
|
|
||||||
{num: 1, denom: 4},
|
|
||||||
{num: 1, denom: 3},
|
|
||||||
{num: 1, denom: 2},
|
|
||||||
{num: 2, denom: 3},
|
|
||||||
{num: 3, denom: 4},
|
|
||||||
{num: 4, denom: 5},
|
|
||||||
{num: 7, denom: 8},
|
|
||||||
{num: 1, denom: 1},
|
{num: 1, denom: 1},
|
||||||
|
{num: 1, denom: 2},
|
||||||
|
{num: 1, denom: 3},
|
||||||
|
{num: 1, denom: 4},
|
||||||
|
{num: 1, denom: 5},
|
||||||
|
{num: 1, denom: 6},
|
||||||
|
{num: 1, denom: 7},
|
||||||
|
{num: 1, denom: 8},
|
||||||
|
{num: 1, denom: 16},
|
||||||
|
{num: 1, denom: 32},
|
||||||
],
|
],
|
||||||
loggingRatesSelect = $(".blackboxRate select");
|
loggingRatesSelect = $(".blackboxRate select");
|
||||||
|
|
||||||
var
|
var addedCurrentValue = false;
|
||||||
addedCurrentValue = false;
|
var pidRate = 8000 / PID_ADVANCED_CONFIG.gyro_sync_denom / PID_ADVANCED_CONFIG.pid_process_denom;
|
||||||
|
|
||||||
for (var i = 0; i < loggingRates.length; i++) {
|
for (var i = 0; i < loggingRates.length; i++) {
|
||||||
if (!addedCurrentValue && userRate.num / userRate.denom <= loggingRates[i].num / loggingRates[i].denom) {
|
var loggingRate = Math.round(pidRate / loggingRates[i].denom);
|
||||||
if (userRate.num / userRate.denom < loggingRates[i].num / loggingRates[i].denom) {
|
var loggingRateUnit = " Hz";
|
||||||
loggingRatesSelect.append('<option value="' + userRate.num + '/' + userRate.denom + '">'
|
if (gcd(loggingRate, 1000)==1000) {
|
||||||
+ userRate.num + '/' + userRate.denom + ' (' + Math.round(userRate.num / userRate.denom * 100) + '%)</option>');
|
loggingRate /= 1000;
|
||||||
}
|
loggingRateUnit = " KHz";
|
||||||
addedCurrentValue = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
loggingRatesSelect.append('<option value="' + loggingRates[i].num + '/' + loggingRates[i].denom + '">'
|
loggingRatesSelect.append('<option value="' + loggingRates[i].num + '/' + loggingRates[i].denom + '">'
|
||||||
+ loggingRates[i].num + '/' + loggingRates[i].denom + ' (' + Math.round(loggingRates[i].num / loggingRates[i].denom * 100) + '%)</option>');
|
+ loggingRate + loggingRateUnit + ' (' + Math.round(loggingRates[i].num / loggingRates[i].denom * 100) + '%)</option>');
|
||||||
|
|
||||||
}
|
}
|
||||||
loggingRatesSelect.val(userRate.num + '/' + userRate.denom);
|
loggingRatesSelect.val(BLACKBOX.blackboxRateNum + '/' + BLACKBOX.blackboxRateDenom);
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatFilesizeKilobytes(kilobytes) {
|
function formatFilesizeKilobytes(kilobytes) {
|
||||||
|
|
Loading…
Reference in New Issue