diff --git a/js/configurator_main.js b/js/configurator_main.js index 606f02f53..ce2e56345 100644 --- a/js/configurator_main.js +++ b/js/configurator_main.js @@ -224,10 +224,6 @@ $(function() { require('./../tabs/receiver'); TABS.receiver.initialize(content_ready); break; - case 'modes': - require('./../tabs/modes'); - TABS.modes.initialize(content_ready); - break; case 'gps': require('./../tabs/gps'); TABS.gps.initialize(content_ready); diff --git a/js/gui.js b/js/gui.js index c039879c8..0dc3b6cc2 100644 --- a/js/gui.js +++ b/js/gui.js @@ -37,7 +37,6 @@ var GUI_control = function () { 'led_strip', 'logging', 'onboard_logging', - 'modes', 'outputs', 'pid_tuning', 'ports', diff --git a/tabs/blank.html b/tabs/blank.html deleted file mode 100644 index 582a0c143..000000000 --- a/tabs/blank.html +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/tabs/modes.html b/tabs/modes.html deleted file mode 100644 index 8374f03d2..000000000 --- a/tabs/modes.html +++ /dev/null @@ -1,17 +0,0 @@ -
-
- - - - - - - -
-
-
-
- -
-
-
diff --git a/tabs/modes.js b/tabs/modes.js deleted file mode 100644 index 9881b8cd0..000000000 --- a/tabs/modes.js +++ /dev/null @@ -1,163 +0,0 @@ -// Disabled via main.js/main.html, cleanflight does not use MSP_BOX. - -'use strict'; - -const path = require('path'); - -const mspHelper = require('./../js/msp/MSPHelper'); -const MSPCodes = require('./../js/msp/MSPCodes'); -const MSP = require('./../js/msp'); -const { GUI, TABS } = require('./../js/gui'); -const FC = require('./../js/fc'); -const interval = require('./../js/intervals'); -const BitHelper = require('./../js/bitHelper'); -const i18n = require('./../js/localization'); - -TABS.modes = {}; -TABS.modes.initialize = function (callback) { - var self = this; - - if (GUI.active_tab != 'modes') { - GUI.active_tab = 'modes'; - } - - function get_active_box_data() { - MSP.send_message(MSPCodes.MSP_ACTIVEBOXES, false, false, get_box_ids); - } - - function get_box_ids() { - MSP.send_message(MSPCodes.MSP_BOXIDS, false, false, get_rc_data); - } - - function get_rc_data() { - MSP.send_message(MSPCodes.MSP_RC, false, false, load_html); - } - - function load_html() { - GUI.load(path.join(__dirname, "modes.html"), process_html); - } - - MSP.send_message(MSPCodes.MSP_BOXNAMES, false, false, get_active_box_data); - - function process_html() { - // generate heads according to RC count - var table_head = $('table.boxes .heads'); - var main_head = $('table.boxes .main'); - for (var i = 0; i < (FC.RC.active_channels - 4); i++) { - table_head.append('AUX ' + (i + 1) + ''); - - // 3 columns per aux channel (this might be requested to change to 6 in the future, so watch out) - main_head.append('\ - \ - \ - \ - '); - } - - // translate to user-selected language - i18n.localize();; - - // generate table from the supplied AUX names and AUX data - for (var i = 0; i < FC.AUX_CONFIG.length; i++) { - var line = ''; - line += '' + FC.AUX_CONFIG[i] + ''; - - for (var j = 0; j < (RC.active_channels - 4) * 3; j++) { - if (BitHelper.bit_check(FC.AUX_CONFIG_values[i], j)) { - line += ''; - } else { - line += ''; - } - } - - line += ''; - - $('.boxes > tbody:last').append(line); - } - - // UI Hooks - $('a.update').on('click', function () { - // catch the input changes - var main_needle = 0, - needle = 0; - - $('.boxes input').each(function () { - if ($(this).is(':checked')) { - FC.AUX_CONFIG_values[main_needle] = BitHelper.bit_set(FC.AUX_CONFIG_values[main_needle], needle); - } else { - FC.AUX_CONFIG_values[main_needle] = BitHelper.bit_clear(FC.AUX_CONFIG_values[main_needle], needle); - } - - needle++; - - if (needle >= (FC.RC.active_channels - 4) * 3) { // 1 aux * 3 checkboxes, 4 AUX = 12 bits per line - main_needle++; - needle = 0; - } - }); - - function save_to_eeprom() { - MSP.send_message(MSPCodes.MSP_EEPROM_WRITE, false, false, function () { - GUI.log(i18n.getMessage('auxiliaryEepromSaved')); - }); - } - - MSP.send_message(MSPCodes.MSP_SET_BOX, mspHelper.crunch(MSPCodes.MSP_SET_BOX), false, save_to_eeprom); - }); - - // val = channel value - // aux_num = position of corresponding aux channel in the html table - var switches_e = $('table.boxes .switches'); - function box_highlight(aux_num, val) { - var pos = 0; // < 1300 - - if (val > 1300 && val < 1700) { - pos = 1; - } else if (val > 1700) { - pos = 2; - } - - var highlight_column = (aux_num * 3) + pos + 2; // +2 to skip name column and index starting on 1 instead of 0 - var erase_columns = (aux_num * 3) + 2; - - $('td:nth-child(n+' + erase_columns + '):nth-child(-n+' + (erase_columns + 2) + ')', switches_e).css('background-color', 'transparent'); - $('td:nth-child(' + highlight_column + ')', switches_e).css('background-color', 'orange'); - } - - // data pulling functions used inside interval timer - function get_rc_data() { - MSP.send_message(MSPCodes.MSP_RC, false, false, update_ui); - } - - function update_ui() { - for (var i = 0; i < FC.AUX_CONFIG.length; i++) { - if (FC.isModeBitSet(i)) { - $('td.name').eq(i).addClass('on').removeClass('off'); - } else { - $('td.name').eq(i).removeClass('on').removeClass('off'); - - if (FC.AUX_CONFIG_values[i] > 0) { - $('td.name').eq(i).addClass('off'); - } - } - - } - - for (var i = 0; i < (FC.RC.active_channels - 4); i++) { - box_highlight(i, FC.RC.channels[i + 4]); - } - } - - // update ui instantly on first load - update_ui(); - - // enable data pulling - interval.add('aux_data_pull', get_rc_data, 50); - - GUI.content_ready(callback); - } -}; - -TABS.modes.cleanup = function (callback) { - if (callback) callback(); -}; diff --git a/tabs/review.html b/tabs/review.html deleted file mode 100644 index 0fc52a1ed..000000000 --- a/tabs/review.html +++ /dev/null @@ -1,11 +0,0 @@ -
-
-

-

-

-
-
-
-
-
-
\ No newline at end of file