diff --git a/js/msp.js b/js/msp.js index 6d5e81f3..50d1bf60 100644 --- a/js/msp.js +++ b/js/msp.js @@ -823,6 +823,7 @@ var MSP = { DATAFLASH.totalSize = 0; DATAFLASH.usedSize = 0; } + update_dataflash_global(); break; case MSP_codes.MSP_DATAFLASH_READ: // No-op, let callback handle it diff --git a/js/serial_backend.js b/js/serial_backend.js index df901468..f67aa9cf 100755 --- a/js/serial_backend.js +++ b/js/serial_backend.js @@ -256,52 +256,9 @@ function onConnect() { // TEST code for dataflash status in header //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'); sensor_state.show(); @@ -439,7 +396,34 @@ function highByte(num) { function lowByte(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) { return 0x000000FF & (num >> (8 * pos)); @@ -457,3 +441,46 @@ function bit_clear(num, 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' + }); + } + + } diff --git a/main.css b/main.css index 9303d4b4..39847fb3 100644 --- a/main.css +++ b/main.css @@ -1429,7 +1429,7 @@ dialog { background-color: #bcf; } -.noflash_gloabal { +.noflash_global { display:none; color: #4f4f4f; text-align: center;