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

Merge pull request #1256 from etracer65/reboot_msc_utc

Browse source 
Add MSP_REBOOT_MSC_UTC reboot type to reboot into mass storage using UTC timestamps
This commit is contained in:
Michael Keller 2018-12-19 15:50:53 +13:00 • committed by GitHub
commit d6cdba8d91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,8 @@ function MspHelper () {
self.REBOOT_TYPES = { self.REBOOT_TYPES = {
FIRMWARE: 0, FIRMWARE: 0,
BOOTLOADER: 1, BOOTLOADER: 1,
MSC: 2 MSC: 2,
MSC_UTC: 3
}; };
} }
@ -647,7 +648,7 @@ MspHelper.prototype.process_data = function(dataHandler) {
case MSPCodes.MSP_SET_REBOOT: case MSPCodes.MSP_SET_REBOOT:
if (semver.gte(CONFIG.apiVersion, "1.40.0")) { if (semver.gte(CONFIG.apiVersion, "1.40.0")) {
var rebootType = data.read8(); var rebootType = data.read8();
if (rebootType === self.REBOOT_TYPES.MSC) { if ((rebootType === self.REBOOT_TYPES.MSC) || (rebootType === self.REBOOT_TYPES.MSC_UTC)) {
if (data.read8() === 0) { if (data.read8() === 0) {
console.log('Storage device not ready.'); console.log('Storage device not ready.');

12
src/js/tabs/onboard_logging.js
View file

@ -156,7 +156,17 @@ TABS.onboard_logging.initialize = function (callback) {
analytics.sendEvent(analytics.EVENT_CATEGORIES.FLIGHT_CONTROLLER, 'RebootMsc'); analytics.sendEvent(analytics.EVENT_CATEGORIES.FLIGHT_CONTROLLER, 'RebootMsc');
var buffer = []; var buffer = [];
buffer.push(2); if (semver.gte(CONFIG.apiVersion, "1.41.0")) {
if (GUI.operating_system === "Linux") {
// Reboot into MSC using UTC time offset instead of user timezone
// Linux seems to expect that the FAT file system timestamps are UTC based
buffer.push(mspHelper.REBOOT_TYPES.MSC_UTC);
} else {
buffer.push(mspHelper.REBOOT_TYPES.MSC);
}
} else {
buffer.push(mspHelper.REBOOT_TYPES.MSC);
}
MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false); MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false);
}); });
} }

2
src/js/tabs/setup.js
View file

@ -70,7 +70,7 @@ TABS.setup.initialize = function (callback) {
$('a.rebootBootloader').click(function () { $('a.rebootBootloader').click(function () {
var buffer = []; var buffer = [];
buffer.push(1); buffer.push(mspHelper.REBOOT_TYPES.BOOTLOADER);
MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false); MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false);
}); });
} else { } else {