sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add dataflash tab: Very basic functionality is working

10.3.x-maintenance
Nicholas Sherlock 2015-01-31 00:41:41 +13:00
parent e672dde6e2
commit 0f22b92e35
9 changed files with 284 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
_locales/en/messages.json
View File

@ -102,7 +102,9 @@
"tabLogging": {
"message": "Logging"
},
"tabDataflash": {
"message": "Dataflash"
},
"tabAdjustments": {
"message": "Adjustments"
},
@ -843,6 +845,13 @@
"message": "Automatically loaded previous log file: <strong>$1</strong>"
},
"dataflashButtonSaveFile": {
"message": "Save flash to file..."
},
"dataflashButtonErase": {
"message": "Erase flash"
},
"firmwareFlasherReleaseSummaryHead": {
"message": "Release info"
},

5
js/data_storage.js
View File

@ -149,3 +149,8 @@ var MISC = {
vbatmaxcellvoltage: 0,
vbatwarningcellvoltage: 0
};
var DATAFLASH = {
sectors: 0,
totalSize: 0
};

1
js/gui.js
View File

@ -25,6 +25,7 @@ var GUI_control = function () {
'gps',
'led_strip',
'logging',
'dataflash',
'modes',
'motors',
'pid_tuning',

39
js/msp.js
View File

@ -22,6 +22,9 @@ var MSP_codes = {
MSP_SONAR: 58,
MSP_PID_CONTROLLER: 59,
MSP_SET_PID_CONTROLLER: 60,
MSP_DATAFLASH_SUMMARY: 70,
MSP_DATAFLASH_READ: 71,
MSP_DATAFLASH_ERASE: 72,
// Multiwii MSP commands
MSP_IDENT: 100,
@ -666,8 +669,16 @@ var MSP = {
case MSP_codes.MSP_SET_LED_STRIP_CONFIG:
console.log('Led strip config saved');
break;
case MSP_codes.MSP_DATAFLASH_SUMMARY:
DATAFLASH.sectors = data.getUint32(0, 1);
DATAFLASH.totalSize = data.getUint32(4, 1);
break;
case MSP_codes.MSP_DATAFLASH_READ:
// No-op, let callback handle it
break;
case MSP_codes.MSP_DATAFLASH_ERASE:
console.log("Data flash erased");
break;
case MSP_codes.MSP_SET_MODE_RANGE:
console.log('Mode range saved');
break;
@ -793,6 +804,9 @@ var MSP = {
}
};
/**
* Encode the request body for the MSP request with the given code and return it as an array of bytes.
*/
MSP.crunch = function (code) {
var buffer = [];
@ -950,6 +964,27 @@ MSP.crunch = function (code) {
return buffer;
};
/**
* Send a request to read a block of data from the dataflash at the given address and pass that address and a dataview
* of the returned data to the given callback (or null for the data if an error occured).
*/
MSP.dataflashRead = function(address, onDataCallback) {
MSP.send_message(MSP_codes.MSP_DATAFLASH_READ, [address & 0xFF, (address >> 8) & 0xFF, (address >> 16) & 0xFF, (address >> 24) & 0xFF],
false, function(response) {
var chunkAddress = response.data.getUint32(0, 1);
// Verify that the address of the memory returned matches what the caller asked for
if (chunkAddress == address) {
/* Strip that address off the front of the reply and deliver it separately so the caller doesn't have to
* figure out the reply format:
*/
onDataCallback(address, new DataView(response.data.buffer, response.data.byteOffset + 4, response.data.buffer.byteLength - 4));
} else {
// Report error
onDataCallback(address, null);
}
});
} ;
MSP.sendModeRanges = function(onCompleteCallback) {
var nextFunction = send_next_mode_range;

3
main.html
View File

@ -22,6 +22,7 @@
<link type="text/css" rel="stylesheet" href="./tabs/sensors.css" media="all" />
<link type="text/css" rel="stylesheet" href="./tabs/cli.css" media="all" />
<link type="text/css" rel="stylesheet" href="./tabs/logging.css" media="all" />
<link type="text/css" rel="stylesheet" href="./tabs/dataflash.css" media="all" />
<link type="text/css" rel="stylesheet" href="./tabs/firmware_flasher.css" media="all" />
<link type="text/css" rel="stylesheet" href="./tabs/adjustments.css" media="all" />
@ -68,6 +69,7 @@
<script type="text/javascript" src="./tabs/sensors.js"></script>
<script type="text/javascript" src="./tabs/cli.js"></script>
<script type="text/javascript" src="./tabs/logging.js"></script>
<script type="text/javascript" src="./tabs/dataflash.js"></script>
<script type="text/javascript" src="./tabs/firmware_flasher.js"></script>
</head>
<body>
@ -146,6 +148,7 @@
<li class="tab_led_strip"><a href="#" i18n="tabLedStrip"></a></li>
<li class="tab_sensors"><a href="#" i18n="tabRawSensorData"></a></li>
<li class="tab_logging"><a href="#" i18n="tabLogging"></a></li>
<li class="tab_dataflash"><a href="#" i18n="tabDataflash"></a></li>
<li class="tab_cli"><a href="#" i18n="tabCLI"></a></li>
</ul>
<div class="clear-both"></div>

3
main.js
View File

@ -153,6 +153,9 @@ $(document).ready(function () {
case 'logging':
TABS.logging.initialize(content_ready);
break;
case 'dataflash':
TABS.dataflash.initialize(content_ready);
break;
case 'cli':
TABS.cli.initialize(content_ready);
break;

81
tabs/dataflash.css Normal file
View File

@ -0,0 +1,81 @@
.tab-dataflash {
}
.tab-dataflash .dataflash-info dd{
}
.tab-dataflash .note {
padding: 5px;
border: 1px dashed silver;
}
.tab-dataflash .properties {
margin-top: 10px;
}
.tab-dataflash .dataflash-info {
overflow:hidden;
}
.tab-dataflash .dataflash-info dt {
float: left;
width: 12em;
height: 20px;
line-height: 20px;
font-weight: bold;
}
.tab-dataflash .dataflash-info dd {
display: block;
height: 20px;
line-height: 20px;
}
.tab-dataflash .speed {
margin-top: 5px;
width: 80px;
border: 1px solid silver;
}
.tab-dataflash .info {
margin-top: 10px;
}
.tab-dataflash .info dt {
float: left;
width: 120px;
height: 20px;
line-height: 20px;
font-weight: bold;
}
.tab-dataflash .info dd {
display: block;
margin-left: 130px;
height: 20px;
line-height: 20px;
}
.tab-dataflash .buttons {
width: calc(100% - 20px);
position: absolute;
bottom: 10px;
}
.tab-dataflash .buttons a {
display: block;
float: right;
margin-left: 10px;
height: 28px;
line-height: 28px;
padding: 0 15px 0 15px;
text-align: center;
font-weight: bold;
border: 1px solid silver;
background-color: #ececec;
}
.tab-dataflash .buttons a:hover {
background-color: #dedcdc;
}
.tab-dataflash .buttons .back {
display: none;
}

14
tabs/dataflash.html Normal file
View File

@ -0,0 +1,14 @@
<div class="tab-dataflash">
<h3>Dataflash</h3>
<dl class="dataflash-info">
<dt>Capacity (bytes)</dt>
<dd class="dataflash-capacity"></dd>
<dt>Capacity (sectors)</dt>
<dd class="dataflash-sectors"></dd>
</dl>
<div class="buttons">
<a href="#" class="erase_flash" i18n="dataflashButtonErase"></a>
<a href="#" class="save_to_file" i18n="dataflashButtonSaveFile"></a>
</div>
</div>

130
tabs/dataflash.js Normal file
View File

@ -0,0 +1,130 @@
'use strict';
TABS.dataflash = {};
TABS.dataflash.initialize = function (callback) {
var self = this;
if (GUI.active_tab != 'dataflash') {
GUI.active_tab = 'dataflash';
googleAnalytics.sendAppView('dataflash');
}
var requested_properties = [],
samples = 0,
requests = 0,
log_buffer = [];
if (CONFIGURATOR.connectionValid) {
MSP.send_message(MSP_codes.MSP_DATAFLASH_SUMMARY, false, false, function() {
$('#content').load("./tabs/dataflash.html", process_html);
});
}
function process_html() {
// translate to user-selected language
localize();
$(".tab-dataflash .dataflash-capacity").text(DATAFLASH.totalSize);
$(".tab-dataflash .dataflash-sectors").text(DATAFLASH.sectors);
// UI hooks
$('.tab-dataflash a.erase_flash').click(erase_flash);
$('.tab-dataflash a.save_to_file').click(stream_flash_to_file);
if (callback) callback();
}
// IO related methods
function zeroPad(value, width) {
value = "" + value;
while (value.length < width) {
value = "0" + value;
}
return value;
}
function stream_flash_to_file() {
if (GUI.connected_to) {
prepare_file(function(fileWriter) {
var
nextAddress = 0;
function onChunkRead(chunkAddress, chunkDataView) {
// If we didn't get a zero-byte chunk (indicating end-of-file), request more
if (chunkDataView.byteLength > 0) {
var blob = new Blob([chunkDataView]);
fileWriter.write(blob);
nextAddress += chunkDataView.byteLength;
MSP.dataflashRead(nextAddress, onChunkRead);
}
}
MSP.dataflashRead(nextAddress, onChunkRead);
});
}
}
function prepare_file(onComplete) {
var
date = new Date(),
filename = 'blackbox_log_' + date.getFullYear() + '-' + zeroPad(date.getMonth() + 1, 2) + '-'
+ zeroPad(date.getDate(), 2) + '_' + zeroPad(date.getHours(), 2) + zeroPad(date.getMinutes(), 2)
+ zeroPad(date.getSeconds(), 2);
chrome.fileSystem.chooseEntry({type: 'saveFile', suggestedName: filename,
accepts: [{extensions: ['TXT']}]}, function(fileEntry) {
if (!fileEntry) {
console.log('No file selected');
return;
}
// echo/console log path specified
chrome.fileSystem.getDisplayPath(fileEntry, function(path) {
console.log('Dataflash dump file path: ' + path);
});
prepare_writer(fileEntry, onComplete);
});
}
function prepare_writer(fileEntry, onComplete) {
fileEntry.createWriter(function (fileWriter) {
fileWriter.onerror = function (e) {
console.error(e);
// stop logging if the procedure was/is still running
};
fileWriter.onwriteend = function () {
};
onComplete(fileWriter);
}, function (e) {
// File is not readable or does not exist!
console.error(e);
});
}
function erase_flash() {
/* var dialog = $("<dialog>lol</dialog>");
$("body").append(dialog);
dialog[0].showModal();
TODO modal dialog to confirm erase */
MSP.send_message(MSP_codes.MSP_DATAFLASH_ERASE, false, false, function(data) {
});
}
};
TABS.dataflash.cleanup = function (callback) {
if (callback) callback();
};