mirror of
https://github.com/betaflight/betaflight-configurator.git
synced 2025-07-19 06:15:13 +03:00
CF/BF - delete old unused commented out code.
This commit is contained in:
Michael Keller
parent
1a87198bba
commit
a7703a995d
2 changed files with 8 additions and 109 deletions
37
js/fc.js
37
js/fc.js
|
|
@ -1,9 +1,8 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// define all the global variables that are uses to hold FC state
|
// define all the global variables that are uses to hold FC state
|
||||||
var CONFIG; // FIXME rename to STATUS
|
var CONFIG;
|
||||||
var FEATURE_CONFIG;
|
var FEATURE_CONFIG;
|
||||||
//var BF_CONFIG; // FIXME remove all references to this and delete it
|
|
||||||
var MIXER_CONFIG;
|
var MIXER_CONFIG;
|
||||||
var BOARD_ALIGNMENT_CONFIG;
|
var BOARD_ALIGNMENT_CONFIG;
|
||||||
var LED_STRIP;
|
var LED_STRIP;
|
||||||
|
|
@ -39,7 +38,6 @@ var MOTOR_CONFIG;
|
||||||
var GPS_CONFIG;
|
var GPS_CONFIG;
|
||||||
var COMPASS_CONFIG;
|
var COMPASS_CONFIG;
|
||||||
var RSSI_CONFIG;
|
var RSSI_CONFIG;
|
||||||
//var MISC; // FIXME remove all references to this and delete it
|
|
||||||
var MOTOR_3D_CONFIG;
|
var MOTOR_3D_CONFIG;
|
||||||
var DATAFLASH;
|
var DATAFLASH;
|
||||||
var SDCARD;
|
var SDCARD;
|
||||||
|
|
@ -92,19 +90,6 @@ var FC = {
|
||||||
yaw: 0,
|
yaw: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
// FIXME remove all references to this and delete it
|
|
||||||
// BF_CONFIG = {
|
|
||||||
// mixer: 0,
|
|
||||||
// features: new Features(CONFIG),
|
|
||||||
// board_align_roll: 0,
|
|
||||||
// board_align_pitch: 0,
|
|
||||||
// board_align_yaw: 0,
|
|
||||||
// currentscale: 0,
|
|
||||||
// currentoffset: 0,
|
|
||||||
// currentMeterSource: 0,
|
|
||||||
// batterycapacity: 0,
|
|
||||||
// };
|
|
||||||
|
|
||||||
LED_STRIP = [];
|
LED_STRIP = [];
|
||||||
LED_COLORS = [];
|
LED_COLORS = [];
|
||||||
LED_MODE_COLORS = [];
|
LED_MODE_COLORS = [];
|
||||||
|
|
@ -245,26 +230,6 @@ var FC = {
|
||||||
channel: 0,
|
channel: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
// FIXME remove all references to this and delete it
|
|
||||||
// MISC = {
|
|
||||||
// minthrottle: 0,
|
|
||||||
// maxthrottle: 0,
|
|
||||||
// mincommand: 0,
|
|
||||||
// failsafe_throttle: 0,
|
|
||||||
// gps_type: 0,
|
|
||||||
// gps_baudrate: 0,
|
|
||||||
// gps_ubx_sbas: 0,
|
|
||||||
// multiwiicurrentoutput: 0,
|
|
||||||
// rssi_channel: 0,
|
|
||||||
// placeholder2: 0,
|
|
||||||
// mag_declination: 0, // not checked
|
|
||||||
// vbatscale: 0,
|
|
||||||
// vbatmincellvoltage: 0,
|
|
||||||
// vbatmaxcellvoltage: 0,
|
|
||||||
// vbatwarningcellvoltage: 0,
|
|
||||||
// batterymetertype: 1, // 1=ADC, 2=ESC
|
|
||||||
// };
|
|
||||||
|
|
||||||
MOTOR_3D_CONFIG = {
|
MOTOR_3D_CONFIG = {
|
||||||
deadband3d_low: 0,
|
deadband3d_low: 0,
|
||||||
deadband3d_high: 0,
|
deadband3d_high: 0,
|
||||||
|
|
|
||||||
|
|
@ -307,26 +307,6 @@ MspHelper.prototype.process_data = function(dataHandler) {
|
||||||
case MSPCodes.MSP_RSSI_CONFIG:
|
case MSPCodes.MSP_RSSI_CONFIG:
|
||||||
RSSI_CONFIG.channel = data.readU8();
|
RSSI_CONFIG.channel = data.readU8();
|
||||||
break;
|
break;
|
||||||
// case MSPCodes.MSP_MISC:
|
|
||||||
// RX_CONFIG.stick_center = data.readU16();
|
|
||||||
// MOTOR_CONFIG.minthrottle = data.readU16(); // 0-2000
|
|
||||||
// MOTOR_CONFIG.maxthrottle = data.readU16(); // 0-2000
|
|
||||||
// MOTOR_CONFIG.mincommand = data.readU16(); // 0-2000
|
|
||||||
// MISC.failsafe_throttle = data.readU16(); // 1000-2000
|
|
||||||
// GPS_CONFIG.provider = data.readU8();
|
|
||||||
// GPS_CONFIG.baudrate = data.readU8();
|
|
||||||
// GPS_CONFIG.ublox_sbas = data.readU8();
|
|
||||||
// MISC.multiwiicurrentoutput = data.readU8();
|
|
||||||
// MISC.placeholder2 = data.readU8();
|
|
||||||
// if (semver.lt(CONFIG.apiVersion, "1.18.0"))
|
|
||||||
// COMPASS_CONFIG.mag_declination = data.read16() / 10; // -1800-1800
|
|
||||||
// else
|
|
||||||
// COMPASS_CONFIG.mag_declination = data.read16() / 100; // -18000-18000
|
|
||||||
// MISC.vbatscale = data.readU8(); // 10-200
|
|
||||||
// BATTERY_CONFIG.vbatmincellvoltage = data.readU8() / 10; // 10-50
|
|
||||||
// BATTERY_CONFIG.vbatmaxcellvoltage = data.readU8() / 10; // 10-50
|
|
||||||
// BATTERY_CONFIG.vbatwarningcellvoltage = data.readU8() / 10; // 10-50
|
|
||||||
// break;
|
|
||||||
case MSPCodes.MSP_MOTOR_3D_CONFIG:
|
case MSPCodes.MSP_MOTOR_3D_CONFIG:
|
||||||
MOTOR_3D_CONFIG.deadband3d_low = data.readU16();
|
MOTOR_3D_CONFIG.deadband3d_low = data.readU16();
|
||||||
MOTOR_3D_CONFIG.deadband3d_high = data.readU16();
|
MOTOR_3D_CONFIG.deadband3d_high = data.readU16();
|
||||||
|
|
@ -479,9 +459,6 @@ MspHelper.prototype.process_data = function(dataHandler) {
|
||||||
case MSPCodes.MSP_SET_RSSI_CONFIG:
|
case MSPCodes.MSP_SET_RSSI_CONFIG:
|
||||||
console.log('RSSI Configuration saved');
|
console.log('RSSI Configuration saved');
|
||||||
break;
|
break;
|
||||||
// case MSPCodes.MSP_SET_MISC:
|
|
||||||
// console.log('MISC Configuration saved');
|
|
||||||
// break;
|
|
||||||
case MSPCodes.MSP_SET_FEATURE_CONFIG:
|
case MSPCodes.MSP_SET_FEATURE_CONFIG:
|
||||||
console.log('Features saved');
|
console.log('Features saved');
|
||||||
break;
|
break;
|
||||||
|
|
@ -544,34 +521,23 @@ MspHelper.prototype.process_data = function(dataHandler) {
|
||||||
case MSPCodes.MSP_SET_RX_MAP:
|
case MSPCodes.MSP_SET_RX_MAP:
|
||||||
console.log('RCMAP saved');
|
console.log('RCMAP saved');
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MSPCodes.MSP_MIXER_CONFIG:
|
case MSPCodes.MSP_MIXER_CONFIG:
|
||||||
MIXER_CONFIG.mixer = data.readU8();
|
MIXER_CONFIG.mixer = data.readU8();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MSPCodes.MSP_FEATURE_CONFIG:
|
case MSPCodes.MSP_FEATURE_CONFIG:
|
||||||
FEATURE_CONFIG.features.setMask(data.readU32());
|
FEATURE_CONFIG.features.setMask(data.readU32());
|
||||||
|
|
||||||
updateTabList(FEATURE_CONFIG.features);
|
updateTabList(FEATURE_CONFIG.features);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// case MSPCodes.MSP_BF_CONFIG:
|
|
||||||
// MIXER_CONFIG.mixer = data.readU8();
|
|
||||||
// FEATURE_CONFIG.features.setMask(data.readU32());
|
|
||||||
// RX_CONFIG.serialrx_provider = data.readU8();
|
|
||||||
// BOARD_ALIGNMENT_CONFIG.roll = data.read16(); // -180 - 360
|
|
||||||
// BOARD_ALIGNMENT_CONFIG.pitch = data.read16(); // -180 - 360
|
|
||||||
// BOARD_ALIGNMENT_CONFIG.yaw = data.read16(); // -180 - 360
|
|
||||||
// BF_CONFIG.currentscale = data.read16();
|
|
||||||
// BF_CONFIG.currentoffset = data.read16();
|
|
||||||
//
|
|
||||||
// updateTabList(FEATURE_CONFIG.features);
|
|
||||||
//
|
|
||||||
// break;
|
|
||||||
case MSPCodes.MSP_BOARD_ALIGNMENT_CONFIG:
|
case MSPCodes.MSP_BOARD_ALIGNMENT_CONFIG:
|
||||||
BOARD_ALIGNMENT_CONFIG.roll = data.read16(); // -180 - 360
|
BOARD_ALIGNMENT_CONFIG.roll = data.read16(); // -180 - 360
|
||||||
BOARD_ALIGNMENT_CONFIG.pitch = data.read16(); // -180 - 360
|
BOARD_ALIGNMENT_CONFIG.pitch = data.read16(); // -180 - 360
|
||||||
BOARD_ALIGNMENT_CONFIG.yaw = data.read16(); // -180 - 360
|
BOARD_ALIGNMENT_CONFIG.yaw = data.read16(); // -180 - 360
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MSPCodes.MSP_SET_REBOOT:
|
case MSPCodes.MSP_SET_REBOOT:
|
||||||
console.log('Reboot request accepted');
|
console.log('Reboot request accepted');
|
||||||
break;
|
break;
|
||||||
|
|
@ -1137,17 +1103,6 @@ MspHelper.prototype.crunch = function(code) {
|
||||||
case MSPCodes.MSP_SET_MIXER_CONFIG:
|
case MSPCodes.MSP_SET_MIXER_CONFIG:
|
||||||
buffer.push8(MIXER_CONFIG.mixer)
|
buffer.push8(MIXER_CONFIG.mixer)
|
||||||
break;
|
break;
|
||||||
// case MSPCodes.MSP_SET_BF_CONFIG:
|
|
||||||
// var featureMask = FEATURE_CONFIG.features.getMask();
|
|
||||||
// buffer.push8(MIXER_CONFIG.mixer)
|
|
||||||
// .push32(featureMask)
|
|
||||||
// .push8(RX_CONFIG.serialrx_provider)
|
|
||||||
// .push16(BOARD_ALIGNMENT_CONFIG.roll)
|
|
||||||
// .push16(BOARD_ALIGNMENT_CONFIG.pitch)
|
|
||||||
// .push16(BOARD_ALIGNMENT_CONFIG.yaw)
|
|
||||||
// .push16(BF_CONFIG.currentscale)
|
|
||||||
// .push16(BF_CONFIG.currentoffset);
|
|
||||||
// break;
|
|
||||||
case MSPCodes.MSP_SET_BOARD_ALIGNMENT_CONFIG:
|
case MSPCodes.MSP_SET_BOARD_ALIGNMENT_CONFIG:
|
||||||
buffer.push16(BOARD_ALIGNMENT_CONFIG.roll)
|
buffer.push16(BOARD_ALIGNMENT_CONFIG.roll)
|
||||||
.push16(BOARD_ALIGNMENT_CONFIG.pitch)
|
.push16(BOARD_ALIGNMENT_CONFIG.pitch)
|
||||||
|
|
@ -1214,28 +1169,6 @@ MspHelper.prototype.crunch = function(code) {
|
||||||
case MSPCodes.MSP_SET_RSSI_CONFIG:
|
case MSPCodes.MSP_SET_RSSI_CONFIG:
|
||||||
buffer.push8(RSSI_CONFIG.channel);
|
buffer.push8(RSSI_CONFIG.channel);
|
||||||
break;
|
break;
|
||||||
// case MSPCodes.MSP_SET_MISC:
|
|
||||||
// buffer.push16(RX_CONFIG.stick_center)
|
|
||||||
// .push16(MOTOR_CONFIG.minthrottle)
|
|
||||||
// .push16(MOTOR_CONFIG.maxthrottle)
|
|
||||||
// .push16(MOTOR_CONFIG.mincommand)
|
|
||||||
// .push16(MISC.failsafe_throttle)
|
|
||||||
// .push8(GPS_CONFIG.provider)
|
|
||||||
// .push8(GPS_CONFIG.baudrate)
|
|
||||||
// .push8(GPS_CONFIG.ublox_sbas)
|
|
||||||
// .push8(MISC.multiwiicurrentoutput)
|
|
||||||
// .push8(RSSI_CONFIG.channel)
|
|
||||||
// .push8(MISC.placeholder2);
|
|
||||||
// if (semver.lt(CONFIG.apiVersion, "1.18.0")) {
|
|
||||||
// buffer.push16(Math.round(COMPASS_CONFIG.mag_declination * 10));
|
|
||||||
// } else {
|
|
||||||
// buffer.push16(Math.round(COMPASS_CONFIG.mag_declination * 100));
|
|
||||||
// }
|
|
||||||
// buffer.push8(MISC.vbatscale)
|
|
||||||
// .push8(Math.round(BATTERY_CONFIG.vbatmincellvoltage * 10))
|
|
||||||
// .push8(Math.round(BATTERY_CONFIG.vbatmaxcellvoltage * 10))
|
|
||||||
// .push8(Math.round(BATTERY_CONFIG.vbatwarningcellvoltage * 10));
|
|
||||||
// break;
|
|
||||||
case MSPCodes.MSP_SET_BATTERY_CONFIG:
|
case MSPCodes.MSP_SET_BATTERY_CONFIG:
|
||||||
buffer.push8(Math.round(BATTERY_CONFIG.vbatmincellvoltage * 10))
|
buffer.push8(Math.round(BATTERY_CONFIG.vbatmincellvoltage * 10))
|
||||||
.push8(Math.round(BATTERY_CONFIG.vbatmaxcellvoltage * 10))
|
.push8(Math.round(BATTERY_CONFIG.vbatmaxcellvoltage * 10))
|
||||||
|
|
@ -1244,6 +1177,7 @@ MspHelper.prototype.crunch = function(code) {
|
||||||
.push8(BATTERY_CONFIG.voltageMeterSource)
|
.push8(BATTERY_CONFIG.voltageMeterSource)
|
||||||
.push8(BATTERY_CONFIG.currentMeterSource);
|
.push8(BATTERY_CONFIG.currentMeterSource);
|
||||||
break;
|
break;
|
||||||
|
// FIXME - Needs updating before it can be used.
|
||||||
// case MSPCodes.MSP_SET_VOLTAGE_METER_CONFIG:
|
// case MSPCodes.MSP_SET_VOLTAGE_METER_CONFIG:
|
||||||
// buffer.push8(MISC.vbatscale)
|
// buffer.push8(MISC.vbatscale)
|
||||||
// .push8(Math.round(BATTERY_CONFIG.vbatmincellvoltage * 10))
|
// .push8(Math.round(BATTERY_CONFIG.vbatmincellvoltage * 10))
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue