From da3a732a543251339133b9679dba4dc42ab77a10 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Tue, 30 Jan 2024 02:18:05 +0100 Subject: [PATCH] Cleanup more F3 code (#3747) * Remove boards.js * Cleanup unused blocksize --- src/js/boards.js | 95 ---------------------------------- src/js/tabs/onboard_logging.js | 9 +--- src/js/tabs/ports.js | 6 --- 3 files changed, 2 insertions(+), 108 deletions(-) delete mode 100644 src/js/boards.js diff --git a/src/js/boards.js b/src/js/boards.js deleted file mode 100644 index 3a1409346a..0000000000 --- a/src/js/boards.js +++ /dev/null @@ -1,95 +0,0 @@ -'use strict'; - -// NOTICE: This feature has become obsolete but is still in place to support firmware added before v3.3.0 -// There is no reason to update the list as changes in firmware allows self-reporting of VCP usage. - -// This list has been extracted from the firmware source with: -// grep TARGET_BOARD_IDENTIFIER src/main/target/*/target.h | sed -n "s/^src\/main\/target\/\([^\/]*\).*#define TARGET_BOARD_IDENTIFIER \"\([^\"]*\).*$/ {name: '\1', identifier: '\2', vcp: true},/p" | sort -// and then manually setting vcp to true for boards that use VCP -// Also, please note that the targets in this list are ordered in the order they are returned by the above command. Please do not reorder to avoid churn. - -const BOARD_DEFINITIONS = [ - {name: 'AIR32', identifier: 'AR32', vcp: true}, - {name: 'AIRHEROF3', identifier: 'AIR3', vcp: false}, - {name: 'ALIENFLIGHTF1', identifier: 'AFF1', vcp: false}, - {name: 'ALIENFLIGHTF3', identifier: 'AFF3', vcp: true}, - {name: 'ALIENFLIGHTF4', identifier: 'AFF4', vcp: true}, - {name: 'ANYFCF7', identifier: 'ANY7', vcp: true}, - {name: 'BETAFLIGHTF3', identifier: 'BFF3', vcp: true}, - {name: 'BLUEJAYF4', identifier: 'BJF4', vcp: true}, - {name: 'CC3D', identifier: 'CC3D', vcp: true}, - {name: 'CHEBUZZF3', identifier: 'CHF3', vcp: true}, - {name: 'CJMCU', identifier: 'CJM1', vcp: false}, - {name: 'COLIBRI', identifier: 'COLI', vcp: true}, - {name: 'COLIBRI_RACE', identifier: 'CLBR', vcp: true}, - {name: 'DOGE', identifier: 'DOGE', vcp: true}, - {name: 'ELLE0', identifier: 'ELL0', vcp: true}, - {name: 'F4BY', identifier: 'F4BY', vcp: true}, - {name: 'FISHDRONEF4', identifier: 'FDF4', vcp: true}, - {name: 'FURYF3', identifier: 'FYF3', vcp: true}, - {name: 'FURYF4', identifier: 'FYF4', vcp: true}, - {name: 'FURYF7', identifier: 'FYF7', vcp: true}, - {name: 'IMPULSERCF3', identifier: 'IMF3', vcp: true}, - {name: 'IRCFUSIONF3', identifier: 'IFF3', vcp: true}, - {name: 'ISHAPEDF3', identifier: 'ISF3', vcp: false}, - {name: 'KAKUTEF4', identifier: 'KTV1', vcp: true}, - {name: 'KISSFC', identifier: 'KISS', vcp: true}, - {name: 'KIWIF4', identifier: 'KIWI', vcp: true}, - {name: 'LUXV2_RACE', identifier: 'LUXR', vcp: true}, - {name: 'LUX_RACE', identifier: 'LUX', vcp: true}, - {name: 'MICROSCISKY', identifier: 'MSKY', vcp: false}, - {name: 'MOTOLAB', identifier: 'MOTO', vcp: true}, - {name: 'MULTIFLITEPICO', identifier: 'MFPB', vcp: false}, - {name: 'AFROMINI', identifier: 'AFMN', vcp: false}, - {name: 'NAZE', identifier: 'AFNA', vcp: false}, - {name: 'BEEBRAIN', identifier: 'BEBR', vcp: false}, - {name: 'NERO', identifier: 'NERO', vcp: true}, - {name: 'NUCLEOF7', identifier: 'NUC7', vcp: true}, - {name: 'OMNIBUSF4', identifier: 'OBF4', vcp: true}, - {name: 'OMNIBUSF4SD', identifier: 'OBSD', vcp: true}, - {name: 'OMNIBUS', identifier: 'OMNI', vcp: true}, - {name: 'PIKOBLX', identifier: 'PIKO', vcp: true}, - {name: 'RACEBASE', identifier: 'RBFC', vcp: false}, - {name: 'RCEXPLORERF3', identifier: 'REF3', vcp: true}, - {name: 'AIRBOTF4', identifier: 'AIR4', vcp: true}, - {name: 'PODIUMF4', identifier: 'PODI', vcp: true}, - {name: 'REVO', identifier: 'REVO', vcp: true}, - {name: 'REVOLT', identifier: 'RVLT', vcp: true}, - {name: 'SOULF4', identifier: 'SOUL', vcp: true}, - {name: 'REVONANO', identifier: 'REVN', vcp: true}, - {name: 'RG_SSD_F3', identifier: 'RGF3', vcp: true}, - {name: 'SINGULARITY', identifier: 'SING', vcp: true}, - {name: 'SIRINFPV', identifier: 'SIRF', vcp: true}, - {name: 'SPARKY2', identifier: 'SPK2', vcp: true}, - {name: 'SPARKY', identifier: 'SPKY', vcp: true}, - {name: 'SPRACINGF3EVO', identifier: 'SPEV', vcp: true}, - {name: 'AIORACERF3', identifier: 'ARF3', vcp: true}, - {name: 'RMDO', identifier: 'RMDO', vcp: false}, - {name: 'SPRACINGF3', identifier: 'SRF3', vcp: false}, - {name: 'SPRACINGF3MINI', identifier: 'SRFM', vcp: true}, - {name: 'TINYBEEF3', identifier: 'TBF3', vcp: true}, - {name: 'SPRACINGF3NEO', identifier: 'SP3N', vcp: true}, - {name: 'STM32F3DISCOVERY', identifier: 'SDF3', vcp: true}, - {name: 'TINYFISH', identifier: 'TFSH', vcp: true}, - {name: 'VRRACE', identifier: 'VRRA', vcp: true}, - {name: 'X_RACERSPI', identifier: 'XRC3', vcp: false}, - {name: 'YUPIF4', identifier: 'YPF4', vcp: true}, - {name: 'ZCOREF3', identifier: 'ZCF3', vcp: false}, -]; - -const DEFAULT_BOARD_DEFINITION = { - name: "Unknown", identifier: "????", vcp: false, -}; - -const BOARD = {}; - -BOARD.find_board_definition = function (identifier) { - for (const candidate of BOARD_DEFINITIONS) { - if (candidate.identifier === identifier) { - return candidate; - } - } - return DEFAULT_BOARD_DEFINITION; -}; - -export default BOARD; diff --git a/src/js/tabs/onboard_logging.js b/src/js/tabs/onboard_logging.js index 0a6f4a5281..c81ff5c314 100644 --- a/src/js/tabs/onboard_logging.js +++ b/src/js/tabs/onboard_logging.js @@ -21,8 +21,6 @@ const onboard_logging = { writeError: false, BLOCK_SIZE: 4096, - VCP_BLOCK_SIZE_3_0: 512, - VCP_BLOCK_SIZE: 4096, }; onboard_logging.initialize = function (callback) { @@ -434,11 +432,8 @@ onboard_logging.initialize = function (callback) { function flash_save_begin() { if (GUI.connected_to) { - if (FC.boardHasVcp()) { - self.blockSize = self.VCP_BLOCK_SIZE; - } else { - self.blockSize = self.BLOCK_SIZE; - } + + self.blockSize = self.BLOCK_SIZE; // Begin by refreshing the occupied size in case it changed while the tab was open flash_update_summary(function() { diff --git a/src/js/tabs/ports.js b/src/js/tabs/ports.js index 139a18848a..5575a0a7b6 100644 --- a/src/js/tabs/ports.js +++ b/src/js/tabs/ports.js @@ -7,7 +7,6 @@ import FC from '../fc'; import MSP from '../msp'; import MSPCodes from '../msp/MSPCodes'; import { API_VERSION_1_42, API_VERSION_1_43, API_VERSION_1_45 } from '../data_storage'; -import BOARD from '../boards'; import $ from 'jquery'; const ports = { @@ -17,8 +16,6 @@ const ports = { ports.initialize = function (callback) { const self = this; - let board_definition = {}; - const functionRules = [ { name: 'MSP', groups: ['configuration', 'msp'], maxPorts: 2 }, { name: 'GPS', groups: ['sensors'], maxPorts: 1 }, @@ -112,9 +109,6 @@ ports.initialize = function (callback) { function on_configuration_loaded_handler() { $('#content').load("./tabs/ports.html", on_tab_loaded_handler); - - board_definition = BOARD.find_board_definition(FC.CONFIG.boardIdentifier); - console.log('Using board definition', board_definition); } }