From 5a7b20d060a6720c0b811cabfd6691917233a29e Mon Sep 17 00:00:00 2001 From: rmawatson Date: Mon, 19 Dec 2022 05:20:12 +0100 Subject: [PATCH 01/23] armingFlags on status line --- _locales/en/messages.json | 3 +++ js/gui.js | 40 +++++++++++++++++++++++++++++++++++++++ main.html | 3 +++ 3 files changed, 46 insertions(+) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 41bca55f..145c4f1c 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -341,6 +341,9 @@ "statusbar_cpu_load": { "message": "CPU Load: $1%" }, + "statusbar_arming_flags": { + "message": "Arming Flags:" + }, "dfu_connect_message": { "message": "Please use the Firmware Flasher to access DFU devices" diff --git a/js/gui.js b/js/gui.js index 94cbabe6..49866fea 100644 --- a/js/gui.js +++ b/js/gui.js @@ -202,9 +202,49 @@ GUI_control.prototype.content_ready = function (callback) { }; GUI_control.prototype.updateStatusBar = function() { + + var armingFlags = { + 'ARMED':(1 << 2), + //'WAS_EVER_ARMED':(1 << 3), + 'SIMULATOR_MODE':(1 << 4), + 'ARMING_DISABLED_FAILSAFE_SYSTEM':(1 << 7), + 'ARMING_DISABLED_NOT_LEVEL':(1 << 8), + 'ARMING_DISABLED_SENSORS_CALIBRATING':(1 << 9), + 'ARMING_DISABLED_SYSTEM_OVERLOADED':(1 << 10), + 'ARMING_DISABLED_NAVIGATION_UNSAFE':(1 << 11), + 'ARMING_DISABLED_COMPASS_NOT_CALIBRATED':(1 << 12), + 'ARMING_DISABLED_ACCELEROMETER_NOT_CALIBRATED':(1 << 13), + 'ARMING_DISABLED_ARM_SWITCH':(1 << 14), + 'ARMING_DISABLED_HARDWARE_FAILURE':(1 << 15), + 'ARMING_DISABLED_BOXFAILSAFE':(1 << 16), + 'ARMING_DISABLED_BOXKILLSWITCH':(1 << 17), + 'ARMING_DISABLED_RC_LINK':(1 << 18), + 'ARMING_DISABLED_THROTTLE':(1 << 19), + 'ARMING_DISABLED_CLI':(1 << 20), + 'ARMING_DISABLED_CMS_MENU':(1 << 21), + 'ARMING_DISABLED_OSD_MENU':(1 << 22), + 'ARMING_DISABLED_ROLLPITCH_NOT_CENTERED':(1 << 23), + 'ARMING_DISABLED_SERVO_AUTOTRIM':(1 << 24), + 'ARMING_DISABLED_OOM':(1 << 25), + 'ARMING_DISABLED_INVALID_SETTING':(1 << 26), + 'ARMING_DISABLED_PWM_OUTPUT_ERROR':(1 << 27), + 'ARMING_DISABLED_NO_PREARM':(1 << 28), + 'ARMING_DISABLED_DSHOT_BEEPER':(1 << 29), + 'ARMING_DISABLED_LANDING_DETECTED':(1 << 30), + }; + + var activeArmFlags = []; + for(var i=0;i<32;i++) { + var checkBit = (1 << i); + if(Object.values(armingFlags).includes(checkBit) && (checkBit & CONFIG.armingFlags)) { + activeArmFlags.push(Object.keys(armingFlags)[Object.values(armingFlags).indexOf(checkBit)]); + } + } + $('span.i2c-error').text(CONFIG.i2cError); $('span.cycle-time').text(CONFIG.cycleTime); $('span.cpu-load').text(chrome.i18n.getMessage('statusbar_cpu_load', [CONFIG.cpuload])); + $('span.arming-flags').text(activeArmFlags.length ? activeArmFlags.join(', ') : '-'); }; GUI_control.prototype.updateProfileChange = function() { diff --git a/main.html b/main.html index 04035010..e56a063d 100755 --- a/main.html +++ b/main.html @@ -282,6 +282,9 @@
+
+ - +
From 11b59ffe9504b07a5add510265adf4a0ae2875d3 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Sun, 15 Jan 2023 14:45:10 +0100 Subject: [PATCH 02/23] Add BFHDCOMPAT --- tabs/osd.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tabs/osd.js b/tabs/osd.js index a062f31f..c8670a22 100644 --- a/tabs/osd.js +++ b/tabs/osd.js @@ -540,7 +540,8 @@ OSD.constants = { 'HDZERO', 'DJIWTF', 'AVATAR', - 'BF43COMPAT' + 'BF43COMPAT', + 'BFHDCOMPAT' ], VIDEO_LINES: { PAL: 16, @@ -549,6 +550,7 @@ OSD.constants = { DJIWTF: 22, AVATAR: 20, BF43COMPAT: 16, + BFHDCOMPAT: 20 }, VIDEO_COLS: { PAL: 30, @@ -556,7 +558,8 @@ OSD.constants = { HDZERO: 50, DJIWTF: 60, AVATAR: 53, - BF43COMPAT: 30 + BF43COMPAT: 30, + BFHDCOMPAT: 53 }, VIDEO_BUFFER_CHARS: { PAL: 480, @@ -564,7 +567,8 @@ OSD.constants = { HDZERO: 900, DJIWTF: 1320, AVATAR: 1060, - BF43COMPAT: 480 + BF43COMPAT: 480, + BFHDCOMPAT: 1060 }, UNIT_TYPES: [ {name: 'osdUnitImperial', value: 0}, @@ -2401,7 +2405,7 @@ OSD.GUI.checkAndProcessSymbolPosition = function(pos, charCode) { } }; -const mspVideoSystem = [1,3,4,5,6]; // indexes of PAL, HDZERO, DJIWTF,AVATAR, & BF43COMPAT +const mspVideoSystem = [1,3,4,5,6,7]; // indexes of PAL, HDZERO, DJIWTF, AVATAR, BF43COMPAT & BFHDCOMPAT const analogVideoSystem = [0,1,2]; // indexes of AUTO, PAL, & NTSC OSD.GUI.updateVideoMode = function() { From cf35bd61428a8ada640898bcd81bc79909659e7d Mon Sep 17 00:00:00 2001 From: "Ernest Stepanov (ErNis)" Date: Thu, 2 Feb 2023 15:05:34 +0200 Subject: [PATCH 03/23] AT32 MCU DFU added --- js/port_handler.js | 9 ++++++--- js/protocols/stm32.js | 2 +- js/protocols/stm32usbdfu.js | 7 +++++++ manifest.json | 3 ++- tabs/firmware_flasher.js | 2 +- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/js/port_handler.js b/js/port_handler.js index 58e464fd..2dc395fd 100755 --- a/js/port_handler.js +++ b/js/port_handler.js @@ -1,7 +1,10 @@ 'use strict'; var usbDevices = { - STM32DFU: {'vendorId': 1155, 'productId': 57105} + filters: [ + {'vendorId': 1155, 'productId': 57105}, + {'vendorId': 11836, 'productId': 57105} + ] }; var PortHandler = new function () { @@ -152,7 +155,7 @@ PortHandler.check = function () { }; PortHandler.check_usb_devices = function (callback) { - chrome.usb.getDevices(usbDevices.STM32DFU, function (result) { + chrome.usb.getDevices(usbDevices, function (result) { if (result.length) { if (!$("div#port-picker #port [value='DFU']").length) { $('div#port-picker #port').append($('