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

Migrate chrome storage API to window.localStorage

Browse source 
Add remove function

Remove callback from set and remove

Rebased

Rebased
This commit is contained in:
Mark Haslinghuis 2021-10-18 01:45:30 +02:00
parent c86348b4db
commit f41e135333
17 changed files with 597 additions and 636 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/js/ConfigStorage.js
View file

@ -4,7 +4,7 @@
// localStorage deals with strings, not objects, so the objects have been serialized. // localStorage deals with strings, not objects, so the objects have been serialized.
const ConfigStorage = { const ConfigStorage = {
// key can be one string, or array of strings // key can be one string, or array of strings
get: function(key, callback) { get: function(key) {
let result = {}; let result = {};
if (Array.isArray(key)) { if (Array.isArray(key)) {
key.forEach(function (element) { key.forEach(function (element) {
@ -14,7 +14,6 @@ const ConfigStorage = {
// is okay // is okay
} }
}); });
callback?.(result);
} else { } else {
const keyValue = window.localStorage.getItem(key); const keyValue = window.localStorage.getItem(key);
if (keyValue) { if (keyValue) {
@ -23,9 +22,6 @@ const ConfigStorage = {
} catch (e) { } catch (e) {
// It's fine if we fail that parse // It's fine if we fail that parse
} }
callback?.(result);
} else {
callback?.(result);
} }
} }
@ -39,4 +35,7 @@ const ConfigStorage = {
window.localStorage.setItem(element, JSON.stringify(tmpObj)); window.localStorage.setItem(element, JSON.stringify(tmpObj));
}); });
}, },
remove: function(item) {
window.localStorage.removeItem(item);
},
}; };

72
src/js/FirmwareCache.js
View file

@ -44,19 +44,18 @@ let FirmwareCache = (function () {
function persist(data) { function persist(data) {
let obj = {}; let obj = {};
obj[CACHEKEY] = data; obj[CACHEKEY] = data;
chrome.storage.local.set(obj); ConfigStorage.set(obj);
} }
/** /**
* @param {Function} callback * @param {Function} callback
*/ */
function load(callback) { function load(callback) {
chrome.storage.local.get(CACHEKEY, obj => { const obj = ConfigStorage.get(CACHEKEY);
let entries = typeof obj === "object" && obj.hasOwnProperty(CACHEKEY) let entries = typeof obj === "object" && obj.hasOwnProperty(CACHEKEY)
? obj[CACHEKEY] ? obj[CACHEKEY]
: []; : [];
callback(entries); callback(entries);
});
} }
return { return {
@ -76,18 +75,14 @@ let FirmwareCache = (function () {
} }
let key = oldest[0]; let key = oldest[0];
let cacheKey = withCachePrefix(key); let cacheKey = withCachePrefix(key);
chrome.storage.local.get(cacheKey, obj => { const obj = ConfigStorage.get(cacheKey);
/** @type {CacheItem} */ /** @type {CacheItem} */
let cached = typeof obj === "object" && obj.hasOwnProperty(cacheKey) const cached = typeof obj === "object" && obj.hasOwnProperty(cacheKey) ? obj[cacheKey] : null;
? obj[cacheKey] if (cached === null) {
: null; return undefined;
if (cached === null) { }
return; ConfigStorage.remove(cacheKey);
} onRemoveFromCache(cached.release);
chrome.storage.local.remove(cacheKey, () => {
onRemoveFromCache(cached.release);
});
});
return oldest; return oldest;
}; };
@ -143,9 +138,8 @@ let FirmwareCache = (function () {
release: release, release: release,
hexdata: hexdata, hexdata: hexdata,
}; };
chrome.storage.local.set(obj, () => { ConfigStorage.set(obj);
onPutToCache(release); onPutToCache(release);
});
} }
/** /**
@ -163,13 +157,9 @@ let FirmwareCache = (function () {
return; return;
} }
let cacheKey = withCachePrefix(key); let cacheKey = withCachePrefix(key);
chrome.storage.local.get(cacheKey, obj => { const obj = ConfigStorage.get(cacheKey);
/** @type {CacheItem} */ const cached = typeof obj === "object" && obj.hasOwnProperty(cacheKey) ? obj[cacheKey] : null;
let cached = typeof obj === "object" && obj.hasOwnProperty(cacheKey) callback(cached);
? obj[cacheKey]
: null;
callback(cached);
});
} }
/** /**
@ -184,19 +174,19 @@ let FirmwareCache = (function () {
for (let key of journal.keys()) { for (let key of journal.keys()) {
cacheKeys.push(withCachePrefix(key)); cacheKeys.push(withCachePrefix(key));
} }
chrome.storage.local.get(cacheKeys, obj => { const obj = ConfigStorage.get(cacheKeys);
if (typeof obj !== "object") { if (typeof obj !== "object") {
return; return;
}
console.log(obj.entries());
for (let cacheKey of cacheKeys) {
if (obj.hasOwnProperty(cacheKey)) {
/** @type {CacheItem} */
let item = obj[cacheKey];
onRemoveFromCache(item.release);
} }
for (let cacheKey of cacheKeys) { }
if (obj.hasOwnProperty(cacheKey)) { ConfigStorage.remove(cacheKeys);
/** @type {CacheItem} */
let item = obj[cacheKey];
onRemoveFromCache(item.release);
}
}
chrome.storage.local.remove(cacheKeys);
});
journal.clear(); journal.clear();
JournalStorage.persist(journal.toJSON()); JournalStorage.persist(journal.toJSON());
} }

34
src/js/cordova_startup.js vendored
View file

@ -22,29 +22,27 @@ const cordovaUI = {
if (screenWidth > 575 && screenHeight > 575) { if (screenWidth > 575 && screenHeight > 575) {
self.canChangeUI = false; self.canChangeUI = false;
} }
ConfigStorage.get('cordovaForceComputerUI', function (result) { const result = ConfigStorage.get('cordovaForceComputerUI');
if (result.cordovaForceComputerUI === undefined) { if (result.cordovaForceComputerUI === undefined) {
if ((orientation === 'landscape' && screenHeight <= 575) if ((orientation === 'landscape' && screenHeight <= 575)
|| (orientation === 'portrait' && screenWidth <= 575)) { || (orientation === 'portrait' && screenWidth <= 575)) {
ConfigStorage.set({'cordovaForceComputerUI': false}); ConfigStorage.set({'cordovaForceComputerUI': false});
} else { } else {
ConfigStorage.set({'cordovaForceComputerUI': true}); ConfigStorage.set({'cordovaForceComputerUI': true});
}
} }
}); }
self.set(); self.set();
}, },
set: function() { set: function() {
const self = this; const self = this;
ConfigStorage.get('cordovaForceComputerUI', function (result) { const result = ConfigStorage.get('cordovaForceComputerUI');
if (result.cordovaForceComputerUI) { if (result.cordovaForceComputerUI) {
window.screen.orientation.lock('landscape'); window.screen.orientation.lock('landscape');
$('body').css('zoom', self.uiZoom); $('body').css('zoom', self.uiZoom);
} else { } else {
window.screen.orientation.lock('portrait'); window.screen.orientation.lock('portrait');
$('body').css('zoom', 1); $('body').css('zoom', 1);
} }
});
}, },
}; };

13
src/js/gui.js
View file

