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

Replace API versions by constants

Browse source
This commit is contained in:
Miguel Angel Mulero Martinez 2020-10-15 08:47:55 +02:00
parent 7fcc9efc72
commit fd35031e6f
25 changed files with 315 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

78
src/js/tabs/osd.js
View file

@ -72,7 +72,7 @@ SYM.loadSymbols = function() {
* - Symbols used in this versions
* - That were moved or didn't exist in the font file
*/
if (semver.lt(FC.CONFIG.apiVersion, "1.42.0")) {
if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
SYM.AH_CENTER_LINE = 0x26;
SYM.AH_CENTER = 0x7E;
SYM.AH_CENTER_LINE_RIGHT = 0x27;
@ -543,7 +543,7 @@ OSD.loadDisplayFields = function() {
},
draw_order: 40,
positionable() {
return semver.gte(FC.CONFIG.apiVersion, "1.39.0") ? true : false;
return semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_39) ? true : false;
},
preview() {
return FONT.symbol(SYM.AH_CENTER_LINE) + FONT.symbol(SYM.AH_CENTER) + FONT.symbol(SYM.AH_CENTER_LINE_RIGHT);
@ -562,7 +562,7 @@ OSD.loadDisplayFields = function() {
},
draw_order: 10,
positionable() {
return semver.gte(FC.CONFIG.apiVersion, "1.39.0") ? true : false;
return semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_39) ? true : false;
},
preview() {
const artificialHorizon = [];
@ -599,7 +599,7 @@ OSD.loadDisplayFields = function() {
},
draw_order: 50,
positionable() {
return semver.gte(FC.CONFIG.apiVersion, "1.39.0") ? true : false;
return semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_39) ? true : false;
},
preview() {
@ -645,7 +645,7 @@ OSD.loadDisplayFields = function() {
draw_order: 130,
positionable: true,
preview() {
return semver.gte(FC.CONFIG.apiVersion, "1.36.0") ? ` 42.00${FONT.symbol(SYM.AMP)}` : `${FONT.symbol(SYM.AMP)}42.0`;
return semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36) ? ` 42.00${FONT.symbol(SYM.AMP)}` : `${FONT.symbol(SYM.AMP)}42.0`;
},
},
MAH_DRAWN: {
@ -656,7 +656,7 @@ OSD.loadDisplayFields = function() {
draw_order: 140,
positionable: true,
preview() {
return semver.gte(FC.CONFIG.apiVersion, "1.36.0") ? ` 690${FONT.symbol(SYM.MAH)}` : `${FONT.symbol(SYM.MAH)}690`;
return semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36) ? ` 690${FONT.symbol(SYM.MAH)}` : `${FONT.symbol(SYM.MAH)}690`;
},
},
CRAFT_NAME: {
@ -788,7 +788,7 @@ OSD.loadDisplayFields = function() {
draw_order: 200,
positionable: true,
preview() {
return semver.gte(FC.CONFIG.apiVersion, "1.36.0") ? ' 142W' : '142W';
return semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36) ? ' 142W' : '142W';
},
},
PID_RATE_PROFILE: {
@ -1491,7 +1491,7 @@ OSD.chooseFields = function() {
F.HORIZON_SIDEBARS,
];
if (semver.lt(FC.CONFIG.apiVersion, "1.36.0")) {
if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.ONTIME,
F.FLYTIME,
@ -1514,31 +1514,31 @@ OSD.chooseFields = function() {
F.GPS_SATS,
F.ALTITUDE,
]);
if (semver.gte(FC.CONFIG.apiVersion, "1.31.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_31)) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.PID_ROLL,
F.PID_PITCH,
F.PID_YAW,
F.POWER,
]);
if (semver.gte(FC.CONFIG.apiVersion, "1.32.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_32)) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.PID_RATE_PROFILE,
semver.gte(FC.CONFIG.apiVersion, "1.36.0") ? F.WARNINGS : F.BATTERY_WARNING,
semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36) ? F.WARNINGS : F.BATTERY_WARNING,
F.AVG_CELL_VOLTAGE,
]);
if (semver.gte(FC.CONFIG.apiVersion, "1.34.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_34)) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.GPS_LON,
F.GPS_LAT,
F.DEBUG,
]);
if (semver.gte(FC.CONFIG.apiVersion, "1.35.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_35)) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.PITCH_ANGLE,
F.ROLL_ANGLE,
]);
if (semver.gte(FC.CONFIG.apiVersion, "1.36.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.MAIN_BATT_USAGE,
F.DISARMED,
@ -1550,22 +1550,22 @@ OSD.chooseFields = function() {
F.ESC_TEMPERATURE,
F.ESC_RPM,
]);
if (semver.gte(FC.CONFIG.apiVersion, "1.37.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_37)) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.REMAINING_TIME_ESTIMATE,
F.RTC_DATE_TIME,
F.ADJUSTMENT_RANGE,
F.CORE_TEMPERATURE,
]);
if (semver.gte(FC.CONFIG.apiVersion, "1.39.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_39)) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.ANTI_GRAVITY,
]);
if (semver.gte(FC.CONFIG.apiVersion, "1.40.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.G_FORCE,
]);
if (semver.gte(FC.CONFIG.apiVersion, "1.41.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.MOTOR_DIAG,
F.LOG_STATUS,
@ -1577,7 +1577,7 @@ OSD.chooseFields = function() {
F.DISPLAY_NAME,
F.ESC_RPM_FREQ,
]);
if (semver.gte(FC.CONFIG.apiVersion, "1.42.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.RATE_PROFILE_NAME,
F.PID_PROFILE_NAME,
@ -1634,7 +1634,7 @@ OSD.chooseFields = function() {
// that needs to be implemented here as well. Simply appending new stats does not
// require a completely new section for the version - only reordering.
if (semver.lt(FC.CONFIG.apiVersion, "1.39.0")) {
if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_39)) {
OSD.constants.STATISTIC_FIELDS = [
F.MAX_SPEED,
F.MIN_BATTERY,
@ -1649,7 +1649,7 @@ OSD.chooseFields = function() {
F.MAX_DISTANCE,
F.BLACKBOX_LOG_NUMBER,
];
if (semver.gte(FC.CONFIG.apiVersion, "1.37.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_37)) {
OSD.constants.STATISTIC_FIELDS = OSD.constants.STATISTIC_FIELDS.concat([
F.RTC_DATE_TIME,
]);
@ -1671,7 +1671,7 @@ OSD.chooseFields = function() {
F.BLACKBOX,
F.BLACKBOX_LOG_NUMBER,
];
if (semver.gte(FC.CONFIG.apiVersion, "1.41.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
OSD.constants.STATISTIC_FIELDS = OSD.constants.STATISTIC_FIELDS.concat([
F.MAX_G_FORCE,
F.MAX_ESC_TEMP,
@ -1681,7 +1681,7 @@ OSD.chooseFields = function() {
F.MAX_FFT,
]);
}
if (semver.gte(FC.CONFIG.apiVersion, "1.42.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
OSD.constants.STATISTIC_FIELDS = OSD.constants.STATISTIC_FIELDS.concat([
F.TOTAL_FLIGHTS,
F.TOTAL_FLIGHT_TIME,
@ -1702,14 +1702,14 @@ OSD.chooseFields = function() {
F.VISUAL_BEEPER,
F.CRASH_FLIP_MODE,
];
if (semver.gte(FC.CONFIG.apiVersion, "1.39.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_39)) {
OSD.constants.WARNINGS = OSD.constants.WARNINGS.concat([
F.ESC_FAIL,
F.CORE_TEMPERATURE,
F.RC_SMOOTHING_FAILURE,
]);
}
if (semver.gte(FC.CONFIG.apiVersion, "1.41.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
OSD.constants.WARNINGS = OSD.constants.WARNINGS.concat([
F.FAILSAFE,
F.LAUNCH_CONTROL,
@ -1723,7 +1723,7 @@ OSD.chooseFields = function() {
'TOTAL_ARMED_TIME',
'LAST_ARMED_TIME',
];
if (semver.gte(FC.CONFIG.apiVersion, "1.42.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
OSD.constants.TIMER_TYPES = OSD.constants.TIMER_TYPES.concat([
'ON_ARM_TIME',
]);
@ -1840,14 +1840,14 @@ OSD.msp = {
// watch out, order matters! match the firmware
result.push8(OSD.data.alarms.rssi.value);
result.push16(OSD.data.alarms.cap.value);
if (semver.lt(FC.CONFIG.apiVersion, "1.36.0")) {
if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
result.push16(OSD.data.alarms.time.value);
} else {
// This value is unused by the firmware with configurable timers
result.push16(0);
}
result.push16(OSD.data.alarms.alt.value);
if (semver.gte(FC.CONFIG.apiVersion, "1.37.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_37)) {
let warningFlags = 0;
for (let i = 0; i < OSD.data.warnings.length; i++) {
if (OSD.data.warnings[i].enabled) {
@ -1856,7 +1856,7 @@ OSD.msp = {
}
console.log(warningFlags);
result.push16(warningFlags);
if (semver.gte(FC.CONFIG.apiVersion, "1.41.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
result.push32(warningFlags);
result.push8(OSD.data.osd_profiles.selected + 1);
@ -1907,13 +1907,13 @@ OSD.msp = {
d.alarms = {};
d.alarms['rssi'] = { display_name: i18n.getMessage('osdTimerAlarmOptionRssi'), value: view.readU8() };
d.alarms['cap'] = { display_name: i18n.getMessage('osdTimerAlarmOptionCapacity'), value: view.readU16() };
if (semver.lt(FC.CONFIG.apiVersion, "1.36.0")) {
if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
d.alarms['time'] = { display_name: 'Minutes', value: view.readU16() };
} else {
// This value was obsoleted by the introduction of configurable timers, and has been reused to encode the number of display elements sent in this command
view.readU8();
const tmp = view.readU8();
if (semver.gte(FC.CONFIG.apiVersion, "1.37.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_37)) {
displayItemsCountActual = tmp;
}
}
@ -1924,12 +1924,12 @@ OSD.msp = {
d.state = {};
d.state.haveSomeOsd = (d.flags !== 0);
d.state.haveMax7456Configured = bit_check(d.flags, 4) || (d.flags === 1 && semver.lt(FC.CONFIG.apiVersion, "1.34.0"));
d.state.haveMax7456Configured = bit_check(d.flags, 4) || (d.flags === 1 && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_34));
d.state.haveFrSkyOSDConfigured = semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43) && bit_check(d.flags, 3);
d.state.haveMax7456FontDeviceConfigured = d.state.haveMax7456Configured || d.state.haveFrSkyOSDConfigured;
d.state.isMax7456FontDeviceDetected = bit_check(d.flags, 5) || (d.state.haveMax7456FontDeviceConfigured && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_43));
d.state.haveOsdFeature = bit_check(d.flags, 0) || (d.flags === 1 && semver.lt(FC.CONFIG.apiVersion, "1.34.0"));
d.state.isOsdSlave = bit_check(d.flags, 1) && semver.gte(FC.CONFIG.apiVersion, "1.34.0");
d.state.haveOsdFeature = bit_check(d.flags, 0) || (d.flags === 1 && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_34));
d.state.isOsdSlave = bit_check(d.flags, 1) && semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_34);
d.displayItems = [];
d.statItems = [];
@ -1953,7 +1953,7 @@ OSD.msp = {
itemsPositionsRead.push(v);
}
if (semver.gte(FC.CONFIG.apiVersion, "1.36.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
// Parse statistics display enable
const expectedStatsCount = view.readU8();
if (expectedStatsCount !== OSD.constants.STATISTIC_FIELDS.length) {
@ -2009,7 +2009,7 @@ OSD.msp = {
// Parse enabled warnings
let warningCount = OSD.constants.WARNINGS.length;
let warningFlags = view.readU16();
if (semver.gte(FC.CONFIG.apiVersion, "1.41.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
warningCount = view.readU8();
// the flags were replaced with a 32bit version
warningFlags = view.readU32();
@ -2036,7 +2036,7 @@ OSD.msp = {
}
}
if (semver.gte(FC.CONFIG.apiVersion, "1.41.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
// OSD profiles
d.osd_profiles.number = view.readU8();
d.osd_profiles.selected = view.readU8() - 1;
@ -2385,7 +2385,7 @@ TABS.osd.initialize = function(callback) {
$alarms.append($input);
}
if (semver.gte(FC.CONFIG.apiVersion, "1.36.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
// Timers
$('.timers-container').show();
const $timers = $('#timer-fields').empty();
@ -2903,7 +2903,7 @@ TABS.osd.initialize = function(callback) {
fontPresetsElement.change(function() {
const $font = $('.fontpresets option:selected');
let fontver = 1;
if (semver.gte(FC.CONFIG.apiVersion, "1.42.0")) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
fontver = 2;
}
$('.font-manager-version-info').text(i18n.getMessage(`osdDescribeFontVersion${fontver}`));