diff --git a/tabs/failsafe.js b/tabs/failsafe.js
index 28a9fcce..af914804 100644
--- a/tabs/failsafe.js
+++ b/tabs/failsafe.js
@@ -34,33 +34,31 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
}
function get_rc_data() {
- MSP.send_message(MSPCodes.MSP_RC, false, false, load_config);
+ MSP.send_message(MSPCodes.MSP_RC, false, false, load_feature_config);
}
- // BEGIN Support for pre API version 1.15.0
- function load_config() {
- MSP.send_message(MSPCodes.MSP_BF_CONFIG, false, false, load_misc);
+ function load_feature_config() {
+ MSP.send_message(MSPCodes.MSP_FEATURE_CONFIG, false, false, load_motor_config);
}
- function load_misc() {
- MSP.send_message(MSPCodes.MSP_MISC, false, false, load_html);
+ function load_motor_config() {
+ MSP.send_message(MSPCodes.MSP_MOTOR_CONFIG, false, false, load_compass_config);
+ }
+
+ function load_compass_config() {
+ MSP.send_message(MSPCodes.MSP_COMPASS_CONFIG, false, false, load_gps_config);
+ }
+
+ function load_gps_config() {
+ MSP.send_message(MSPCodes.MSP_GPS_CONFIG, false, false, load_html);
}
- // END (Support for pre API version 1.15.0
function load_html() {
$('#content').load("./tabs/failsafe.html", process_html);
}
- var apiVersionGte1_15_0 = semver.gte(CONFIG.apiVersion, "1.15.0");
- // Uncomment next line for testing older functionality on newer API version
- //apiVersionGte1_15_0 = false;
-
- if(apiVersionGte1_15_0) {
- load_rx_config();
- } else {
- load_config();
- }
+ load_rx_config();
function process_html() {
// fill stage 2 fields
@@ -72,244 +70,221 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
}
}
- // Conditionally hide the old or the new control pane's
- if(apiVersionGte1_15_0) {
- var oldPane = $('div.oldpane');
- oldPane.prop("disabled", true);
- oldPane.hide();
- } else {
- var newPane = $('div.newpane');
- newPane.prop("disabled", true);
- newPane.hide();
+ // FIXME cleanup oldpane html and css
+ var oldPane = $('div.oldpane');
+ oldPane.prop("disabled", true);
+ oldPane.hide();
+
+ // generate labels for assigned aux modes
+ var auxAssignment = [],
+ i,
+ element;
+
+ for (var channelIndex = 0; channelIndex < RC.active_channels - 4; channelIndex++) {
+ auxAssignment.push("");
}
- if (apiVersionGte1_15_0) {
- // generate labels for assigned aux modes
- var auxAssignment = [],
- i,
- element;
+ for (var modeIndex = 0; modeIndex < AUX_CONFIG.length; modeIndex++) {
- for (var channelIndex = 0; channelIndex < RC.active_channels - 4; channelIndex++) {
- auxAssignment.push("");
- }
+ var modeId = AUX_CONFIG_IDS[modeIndex];
- for (var modeIndex = 0; modeIndex < AUX_CONFIG.length; modeIndex++) {
+ // scan mode ranges to find assignments
+ for (var modeRangeIndex = 0; modeRangeIndex < MODE_RANGES.length; modeRangeIndex++) {
+ var modeRange = MODE_RANGES[modeRangeIndex];
- var modeId = AUX_CONFIG_IDS[modeIndex];
-
- // scan mode ranges to find assignments
- for (var modeRangeIndex = 0; modeRangeIndex < MODE_RANGES.length; modeRangeIndex++) {
- var modeRange = MODE_RANGES[modeRangeIndex];
-
- if (modeRange.id != modeId) {
- continue;
- }
-
- var range = modeRange.range;
- if (!(range.start < range.end)) {
- continue; // invalid!
- }
-
- auxAssignment[modeRange.auxChannelIndex] += "
" + AUX_CONFIG[modeIndex] + "";
+ if (modeRange.id != modeId) {
+ continue;
}
- }
- // generate full channel list
- var channelNames = [
- chrome.i18n.getMessage('controlAxisRoll'),
- chrome.i18n.getMessage('controlAxisPitch'),
- chrome.i18n.getMessage('controlAxisYaw'),
- chrome.i18n.getMessage('controlAxisThrottle')
- ],
- fullChannels_e = $('div.activechannellist'),
- aux_index = 1,
- aux_assignment_index = 0;
-
- for (i = 0; i < RXFAIL_CONFIG.length; i++) {
- if (i < channelNames.length) {
- fullChannels_e.append('\
-
\
-
\
- ' + channelNames[i] + '\
-
\
-
\
- \
-
\
-
\
- ');
- } else {
- fullChannels_e.append('\
-
\
-
\
- ' + chrome.i18n.getMessage("controlAxisAux" + (aux_index++)) + '\
- ' + auxAssignment[aux_assignment_index++] + '\
-
\
-
\
- \
-
\
-
\
-
\
- ');
+ var range = modeRange.range;
+ if (!(range.start < range.end)) {
+ continue; // invalid!
}
+
+ auxAssignment[modeRange.auxChannelIndex] += "
" + AUX_CONFIG[modeIndex] + "";
}
-
- var channel_mode_array = [];
- $('.number', fullChannels_e).each(function () {
- channel_mode_array.push($('select.aux_set' , this));
- });
-
- var channel_value_array = [];
- $('.number', fullChannels_e).each(function () {
- channel_value_array.push($('input[name="aux_value"]' , this));
- });
-
- var channelMode = $('select.aux_set');
- var channelValue = $('input[name="aux_value"]');
-
- // UI hooks
- channelMode.change(function () {
- var currentMode = parseInt($(this).val());
- var i = parseInt($(this).prop("id"));
- RXFAIL_CONFIG[i].mode = currentMode;
- if (currentMode == 2) {
- channel_value_array[i].prop("disabled", false);
- channel_value_array[i].show();
- } else {
- channel_value_array[i].prop("disabled", true);
- channel_value_array[i].hide();
- }
- });
-
- // UI hooks
- channelValue.change(function () {
- var i = parseInt($(this).prop("id"));
- RXFAIL_CONFIG[i].value = parseInt($(this).val());
- });
-
- // for some odd reason chrome 38+ changes scroll according to the touched select element
- // i am guessing this is a bug, since this wasn't happening on 37
- // code below is a temporary fix, which we will be able to remove in the future (hopefully)
- $('#content').scrollTop((scrollPosition) ? scrollPosition : 0);
-
- // fill stage 1 Valid Pulse Range Settings
- $('input[name="rx_min_usec"]').val(RX_CONFIG.rx_min_usec);
- $('input[name="rx_max_usec"]').val(RX_CONFIG.rx_max_usec);
-
- // fill fallback settings (mode and value) for all channels
- for (i = 0; i < RXFAIL_CONFIG.length; i++) {
- channel_value_array[i].val(RXFAIL_CONFIG[i].value);
- channel_mode_array[i].val(RXFAIL_CONFIG[i].mode);
- channel_mode_array[i].change();
- }
-
- BF_CONFIG.features.generateElements($('.tab-failsafe .featuresNew'));
-
- var failsafeFeature = $('input[name="FAILSAFE"]');
- failsafeFeature.change(function () {
- toggleStage2($(this).is(':checked'));
- });
- toggleStage2(BF_CONFIG.features.isEnabled('FAILSAFE'));
-
- $('input[name="failsafe_throttle"]').val(FAILSAFE_CONFIG.failsafe_throttle);
- $('input[name="failsafe_off_delay"]').val(FAILSAFE_CONFIG.failsafe_off_delay);
- $('input[name="failsafe_throttle_low_delay"]').val(FAILSAFE_CONFIG.failsafe_throttle_low_delay);
- $('input[name="failsafe_delay"]').val(FAILSAFE_CONFIG.failsafe_delay);
-
- // set stage 2 failsafe procedure
- $('input[type="radio"].procedure').change(function () {
- var element = $(this),
- checked = element.is(':checked'),
- id = element.attr('id');
- switch(id) {
- case 'drop':
- if (checked) {
- $('input[name="failsafe_throttle"]').prop("disabled", true);
- $('input[name="failsafe_off_delay"]').prop("disabled", true);
- }
- break;
-
- case 'land':
- if (checked) {
- $('input[name="failsafe_throttle"]').prop("disabled", false);
- $('input[name="failsafe_off_delay"]').prop("disabled", false);
- }
- break;
- }
- });
-
- switch(FAILSAFE_CONFIG.failsafe_procedure) {
- default:
- case 0:
- element = $('input[id="land"]') ;
- element.prop('checked', true);
- element.change();
- break;
- case 1:
- element = $('input[id="drop"]');
- element.prop('checked', true);
- element.change();
- break;
- }
-
- // set stage 2 kill switch option
- $('input[name="failsafe_kill_switch"]').prop('checked', FAILSAFE_CONFIG.failsafe_kill_switch);
-
- } else {
- BF_CONFIG.features.generateElements($('.tab-failsafe .featuresOld'));
- // fill failsafe_throttle field (pre API 1.15.0)
- $('input[name="failsafe_throttle_old"]').val(MISC.failsafe_throttle);
}
+ // generate full channel list
+ var channelNames = [
+ chrome.i18n.getMessage('controlAxisRoll'),
+ chrome.i18n.getMessage('controlAxisPitch'),
+ chrome.i18n.getMessage('controlAxisYaw'),
+ chrome.i18n.getMessage('controlAxisThrottle')
+ ],
+ fullChannels_e = $('div.activechannellist'),
+ aux_index = 1,
+ aux_assignment_index = 0;
+
+ for (i = 0; i < RXFAIL_CONFIG.length; i++) {
+ if (i < channelNames.length) {
+ fullChannels_e.append('\
+
\
+
\
+ ' + channelNames[i] + '\
+
\
+
\
+ \
+
\
+
\
+ ');
+ } else {
+ fullChannels_e.append('\
+
\
+
\
+ ' + chrome.i18n.getMessage("controlAxisAux" + (aux_index++)) + '\
+ ' + auxAssignment[aux_assignment_index++] + '\
+
\
+
\
+ \
+
\
+
\
+
\
+ ');
+ }
+ }
+
+ var channel_mode_array = [];
+ $('.number', fullChannels_e).each(function () {
+ channel_mode_array.push($('select.aux_set' , this));
+ });
+
+ var channel_value_array = [];
+ $('.number', fullChannels_e).each(function () {
+ channel_value_array.push($('input[name="aux_value"]' , this));
+ });
+
+ var channelMode = $('select.aux_set');
+ var channelValue = $('input[name="aux_value"]');
+
+ // UI hooks
+ channelMode.change(function () {
+ var currentMode = parseInt($(this).val());
+ var i = parseInt($(this).prop("id"));
+ RXFAIL_CONFIG[i].mode = currentMode;
+ if (currentMode == 2) {
+ channel_value_array[i].prop("disabled", false);
+ channel_value_array[i].show();
+ } else {
+ channel_value_array[i].prop("disabled", true);
+ channel_value_array[i].hide();
+ }
+ });
+
+ // UI hooks
+ channelValue.change(function () {
+ var i = parseInt($(this).prop("id"));
+ RXFAIL_CONFIG[i].value = parseInt($(this).val());
+ });
+
+ // for some odd reason chrome 38+ changes scroll according to the touched select element
+ // i am guessing this is a bug, since this wasn't happening on 37
+ // code below is a temporary fix, which we will be able to remove in the future (hopefully)
+ $('#content').scrollTop((scrollPosition) ? scrollPosition : 0);
+
+ // fill stage 1 Valid Pulse Range Settings
+ $('input[name="rx_min_usec"]').val(RX_CONFIG.rx_min_usec);
+ $('input[name="rx_max_usec"]').val(RX_CONFIG.rx_max_usec);
+
+ // fill fallback settings (mode and value) for all channels
+ for (i = 0; i < RXFAIL_CONFIG.length; i++) {
+ channel_value_array[i].val(RXFAIL_CONFIG[i].value);
+ channel_mode_array[i].val(RXFAIL_CONFIG[i].mode);
+ channel_mode_array[i].change();
+ }
+
+ FEATURE_CONFIG.features.generateElements($('.tab-failsafe .featuresNew'));
+
+ var failsafeFeature = $('input[name="FAILSAFE"]');
+ failsafeFeature.change(function () {
+ toggleStage2($(this).is(':checked'));
+ });
+ toggleStage2(FEATURE_CONFIG.features.isEnabled('FAILSAFE'));
+
+ $('input[name="failsafe_throttle"]').val(FAILSAFE_CONFIG.failsafe_throttle);
+ $('input[name="failsafe_off_delay"]').val(FAILSAFE_CONFIG.failsafe_off_delay);
+ $('input[name="failsafe_throttle_low_delay"]').val(FAILSAFE_CONFIG.failsafe_throttle_low_delay);
+ $('input[name="failsafe_delay"]').val(FAILSAFE_CONFIG.failsafe_delay);
+
+ // set stage 2 failsafe procedure
+ $('input[type="radio"].procedure').change(function () {
+ var element = $(this),
+ checked = element.is(':checked'),
+ id = element.attr('id');
+ switch(id) {
+ case 'drop':
+ if (checked) {
+ $('input[name="failsafe_throttle"]').prop("disabled", true);
+ $('input[name="failsafe_off_delay"]').prop("disabled", true);
+ }
+ break;
+
+ case 'land':
+ if (checked) {
+ $('input[name="failsafe_throttle"]').prop("disabled", false);
+ $('input[name="failsafe_off_delay"]').prop("disabled", false);
+ }
+ break;
+ }
+ });
+
+ switch(FAILSAFE_CONFIG.failsafe_procedure) {
+ default:
+ case 0:
+ element = $('input[id="land"]') ;
+ element.prop('checked', true);
+ element.change();
+ break;
+ case 1:
+ element = $('input[id="drop"]');
+ element.prop('checked', true);
+ element.change();
+ break;
+ }
+
+ // set stage 2 kill switch option
+ $('input[name="failsafe_kill_switch"]').prop('checked', FAILSAFE_CONFIG.failsafe_kill_switch);
+
+
$('a.save').click(function () {
// gather data that doesn't have automatic change event bound
- BF_CONFIG.features.updateData($('input[name="FAILSAFE"]'));
+ FEATURE_CONFIG.features.updateData($('input[name="FAILSAFE"]'));
- if(apiVersionGte1_15_0) {
- RX_CONFIG.rx_min_usec = parseInt($('input[name="rx_min_usec"]').val());
- RX_CONFIG.rx_max_usec = parseInt($('input[name="rx_max_usec"]').val());
+ RX_CONFIG.rx_min_usec = parseInt($('input[name="rx_min_usec"]').val());
+ RX_CONFIG.rx_max_usec = parseInt($('input[name="rx_max_usec"]').val());
- FAILSAFE_CONFIG.failsafe_throttle = parseInt($('input[name="failsafe_throttle"]').val());
- FAILSAFE_CONFIG.failsafe_off_delay = parseInt($('input[name="failsafe_off_delay"]').val());
- FAILSAFE_CONFIG.failsafe_throttle_low_delay = parseInt($('input[name="failsafe_throttle_low_delay"]').val());
- FAILSAFE_CONFIG.failsafe_delay = parseInt($('input[name="failsafe_delay"]').val());
+ FAILSAFE_CONFIG.failsafe_throttle = parseInt($('input[name="failsafe_throttle"]').val());
+ FAILSAFE_CONFIG.failsafe_off_delay = parseInt($('input[name="failsafe_off_delay"]').val());
+ FAILSAFE_CONFIG.failsafe_throttle_low_delay = parseInt($('input[name="failsafe_throttle_low_delay"]').val());
+ FAILSAFE_CONFIG.failsafe_delay = parseInt($('input[name="failsafe_delay"]').val());
- if( $('input[id="land"]').is(':checked')) {
- FAILSAFE_CONFIG.failsafe_procedure = 0;
- } else if( $('input[id="drop"]').is(':checked')) {
- FAILSAFE_CONFIG.failsafe_procedure = 1;
- }
-
- FAILSAFE_CONFIG.failsafe_kill_switch = $('input[name="failsafe_kill_switch"]').is(':checked') ? 1 : 0;
- } else {
- // get failsafe_throttle field value (pre API 1.15.0)
- MISC.failsafe_throttle = parseInt($('input[name="failsafe_throttle_old"]').val());
+ if( $('input[id="land"]').is(':checked')) {
+ FAILSAFE_CONFIG.failsafe_procedure = 0;
+ } else if( $('input[id="drop"]').is(':checked')) {
+ FAILSAFE_CONFIG.failsafe_procedure = 1;
}
+ FAILSAFE_CONFIG.failsafe_kill_switch = $('input[name="failsafe_kill_switch"]').is(':checked') ? 1 : 0;
+
function save_failssafe_config() {
MSP.send_message(MSPCodes.MSP_SET_FAILSAFE_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_FAILSAFE_CONFIG), false, save_rxfail_config);
}
function save_rxfail_config() {
- mspHelper.sendRxFailConfig(save_bf_config);
+ mspHelper.sendRxFailConfig(save_feature_config);
}
- function save_bf_config() {
- MSP.send_message(MSPCodes.MSP_SET_BF_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_BF_CONFIG), false, save_to_eeprom);
+ function save_feature_config() {
+ MSP.send_message(MSPCodes.MSP_SET_FEATURE_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_FEATURE_CONFIG), false, save_to_eeprom);
}
- // BEGIN pre API 1.15.0 save functions
- function save_misc() {
- MSP.send_message(MSPCodes.MSP_SET_MISC, mspHelper.crunch(MSPCodes.MSP_SET_MISC), false, save_to_eeprom);
- }
- // END pre API 1.15.0 save functions
-
function save_to_eeprom() {
MSP.send_message(MSPCodes.MSP_EEPROM_WRITE, false, false, reboot);
}
@@ -341,11 +316,7 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
}
}
- if(apiVersionGte1_15_0) {
- MSP.send_message(MSPCodes.MSP_SET_RX_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_RX_CONFIG), false, save_failssafe_config);
- } else {
- MSP.send_message(MSPCodes.MSP_SET_BF_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_BF_CONFIG), false, save_misc);
- }
+ MSP.send_message(MSPCodes.MSP_SET_RX_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_RX_CONFIG), false, save_failssafe_config);
});
// translate to user-selected language
diff --git a/tabs/logging.js b/tabs/logging.js
index 25551776..d6c04af4 100644
--- a/tabs/logging.js
+++ b/tabs/logging.js
@@ -229,8 +229,18 @@ TABS.logging.initialize = function (callback) {
fileWriter = null;
function prepare_file() {
+
+ var prefix = CONFIG.flightControllerIdentifier + '_log';
+ var suffix = 'csv';
+
+ var filename = generateFilename(prefix, suffix);
+
+ var accepts = [{
+ extensions: [suffix],
+ }];
+
// create or load the file
- chrome.fileSystem.chooseEntry({type: 'saveFile', suggestedName: 'betaflight_data_log', accepts: [{extensions: ['csv']}]}, function(entry) {
+ chrome.fileSystem.chooseEntry({type: 'saveFile', suggestedName: filename, accepts: accepts}, function(entry) {
if (!entry) {
console.log('No file selected');
return;
diff --git a/tabs/motors.js b/tabs/motors.js
index 05121c21..d8eeba0d 100644
--- a/tabs/motors.js
+++ b/tabs/motors.js
@@ -12,40 +12,29 @@ TABS.motors.initialize = function (callback) {
self.armed = false;
self.feature3DSupported = false;
self.allowTestMode = true;
+ self.feature3DSupported = true;
if (GUI.active_tab != 'motors') {
GUI.active_tab = 'motors';
}
function get_arm_status() {
- MSP.send_message(MSPCodes.MSP_STATUS, false, false, load_config);
+ MSP.send_message(MSPCodes.MSP_STATUS, false, false, load_feature_config);
}
- function load_config() {
- MSP.send_message(MSPCodes.MSP_BF_CONFIG, false, false, load_3d);
+ function load_feature_config() {
+ MSP.send_message(MSPCodes.MSP_FEATURE_CONFIG, false, false, load_motor_3d_config);
}
- function load_3d() {
- var next_callback = esc_protocol;
- if (semver.gte(CONFIG.apiVersion, "1.14.0")) {
- self.feature3DSupported = true;
- MSP.send_message(MSPCodes.MSP_3D, false, false, next_callback);
- } else {
- next_callback();
- }
+ function load_motor_3d_config() {
+ MSP.send_message(MSPCodes.MSP_MOTOR_3D_CONFIG, false, false, load_esc_protocol);
}
- function esc_protocol() {
- var next_callback = get_motor_data;
- if (semver.gte(CONFIG.apiVersion, "1.16.0")) {
- MSP.send_message(MSPCodes.MSP_ADVANCED_CONFIG, false, false, next_callback);
- } else {
- next_callback();
- }
+ function load_esc_protocol() {
+ MSP.send_message(MSPCodes.MSP_ADVANCED_CONFIG, false, false, load_motor_data);
}
- function get_motor_data() {
- update_arm_status();
+ function load_motor_data() {
MSP.send_message(MSPCodes.MSP_MOTOR, false, false, load_html);
}
@@ -53,7 +42,7 @@ TABS.motors.initialize = function (callback) {
$('#content').load("./tabs/motors.html", process_html);
}
- MSP.send_message(MSPCodes.MSP_MISC, false, false, get_arm_status);
+ MSP.send_message(MSPCodes.MSP_MOTOR_CONFIG, false, false, get_arm_status);
function update_arm_status() {
self.armed = bit_check(CONFIG.mode, 0);
@@ -185,8 +174,10 @@ TABS.motors.initialize = function (callback) {
function process_html() {
// translate to user-selected language
localize();
+
+ update_arm_status();
- self.feature3DEnabled = BF_CONFIG.features.isEnabled('3D');
+ self.feature3DEnabled = FEATURE_CONFIG.features.isEnabled('3D');
if (self.feature3DEnabled && !self.feature3DSupported) {
self.allowTestMode = false;
@@ -201,7 +192,7 @@ TABS.motors.initialize = function (callback) {
$('#motorsEnableTestMode').prop('checked', false)
.prop('disabled', true);
- update_model(BF_CONFIG.mixerConfiguration);
+ update_model(MIXER_CONFIG.mixer);
// Always start with default/empty sensor data array, clean slate all
initSensorData();
@@ -330,19 +321,19 @@ TABS.motors.initialize = function (callback) {
');
}
- $('div.sliders input').prop('min', MISC.mincommand)
- .prop('max', MISC.maxthrottle);
- $('div.values li:not(:last)').text(MISC.mincommand);
+ $('div.sliders input').prop('min', MOTOR_CONFIG.mincommand)
+ .prop('max', MOTOR_CONFIG.maxthrottle);
+ $('div.values li:not(:last)').text(MOTOR_CONFIG.mincommand);
if(self.feature3DEnabled && self.feature3DSupported) {
//Arbitrary sanity checks
//Note: values may need to be revisited
- if(_3D.neutral3d > 1575 || _3D.neutral3d < 1425)
- _3D.neutral3d = 1500;
+ if(MOTOR_3D_CONFIG.neutral > 1575 || MOTOR_3D_CONFIG.neutral < 1425)
+ MOTOR_3D_CONFIG.neutral = 1500;
- $('div.sliders input').val(_3D.neutral3d);
+ $('div.sliders input').val(MOTOR_3D_CONFIG.neutral);
} else {
- $('div.sliders input').val(MISC.mincommand);
+ $('div.sliders input').val(MOTOR_CONFIG.mincommand);
}
if(self.allowTestMode){
@@ -397,9 +388,9 @@ TABS.motors.initialize = function (callback) {
// change all values to default
if (self.feature3DEnabled && self.feature3DSupported) {
- $('div.sliders input').val(_3D.neutral3d);
+ $('div.sliders input').val(MOTOR_3D_CONFIG.neutral);
} else {
- $('div.sliders input').val(MISC.mincommand);
+ $('div.sliders input').val(MOTOR_CONFIG.mincommand);
}
$('div.sliders input').trigger('input');
@@ -411,11 +402,11 @@ TABS.motors.initialize = function (callback) {
for (var i = 0; i < number_of_valid_outputs; i++) {
if (!self.feature3DEnabled) {
- if (MOTOR_DATA[i] > MISC.mincommand) {
+ if (MOTOR_DATA[i] > MOTOR_CONFIG.mincommand) {
motors_running = true;
}
} else {
- if ((MOTOR_DATA[i] < _3D.deadband3d_low) || (MOTOR_DATA[i] > _3D.deadband3d_high)) {
+ if ((MOTOR_DATA[i] < MOTOR_3D_CONFIG.deadband3d_low) || (MOTOR_DATA[i] > MOTOR_3D_CONFIG.deadband3d_high)) {
motors_running = true;
}
}
@@ -473,8 +464,8 @@ TABS.motors.initialize = function (callback) {
full_block_scale = 1000;
motorOffset = 1000;
} else {
- full_block_scale = MISC.maxthrottle - MISC.mincommand;
- motorOffset = MISC.mincommand;
+ full_block_scale = MOTOR_CONFIG.maxthrottle - MOTOR_CONFIG.mincommand;
+ motorOffset = MOTOR_CONFIG.mincommand;
}
function update_ui() {
diff --git a/tabs/onboard_logging.js b/tabs/onboard_logging.js
index 155bb0db..76a6402e 100644
--- a/tabs/onboard_logging.js
+++ b/tabs/onboard_logging.js
@@ -4,7 +4,6 @@ var
sdcardTimer;
TABS.onboard_logging = {
- available: false,
blockSize: 128,
BLOCK_SIZE: 4096,
@@ -21,39 +20,17 @@ TABS.onboard_logging.initialize = function (callback) {
}
if (CONFIGURATOR.connectionValid) {
- // Blackbox was introduced in 1.5.0, dataflash API was introduced in 1.8.0, BLACKBOX/SDCARD MSP APIs in 1.11.0
- TABS.onboard_logging.available = semver.gte(CONFIG.flightControllerVersion, "1.5.0");
-
- if (!TABS.onboard_logging.available) {
- load_html();
- return;
- }
- var load_name = function () {
- var next_callback = load_html;
- if (semver.gte(CONFIG.apiVersion, "1.20.0")) {
- MSP.send_message(MSPCodes.MSP_NAME, false, false, next_callback);
- } else {
- next_callback();
- }
- };
-
- MSP.send_message(MSPCodes.MSP_BF_CONFIG, false, false, function() {
- if (semver.gte(CONFIG.flightControllerVersion, "1.8.0")) {
- MSP.send_message(MSPCodes.MSP_DATAFLASH_SUMMARY, false, false, function() {
- if (semver.gte(CONFIG.flightControllerVersion, "1.11.0")) {
- MSP.send_message(MSPCodes.MSP_SDCARD_SUMMARY, false, false, function() {
- MSP.send_message(MSPCodes.MSP_BLACKBOX_CONFIG, false, false, function() {
- MSP.send_message(MSPCodes.MSP_ADVANCED_CONFIG, false, false, load_name);
- });
+ MSP.send_message(MSPCodes.MSP_FEATURE_CONFIG, false, false, function() {
+ MSP.send_message(MSPCodes.MSP_DATAFLASH_SUMMARY, false, false, function() {
+ MSP.send_message(MSPCodes.MSP_SDCARD_SUMMARY, false, false, function() {
+ MSP.send_message(MSPCodes.MSP_BLACKBOX_CONFIG, false, false, function() {
+ MSP.send_message(MSPCodes.MSP_ADVANCED_CONFIG, false, false, function() {
+ MSP.send_message(MSPCodes.MSP_NAME, false, false, load_html);
});
- } else {
- load_html();
- }
+ });
});
- } else {
- load_html();
- }
+ });
});
}
@@ -109,11 +86,8 @@ TABS.onboard_logging.initialize = function (callback) {
*
* The best we can do on those targets is check the BLACKBOX feature bit to identify support for Blackbox instead.
*/
- if (BLACKBOX.supported || DATAFLASH.supported
- || semver.gte(CONFIG.flightControllerVersion, "1.5.0") && semver.lte(CONFIG.flightControllerVersion, "1.10.0") && BF_CONFIG.features.isEnabled('BLACKBOX')) {
+ if ((BLACKBOX.supported || DATAFLASH.supported) && FEATURE_CONFIG.features.isEnabled('BLACKBOX')) {
blackboxSupport = 'yes';
- } else if (semver.gte(CONFIG.flightControllerVersion, "1.5.0") && semver.lte(CONFIG.flightControllerVersion, "1.10.0")) {
- blackboxSupport = 'maybe';
} else {
blackboxSupport = 'no';
}
diff --git a/tabs/pid_tuning.js b/tabs/pid_tuning.js
index 4d8947e7..7c678a36 100755
--- a/tabs/pid_tuning.js
+++ b/tabs/pid_tuning.js
@@ -34,19 +34,7 @@ TABS.pid_tuning.initialize = function (callback) {
}).then(function() {
return MSP.promise(MSPCodes.MSP_FILTER_CONFIG);
}).then(function() {
- var promise = true;
- if (CONFIG.flightControllerIdentifier === "BTFL" && semver.gte(CONFIG.apiVersion, "1.16.0")) {
- promise = MSP.promise(MSPCodes.MSP_BF_CONFIG);
- }
-
- return promise;
- }).then(function() {
- var promise = true;
- if (semver.gte(CONFIG.apiVersion, "1.15.0")) {
- promise = MSP.promise(MSPCodes.MSP_RC_DEADBAND);
- }
-
- return promise;
+ return MSP.promise(MSPCodes.MSP_RC_DEADBAND);
}).then(function() {
$('#content').load("./tabs/pid_tuning.html", process_html);
});
@@ -236,7 +224,7 @@ TABS.pid_tuning.initialize = function (callback) {
}
if (semver.gte(CONFIG.apiVersion, "1.20.0")
- || semver.gte(CONFIG.apiVersion, "1.16.0") && BF_CONFIG.features.isEnabled('SUPEREXPO_RATES')) {
+ || semver.gte(CONFIG.apiVersion, "1.16.0") && FEATURE_CONFIG.features.isEnabled('SUPEREXPO_RATES')) {
$('#pid-tuning .rate').text(chrome.i18n.getMessage("pidTuningSuperRate"));
} else {
$('#pid-tuning .rate').text(chrome.i18n.getMessage("pidTuningRate"));
@@ -351,7 +339,7 @@ TABS.pid_tuning.initialize = function (callback) {
FILTER_CONFIG.yaw_lpf_hz = parseInt($('.pid_filter input[name="yawLowpassFrequency"]').val());
if (semver.gte(CONFIG.apiVersion, "1.16.0") && !semver.gte(CONFIG.apiVersion, "1.20.0")) {
- BF_CONFIG.features.updateData($('input[name="SUPEREXPO_RATES"]'));
+ FEATURE_CONFIG.features.updateData($('input[name="SUPEREXPO_RATES"]'));
}
if (semver.gte(CONFIG.apiVersion, "1.16.0")) {
@@ -407,7 +395,7 @@ TABS.pid_tuning.initialize = function (callback) {
$('#pid_mag').show();
showTitle = true;
}
- if (BF_CONFIG.features.isEnabled('GPS')) {
+ if (FEATURE_CONFIG.features.isEnabled('GPS')) {
$('#pid_gps').show();
showTitle = true;
}
@@ -470,7 +458,7 @@ TABS.pid_tuning.initialize = function (callback) {
function process_html() {
if (semver.gte(CONFIG.apiVersion, "1.16.0") && !semver.gte(CONFIG.apiVersion, "1.20.0")) {
- BF_CONFIG.features.generateElements($('.tab-pid_tuning .features'));
+ FEATURE_CONFIG.features.generateElements($('.tab-pid_tuning .features'));
} else {
$('.tab-pid_tuning .pidTuningFeatures').hide();
}
@@ -487,9 +475,9 @@ TABS.pid_tuning.initialize = function (callback) {
rc_rate_yaw: RC_tuning.rcYawRate,
rc_expo: RC_tuning.RC_EXPO,
rc_yaw_expo: RC_tuning.RC_YAW_EXPO,
- superexpo: BF_CONFIG.features.isEnabled('SUPEREXPO_RATES'),
- deadband: RC_deadband.deadband,
- yawDeadband: RC_deadband.yaw_deadband
+ superexpo: FEATURE_CONFIG.features.isEnabled('SUPEREXPO_RATES'),
+ deadband: RC_DEADBAND_CONFIG.deadband,
+ yawDeadband: RC_DEADBAND_CONFIG.yaw_deadband
};
if (semver.lt(CONFIG.apiVersion, "1.7.0")) {
@@ -853,19 +841,11 @@ TABS.pid_tuning.initialize = function (callback) {
}).then(function () {
return MSP.promise(MSPCodes.MSP_SET_PID, mspHelper.crunch(MSPCodes.MSP_SET_PID));
}).then(function () {
- if (semver.gte(CONFIG.apiVersion, "1.16.0")) {
- return MSP.promise(MSPCodes.MSP_SET_PID_ADVANCED, mspHelper.crunch(MSPCodes.MSP_SET_PID_ADVANCED));
- }
+ return MSP.promise(MSPCodes.MSP_SET_PID_ADVANCED, mspHelper.crunch(MSPCodes.MSP_SET_PID_ADVANCED));
}).then(function () {
- if (semver.gte(CONFIG.apiVersion, "1.16.0")) {
- return MSP.promise(MSPCodes.MSP_SET_FILTER_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_FILTER_CONFIG));
- }
+ return MSP.promise(MSPCodes.MSP_SET_FILTER_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_FILTER_CONFIG));
}).then(function () {
return MSP.promise(MSPCodes.MSP_SET_RC_TUNING, mspHelper.crunch(MSPCodes.MSP_SET_RC_TUNING));
- }).then(function () {
- if (semver.gte(CONFIG.apiVersion, "1.16.0")) {
- return MSP.promise(MSPCodes.MSP_SET_BF_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_BF_CONFIG));
- }
}).then(function () {
return MSP.promise(MSPCodes.MSP_EEPROM_WRITE);
}).then(function () {
diff --git a/tabs/receiver.css b/tabs/receiver.css
index 9c97a8ce..e8dd4497 100644
--- a/tabs/receiver.css
+++ b/tabs/receiver.css
@@ -164,6 +164,7 @@
border-right: 1px solid silver;
}
.tab-receiver .tunings table {
+ width: 100%;
border-collapse: collapse;
}
diff --git a/tabs/receiver.html b/tabs/receiver.html
index 40e2f8c9..db80ae35 100644
--- a/tabs/receiver.html
+++ b/tabs/receiver.html
@@ -27,45 +27,65 @@