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

Merge pull request #1385 from etracer65/firmware_flasher_progress_color

Browse source 
Fix Firmware Flasher progress bar color indicators
This commit is contained in:
Michael Keller 2019-04-19 13:45:27 +12:00 • committed by GitHub
commit a12826de6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/js/protocols/stm32.js
View file

@ -145,7 +145,8 @@ STM32_protocol.prototype.initialize = function () {
// reset progress bar to initial state
self.progress_bar_e = $('.progress');
self.progress_bar_e.val(0);
self.progress_bar_e.removeClass('valid invalid');
self.progress_label_e = $('span.progressLabel');
self.progress_label_e.removeClass('valid invalid actionRequired');
// lock some UI elements TODO needs rework
$('select[name="release"]').prop('disabled', true);
@ -161,7 +162,7 @@ STM32_protocol.prototype.initialize = function () {
console.log('STM32 - timed out, programming failed ...');
$('span.progressLabel').text(i18n.getMessage('stm32TimedOut'));
self.progress_bar_e.addClass('invalid');
self.progress_label_e.addClass('invalid');
// protocol got stuck, clear timer and disconnect
GUI.interval_remove('STM32_timeout');
@ -244,7 +245,7 @@ STM32_protocol.prototype.verify_response = function (val, data) {
var message = 'STM32 Communication failed, wrong response, expected: ' + val + ' (0x' + val.toString(16) + ') received: ' + data[0] + ' (0x' + data[0].toString(16) + ')';
console.error(message);
$('span.progressLabel').text(i18n.getMessage('stm32WrongResponse',[val, val.toString(16), data[0], data[0].toString(16)]));
self.progress_bar_e.addClass('invalid');
self.progress_label_e.addClass('invalid');
// disconnect
this.upload_procedure(99);
@ -369,7 +370,7 @@ STM32_protocol.prototype.upload_procedure = function (step) {
self.upload_procedure(2);
} else {
$('span.progressLabel').text(i18n.getMessage('stm32ContactingBootloaderFailed'));
self.progress_bar_e.addClass('invalid');
self.progress_label_e.addClass('invalid');
GUI.interval_remove('stm32_initialize_mcu');
@ -383,7 +384,7 @@ STM32_protocol.prototype.upload_procedure = function (step) {
console.log('STM32 - no response from bootloader, disconnecting');
$('span.progressLabel').text(i18n.getMessage('stm32ResponseBootloaderFailed'));
self.progress_bar_e.addClass('invalid');
self.progress_label_e.addClass('invalid');
GUI.interval_remove('stm32_initialize_mcu');
GUI.interval_remove('STM32_timeout');
@ -699,19 +700,17 @@ STM32_protocol.prototype.upload_procedure = function (step) {
if (verify) {
console.log('Programming: SUCCESSFUL');
$('span.progressLabel').text(i18n.getMessage('stm32ProgrammingSuccessful'));
// update progress bar
self.progress_bar_e.addClass('valid');
$('span.progressLabel').text(i18n.getMessage('stm32ProgrammingSuccessful'));
self.progress_label_e.addClass('valid');
// proceed to next step
self.upload_procedure(7);
} else {
console.log('Programming: FAILED');
$('span.progressLabel').text(i18n.getMessage('stm32ProgrammingFailed'));
// update progress bar
self.progress_bar_e.addClass('invalid');
$('span.progressLabel').text(i18n.getMessage('stm32ProgrammingFailed'));
self.progress_label_e.addClass('invalid');
// disconnect
self.upload_procedure(99);

21
src/js/protocols/stm32usbdfu.js
View file

@ -87,7 +87,8 @@ STM32DFU_protocol.prototype.connect = function (device, hex, options, callback)
// reset progress bar to initial state
self.progress_bar_e = $('.progress');
self.progress_bar_e.val(0);
self.progress_bar_e.removeClass('valid invalid');
self.progress_label_e = $('span.progressLabel');
self.progress_label_e.removeClass('valid invalid actionRequired');
chrome.usb.getDevices(device, function (result) {
if (result.length) {
@ -580,7 +581,7 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) {
console.log('Initiate read unprotect');
GUI.log(i18n.getMessage('stm32ReadProtected'));
$('span.progressLabel').text(i18n.getMessage('stm32ReadProtected'));
self.progress_bar_e.addClass('actionRequired');
self.progress_label_e.addClass('actionRequired');
self.controlTransfer('out', self.request.DNLOAD, 0, 0, 0, [0x92], function () { // 0x92 initiates read unprotect
self.controlTransfer('in', self.request.GETSTATUS, 0, 0, 6, 0, function (data) {
@ -604,12 +605,12 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) {
GUI.log(i18n.getMessage('stm32UnprotectUnplug'));
$('span.progressLabel').text(i18n.getMessage('stm32UnprotectUnplug'));
self.progress_bar_e.val(0);
self.progress_bar_e.addClass('actionRequired');
self.progress_label_e.addClass('actionRequired');
} else { // unprotecting the flight controller did not work. It did not reboot.
console.log('Failed to execute unprotect memory command');
GUI.log(i18n.getMessage('stm32UnprotectFailed'));
$('span.progressLabel').text(i18n.getMessage('stm32UnprotectFailed'));
self.progress_bar_e.addClass('invalid');
self.progress_label_e.addClass('invalid');
console.log(data);
self.upload_procedure(99);
}
@ -619,7 +620,7 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) {
console.log('Failed to initiate unprotect memory command');
GUI.log(i18n.getMessage('stm32UnprotectInitFailed'));
$('span.progressLabel').text(i18n.getMessage('stm32UnprotectInitFailed'));
self.progress_bar_e.addClass('invalid');
self.progress_label_e.addClass('invalid');
self.upload_procedure(99);
}
});
@ -928,19 +929,17 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) {
if (verify) {
console.log('Programming: SUCCESSFUL');
$('span.progressLabel').text(i18n.getMessage('stm32ProgrammingSuccessful'));
// update progress bar
self.progress_bar_e.addClass('valid');
$('span.progressLabel').text(i18n.getMessage('stm32ProgrammingSuccessful'));
self.progress_label_e.addClass('valid');
// proceed to next step
self.upload_procedure(6);
} else {
console.log('Programming: FAILED');
$('span.progressLabel').text(i18n.getMessage('stm32ProgrammingFailed'));
// update progress bar
self.progress_bar_e.addClass('invalid');
$('span.progressLabel').text(i18n.getMessage('stm32ProgrammingFailed'));
self.progress_label_e.addClass('invalid');
// disconnect
self.upload_procedure(99);