Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-17 05:15:21 +03:00
Code Issues Wiki Activity

Typo in css classes, update global dataflash display on every dataflash summary respond.

Browse source
This commit is contained in:
NightHawk32 2015-11-24 18:17:53 -05:00
parent 6157c875f9
commit d21b4a157f
3 changed files with 74 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/msp.js
View file

@ -823,6 +823,7 @@ var MSP = {
DATAFLASH.totalSize = 0; DATAFLASH.totalSize = 0;
DATAFLASH.usedSize = 0; DATAFLASH.usedSize = 0;
} }
update_dataflash_global();
break; break;
case MSP_codes.MSP_DATAFLASH_READ: case MSP_codes.MSP_DATAFLASH_READ:
// No-op, let callback handle it // No-op, let callback handle it

117
js/serial_backend.js
View file

@ -256,52 +256,9 @@ function onConnect() {
// TEST code for dataflash status in header // TEST code for dataflash status in header
//MSP.send_message(MSP_codes.MSP_DATAFLASH_SUMMARY, false, update_html()); //MSP.send_message(MSP_codes.MSP_DATAFLASH_SUMMARY, false, update_html());
function formatFilesize(bytes) {
if (bytes < 1024) {
return bytes + "B";
}
var kilobytes = bytes / 1024;
if (kilobytes < 1024) {
return Math.round(kilobytes) + "kB";
}
var megabytes = kilobytes / 1024;
return megabytes.toFixed(1) + "MB";
}
function update_dataflash_global() {
var supportsDataflash = DATAFLASH.totalSize > 0;
if (supportsDataflash){
$(".noflash_global").css({
display: 'none'
});
$(".dataflash-contents_global").css({
display: 'block'
});
$(".dataflash-free_global").css({
width: (100-(DATAFLASH.totalSize - DATAFLASH.usedSize) / DATAFLASH.totalSize * 100) + "%",
display: 'block'
});
$(".dataflash-free_global div").text('Dataflash: free ' + formatFilesize(DATAFLASH.totalSize - DATAFLASH.usedSize));
} else {
$(".noflash_global").css({
display: 'block'
});
$(".dataflash-contents_global").css({
display: 'none'
});
}
}
MSP.send_message(MSP_codes.MSP_DATAFLASH_SUMMARY, false, update_dataflash_global); MSP.send_message(MSP_codes.MSP_DATAFLASH_SUMMARY, false, false);
var sensor_state = $('#sensor-status'); var sensor_state = $('#sensor-status');
sensor_state.show(); sensor_state.show();
@ -439,7 +396,34 @@ function highByte(num) {
function lowByte(num) { function lowByte(num) {
return 0x00FF & num; return 0x00FF & num;
} }function update_dataflash_global() {
var supportsDataflash = DATAFLASH.totalSize > 0;
if (supportsDataflash){
$(".noflash_global").css({
display: 'none'
});
$(".dataflash-contents_global").css({
display: 'block'
});
$(".dataflash-free_global").css({
width: (100-(DATAFLASH.totalSize - DATAFLASH.usedSize) / DATAFLASH.totalSize * 100) + "%",
display: 'block'
});
$(".dataflash-free_global div").text('Dataflash: free ' + formatFilesize(DATAFLASH.totalSize - DATAFLASH.usedSize));
} else {
$(".noflash_global").css({
display: 'block'
});
$(".dataflash-contents_global").css({
display: 'none'
});
}
}
function specificByte(num, pos) { function specificByte(num, pos) {
return 0x000000FF & (num >> (8 * pos)); return 0x000000FF & (num >> (8 * pos));
@ -457,3 +441,46 @@ function bit_clear(num, bit) {
return num & ~(1 << bit); return num & ~(1 << bit);
} }
function update_dataflash_global() {
function formatFilesize(bytes) {
if (bytes < 1024) {
return bytes + "B";
}
var kilobytes = bytes / 1024;
if (kilobytes < 1024) {
return Math.round(kilobytes) + "kB";
}
var megabytes = kilobytes / 1024;
return megabytes.toFixed(1) + "MB";
}
var supportsDataflash = DATAFLASH.totalSize > 0;
if (supportsDataflash){
$(".noflash_global").css({
display: 'none'
});
$(".dataflash-contents_global").css({
display: 'block'
});
$(".dataflash-free_global").css({
width: (100-(DATAFLASH.totalSize - DATAFLASH.usedSize) / DATAFLASH.totalSize * 100) + "%",
display: 'block'
});
$(".dataflash-free_global div").text('Dataflash: free ' + formatFilesize(DATAFLASH.totalSize - DATAFLASH.usedSize));
} else {
$(".noflash_global").css({
display: 'block'
});
$(".dataflash-contents_global").css({
display: 'none'
});
}
}

2
main.css
View file

@ -1429,7 +1429,7 @@ dialog {
background-color: #bcf; background-color: #bcf;
} }
.noflash_gloabal { .noflash_global {
display:none; display:none;
color: #4f4f4f; color: #4f4f4f;
text-align: center; text-align: center;