Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-24 00:35:26 +03:00
Code Issues Wiki Activity

Show SDC in DataFlash component (#4267)

Browse source
This commit is contained in:
Mark Haslinghuis 2024-12-06 21:29:12 +01:00 • committed by GitHub
parent eef91fbe78
commit 2b72e29d96
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/data-flash/DataFlash.vue
View file

@ -46,10 +46,14 @@ export default {
}
const kilobytes = bytes / 1024;
if (kilobytes < 1024) {
return `${Math.round(kilobytes)}kB`;
return `${Math.round(kilobytes)}KB`;
}
const megabytes = kilobytes / 1024;
return `${megabytes.toFixed(1)}MB`;
if (megabytes < 1024) {
return `${megabytes.toFixed(1)}MB`;
}
const gigabytes = megabytes / 1024;
return `${gigabytes.toFixed(1)}GB`;
},
indicatorWidth() {
if (!this.supportDataflash) return;

1
src/js/msp/MSPHelper.js
View file

@ -1361,6 +1361,7 @@ MspHelper.prototype.process_data = function(dataHandler) {
FC.SDCARD.filesystemLastError = data.readU8();
FC.SDCARD.freeSizeKB = data.readU32();
FC.SDCARD.totalSizeKB = data.readU32();
update_dataflash_global();
break;
case MSPCodes.MSP_BLACKBOX_CONFIG:
FC.BLACKBOX.supported = (data.readU8() & 1) != 0;

1
src/js/serial_backend.js
View file

@ -635,6 +635,7 @@ function onConnect() {
MSP.send_message(MSPCodes.MSP_FEATURE_CONFIG, false, false);
MSP.send_message(MSPCodes.MSP_BATTERY_CONFIG, false, false);
MSP.send_message(MSPCodes.MSP_DATAFLASH_SUMMARY, false, false);
MSP.send_message(MSPCodes.MSP_SDCARD_SUMMARY, false, false);
if (FC.CONFIG.boardType === 0 || FC.CONFIG.boardType === 2) {
startLiveDataRefreshTimer();

32
src/js/update_dataflash_global.js
View file

@ -13,13 +13,17 @@ export function update_dataflash_global() {
}
const megabytes = kilobytes / 1024;
return `${megabytes.toFixed(1)}MB`;
if (megabytes < 1024) {
return `${megabytes.toFixed(1)}MB`;
}
const gigabytes = megabytes / 1024;
return `${gigabytes.toFixed(1)}GB`;
}
const supportsDataflash = FC.DATAFLASH.totalSize > 0;
const supportsDataflash = FC.DATAFLASH.supported && FC.DATAFLASH.totalSize > 0;
const supportsDatacard = FC.SDCARD.supported && FC.SDCARD.totalSizeKB > 0;
if (supportsDataflash){
if (supportsDataflash || supportsDatacard) {
$(".noflash_global").css({
display: 'none',
});
@ -28,9 +32,21 @@ export function update_dataflash_global() {
display: 'block',
});
$(".dataflash-progress_global").val(`${100-(FC.DATAFLASH.totalSize - FC.DATAFLASH.usedSize) / FC.DATAFLASH.totalSize * 100}`);
$(".dataflash-contents_global div").text(`Dataflash: free ${formatFilesize(FC.DATAFLASH.totalSize - FC.DATAFLASH.usedSize)}`);
} else {
let dataflashProgress;
let dataflashProgressText;
if (supportsDataflash) {
dataflashProgress = 100 - (FC.DATAFLASH.totalSize - FC.DATAFLASH.usedSize) / FC.DATAFLASH.totalSize * 100;
dataflashProgressText = `Dataflash: free ${formatFilesize(FC.DATAFLASH.totalSize - FC.DATAFLASH.usedSize)}`;
}
if (supportsDatacard) {
dataflashProgress = 100 - FC.SDCARD.freeSizeKB / FC.SDCARD.totalSizeKB * 100;
dataflashProgressText = `SD Card: free ${formatFilesize(FC.SDCARD.freeSizeKB * 1024)}`;
}
$(".dataflash-progress_global").val(dataflashProgress);
$(".dataflash-contents_global div").text(dataflashProgressText);
} else {
$(".noflash_global").css({
display: 'block',
});
@ -38,5 +54,5 @@ export function update_dataflash_global() {
$(".dataflash-contents_global").css({
display: 'none',
});
}
}
}