@ -389,13 +389,12 @@ GuiControl.prototype.content_ready = function (callback) {
}; };
GuiControl.prototype.selectDefaultTabWhenConnected = function() { GuiControl.prototype.selectDefaultTabWhenConnected = function() {
ConfigStorage.get(['rememberLastTab', 'lastTab'], function (result) { const result = ConfigStorage.get(['rememberLastTab', 'lastTab']);
if (result.rememberLastTab && result.lastTab) { if (result.rememberLastTab && result.lastTab) {
$(`#tabs ul.mode-connected .${result.lastTab} a`).click(); $(`#tabs ul.mode-connected .${result.lastTab} a`).click();
} else { } else {
$('#tabs ul.mode-connected .tab_setup a').click(); $('#tabs ul.mode-connected .tab_setup a').click();
} }
});
}; };
GuiControl.prototype.isNWJS = function () { GuiControl.prototype.isNWJS = function () {

154
src/js/jenkins_loader.js
View file

@ -21,45 +21,44 @@ JenkinsLoader.prototype.loadJobs = function (viewName, callback) {
callback(jobs); callback(jobs);
}; };
chrome.storage.local.get([cacheLastUpdateTag, jobsDataTag], function (result) { const result = ConfigStorage.get([cacheLastUpdateTag, jobsDataTag]);
const jobsDataTimestamp = $.now(); const jobsDataTimestamp = $.now();
const cachedJobsData = result[jobsDataTag]; const cachedJobsData = result[jobsDataTag];
const cachedJobsLastUpdate = result[cacheLastUpdateTag]; const cachedJobsLastUpdate = result[cacheLastUpdateTag];
const cachedCallback = () => { const cachedCallback = () => {
if (cachedJobsData) { if (cachedJobsData) {
GUI.log(i18n.getMessage('buildServerUsingCached', ['jobs'])); GUI.log(i18n.getMessage('buildServerUsingCached', ['jobs']));
}
wrappedCallback(cachedJobsData ? cachedJobsData : []);
};
if (!cachedJobsData || !cachedJobsLastUpdate || jobsDataTimestamp - cachedJobsLastUpdate > self._cacheExpirationPeriod) {
const url = `${viewUrl}${self._jobsRequest}`;
$.get(url, jobsInfo => {
GUI.log(i18n.getMessage('buildServerLoaded', ['jobs']));
// remove Betaflight prefix, rename Betaflight job to Development
const jobs = jobsInfo.jobs.map(job => {
return { title: job.name.replace('Betaflight ', '').replace('Betaflight', 'Development'), name: job.name };
});
// cache loaded info
const object = {};
object[jobsDataTag] = jobs;
object[cacheLastUpdateTag] = $.now();
chrome.storage.local.set(object);
wrappedCallback(jobs);
}).fail(xhr => {
GUI.log(i18n.getMessage('buildServerLoadFailed', ['jobs', `HTTP ${xhr.status}`]));
cachedCallback();
});
} else {
cachedCallback();
} }
});
wrappedCallback(cachedJobsData ? cachedJobsData : []);
};
if (!cachedJobsData || !cachedJobsLastUpdate || jobsDataTimestamp - cachedJobsLastUpdate > self._cacheExpirationPeriod) {
const url = `${viewUrl}${self._jobsRequest}`;
$.get(url, jobsInfo => {
GUI.log(i18n.getMessage('buildServerLoaded', ['jobs']));
// remove Betaflight prefix, rename Betaflight job to Development
const jobs = jobsInfo.jobs.map(job => {
return { title: job.name.replace('Betaflight ', '').replace('Betaflight', 'Development'), name: job.name };
});
// cache loaded info
const object = {};
object[jobsDataTag] = jobs;
object[cacheLastUpdateTag] = $.now();
ConfigStorage.set(object);
wrappedCallback(jobs);
}).fail(xhr => {
GUI.log(i18n.getMessage('buildServerLoadFailed', ['jobs', `HTTP ${xhr.status}`]));
cachedCallback();
});
} else {
cachedCallback();
}
}; };
JenkinsLoader.prototype.loadBuilds = function (jobName, callback) { JenkinsLoader.prototype.loadBuilds = function (jobName, callback) {
@ -69,49 +68,48 @@ JenkinsLoader.prototype.loadBuilds = function (jobName, callback) {
const buildsDataTag = `${jobUrl}BuildsData`; const buildsDataTag = `${jobUrl}BuildsData`;
const cacheLastUpdateTag = `${jobUrl}BuildsLastUpdate`; const cacheLastUpdateTag = `${jobUrl}BuildsLastUpdate`;
chrome.storage.local.get([cacheLastUpdateTag, buildsDataTag], function (result) { const result = ConfigStorage.get([cacheLastUpdateTag, buildsDataTag]);
const buildsDataTimestamp = $.now(); const buildsDataTimestamp = $.now();
const cachedBuildsData = result[buildsDataTag]; const cachedBuildsData = result[buildsDataTag];
const cachedBuildsLastUpdate = result[cacheLastUpdateTag]; const cachedBuildsLastUpdate = result[cacheLastUpdateTag];
const cachedCallback = () => { const cachedCallback = () => {
if (cachedBuildsData) { if (cachedBuildsData) {
GUI.log(i18n.getMessage('buildServerUsingCached', [jobName])); GUI.log(i18n.getMessage('buildServerUsingCached', [jobName]));
}
self._parseBuilds(jobUrl, jobName, cachedBuildsData ? cachedBuildsData : [], callback);
};
if (!cachedBuildsData || !cachedBuildsLastUpdate || buildsDataTimestamp - cachedBuildsLastUpdate > self._cacheExpirationPeriod) {
const url = `${jobUrl}${self._buildsRequest}`;
$.get(url, function (buildsInfo) {
GUI.log(i18n.getMessage('buildServerLoaded', [jobName]));
// filter successful builds
const builds = buildsInfo.builds.filter(build => build.result == 'SUCCESS')
.map(build => ({
number: build.number,
artifacts: build.artifacts.map(artifact => artifact.relativePath),
changes: build.changeSet.items.map(item => `* ${item.msg}`).join('<br>\n'),
timestamp: build.timestamp,
}));
// cache loaded info
const object = {};
object[buildsDataTag] = builds;
object[cacheLastUpdateTag] = $.now();
chrome.storage.local.set(object);
self._parseBuilds(jobUrl, jobName, builds, callback);
}).fail(xhr => {
GUI.log(i18n.getMessage('buildServerLoadFailed', [jobName, `HTTP ${xhr.status}`]));
cachedCallback();
});
} else {
cachedCallback();
} }
});
self._parseBuilds(jobUrl, jobName, cachedBuildsData ? cachedBuildsData : [], callback);
};
if (!cachedBuildsData || !cachedBuildsLastUpdate || buildsDataTimestamp - cachedBuildsLastUpdate > self._cacheExpirationPeriod) {
const url = `${jobUrl}${self._buildsRequest}`;
$.get(url, function (buildsInfo) {
GUI.log(i18n.getMessage('buildServerLoaded', [jobName]));
// filter successful builds
const builds = buildsInfo.builds.filter(build => build.result == 'SUCCESS')
.map(build => ({
number: build.number,
artifacts: build.artifacts.map(artifact => artifact.relativePath),
changes: build.changeSet.items.map(item => `* ${item.msg}`).join('<br>\n'),
timestamp: build.timestamp,
}));
// cache loaded info
const object = {};
object[buildsDataTag] = builds;
object[cacheLastUpdateTag] = $.now();
ConfigStorage.set(object);
self._parseBuilds(jobUrl, jobName, builds, callback);
}).fail(xhr => {
GUI.log(i18n.getMessage('buildServerLoadFailed', [jobName, `HTTP ${xhr.status}`]));
cachedCallback();
});
} else {
cachedCallback();
}
}; };
JenkinsLoader.prototype._parseBuilds = function (jobUrl, jobName, builds, callback) { JenkinsLoader.prototype._parseBuilds = function (jobUrl, jobName, builds, callback) {

22
src/js/localization.js
View file

@ -190,22 +190,16 @@ i18n.localizePage = function(forceReTranslate) {
* returns the current locale to the callback * returns the current locale to the callback
*/ */
function getStoredUserLocale(cb) { function getStoredUserLocale(cb) {
let userLanguage = 'DEFAULT';
if (typeof ConfigStorage !== 'undefined') { if (typeof ConfigStorage !== 'undefined') {
ConfigStorage.get('userLanguageSelect', function (result) { const result = ConfigStorage.get('userLanguageSelect');
let userLanguage = 'DEFAULT'; if (result.userLanguageSelect) {
if (result.userLanguageSelect) { userLanguage = result.userLanguageSelect;
userLanguage = result.userLanguageSelect; }
} i18n.selectedLanguage = userLanguage;
i18n.selectedLanguage = userLanguage;
userLanguage = getValidLocale(userLanguage);
cb(userLanguage);
});
} else {
const userLanguage = getValidLocale('DEFAULT');
cb(userLanguage);
} }
userLanguage = getValidLocale(userLanguage);
cb(userLanguage);
} }
function getValidLocale(userLocale) { function getValidLocale(userLocale) {

163
src/js/main.js
View file

@ -45,13 +45,12 @@ function appReady() {
function checkSetupAnalytics(callback) { function checkSetupAnalytics(callback) {
if (!analytics) { if (!analytics) {
setTimeout(function () { setTimeout(function () {
ConfigStorage.get(['userId', 'analyticsOptOut', 'checkForConfiguratorUnstableVersions' ], function (result) { const result = ConfigStorage.get(['userId', 'analyticsOptOut', 'checkForConfiguratorUnstableVersions' ]);
if (!analytics) { if (!analytics) {
setupAnalytics(result); setupAnalytics(result);
} }
callback(analytics); callback(analytics);
});
}); });
} else if (callback) { } else if (callback) {
callback(analytics); callback(analytics);
@ -499,48 +498,45 @@ function startProcess() {
$(this).data('state', state); $(this).data('state', state);
}); });
ConfigStorage.get('logopen', function (result) { let result = ConfigStorage.get('logopen');
if (result.logopen) { if (result.logopen) {
$("#showlog").trigger('click'); $("#showlog").trigger('click');
} }
});
ConfigStorage.get('permanentExpertMode', function (result) { result = ConfigStorage.get('permanentExpertMode');
const expertModeCheckbox = 'input[name="expertModeCheckbox"]'; const expertModeCheckbox = 'input[name="expertModeCheckbox"]';
if (result.permanentExpertMode) { if (result.permanentExpertMode) {
$(expertModeCheckbox).prop('checked', true); $(expertModeCheckbox).prop('checked', true);
} }
$(expertModeCheckbox).on("change", () => { $(expertModeCheckbox).on("change", () => {
const checked = $(expertModeCheckbox).is(':checked'); const checked = $(expertModeCheckbox).is(':checked');
checkSetupAnalytics(function (analyticsService) { checkSetupAnalytics(function (analyticsService) {
analyticsService.setDimension(analyticsService.DIMENSIONS.CONFIGURATOR_EXPERT_MODE, checked ? 'On' : 'Off'); analyticsService.setDimension(analyticsService.DIMENSIONS.CONFIGURATOR_EXPERT_MODE, checked ? 'On' : 'Off');
});
if (FC.FEATURE_CONFIG && FC.FEATURE_CONFIG.features !== 0) {
updateTabList(FC.FEATURE_CONFIG.features);
}
if (GUI.active_tab) {
TABS[GUI.active_tab]?.expertModeChanged?.(checked);
}
}); });
$(expertModeCheckbox).trigger("change"); if (FC.FEATURE_CONFIG && FC.FEATURE_CONFIG.features !== 0) {
}); updateTabList(FC.FEATURE_CONFIG.features);
}
ConfigStorage.get('cliAutoComplete', function (result) { if (GUI.active_tab) {
CliAutoComplete.setEnabled(typeof result.cliAutoComplete == 'undefined' || result.cliAutoComplete); // On by default TABS[GUI.active_tab]?.expertModeChanged?.(checked);
});
ConfigStorage.get('darkTheme', function (result) {
if (result.darkTheme === undefined || typeof result.darkTheme !== "number") {
// sets dark theme to auto if not manually changed
setDarkTheme(2);
} else {
setDarkTheme(result.darkTheme);
} }
}); });
$(expertModeCheckbox).trigger("change");
result = ConfigStorage.get('cliAutoComplete');
CliAutoComplete.setEnabled(typeof result.cliAutoComplete === undefined || result.cliAutoComplete); // On by default
result = ConfigStorage.get('darkTheme');
if (result.darkTheme === undefined || typeof result.darkTheme !== "number") {
// sets dark theme to auto if not manually changed
setDarkTheme(2);
} else {
setDarkTheme(result.darkTheme);
}
if (GUI.isCordova()) { if (GUI.isCordova()) {
let darkMode = false; let darkMode = false;
const checkDarkMode = function() { const checkDarkMode = function() {
@ -575,52 +571,51 @@ function checkForConfiguratorUpdates() {
} }
function notifyOutdatedVersion(releaseData) { function notifyOutdatedVersion(releaseData) {
ConfigStorage.get('checkForConfiguratorUnstableVersions', function (result) { const result = ConfigStorage.get('checkForConfiguratorUnstableVersions');
let showUnstableReleases = false; let showUnstableReleases = false;
if (result.checkForConfiguratorUnstableVersions) { if (result.checkForConfiguratorUnstableVersions) {
showUnstableReleases = true; showUnstableReleases = true;
}
const versions = releaseData.filter(function (version) {
const semVerVersion = semver.parse(version.tag_name);
if (semVerVersion && (showUnstableReleases || semVerVersion.prerelease.length === 0)) {
return version;
} else {
return null;
} }
const versions = releaseData.filter(function (version) { }).sort(function (v1, v2) {
const semVerVersion = semver.parse(version.tag_name); try {
if (semVerVersion && (showUnstableReleases || semVerVersion.prerelease.length === 0)) { return semver.compare(v2.tag_name, v1.tag_name);
return version; } catch (e) {
} else { return false;
return null;
}
}).sort(function (v1, v2) {
try {
return semver.compare(v2.tag_name, v1.tag_name);
} catch (e) {
return false;
}
});
if (versions.length > 0) {
CONFIGURATOR.latestVersion = versions[0].tag_name;
CONFIGURATOR.latestVersionReleaseUrl = versions[0].html_url;
}
if (semver.lt(CONFIGURATOR.version, CONFIGURATOR.latestVersion)) {
const message = i18n.getMessage('configuratorUpdateNotice', [CONFIGURATOR.latestVersion, CONFIGURATOR.latestVersionReleaseUrl]);
GUI.log(message);
const dialog = $('.dialogConfiguratorUpdate')[0];
$('.dialogConfiguratorUpdate-content').html(message);
$('.dialogConfiguratorUpdate-closebtn').click(function() {
dialog.close();
});
$('.dialogConfiguratorUpdate-websitebtn').click(function() {
dialog.close();
window.open(CONFIGURATOR.latestVersionReleaseUrl, '_blank');
});
dialog.showModal();
} }
}); });
if (versions.length > 0) {
CONFIGURATOR.latestVersion = versions[0].tag_name;
CONFIGURATOR.latestVersionReleaseUrl = versions[0].html_url;
}
if (semver.lt(CONFIGURATOR.version, CONFIGURATOR.latestVersion)) {
const message = i18n.getMessage('configuratorUpdateNotice', [CONFIGURATOR.latestVersion, CONFIGURATOR.latestVersionReleaseUrl]);
GUI.log(message);
const dialog = $('.dialogConfiguratorUpdate')[0];
$('.dialogConfiguratorUpdate-content').html(message);
$('.dialogConfiguratorUpdate-closebtn').click(function() {
dialog.close();
});
$('.dialogConfiguratorUpdate-websitebtn').click(function() {
dialog.close();
window.open(CONFIGURATOR.latestVersionReleaseUrl, '_blank');
});
dialog.showModal();
}
} }
function isExpertModeEnabled() { function isExpertModeEnabled() {

26
src/js/port_handler.js
View file

@ -32,9 +32,12 @@ PortHandler.initialize = function () {
PortHandler.check = function () { PortHandler.check = function () {
const self = this; const self = this;
let result;
ConfigStorage.get('showVirtualMode', res => self.showVirtualMode = res.showVirtualMode); result = ConfigStorage.get('showVirtualMode');
ConfigStorage.get('showAllSerialDevices', res => self.showAllSerialDevices = res.showAllSerialDevices); self.showVirtualMode = result.showVirtualMode;
result = ConfigStorage.get('showAllSerialDevices');
self.showAllSerialDevices = result.showAllSerialDevices;
self.check_usb_devices(); self.check_usb_devices();
self.check_serial_devices(); self.check_serial_devices();
@ -168,17 +171,16 @@ PortHandler.detectPort = function(currentPorts) {
currentPorts = self.updatePortSelect(currentPorts); currentPorts = self.updatePortSelect(currentPorts);
console.log(`PortHandler - Found: ${JSON.stringify(newPorts)}`); console.log(`PortHandler - Found: ${JSON.stringify(newPorts)}`);
ConfigStorage.get('last_used_port', function (result) { const result = ConfigStorage.get('last_used_port');
if (result.last_used_port) { if (result.last_used_port) {
if (result.last_used_port.includes('tcp')) { if (result.last_used_port.includes('tcp')) {
self.portPickerElement.val('manual'); self.portPickerElement.val('manual');
} else if (newPorts.length === 1) { } else if (newPorts.length === 1) {
self.portPickerElement.val(newPorts[0].path); self.portPickerElement.val(newPorts[0].path);
} else if (newPorts.length > 1) { } else if (newPorts.length > 1) {
self.selectPort(currentPorts); self.selectPort(currentPorts);
}
} }
}); }
self.port_available = true; self.port_available = true;
// Signal board verification // Signal board verification

48
src/js/release_checker.js
View file

@ -11,37 +11,37 @@ const ReleaseChecker = function (releaseName, releaseUrl) {
ReleaseChecker.prototype.loadReleaseData = function (processFunction) { ReleaseChecker.prototype.loadReleaseData = function (processFunction) {
const self = this; const self = this;
chrome.storage.local.get([self._releaseLastUpdateTag, self._releaseDataTag], function (result) { const result = ConfigStorage.get([self._releaseLastUpdateTag, self._releaseDataTag]);
const releaseDataTimestamp = $.now(); const releaseDataTimestamp = $.now();
const cacheReleaseData = result[self._releaseDataTag]; const cacheReleaseData = result[self._releaseDataTag];
const cachedReleaseLastUpdate = result[self._releaseLastUpdateTag]; const cachedReleaseLastUpdate = result[self._releaseLastUpdateTag];
if (!cacheReleaseData || !cachedReleaseLastUpdate || releaseDataTimestamp - cachedReleaseLastUpdate > 3600 * 1000) {
$.get(self._releaseUrl, function (releaseData) {
GUI.log(i18n.getMessage('releaseCheckLoaded',[self._releaseName]));
const data = {}; if (!cacheReleaseData || !cachedReleaseLastUpdate || releaseDataTimestamp - cachedReleaseLastUpdate > 3600 * 1000) {
data[self._releaseDataTag] = releaseData; $.get(self._releaseUrl, function (releaseData) {
data[self._releaseLastUpdateTag] = releaseDataTimestamp; GUI.log(i18n.getMessage('releaseCheckLoaded',[self._releaseName]));
chrome.storage.local.set(data, function () {});
self._processReleaseData(releaseData, processFunction); const data = {};
}).fail(function (data) { data[self._releaseDataTag] = releaseData;
let message = ''; data[self._releaseLastUpdateTag] = releaseDataTimestamp;
if (data['responseJSON']) { ConfigStorage.set(data);
message = data['responseJSON'].message;
}
GUI.log(i18n.getMessage('releaseCheckFailed',[self._releaseName,message]));
self._processReleaseData(cacheReleaseData, processFunction); self._processReleaseData(releaseData, processFunction);
}); }).fail(function (data) {
} else { let message = '';
if (cacheReleaseData) { if (data['responseJSON']) {
GUI.log(i18n.getMessage('releaseCheckCached',[self._releaseName])); message = data['responseJSON'].message;
} }
GUI.log(i18n.getMessage('releaseCheckFailed',[self._releaseName,message]));
self._processReleaseData(cacheReleaseData, processFunction); self._processReleaseData(cacheReleaseData, processFunction);
});
} else {
if (cacheReleaseData) {
GUI.log(i18n.getMessage('releaseCheckCached',[self._releaseName]));
} }
});
self._processReleaseData(cacheReleaseData, processFunction);
}
}; };

58
src/js/serial_backend.js
View file

@ -33,16 +33,17 @@ function initializeSerialBackend() {
ConfigStorage.set({'portOverride': $('#port-override').val()}); ConfigStorage.set({'portOverride': $('#port-override').val()});
}); });
ConfigStorage.get('portOverride', function (data) { const data = ConfigStorage.get('portOverride');
if (data.portOverride) {
$('#port-override').val(data.portOverride); $('#port-override').val(data.portOverride);
}); }
$('div#port-picker #port').change(function (target) { $('div#port-picker #port').change(function (target) {
GUI.updateManualPortVisibility(); GUI.updateManualPortVisibility();
}); });
$('div.connect_controls a.connect').click(function () { $('div.connect_controls a.connect').click(function () {
if (GUI.connect_lock != true) { // GUI control overrides the user control if (!GUI.connect_lock) { // GUI control overrides the user control
const toggleStatus = function() { const toggleStatus = function() {
clicks = !clicks; clicks = !clicks;
@ -113,40 +114,39 @@ function initializeSerialBackend() {
}); });
// auto-connect // auto-connect
ConfigStorage.get('auto_connect', function (result) { const result = ConfigStorage.get('auto_connect');
if (result.auto_connect === undefined || result.auto_connect) { if (result.auto_connect === undefined || result.auto_connect) {
// default or enabled by user // default or enabled by user
GUI.auto_connect = true; GUI.auto_connect = true;
$('input.auto_connect').prop('checked', true); $('input.auto_connect').prop('checked', true);
$('input.auto_connect, span.auto_connect').prop('title', i18n.getMessage('autoConnectEnabled'));
$('select#baud').val(115200).prop('disabled', true);
} else {
// disabled by user
GUI.auto_connect = false;
$('input.auto_connect').prop('checked', false);
$('input.auto_connect, span.auto_connect').prop('title', i18n.getMessage('autoConnectDisabled'));
}
// bind UI hook to auto-connect checkbos
$('input.auto_connect').change(function () {
GUI.auto_connect = $(this).is(':checked');
// update title/tooltip
if (GUI.auto_connect) {
$('input.auto_connect, span.auto_connect').prop('title', i18n.getMessage('autoConnectEnabled')); $('input.auto_connect, span.auto_connect').prop('title', i18n.getMessage('autoConnectEnabled'));
$('select#baud').val(115200).prop('disabled', true); $('select#baud').val(115200).prop('disabled', true);
} else { } else {
// disabled by user
GUI.auto_connect = false;
$('input.auto_connect').prop('checked', false);
$('input.auto_connect, span.auto_connect').prop('title', i18n.getMessage('autoConnectDisabled')); $('input.auto_connect, span.auto_connect').prop('title', i18n.getMessage('autoConnectDisabled'));
if (!GUI.connected_to && !GUI.connecting_to) $('select#baud').prop('disabled', false);
} }
// bind UI hook to auto-connect checkbox ConfigStorage.set({'auto_connect': GUI.auto_connect});
$('input.auto_connect').change(function () {
GUI.auto_connect = $(this).is(':checked');
// update title/tooltip
if (GUI.auto_connect) {
$('input.auto_connect, span.auto_connect').prop('title', i18n.getMessage('autoConnectEnabled'));
$('select#baud').val(115200).prop('disabled', true);
} else {
$('input.auto_connect, span.auto_connect').prop('title', i18n.getMessage('autoConnectDisabled'));
if (!GUI.connected_to && !GUI.connecting_to) $('select#baud').prop('disabled', false);
}
ConfigStorage.set({'auto_connect': GUI.auto_connect});
});
}); });
PortHandler.initialize(); PortHandler.initialize();

19
src/js/tabs/auxiliary.js
View file

@ -540,16 +540,15 @@ TABS.auxiliary.initialize = function (callback) {
} }
let hideUnusedModes = false; let hideUnusedModes = false;
ConfigStorage.get('hideUnusedModes', function (result) { const result = ConfigStorage.get('hideUnusedModes');
$("input#switch-toggle-unused") $("input#switch-toggle-unused")
.change(function() { .change(function() {
hideUnusedModes = $(this).prop("checked"); hideUnusedModes = $(this).prop("checked");
ConfigStorage.set({ hideUnusedModes: hideUnusedModes }); ConfigStorage.set({ hideUnusedModes: hideUnusedModes });
update_ui(); update_ui();
}) })
.prop("checked", !!result.hideUnusedModes) .prop("checked", !!result.hideUnusedModes)
.change(); .change();
});
// update ui instantly on first load // update ui instantly on first load
update_ui(); update_ui();

336
src/js/tabs/firmware_flasher.js
View file

@ -158,12 +158,11 @@ firmware_flasher.initialize = function (callback) {
TABS.firmware_flasher.releases = builds; TABS.firmware_flasher.releases = builds;
ConfigStorage.get('selected_board', function (result) { result = ConfigStorage.get('selected_board');
if (result.selected_board) { if (result.selected_board) {
const boardBuilds = builds[result.selected_board]; const boardBuilds = builds[result.selected_board];
$('select[name="board"]').val(boardBuilds ? result.selected_board : 0).trigger('change'); $('select[name="board"]').val(boardBuilds ? result.selected_board : 0).trigger('change');
} }
});
} }
function processBoardOptions(releaseData, showDevReleases) { function processBoardOptions(releaseData, showDevReleases) {
@ -244,30 +243,29 @@ firmware_flasher.initialize = function (callback) {
if (builds && hasUnifiedTargetBuild(builds)) { if (builds && hasUnifiedTargetBuild(builds)) {
console.log('loaded some builds for later'); console.log('loaded some builds for later');
const storageTag = 'unifiedSourceCache'; const storageTag = 'unifiedSourceCache';
chrome.storage.local.get(storageTag, function (result) { result = ConfigStorage.get(storageTag);
let storageObj = result[storageTag]; let storageObj = result[storageTag];
if (!storageObj || !storageObj.lastUpdate || checkTime - storageObj.lastUpdate > expirationPeriod) { if (!storageObj || !storageObj.lastUpdate || checkTime - storageObj.lastUpdate > expirationPeriod) {
console.log('go get', unifiedSource); console.log('go get', unifiedSource);
$.get(unifiedSource, function(data, textStatus, jqXHR) { $.get(unifiedSource, function(data, textStatus, jqXHR) {
// Cache the information for later use. // Cache the information for later use.
let newStorageObj = {}; let newStorageObj = {};
let newDataObj = {}; let newDataObj = {};
newDataObj.lastUpdate = checkTime; newDataObj.lastUpdate = checkTime;
newDataObj.data = data; newDataObj.data = data;
newStorageObj[storageTag] = newDataObj; newStorageObj[storageTag] = newDataObj;
chrome.storage.local.set(newStorageObj); ConfigStorage.set(newStorageObj);
parseUnifiedBuilds(data, builds); parseUnifiedBuilds(data, builds);
}).fail(xhr => { }).fail(xhr => {
console.log('failed to get new', unifiedSource, 'cached data', Math.floor((checkTime - storageObj.lastUpdate) / 60), 'mins old'); console.log('failed to get new', unifiedSource, 'cached data', Math.floor((checkTime - storageObj.lastUpdate) / 60), 'mins old');
parseUnifiedBuilds(storageObj.data, builds); parseUnifiedBuilds(storageObj.data, builds);
}); });
} else { } else {
// In the event that the cache is okay // In the event that the cache is okay
console.log('unified config cached data', Math.floor((checkTime - storageObj.lastUpdate)/60), 'mins old'); console.log('unified config cached data', Math.floor((checkTime - storageObj.lastUpdate)/60), 'mins old');
parseUnifiedBuilds(storageObj.data, builds); parseUnifiedBuilds(storageObj.data, builds);
} }
});
} else { } else {
populateBoardOptions(builds); populateBoardOptions(builds);
} }
@ -314,13 +312,12 @@ firmware_flasher.initialize = function (callback) {
TABS.firmware_flasher.releases = releases; TABS.firmware_flasher.releases = releases;
TABS.firmware_flasher.unifiedConfigs = unifiedConfigs; TABS.firmware_flasher.unifiedConfigs = unifiedConfigs;
ConfigStorage.get('selected_board', function (result) { result = ConfigStorage.get('selected_board');
if (result.selected_board) { if (result.selected_board) {
const boardReleases = TABS.firmware_flasher.unifiedConfigs[result.selected_board] const boardReleases = TABS.firmware_flasher.unifiedConfigs[result.selected_board]
|| TABS.firmware_flasher.releases[result.selected_board]; || TABS.firmware_flasher.releases[result.selected_board];
$('select[name="board"]').val(boardReleases ? result.selected_board : 0).trigger('change'); $('select[name="board"]').val(boardReleases ? result.selected_board : 0).trigger('change');
} }
});
} }
const buildTypes = [ const buildTypes = [
@ -416,7 +413,7 @@ firmware_flasher.initialize = function (callback) {
buildTypesToShow[build_type].loader(); buildTypesToShow[build_type].loader();
} }
chrome.storage.local.set({'selected_build_type': build_type}); ConfigStorage.set({'selected_build_type': build_type});
}); });
function populateBuilds(builds, target, manufacturerId, duplicateName, targetVersions, callback) { function populateBuilds(builds, target, manufacturerId, duplicateName, targetVersions, callback) {
@ -613,78 +610,77 @@ firmware_flasher.initialize = function (callback) {
const storageTag = 'unifiedConfigLast'; const storageTag = 'unifiedConfigLast';
const expirationPeriod = 3600; // One of your earth hours. const expirationPeriod = 3600; // One of your earth hours.
const checkTime = Math.floor(Date.now() / 1000); // Lets deal in seconds. const checkTime = Math.floor(Date.now() / 1000); // Lets deal in seconds.
chrome.storage.local.get(storageTag, function (result) { result = ConfigStorage.get(storageTag);
let storageObj = result[storageTag]; let storageObj = result[storageTag];
const unifiedConfigList = TABS.firmware_flasher.unifiedConfigs[target]; const unifiedConfigList = TABS.firmware_flasher.unifiedConfigs[target];
const manufacturerIds = Object.keys(unifiedConfigList); const manufacturerIds = Object.keys(unifiedConfigList);
const duplicateName = manufacturerIds.length > 1; const duplicateName = manufacturerIds.length > 1;
const processManufacturer = function(index) { const processManufacturer = function(index) {
const processNext = function () { const processNext = function () {
if (index < manufacturerIds.length - 1) { if (index < manufacturerIds.length - 1) {
processManufacturer(index + 1); processManufacturer(index + 1);
} else {
finishPopulatingBuilds();
}
};
const manufacturerId = manufacturerIds[index];
const targetId = `${target}+${manufacturerId}`;
// Check to see if the cached configuration is the one we want.
if (!storageObj || !storageObj.targetId || storageObj.targetId !== targetId
|| !storageObj.lastUpdate || checkTime - storageObj.lastUpdate > expirationPeriod
|| !storageObj.unifiedTarget) {
const unifiedConfig = unifiedConfigList[manufacturerId];
// Have to go and try and get the unified config, and then do stuff
$.get(unifiedConfig.download_url, function(targetConfig) {
console.log('got unified config');
let config = cleanUnifiedConfigFile(targetConfig);
if (config !== null) {
const bareBoard = grabBuildNameFromConfig(config);
TABS.firmware_flasher.bareBoard = bareBoard;
self.gitHubApi.getFileLastCommitInfo('betaflight/unified-targets', 'master', unifiedConfig.path, function (commitInfo) {
config = self.injectTargetInfo(config, target, manufacturerId, commitInfo);
setUnifiedConfig(target, bareBoard, config, manufacturerId, unifiedConfig.name, unifiedConfig.download_url, commitInfo.date);
// cache it for later
let newStorageObj = {};
newStorageObj[storageTag] = {
unifiedTarget: self.unifiedTarget,
targetId: targetId,
lastUpdate: checkTime,
};
chrome.storage.local.set(newStorageObj);
populateBuilds(builds, target, manufacturerId, duplicateName, TABS.firmware_flasher.releases[bareBoard], processNext);
});
} else {
failLoading(unifiedConfig.download_url);
}
}).fail(xhr => {
failLoading(unifiedConfig.download_url);
});
} else { } else {
console.log('We have the config cached for', targetId); finishPopulatingBuilds();
const unifiedTarget = storageObj.unifiedTarget;
const bareBoard = grabBuildNameFromConfig(unifiedTarget.config);
TABS.firmware_flasher.bareBoard = bareBoard;
if (target === bareBoard) {
self.unifiedTarget = {};
} else {
self.unifiedTarget = unifiedTarget;
}
populateBuilds(builds, target, manufacturerId, duplicateName, TABS.firmware_flasher.releases[bareBoard], processNext);
} }
}; };
processManufacturer(0); const manufacturerId = manufacturerIds[index];
}); const targetId = `${target}+${manufacturerId}`;
// Check to see if the cached configuration is the one we want.
if (!storageObj || !storageObj.targetId || storageObj.targetId !== targetId
|| !storageObj.lastUpdate || checkTime - storageObj.lastUpdate > expirationPeriod
|| !storageObj.unifiedTarget) {
const unifiedConfig = unifiedConfigList[manufacturerId];
// Have to go and try and get the unified config, and then do stuff
$.get(unifiedConfig.download_url, function(targetConfig) {
console.log('got unified config');
let config = cleanUnifiedConfigFile(targetConfig);
if (config !== null) {
const bareBoard = grabBuildNameFromConfig(config);
TABS.firmware_flasher.bareBoard = bareBoard;
self.gitHubApi.getFileLastCommitInfo('betaflight/unified-targets', 'master', unifiedConfig.path, function (commitInfo) {
config = self.injectTargetInfo(config, target, manufacturerId, commitInfo);
setUnifiedConfig(target, bareBoard, config, manufacturerId, unifiedConfig.name, unifiedConfig.download_url, commitInfo.date);
// cache it for later
let newStorageObj = {};
newStorageObj[storageTag] = {
unifiedTarget: self.unifiedTarget,
targetId: targetId,
lastUpdate: checkTime,
};
ConfigStorage.set(newStorageObj);
populateBuilds(builds, target, manufacturerId, duplicateName, TABS.firmware_flasher.releases[bareBoard], processNext);
});
} else {
failLoading(unifiedConfig.download_url);
}
}).fail(xhr => {
failLoading(unifiedConfig.download_url);
});
} else {
console.log('We have the config cached for', targetId);
const unifiedTarget = storageObj.unifiedTarget;
const bareBoard = grabBuildNameFromConfig(unifiedTarget.config);
TABS.firmware_flasher.bareBoard = bareBoard;
if (target === bareBoard) {
self.unifiedTarget = {};
} else {
self.unifiedTarget = unifiedTarget;
}
populateBuilds(builds, target, manufacturerId, duplicateName, TABS.firmware_flasher.releases[bareBoard], processNext);
}
};
processManufacturer(0);
} else { } else {
self.unifiedTarget = {}; self.unifiedTarget = {};
finishPopulatingBuilds(); finishPopulatingBuilds();
@ -894,85 +890,78 @@ firmware_flasher.initialize = function (callback) {
document.querySelector('select[name="board"]').addEventListener('change', updateDetectBoardButton); document.querySelector('select[name="board"]').addEventListener('change', updateDetectBoardButton);
document.querySelector('select[name="firmware_version"]').addEventListener('change', updateDetectBoardButton); document.querySelector('select[name="firmware_version"]').addEventListener('change', updateDetectBoardButton);
ConfigStorage.get('erase_chip', function (result) { let result = ConfigStorage.get('erase_chip');
if (result.erase_chip) { if (result.erase_chip) {
$('input.erase_chip').prop('checked', true); $('input.erase_chip').prop('checked', true);
} else { } else {
$('input.erase_chip').prop('checked', false); $('input.erase_chip').prop('checked', false);
} }
$('input.erase_chip').change(function () { $('input.erase_chip').change(function () {
ConfigStorage.set({'erase_chip': $(this).is(':checked')}); ConfigStorage.set({'erase_chip': $(this).is(':checked')});
}).change(); }).change();
});
chrome.storage.local.get('show_development_releases', function (result) { result = ConfigStorage.get('show_development_releases');
$('input.show_development_releases') $('input.show_development_releases')
.prop('checked', result.show_development_releases) .prop('checked', result.show_development_releases)
.change(function () { .change(function () {
chrome.storage.local.set({'show_development_releases': $(this).is(':checked')}); ConfigStorage.set({'show_development_releases': $(this).is(':checked')});
}).change(); }).change();
}); result = ConfigStorage.get('selected_build_type');
// ensure default build type is selected
buildType_e.val(result.selected_build_type || 0).trigger('change');
chrome.storage.local.get('selected_build_type', function (result) { result = ConfigStorage.get('no_reboot_sequence');
// ensure default build type is selected if (result.no_reboot_sequence) {
buildType_e.val(result.selected_build_type || 0).trigger('change'); $('input.updating').prop('checked', true);
}); $('.flash_on_connect_wrapper').show();
} else {
$('input.updating').prop('checked', false);
}
ConfigStorage.get('no_reboot_sequence', function (result) { // bind UI hook so the status is saved on change
if (result.no_reboot_sequence) { $('input.updating').change(function() {
$('input.updating').prop('checked', true); const status = $(this).is(':checked');
if (status) {
$('.flash_on_connect_wrapper').show(); $('.flash_on_connect_wrapper').show();
} else { } else {
$('input.updating').prop('checked', false); $('input.flash_on_connect').prop('checked', false).change();
$('.flash_on_connect_wrapper').hide();
} }
// bind UI hook so the status is saved on change ConfigStorage.set({'no_reboot_sequence': status});
$('input.updating').change(function() {
const status = $(this).is(':checked');
if (status) {
$('.flash_on_connect_wrapper').show();
} else {
$('input.flash_on_connect').prop('checked', false).change();
$('.flash_on_connect_wrapper').hide();
}
ConfigStorage.set({'no_reboot_sequence': status});
});
$('input.updating').change();
}); });
ConfigStorage.get('flash_manual_baud', function (result) { $('input.updating').change();
if (result.flash_manual_baud) {
$('input.flash_manual_baud').prop('checked', true);
} else {
$('input.flash_manual_baud').prop('checked', false);
}
// bind UI hook so the status is saved on change result = ConfigStorage.get('flash_manual_baud');
$('input.flash_manual_baud').change(function() { if (result.flash_manual_baud) {
const status = $(this).is(':checked'); $('input.flash_manual_baud').prop('checked', true);
ConfigStorage.set({'flash_manual_baud': status}); } else {
}); $('input.flash_manual_baud').prop('checked', false);
}
$('input.flash_manual_baud').change(); // bind UI hook so the status is saved on change
$('input.flash_manual_baud').change(function() {
const status = $(this).is(':checked');
ConfigStorage.set({'flash_manual_baud': status});
}); });
ConfigStorage.get('flash_manual_baud_rate', function (result) { $('input.flash_manual_baud').change();
$('#flash_manual_baud_rate').val(result.flash_manual_baud_rate);
// bind UI hook so the status is saved on change result = ConfigStorage.get('flash_manual_baud_rate');
$('#flash_manual_baud_rate').change(function() { $('#flash_manual_baud_rate').val(result.flash_manual_baud_rate);
const baud = parseInt($('#flash_manual_baud_rate').val());
ConfigStorage.set({'flash_manual_baud_rate': baud});
});
$('input.flash_manual_baud_rate').change(); // bind UI hook so the status is saved on change
$('#flash_manual_baud_rate').change(function() {
const baud = parseInt($('#flash_manual_baud_rate').val());
ConfigStorage.set({'flash_manual_baud_rate': baud});
}); });
$('input.flash_manual_baud_rate').change();
// UI Hooks // UI Hooks
$('a.load_file').click(function () { $('a.load_file').click(function () {
self.enableFlashing(false); self.enableFlashing(false);
@ -1175,17 +1164,16 @@ firmware_flasher.initialize = function (callback) {
function setAcknowledgementTimestamp() { function setAcknowledgementTimestamp() {
const storageObj = {}; const storageObj = {};
storageObj[storageTag] = Date.now(); storageObj[storageTag] = Date.now();
chrome.storage.local.set(storageObj); ConfigStorage.set(storageObj);
} }
chrome.storage.local.get(storageTag, function (result) { result = ConfigStorage.get(storageTag);
if (!result[storageTag] || Date.now() - result[storageTag] > DAY_MS) { if (!result[storageTag] || Date.now() - result[storageTag] > DAY_MS) {
showAcknowledgementDialog(setAcknowledgementTimestamp); showAcknowledgementDialog(setAcknowledgementTimestamp);
} else { } else {
startFlashing(); startFlashing();
} }
});
} }
function showAcknowledgementDialog(acknowledgementCallback) { function showAcknowledgementDialog(acknowledgementCallback) {
@ -1306,8 +1294,8 @@ firmware_flasher.initialize = function (callback) {
if (status) { if (status) {
const catch_new_port = function () { const catch_new_port = function () {
PortHandler.port_detected('flash_detected_device', function (result) { PortHandler.port_detected('flash_detected_device', function (resultPort) {
const port = result[0]; const port = resultPort[0];
if (!GUI.connect_lock) { if (!GUI.connect_lock) {
GUI.log(i18n.getMessage('firmwareFlasherFlashTrigger', [port])); GUI.log(i18n.getMessage('firmwareFlasherFlashTrigger', [port]));

21
src/js/tabs/logging.js
View file

@ -99,18 +99,17 @@ logging.initialize = function (callback) {
} }
}); });
ConfigStorage.get('logging_file_entry', function (result) { const result = ConfigStorage.get('logging_file_entry');
if (result.logging_file_entry) { if (result.logging_file_entry) {
chrome.fileSystem.restoreEntry(result.logging_file_entry, function (entry) { chrome.fileSystem.restoreEntry(result.logging_file_entry, function (entry) {
if (checkChromeRuntimeError()) { if (checkChromeRuntimeError()) {
return; return;
} }
fileEntry = entry; fileEntry = entry;
prepare_writer(true); prepare_writer(true);
}); });
} }
});
GUI.content_ready(callback); GUI.content_ready(callback);
} }

27
src/js/tabs/motors.js
View file

@ -559,22 +559,21 @@ TABS.motors.initialize = function (callback) {
}); });
// set refresh speeds according to configuration saved in storage // set refresh speeds according to configuration saved in storage
ConfigStorage.get(['motors_tab_sensor_settings', 'motors_tab_gyro_settings', 'motors_tab_accel_settings'], function (result) { const result = ConfigStorage.get(['motors_tab_sensor_settings', 'motors_tab_gyro_settings', 'motors_tab_accel_settings']);
if (result.motors_tab_sensor_settings) { if (result.motors_tab_sensor_settings) {
$('.tab-motors select[name="sensor_choice"]').val(result.motors_tab_sensor_settings.sensor); $('.tab-motors select[name="sensor_choice"]').val(result.motors_tab_sensor_settings.sensor);
} }
if (result.motors_tab_gyro_settings) { if (result.motors_tab_gyro_settings) {
TABS.motors.sensorGyroRate = result.motors_tab_gyro_settings.rate; TABS.motors.sensorGyroRate = result.motors_tab_gyro_settings.rate;
TABS.motors.sensorGyroScale = result.motors_tab_gyro_settings.scale; TABS.motors.sensorGyroScale = result.motors_tab_gyro_settings.scale;
} }
if (result.motors_tab_accel_settings) { if (result.motors_tab_accel_settings) {
TABS.motors.sensorAccelRate = result.motors_tab_accel_settings.rate; TABS.motors.sensorAccelRate = result.motors_tab_accel_settings.rate;
TABS.motors.sensorAccelScale = result.motors_tab_accel_settings.scale; TABS.motors.sensorAccelScale = result.motors_tab_accel_settings.scale;
} }
$('.tab-motors .sensor select:first').change(); $('.tab-motors .sensor select:first').change();
});
// Amperage // Amperage
function power_data_pull() { function power_data_pull() {

163
src/js/tabs/options.js
View file

@ -32,83 +32,78 @@ options.cleanup = function (callback) {
}; };
options.initShowWarnings = function () { options.initShowWarnings = function () {
ConfigStorage.get('showPresetsWarningBackup', function (result) { const result = ConfigStorage.get('showPresetsWarningBackup');
if (result.showPresetsWarningBackup) { if (result.showPresetsWarningBackup) {
$('div.presetsWarningBackup input').prop('checked', true); $('div.presetsWarningBackup input').prop('checked', true);
} }
$('div.presetsWarningBackup input').change(function () { $('div.presetsWarningBackup input').change(function () {
const checked = $(this).is(':checked'); const checked = $(this).is(':checked');
ConfigStorage.set({'showPresetsWarningBackup': checked}); ConfigStorage.set({'showPresetsWarningBackup': checked});
}).change(); }).change();
});
}; };
options.initPermanentExpertMode = function () { options.initPermanentExpertMode = function () {
ConfigStorage.get('permanentExpertMode', function (result) { const result = ConfigStorage.get('permanentExpertMode');
if (result.permanentExpertMode) { if (result.permanentExpertMode) {
$('div.permanentExpertMode input').prop('checked', true); $('div.permanentExpertMode input').prop('checked', true);
} }
$('div.permanentExpertMode input').change(function () { $('div.permanentExpertMode input').change(function () {
const checked = $(this).is(':checked'); const checked = $(this).is(':checked');
ConfigStorage.set({'permanentExpertMode': checked}); ConfigStorage.set({'permanentExpertMode': checked});
$('input[name="expertModeCheckbox"]').prop('checked', checked).change(); $('input[name="expertModeCheckbox"]').prop('checked', checked).change();
}).change(); }).change();
});
}; };
options.initRememberLastTab = function () { options.initRememberLastTab = function () {
ConfigStorage.get('rememberLastTab', function (result) { const result = ConfigStorage.get('rememberLastTab');
$('div.rememberLastTab input') $('div.rememberLastTab input')
.prop('checked', !!result.rememberLastTab) .prop('checked', !!result.rememberLastTab)
.change(function() { ConfigStorage.set({rememberLastTab: $(this).is(':checked')}); }) .change(function() { ConfigStorage.set({rememberLastTab: $(this).is(':checked')}); })
.change(); .change();
});
}; };
options.initCheckForConfiguratorUnstableVersions = function () { options.initCheckForConfiguratorUnstableVersions = function () {
ConfigStorage.get('checkForConfiguratorUnstableVersions', function (result) { const result = ConfigStorage.get('checkForConfiguratorUnstableVersions');
if (result.checkForConfiguratorUnstableVersions) { if (result.checkForConfiguratorUnstableVersions) {
$('div.checkForConfiguratorUnstableVersions input').prop('checked', true); $('div.checkForConfiguratorUnstableVersions input').prop('checked', true);
} }
$('div.checkForConfiguratorUnstableVersions input').change(function () { $('div.checkForConfiguratorUnstableVersions input').change(function () {
const checked = $(this).is(':checked'); const checked = $(this).is(':checked');
ConfigStorage.set({'checkForConfiguratorUnstableVersions': checked}); ConfigStorage.set({'checkForConfiguratorUnstableVersions': checked});
checkForConfiguratorUpdates(); checkForConfiguratorUpdates();
});
}); });
}; };
options.initAnalyticsOptOut = function () { options.initAnalyticsOptOut = function () {
ConfigStorage.get('analyticsOptOut', function (result) { const result = ConfigStorage.get('analyticsOptOut');
if (result.analyticsOptOut) { if (result.analyticsOptOut) {
$('div.analyticsOptOut input').prop('checked', true); $('div.analyticsOptOut input').prop('checked', true);
} }
$('div.analyticsOptOut input').change(function () { $('div.analyticsOptOut input').change(function () {
const checked = $(this).is(':checked'); const checked = $(this).is(':checked');
ConfigStorage.set({'analyticsOptOut': checked}); ConfigStorage.set({'analyticsOptOut': checked});
checkSetupAnalytics(function (analyticsService) { checkSetupAnalytics(function (analyticsService) {
if (checked) { if (checked) {
analyticsService.sendEvent(analyticsService.EVENT_CATEGORIES.APPLICATION, 'OptOut'); analyticsService.sendEvent(analyticsService.EVENT_CATEGORIES.APPLICATION, 'OptOut');
} }
analyticsService.setOptOut(checked); analyticsService.setOptOut(checked);
if (!checked) { if (!checked) {
analyticsService.sendEvent(analyticsService.EVENT_CATEGORIES.APPLICATION, 'OptIn'); analyticsService.sendEvent(analyticsService.EVENT_CATEGORIES.APPLICATION, 'OptIn');
} }
}); });
}).change(); }).change();
});
}; };
options.initCliAutoComplete = function () { options.initCliAutoComplete = function () {
@ -122,45 +117,53 @@ options.initCliAutoComplete = function () {
}).change(); }).change();
}; };
options.initAutoConnectConnectionTimeout = function () {
const result = ConfigStorage.get('connectionTimeout');
if (result.connectionTimeout) {
$('#connectionTimeoutSelect').val(result.connectionTimeout);
}
$('#connectionTimeoutSelect').on('change', function () {
const value = parseInt($(this).val());
ConfigStorage.set({'connectionTimeout': value});
});
};
options.initShowAllSerialDevices = function() { options.initShowAllSerialDevices = function() {
const showAllSerialDevicesElement = $('div.showAllSerialDevices input'); const showAllSerialDevicesElement = $('div.showAllSerialDevices input');
ConfigStorage.get('showAllSerialDevices', result => { const result = ConfigStorage.get('showAllSerialDevices');
showAllSerialDevicesElement showAllSerialDevicesElement
.prop('checked', !!result.showAllSerialDevices) .prop('checked', !!result.showAllSerialDevices)
.on('change', () => ConfigStorage.set({ showAllSerialDevices: showAllSerialDevicesElement.is(':checked') })) .on('change', () => ConfigStorage.set({ showAllSerialDevices: showAllSerialDevicesElement.is(':checked') }))
.trigger('change'); .trigger('change');
});
}; };
options.initShowVirtualMode = function() { options.initShowVirtualMode = function() {
const showVirtualModeElement = $('div.showVirtualMode input'); const showVirtualModeElement = $('div.showVirtualMode input');
ConfigStorage.get('showVirtualMode', result => { const result = ConfigStorage.get('showVirtualMode');
showVirtualModeElement showVirtualModeElement
.prop('checked', !!result.showVirtualMode) .prop('checked', !!result.showVirtualMode)
.on('change', () => { .on('change', () => {
ConfigStorage.set({ showVirtualMode: showVirtualModeElement.is(':checked') }); ConfigStorage.set({ showVirtualMode: showVirtualModeElement.is(':checked') });
PortHandler.initialPorts = false; PortHandler.initialPorts = false;
}) })
.trigger('change'); .trigger('change');
});
}; };
options.initCordovaForceComputerUI = function () { options.initCordovaForceComputerUI = function () {
if (GUI.isCordova() && cordovaUI.canChangeUI) { if (GUI.isCordova() && cordovaUI.canChangeUI) {
ConfigStorage.get('cordovaForceComputerUI', function (result) { const result = ConfigStorage.get('cordovaForceComputerUI');
if (result.cordovaForceComputerUI) { if (result.cordovaForceComputerUI) {
$('div.cordovaForceComputerUI input').prop('checked', true); $('div.cordovaForceComputerUI input').prop('checked', true);
}
$('div.cordovaForceComputerUI input').change(function () {
const checked = $(this).is(':checked');
ConfigStorage.set({'cordovaForceComputerUI': checked});
if (typeof cordovaUI.set === 'function') {
cordovaUI.set();
} }
$('div.cordovaForceComputerUI input').change(function () {
const checked = $(this).is(':checked');
ConfigStorage.set({'cordovaForceComputerUI': checked});
if (typeof cordovaUI.set === 'function') {
cordovaUI.set();
}
});
}); });
} else { } else {
$('div.cordovaForceComputerUI').hide(); $('div.cordovaForceComputerUI').hide();

13
src/js/tabs/receiver.js
View file

@ -783,13 +783,12 @@ TABS.receiver.initialize = function (callback) {
GUI.interval_add('receiver_pull', get_rc_refresh_data, plotUpdateRate, true); GUI.interval_add('receiver_pull', get_rc_refresh_data, plotUpdateRate, true);
}); });
ConfigStorage.get('rx_refresh_rate', function (result) { const result = ConfigStorage.get('rx_refresh_rate');
if (result.rxRefreshRate) { if (result.rxRefreshRate) {
rxRefreshRate.val(result.rxRefreshRate).change(); rxRefreshRate.val(result.rxRefreshRate).change();
} else { } else {
rxRefreshRate.change(); // start with default value rxRefreshRate.change(); // start with default value
} }
});
// Setup model for preview // Setup model for preview
tab.initModelPreview(); tab.initModelPreview();

55
src/js/tabs/sensors.js
View file

@ -428,40 +428,39 @@ TABS.sensors.initialize = function (callback) {
} }
}); });
ConfigStorage.get('sensor_settings', function (result) { const result = ConfigStorage.get('sensor_settings');
// set refresh speeds according to configuration saved in storage // set refresh speeds according to configuration saved in storage
if (result.sensor_settings) { if (result.sensor_settings) {
$('.tab-sensors select[name="gyro_refresh_rate"]').val(result.sensor_settings.rates.gyro); $('.tab-sensors select[name="gyro_refresh_rate"]').val(result.sensor_settings.rates.gyro);
$('.tab-sensors select[name="gyro_scale"]').val(result.sensor_settings.scales.gyro); $('.tab-sensors select[name="gyro_scale"]').val(result.sensor_settings.scales.gyro);
$('.tab-sensors select[name="accel_refresh_rate"]').val(result.sensor_settings.rates.accel); $('.tab-sensors select[name="accel_refresh_rate"]').val(result.sensor_settings.rates.accel);
$('.tab-sensors select[name="accel_scale"]').val(result.sensor_settings.scales.accel); $('.tab-sensors select[name="accel_scale"]').val(result.sensor_settings.scales.accel);
$('.tab-sensors select[name="mag_refresh_rate"]').val(result.sensor_settings.rates.mag); $('.tab-sensors select[name="mag_refresh_rate"]').val(result.sensor_settings.rates.mag);
$('.tab-sensors select[name="mag_scale"]').val(result.sensor_settings.scales.mag); $('.tab-sensors select[name="mag_scale"]').val(result.sensor_settings.scales.mag);
$('.tab-sensors select[name="altitude_refresh_rate"]').val(result.sensor_settings.rates.altitude); $('.tab-sensors select[name="altitude_refresh_rate"]').val(result.sensor_settings.rates.altitude);
$('.tab-sensors select[name="sonar_refresh_rate"]').val(result.sensor_settings.rates.sonar); $('.tab-sensors select[name="sonar_refresh_rate"]').val(result.sensor_settings.rates.sonar);
$('.tab-sensors select[name="debug_refresh_rate"]').val(result.sensor_settings.rates.debug); $('.tab-sensors select[name="debug_refresh_rate"]').val(result.sensor_settings.rates.debug);
// start polling data by triggering refresh rate change event // start polling data by triggering refresh rate change event
$('.tab-sensors .rate select:first').change(); $('.tab-sensors .rate select:first').change();
} else { } else {
// start polling immediatly (as there is no configuration saved in the storage) // start polling immediatly (as there is no configuration saved in the storage)
$('.tab-sensors .rate select:first').change(); $('.tab-sensors .rate select:first').change();
}
const resultGraphs = ConfigStorage.get('graphs_enabled');
if (resultGraphs.graphs_enabled) {
const _checkboxes = $('.tab-sensors .info .checkboxes input');
for (let i = 0; i < resultGraphs.graphs_enabled.length; i++) {
_checkboxes.eq(i).not(':disabled').prop('checked', resultGraphs.graphs_enabled[i]).change();
} }
ConfigStorage.get('graphs_enabled', function (resultGraphs) { } else {
if (resultGraphs.graphs_enabled) { $('.tab-sensors .info input:lt(4):not(:disabled)').prop('checked', true).change();
const _checkboxes = $('.tab-sensors .info .checkboxes input'); }
for (let i = 0; i < resultGraphs.graphs_enabled.length; i++) {
_checkboxes.eq(i).not(':disabled').prop('checked', resultGraphs.graphs_enabled[i]).change();
}
} else {
$('.tab-sensors .info input:lt(4):not(:disabled)').prop('checked', true).change();
}
});
});
// status data pulled via separate timer with static speed // status data pulled via separate timer with static speed
GUI.interval_add('status_pull', function status_pull() { GUI.interval_add('status_pull', function status_pull() {