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

fix CheckRunTimeError (#3284)

Browse source 
fic CheckRunTimeError
This commit is contained in:
Mark Haslinghuis 2023-01-28 00:42:18 +01:00 • committed by GitHub
parent acd92a40d3
commit 697943b512
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/js/serial.js
View file

@ -47,7 +47,8 @@ const serial = {
self.connectionType = 'serial'; self.connectionType = 'serial';
chrome.serial.connect(path, options, function (connectionInfo) { chrome.serial.connect(path, options, function (connectionInfo) {
if (connectionInfo && !self.openCanceled && !checkChromeRuntimeError()) { self.failed = checkChromeRuntimeError();
if (connectionInfo && !self.openCanceled && !self.failed) {
self.connected = true; self.connected = true;
self.connectionId = connectionInfo.connectionId; self.connectionId = connectionInfo.connectionId;
self.bitrate = connectionInfo.bitrate; self.bitrate = connectionInfo.bitrate;
@ -65,6 +66,7 @@ const serial = {
if (!self.failed++) { if (!self.failed++) {
chrome.serial.setPaused(self.connectionId, false, function () { chrome.serial.setPaused(self.connectionId, false, function () {
self.getInfo(function (getInfo) { self.getInfo(function (getInfo) {
checkChromeRuntimeError();
if (getInfo) { if (getInfo) {
if (!getInfo.paused) { if (!getInfo.paused) {
console.log(`${self.connectionType}: connection recovered from last onReceiveError`); console.log(`${self.connectionType}: connection recovered from last onReceiveError`);
@ -74,8 +76,6 @@ const serial = {
gui_log(i18n.getMessage('serialUnrecoverable')); gui_log(i18n.getMessage('serialUnrecoverable'));
self.errorHandler(getInfo.error, 'receive'); self.errorHandler(getInfo.error, 'receive');
} }
} else {
checkChromeRuntimeError();
} }
}); });
}); });
@ -87,13 +87,14 @@ const serial = {
self.error = info.error; self.error = info.error;
setTimeout(function() { setTimeout(function() {
chrome.serial.setPaused(info.connectionId, false, function() { chrome.serial.setPaused(info.connectionId, false, function() {
self.getInfo(function (_info) { checkChromeRuntimeError();
if (_info) { self.getInfo(function (getInfo) {
if (_info.paused) { if (getInfo) {
if (getInfo.paused) {
// assume unrecoverable, disconnect // assume unrecoverable, disconnect
console.log(`${self.connectionType}: connection did not recover from ${self.error} condition, disconnecting`); console.log(`${self.connectionType}: connection did not recover from ${self.error} condition, disconnecting`);
gui_log(i18n.getMessage('serialUnrecoverable')); gui_log(i18n.getMessage('serialUnrecoverable'));
self.errorHandler(_info.error, 'receive'); self.errorHandler(getInfo.error, 'receive');
} }
else { else {
console.log(`${self.connectionType}: connection recovered from ${self.error} condition`); console.log(`${self.connectionType}: connection recovered from ${self.error} condition`);

3
src/js/utils/common.js
View file

@ -1,6 +1,7 @@
import semver from "semver"; import semver from "semver";
import { mixerList } from "../model"; import { mixerList } from "../model";
import CONFIGURATOR from "../data_storage"; import CONFIGURATOR from "../data_storage";
import { gui_log } from "../gui_log";
export function millitime() { export function millitime() {
return new Date().getTime(); return new Date().getTime();
@ -39,7 +40,7 @@ export function isInt(n) {
export function checkChromeRuntimeError() { export function checkChromeRuntimeError() {
if (chrome.runtime.lastError) { if (chrome.runtime.lastError) {
console.error(`Chrome API Error: ${chrome.runtime.lastError.message}.\n Traced ${new Error().stack}`); console.error(`Chrome API Error: ${chrome.runtime.lastError.message}.\n Traced ${new Error().stack}`);
gui_log(`Chrome API Error: ${chrome.runtime.lastError.message}.`);
return true; return true;
} }
return false; return false;