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

Added support for ChromeOS.

Browse source
This commit is contained in:
mikeller 2017-12-04 23:03:35 +13:00
parent 357b6c0998
commit b15a391113
2 changed files with 44 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
gulpfile.js
View file

@ -26,9 +26,9 @@ var releaseDir = './release/';
// Get platform from commandline args
// #
// # gulp <task> [<platform>]+ Run only for platform(s) (with <platform> one of --linux64, --osx64, or --win32)
// # gulp <task> [<platform>]+ Run only for platform(s) (with <platform> one of --linux64, --osx64, or --win32 --chromeos)
// #
function getPlatforms() {
function getPlatforms(includeChromeOs) {
var supportedPlatforms = ['linux64', 'osx64', 'win32'];
var platforms = [];
var regEx = /--(\w+)/;
@ -36,6 +36,10 @@ function getPlatforms() {
var arg = process.argv[i].match(regEx)[1];
if (supportedPlatforms.indexOf(arg) > -1) {
platforms.push(arg);
} else if (arg === 'chromeos') {
if (includeChromeOs) {
platforms.push(arg);
}
} else {
console.log('Unknown platform: ' + arg);
process.exit();
@ -83,7 +87,8 @@ function getRunDebugAppCommand() {
break;
default:
return '';
return '';
break;
}
}
@ -333,6 +338,20 @@ function release_linux64() {
return archive.finalize();
}
// Create distribution package for chromeos platform
function release_chromeos() {
var src = distDir;
var output = fs.createWriteStream(path.join(releaseDir, get_release_filename('chromeos', 'zip')));
var archive = archiver('zip', {
zlib: { level: 9 }
});
archive.on('warning', function (err) { throw err; });
archive.on('error', function (err) { throw err; });
archive.pipe(output);
archive.directory(src, false);
return archive.finalize();
}
// Create distribution package for macOS platform
function release_osx64() {
var appdmg = require('gulp-appdmg');
@ -370,9 +389,13 @@ gulp.task('release', ['apps', 'clean-release'], function () {
}
});
var platforms = getPlatforms();
var platforms = getPlatforms(true);
console.log('Packing release.');
if (platforms.indexOf('chromeos') !== -1) {
release_chromeos();
}
if (platforms.indexOf('linux64') !== -1) {
release_linux64();
}

29
main.js
View file

@ -28,7 +28,9 @@ $(document).ready(function () {
break;
}
checkForConfiguratorUpdates();
if (GUI.operating_system !== 'ChromeOS') {
checkForConfiguratorUpdates();
}
chrome.storage.local.get('logopen', function (result) {
if (result.logopen) {
@ -202,20 +204,23 @@ $(document).ready(function () {
}).change();
});
chrome.storage.local.get('checkForConfiguratorUnstableVersions', function (result) {
$('div.checkForConfiguratorUnstableVersions input').change(function () {
var checked = $(this).is(':checked');
if (GUI.operating_system !== 'ChromeOS') {
chrome.storage.local.get('checkForConfiguratorUnstableVersions', function (result) {
if (result.checkForConfiguratorUnstableVersions) {
$('div.checkForConfiguratorUnstableVersions input').prop('checked', true);
}
chrome.storage.local.set({'checkForConfiguratorUnstableVersions': checked});
$('div.checkForConfiguratorUnstableVersions input').change(function () {
var checked = $(this).is(':checked');
$('input[name="checkForConfiguratorUnstableVersions"]').prop('checked', checked).change();
checkForConfiguratorUpdates();
chrome.storage.local.set({'checkForConfiguratorUnstableVersions': checked});
checkForConfiguratorUpdates();
});
});
if (result.checkForConfiguratorUnstableVersions) {
$('div.checkForConfiguratorUnstableVersions input').prop('checked', true);
}
});
} else {
$('div.checkForConfiguratorUnstableVersions').hide();
}
function close_and_cleanup(e) {
if (e.type == 'click' && !$.contains($('div#options-window')[0], e.target) || e.type == 'keyup' && e.keyCode == 27) {