From 7a5252e8779bfa36ff062d795ea4916762c7d7a1 Mon Sep 17 00:00:00 2001 From: skaman82 Date: Thu, 5 Nov 2015 17:47:06 +0100 Subject: [PATCH] Cleaning up some old files --- adjustments.css | 122 ----- configuration.html | 432 ----------------- configuration.js | 476 ------------------- main2.css | 1098 -------------------------------------------- main_bak.html | 251 ---------- 5 files changed, 2379 deletions(-) delete mode 100644 adjustments.css delete mode 100644 configuration.html delete mode 100644 configuration.js delete mode 100755 main2.css delete mode 100755 main_bak.html diff --git a/adjustments.css b/adjustments.css deleted file mode 100644 index 9f9b2e55..00000000 --- a/adjustments.css +++ /dev/null @@ -1,122 +0,0 @@ -.tab-adjustments { -} - -#tab-adjustments-templates { - display: none; -} - -.tab-adjustments .help { - padding: 10px; - background-color: #ffcb18; - margin-bottom: 10px; -} - -.tab-adjustments .help p { - padding-bottom: 5px; -} - -.tab-adjustments .help li { - list-style-type: decimal; - margin-left: 20px; -} - -.tab-adjustments .adjustments { - width: 100%; - border-spacing: 0px; -} - -.tab-adjustments .adjustments thead td { - text-align: center; - white-space: nowrap; - padding: 10px 10px; - background-color: #61B665; -} - -.tab-adjustments .adjustment { - background-color: #ececec; -} - -.tab-adjustments .adjustment:nth-child(odd) { - background-color: #ffffff; -} - -.tab-adjustments .adjustment select { - outline: 1px solid silver; -} - -.tab-adjustments .adjustment td { - text-align: center; -} - -.tab-adjustments .adjustment .info { - width: 5%; - height: 80px; -} - -.tab-adjustments .adjustment .info .enabling { - white-space: nowrap; -} - -.tab-adjustments .adjustment .channelInfo { - width: 5%; - padding: 0px 10px; -} - -.tab-adjustments .adjustment .channelInfo .limits { - padding: 10px 0px; -} - -.tab-adjustments .adjustment .range { - width: 65%; - padding: 0px 20px; -} - -.tab-adjustments .adjustment .range .channel-slider { - margin-top: -28px; -} - -.tab-adjustments .adjustment .range .marker { - position: absolute; - left: 50%; - top: 27px; - height: 13px; - width: 6px; - margin-left: -3px; - background: #ffcb18; -} - -.tab-adjustments .adjustment .functionSelection { - width: 5%; -} - -.tab-adjustments .adjustment .adjustmentSlot { - width: 5%; -} - -.tab-adjustments .adjustment .functionSwitchChannel { - width: 5%; -} - -.tab-adjustments > .buttons { - margin-top: 10px; -} - -.tab-adjustments > .buttons a { - float: right; - height: 28px; - line-height: 28px; - padding: 0 15px 0 15px; - display: block; -} - -.tab-adjustments .buttons a { - text-align: center; - font-weight: bold; - - border: 1px solid silver; - background-color: #ececec; -} - -.tab-adjustments .buttons a:hover { - background-color: #dedcdc; -} \ No newline at end of file diff --git a/configuration.html b/configuration.html deleted file mode 100644 index 9f5b2d72..00000000 --- a/configuration.html +++ /dev/null @@ -1,432 +0,0 @@ -
-
Configuration
-
- -
-
-
-

-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - -
- -
-
-
- -
-
- -
- -
- -
-
- -
-
- -
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
- -
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - -
-
-
-
-
-
-
-
-
-
-
-

-
-
- -
-
-
-
-
-
-
-
- - - - - - - - - - - -
-
- -
-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - -
-
- -
-
- -
-
- -
-
- -
-
-
-
-
-
-
-
-
- - - - - - - - - - - -
- -
- -
-
- -
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-

-
-
-
- -
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-
-
- - - - - - - - - - - -
-
- - -
-
- - -
-
- - -
-
- -
-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - -
-
-
-
-
-
-
-
-
diff --git a/configuration.js b/configuration.js deleted file mode 100644 index 944e0583..00000000 --- a/configuration.js +++ /dev/null @@ -1,476 +0,0 @@ -'use strict'; - -TABS.configuration = {}; - -TABS.configuration.initialize = function (callback, scrollPosition) { - var self = this; - - if (GUI.active_tab != 'configuration') { - GUI.active_tab = 'configuration'; - googleAnalytics.sendAppView('Configuration'); - } - - function load_config() { - MSP.send_message(MSP_codes.MSP_BF_CONFIG, false, false, load_serial_config); - } - - function load_serial_config() { - if (semver.lt(CONFIG.apiVersion, "1.6.0")) { - MSP.send_message(MSP_codes.MSP_CF_SERIAL_CONFIG, false, false, load_rc_map); - } else { - load_rc_map(); - } - } - - function load_rc_map() { - MSP.send_message(MSP_codes.MSP_RX_MAP, false, false, load_misc); - } - - function load_misc() { - MSP.send_message(MSP_codes.MSP_MISC, false, false, load_acc_trim); - } - - function load_acc_trim() { - MSP.send_message(MSP_codes.MSP_ACC_TRIM, false, false - , semver.gte(CONFIG.apiVersion, "1.8.0") ? load_arming_config : load_html); - } - - function load_arming_config() { - MSP.send_message(MSP_codes.MSP_ARMING_CONFIG, false, false, load_loop_time); - } - - function load_loop_time() { - MSP.send_message(MSP_codes.MSP_LOOP_TIME, false, false, load_html); - } - - function load_html() { - $('#content').load("./tabs/configuration.html", process_html); - } - - - - - MSP.send_message(MSP_codes.MSP_IDENT, false, false, load_config); - - function recalculate_cycles_sec() { - var looptime = $('input[name="looptime"]').val(); - - var message = 'Max'; - if (looptime > 0) { - message = parseFloat((1 / looptime) * 1000 * 1000).toFixed(0); - } - - $('input[name="looptimehz"]').val(message); - } - - function process_html() { - // translate to user-selected language - localize(); - - var mixer_list_e = $('select.mixerList'); - for (var i = 0; i < mixerList.length; i++) { - mixer_list_e.append(''); - } - - mixer_list_e.change(function () { - var val = parseInt($(this).val()); - - BF_CONFIG.mixerConfiguration = val; - - $('.mixerPreview img').attr('src', './resources/motor_order/' + mixerList[val - 1].image + '.svg'); - }); - - // select current mixer configuration - mixer_list_e.val(BF_CONFIG.mixerConfiguration).change(); - - // generate features - var features = [ - {bit: 0, group: 'rxMode', mode: 'group', name: 'RX_PPM', description: 'PPM RX input'}, - {bit: 1, group: 'batteryVoltage', name: 'VBAT', description: 'Battery voltage monitoring'}, - {bit: 2, group: 'other', name: 'INFLIGHT_ACC_CAL', description: 'In-flight level calibration'}, - {bit: 3, group: 'rxMode', mode: 'group', name: 'RX_SERIAL', description: 'Serial-based receiver (SPEKSAT, SBUS, SUMD)'}, - {bit: 4, group: 'esc', name: 'MOTOR_STOP', description: 'Don\'t spin the motors when armed'}, - {bit: 5, group: 'other', name: 'SERVO_TILT', description: 'Servo gimbal'}, - {bit: 6, group: 'other', name: 'SOFTSERIAL', description: 'Enable CPU based serial ports'}, - {bit: 7, group: 'gps', name: 'GPS', description: 'GPS (configure port scenario first)'}, - {bit: 8, group: 'rxFailsafe', name: 'FAILSAFE', description: 'Failsafe settings on RX signal loss'}, - {bit: 9, group: 'other', name: 'SONAR', description: 'Sonar'}, - {bit: 10, group: 'other', name: 'TELEMETRY', description: 'Telemetry output'}, - {bit: 11, group: 'batteryCurrent', name: 'CURRENT_METER', description: 'Battery current monitoring'}, - {bit: 12, group: 'other', name: '3D', description: '3D mode (for use with reversible ESCs)'}, - {bit: 13, group: 'rxMode', mode: 'group', name: 'RX_PARALLEL_PWM', description: 'PWM RX input'}, - {bit: 14, group: 'rxMode', mode: 'group', name: 'RX_MSP', description: 'MSP RX input'}, - {bit: 15, group: 'rssi', name: 'RSSI_ADC', description: 'Analog RSSI input'}, - {bit: 16, group: 'other', name: 'LED_STRIP', description: 'Addressable RGB LED strip support'}, - {bit: 17, group: 'other', name: 'DISPLAY', description: 'OLED Screen Display'}, - {bit: 18, group: 'esc', name: 'ONESHOT125', description: 'ONESHOT ESC support (disconnect ESCs, remove props)'}, - {bit: 19, group: 'other', name: 'BLACKBOX', description: 'Blackbox flight data recorder'} - ]; - - if (semver.gte(CONFIG.apiVersion, "1.12.0")) { - features.push( - {bit: 20, group: 'other', name: 'CHANNEL_FORWARDING', description: 'Forward aux channels to remaining servo outputs'} - ); - } - - var radioGroups = []; - - var features_e = $('.features'); - for (var i = 0; i < features.length; i++) { - var row_e; - - if (features[i].mode === 'group') { - row_e = $('' - + features[i].description - + ''); - radioGroups.push(features[i].group); - } else { - row_e = $('' - + features[i].description - + ''); - - var feature_e = row_e.find('input.feature'); - - feature_e.prop('checked', bit_check(BF_CONFIG.features, features[i].bit)); - feature_e.data('bit', features[i].bit); - } - - features_e.each(function () { - if ($(this).hasClass(features[i].group)) { - $(this).append(row_e); - } - }); - } - - for (var i = 0; i < radioGroups.length; i++) { - var group = radioGroups[i]; - var controls_e = $('input[name="' + group + '"].feature'); - - - controls_e.each(function() { - var bit = parseInt($(this).attr('value')); - var state = bit_check(BF_CONFIG.features, bit); - - $(this).prop('checked', state); - }); - } - - // generate GPS - var gpsProtocols = [ - 'NMEA', - 'UBLOX' - ]; - - var gpsBaudRates = [ - '115200', - '57600', - '38400', - '19200', - '9600' - ]; - - var gpsSbas = [ - 'Disabled', - 'Auto-detect', - 'European EGNOS', - 'North American WAAS', - 'Japanese MSAS', - 'Indian GAGAN' - ]; - - var gps_protocol_e = $('select.gps_protocol'); - for (var i = 0; i < gpsProtocols.length; i++) { - gps_protocol_e.append(''); - } - - gps_protocol_e.change(function () { - MISC.gps_type = parseInt($(this).val()); - }); - - gps_protocol_e.val(MISC.gps_type); - - - var gps_baudrate_e = $('select.gps_baudrate'); - for (var i = 0; i < gpsBaudRates.length; i++) { - gps_baudrate_e.append(''); - } - - if (semver.lt(CONFIG.apiVersion, "1.6.0")) { - gps_baudrate_e.change(function () { - SERIAL_CONFIG.gpsBaudRate = parseInt($(this).val()); - }); - gps_baudrate_e.val(SERIAL_CONFIG.gpsBaudRate); - } else { - gps_baudrate_e.prop("disabled", true); - gps_baudrate_e.parent().hide(); - } - - - var gps_ubx_sbas_e = $('select.gps_ubx_sbas'); - for (var i = 0; i < gpsSbas.length; i++) { - gps_ubx_sbas_e.append(''); - } - - gps_ubx_sbas_e.change(function () { - MISC.gps_ubx_sbas = parseInt($(this).val()); - }); - - gps_ubx_sbas_e.val(MISC.gps_ubx_sbas); - - - // generate serial RX - var serialRXtypes = [ - 'SPEKTRUM1024', - 'SPEKTRUM2048', - 'SBUS', - 'SUMD', - 'SUMH', - 'XBUS_MODE_B', - 'XBUS_MODE_B_RJ01' - ]; - - var serialRX_e = $('select.serialRX'); - for (var i = 0; i < serialRXtypes.length; i++) { - serialRX_e.append(''); - } - - serialRX_e.change(function () { - BF_CONFIG.serialrx_type = parseInt($(this).val()); - }); - - // select current serial RX type - serialRX_e.val(BF_CONFIG.serialrx_type); - - // 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 board alignment - $('input[name="board_align_roll"]').val(BF_CONFIG.board_align_roll); - $('input[name="board_align_pitch"]').val(BF_CONFIG.board_align_pitch); - $('input[name="board_align_yaw"]').val(BF_CONFIG.board_align_yaw); - - // fill accel trims - $('input[name="roll"]').val(CONFIG.accelerometerTrims[1]); - $('input[name="pitch"]').val(CONFIG.accelerometerTrims[0]); - - // fill magnetometer - $('input[name="mag_declination"]').val(MISC.mag_declination); - - //fill motor disarm params and FC loop time - if(semver.gte(CONFIG.apiVersion, "1.8.0")) { - $('input[name="autodisarmdelay"]').val(ARMING_CONFIG.auto_disarm_delay); - $('input[name="disarmkillswitch"]').prop('checked', ARMING_CONFIG.disarm_kill_switch); - $('div.disarm').show(); - if(bit_check(BF_CONFIG.features, 4))//MOTOR_STOP - $('div.disarmdelay').show(); - else - $('div.disarmdelay').hide(); - - // fill FC loop time - $('input[name="looptime"]').val(FC_CONFIG.loopTime); - - recalculate_cycles_sec(); - - $('div.cycles').show(); - } - - // fill throttle - $('input[name="minthrottle"]').val(MISC.minthrottle); - $('input[name="midthrottle"]').val(MISC.midrc); - $('input[name="maxthrottle"]').val(MISC.maxthrottle); - $('input[name="failsafe_throttle"]').val(MISC.failsafe_throttle); - $('input[name="mincommand"]').val(MISC.mincommand); - - // fill battery - $('input[name="mincellvoltage"]').val(MISC.vbatmincellvoltage); - $('input[name="maxcellvoltage"]').val(MISC.vbatmaxcellvoltage); - $('input[name="warningcellvoltage"]').val(MISC.vbatwarningcellvoltage); - $('input[name="voltagescale"]').val(MISC.vbatscale); - - // fill current - $('input[name="currentscale"]').val(BF_CONFIG.currentscale); - $('input[name="currentoffset"]').val(BF_CONFIG.currentoffset); - $('input[name="multiwiicurrentoutput"]').prop('checked', MISC.multiwiicurrentoutput); - - - // UI hooks - $('input[name="looptime"]').change(function() { - recalculate_cycles_sec(); - }); - - $('input[type="checkbox"].feature', features_e).change(function () { - var element = $(this), - index = element.data('bit'), - state = element.is(':checked'); - - if (state) { - BF_CONFIG.features = bit_set(BF_CONFIG.features, index); - if(element.attr('name') === 'MOTOR_STOP') - $('div.disarmdelay').show(); - } else { - BF_CONFIG.features = bit_clear(BF_CONFIG.features, index); - if(element.attr('name') === 'MOTOR_STOP') - $('div.disarmdelay').hide(); - } - }); - - // UI hooks - $('input[type="radio"].feature', features_e).change(function () { - var element = $(this), - group = element.attr('name'); - - var controls_e = $('input[name="' + group + '"]'); - var selected_bit = controls_e.filter(':checked').val(); - - controls_e.each(function() { - var bit = $(this).attr('value'); - - var selected = (selected_bit == bit); - if (selected) { - BF_CONFIG.features = bit_set(BF_CONFIG.features, bit); - } else { - BF_CONFIG.features = bit_clear(BF_CONFIG.features, bit); - } - - }); - }); - - - -// load switchery - var elems = Array.prototype.slice.call(document.querySelectorAll('#toggle')); - -elems.forEach(function(html) { - var switchery = new Switchery(html, - { - color: '#59aa29', - secondaryColor: '#c4c4c4' -}); - }); - // load switchery END - - - - - $('a.save').click(function () { - // gather data that doesn't have automatic change event bound - BF_CONFIG.board_align_roll = parseInt($('input[name="board_align_roll"]').val()); - BF_CONFIG.board_align_pitch = parseInt($('input[name="board_align_pitch"]').val()); - BF_CONFIG.board_align_yaw = parseInt($('input[name="board_align_yaw"]').val()); - - CONFIG.accelerometerTrims[1] = parseInt($('input[name="roll"]').val()); - CONFIG.accelerometerTrims[0] = parseInt($('input[name="pitch"]').val()); - MISC.mag_declination = parseFloat($('input[name="mag_declination"]').val()); - - // motor disarm - if(semver.gte(CONFIG.apiVersion, "1.8.0")) { - ARMING_CONFIG.auto_disarm_delay = parseInt($('input[name="autodisarmdelay"]').val()); - ARMING_CONFIG.disarm_kill_switch = ~~$('input[name="disarmkillswitch"]').is(':checked'); // ~~ boolean to decimal conversion - FC_CONFIG.loopTime = parseInt($('input[name="looptime"]').val()); - } - - MISC.minthrottle = parseInt($('input[name="minthrottle"]').val()); - MISC.midrc = parseInt($('input[name="midthrottle"]').val()); - MISC.maxthrottle = parseInt($('input[name="maxthrottle"]').val()); - MISC.failsafe_throttle = parseInt($('input[name="failsafe_throttle"]').val()); - MISC.mincommand = parseInt($('input[name="mincommand"]').val()); - - MISC.vbatmincellvoltage = parseFloat($('input[name="mincellvoltage"]').val()); - MISC.vbatmaxcellvoltage = parseFloat($('input[name="maxcellvoltage"]').val()); - MISC.vbatwarningcellvoltage = parseFloat($('input[name="warningcellvoltage"]').val()); - MISC.vbatscale = parseInt($('input[name="voltagescale"]').val()); - - BF_CONFIG.currentscale = parseInt($('input[name="currentscale"]').val()); - BF_CONFIG.currentoffset = parseInt($('input[name="currentoffset"]').val()); - MISC.multiwiicurrentoutput = ~~$('input[name="multiwiicurrentoutput"]').is(':checked'); // ~~ boolean to decimal conversion - - function save_serial_config() { - if (semver.lt(CONFIG.apiVersion, "1.6.0")) { - MSP.send_message(MSP_codes.MSP_SET_CF_SERIAL_CONFIG, MSP.crunch(MSP_codes.MSP_SET_CF_SERIAL_CONFIG), false, save_misc); - } else { - save_misc(); - } - } - - function save_misc() { - MSP.send_message(MSP_codes.MSP_SET_MISC, MSP.crunch(MSP_codes.MSP_SET_MISC), false, save_acc_trim); - } - - function save_acc_trim() { - MSP.send_message(MSP_codes.MSP_SET_ACC_TRIM, MSP.crunch(MSP_codes.MSP_SET_ACC_TRIM), false - , semver.gte(CONFIG.apiVersion, "1.8.0") ? save_arming_config : save_to_eeprom); - } - - function save_arming_config() { - MSP.send_message(MSP_codes.MSP_SET_ARMING_CONFIG, MSP.crunch(MSP_codes.MSP_SET_ARMING_CONFIG), false, save_looptime_config); - } - - function save_looptime_config() { - MSP.send_message(MSP_codes.MSP_SET_LOOP_TIME, MSP.crunch(MSP_codes.MSP_SET_LOOP_TIME), false, save_to_eeprom); - } - - function save_to_eeprom() { - MSP.send_message(MSP_codes.MSP_EEPROM_WRITE, false, false, reboot); - } - - function reboot() { - GUI.log(chrome.i18n.getMessage('configurationEepromSaved')); - - GUI.tab_switch_cleanup(function() { - MSP.send_message(MSP_codes.MSP_SET_REBOOT, false, false, reinitialize); - }); - } - - function reinitialize() { - GUI.log(chrome.i18n.getMessage('deviceRebooting')); - - GUI.timeout_add('waiting_for_bootup', function waiting_for_bootup() { - MSP.send_message(MSP_codes.MSP_IDENT, false, false, function () { - GUI.log(chrome.i18n.getMessage('deviceReady')); - TABS.configuration.initialize(false, $('#content').scrollTop()); - }); - },1500); // 1500 ms seems to be just the right amount of delay to prevent data request timeouts - } - - MSP.send_message(MSP_codes.MSP_SET_BF_CONFIG, MSP.crunch(MSP_codes.MSP_SET_BF_CONFIG), false, save_serial_config); - }); - - // status data pulled via separate timer with static speed - GUI.interval_add('status_pull', function status_pull() { - MSP.send_message(MSP_codes.MSP_STATUS); - }, 250, true); - - if (callback) callback(); - } -}; - - - - - TABS.configuration.cleanup = function (callback) { - if (callback) callback(); -}; \ No newline at end of file diff --git a/main2.css b/main2.css deleted file mode 100755 index dacad0d8..00000000 --- a/main2.css +++ /dev/null @@ -1,1098 +0,0 @@ -* { - margin: 0; - padding: 0; - border: 0; - list-style: none; - outline: none; -} - -html, body { - height: 100%; - -} -body { - font-family: 'open_sansregular', 'Segoe UI', Tahoma, sans-serif; - font-size: 12px; - color: #303030; - background-color:#dfddd0; - margin:0px; - padding:0px; -} - -a { - text-decoration:none; - color:#000; - font-family: 'open_sanssemibold', Arial; - } - -a:hover { - text-decoration: none; - - - } - - -/* Help-Icon */ - -.helpicon { - float:right; - margin-top:-18px; - margin-right:7px; - display:block; - height:14px; - width:14px; - opacity: 0.2; - background-image:url(images/icons/cf_icon_info_grey.svg); - background-size:contain; - background-position:center; - -} - - -.helpicon:hover { - opacity: 1.0; - background-image:url(images/icons/cf_icon_info_green.svg); -} - - - -/* Change here the content of the documentation button in all tabs!!! */ - -.cf_doc_version_bt a:before { - content:"Documentation 1.10"; - } - -.cf_doc_version_bt a { - padding:1px 9px 1px 9px; - margin-top: -25px; - background-color:#59aa29; - border-radius:3px; - border: 1px solid #4c8829; - color:#fff; - float:right; - font-family: 'open_sansbold', Arial; - font-size:10px; - line-height:17px; - text-shadow:0px 1px rgba(0, 0, 0, 0.25); - text-transform:uppercase; - letter-spacing: 0.03em; - display:block; - - } - -.cf_doc_version_bt a:hover { - background-color:#6ac435; - transition: all ease 0.2s; - - } - - -/* documentation button end */ - - - - -input[type="number"]::-webkit-inner-spin-button { - opacity: 1; /* required for chromium 33+ beta */ - margin-left: 5px; -} -.clear-both { - clear: both; -} -.left { - float: left; -} -.right { - float: right; -} -#main-wrapper { - padding: 0px 0px 0 0px; /* padding: 5px 5px 0 5px; */ - height: calc(100% - 7px); - -} - -.headerbar { - height:110px; - width:100%; - float:left; - background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.15)); -} - - - -#logo { - position: relative; - float:left; - height:70px; - z-index: 0; - background-image: url("images/light-wide-2.svg"); - background-repeat: no-repeat; - width: 340px; - background-position:left center; - background-size: contain; - margin-left:15px; - margin-top:15px; -} - -#port-picker { /* */ - float: left; - margin-top: 20px; - margin-left: 20px; - width:180px; -} - -#port-picker li { - float: left; -} /* -#port-picker select { - height: 20px; - line-height: 20px; - float: left; - margin-right: 5px; - border: 1px solid silver; -} -#port-picker #port { - width: 130px; -} -#port-picker #baud { - width: 80px; -} -#port-picker #delay { - width: 60px; -} -#port-picker #port-override{ - height: 18px; - line-height: 20px; - margin-right: 5px; - width: 120px; - padding: 0 5px; - border: 1px solid silver; -} - -#port-picker a { - float: left; - display: block; - width: 80px; - height: 18px; - border: 1px solid silver; - line-height: 18px; - text-align: center; -} -#port-picker a.connect { - margin-right: 10px; - background-color: #be2222; - color: white; - font-weight: bold; -} -#port-picker a.connect:hover { - text-decoration: none; - background-color: #ea3131; -} -#port-picker a.connect.active { - background-color: #0fab16; -} -#port-picker a.connect.active:hover { - background-color: #13d81d; -} -#port-picker input.auto_connect { - float: left; - margin-top: 4px; -} -#port-picker span.auto_connect { - float: left; - margin: 3px 0 0 5px; -} -*/ - - -#sensor-status { - float: right; - margin-right: 10px; - height: 22px; - line-height: 22px; -} - -#header_dataflash { - display:none; } - - -#sensor-status li { - float: left; - padding: 0 12px 0 12px; - height: 18px; - line-height: 18px; - color: white; - text-align: center; - border: 1px solid #c0c0c0; - border-right: 0; - background-color: #e32424; -} -#sensor-status li:last-child { - border-right: 1px solid #c0c0c0; -} -#sensor-status .on { - background-color: #b8cf02; -} - - - -/* -#documentation-controls { - float: right; - height: 22px; - line-height: 22px; - margin-right: 10px; -} - - -#button-documentation { - float: left; - padding: 0 12px 0 12px; - height: 18px; - line-height: 18px; - background-color: #ffcb18; - color: #000; - font-weight: bold; - border: solid 1px #c0c0c0; - display: none; -} -*/ -#options { - float: right; - width: 25px; - height: 25px; - margin-top:10px; - margin-right:10px; - background-image: url('./images/CF_settings_white.svg'); - background-position: -1px -1px; - background-repeat: no-repeat; - opacity: 0.4; -} -#options:hover { - opacity: 0.65; -} -#options.active { - opacity: 0.65; -} -#options.active:hover { - opacity: 0.75; -} -#options-window { - display: none; - position: fixed; - right: 35px; - top: 25px; - padding: 5px; - line-height: 20px; - border: 1px solid silver; - background-color: white; - border-radius:5px; -} -#options-window input { - float: left; - margin-top: 3px; - margin-right: 5px; -} - - -/* Log setup*/ - - -#log { - margin-bottom: 0px; - border: 0px solid silver; /* was 1px*/ - background-color:#242424; - color:rgba(255,255,255,0.60); - line-height: 21px; - height: 27px; /* was 65*/ - overflow-y: hidden; /* scroll*/ -} - - - -#scrollicon { -position:fixed; -right:10px; -top:113px; -height:27px; -width:27px; -background-image:url(images/icons/scroll.svg); -background-repeat:no-repeat; -background-size:100%; -opacity:0.0; -transition: all ease 1s; - -} - - -#scrollicon.active { -height:110px; -margin-top:10px; -margin-right:20px; - width:110px; - opacity:0.15; - background-image:url(images/icons/scroll.svg); - background-size:80%; - box-shadow: inset 0 0 5px #000000; - - transition: all ease 2s; -} - - -#log.active { - overflow-y: scroll; /* scroll*/ - box-shadow: inset 0 0 15px #000000; -} - - -#log .wrapper { - padding: 5px; /* was 5*/ - padding-left:10px; - padding-bottom:4px; - -webkit-user-select: text; - position:relative; - bottom:0px; - -} - -#log a { - font-weight: regular; - color:#59aa29; -} - -#log a:hover { - text-decoration: underline; -} - - /* Log switch */ - - - .logswitch { - position:fixed; - right: 7px; - margin-top:-1px; - float:right; - padding:5px; - z-index:10; - } - .logswitch a { - color:#656565; - - } - - - -.tab_container { - float:left; - height:100%; - width:210px; - border-right: 4px solid #59aa29; - } - - -#tabs { - position: relative; - float: left; - width:100%; - padding-top: 0px; - padding-bottom: 0px; - margin-top:0px; - z-index: 10; - font-weight: regular; - font-size:13px; -} - -#tabs ul { - margin-top:0px; - overflow: hidden; - /* Cause the height to expand to contain its floated contents */ -} - -#tabs ul.mode-connected { - display: none; -} - -#tabs li { - width:100%; - float: left; - border-bottom: 1px solid rgba(0,0,0,0.30); - border-top: 1px solid #404040; - height:29px; - -} - -#tabs li:first-child { - border-top: 0px; - -} - -#tabs li:last-child { - border-bottom: 0px; - -} - - -#tabs li a { - font-family: 'open_sansregular', Arial; - padding-left:33px; - padding-top:5px; - padding-bottom:3px; - background-color: transparent; - color:#999999; - width:100%; - height:23px; - display:block; - text-shadow:0px 1px rgba(0, 0, 0, 0.45); - transition: none; -} - - -#tabs li a:hover { - text-decoration: none; - background-color: rgba(0,0,0,0.20); -} -#tabs li.active { - color: #fff; - transition: none; - - -} -#tabs li.active a { - background-color: #59aa29; - color: #fff; - transition: none; -} - - -#tabs li.active a:hover { - cursor: default; - background-color:#59aa29; -} - - -.tabicon { - background-repeat: no-repeat; - background-size:15px; - background-position:13px 7px; -} - - -/* Tab-Icons */ - -.ic_setup { - background-image:url(images/icons/cf_icon_setup_grey.svg); - } - -li.active .ic_setup { - background-image:url(images/icons/cf_icon_setup_white.svg); - color: #fff; - } -.ic_ports { - background-image:url(images/icons/cf_icon_ports_grey.svg); - } - -li.active .ic_ports { - background-image:url(images/icons/cf_icon_ports_white.svg); - color: #fff; - } -.ic_config { - background-image:url(images/icons/cf_icon_config_grey.svg); - } - -li.active .ic_config { - background-image:url(images/icons/cf_icon_config_white.svg); - color: #fff; - } -.ic_pid { - background-image:url(images/icons/cf_icon_pid_grey.svg); - } - -li.active .ic_pid { - background-image:url(images/icons/cf_icon_pid_white.svg); - color: #fff; - } -.ic_rx { - background-image:url(images/icons/cf_icon_rx_grey.svg); - } - -li.active .ic_rx { - background-image:url(images/icons/cf_icon_rx_white.svg); - color: #fff; - } -.ic_modes { - background-image:url(images/icons/cf_icon_modes_grey.svg); - } - -li.active .ic_modes { - background-image:url(images/icons/cf_icon_modes_white.svg); - color: #fff; - } -.ic_adjust { - background-image:url(images/icons/cf_icon_adjust_grey.svg); - } - -li.active .ic_adjust { - background-image:url(images/icons/cf_icon_adjust_white.svg); - color: #fff; - } -.ic_servo { - background-image:url(images/icons/cf_icon_servo_grey.svg); - } - -li.active .ic_servo { - background-image:url(images/icons/cf_icon_servo_white.svg); - color: #fff; - } -.ic_gps{ - background-image:url(images/icons/cf_icon_gps_grey.svg); - } - -li.active .ic_gps{ - background-image:url(images/icons/cf_icon_gps_white.svg); - color: #fff; - } - -.ic_led{ - background-image:url(images/icons/cf_icon_led_grey.svg); - } - -li.active .ic_led { - background-image:url(images/icons/cf_icon_led_white.svg); - color: #fff; - } - -.ic_sensors { - background-image:url(images/icons/cf_icon_sensors_grey.svg); - } - -li.active .ic_sensors { - background-image:url(images/icons/cf_icon_sensors_white.svg); - color: #fff; - } -.ic_log { - background-image:url(images/icons/cf_icon_sensors_grey.svg); - } - -li.active .ic_log { - background-image:url(images/icons/cf_icon_log_white.svg); - color: #fff; - } - -.ic_data { - background-image:url(images/icons/cf_icon_log_grey.svg); - } - -li.active .ic_data{ - background-image:url(images/icons/cf_icon_log_white.svg); - color: #fff; - } -.ic_cli { - background-image:url(images/icons/cf_icon_cli_grey.svg); - } - -li.active .ic_cli { - background-image:url(images/icons/cf_icon_cli_white.svg); - color: #fff; - } - -.ic_motor { - background-image:url(images/icons/cf_icon_motor_grey.svg); - } - -li.active .ic_motor { - background-image:url(images/icons/cf_icon_motor_white.svg); - color: #fff; - } - - -.ic_welcome { - background-image:url(images/icons/cf_icon_welcome_grey.svg); - } - -li.active .ic_welcome { - background-image:url(images/icons/cf_icon_welcome_white.svg); - color: #fff; - } - -.ic_help { - background-image:url(images/icons/cf_icon_help_grey.svg); - } - -li.active .ic_help { - background-image:url(images/icons/cf_icon_help_white.svg); - color: #fff; - } - - - .ic_flasher { - background-image:url(images/icons/cf_icon_flasher_grey.svg); - } - -li.active .ic_flasher { - background-image:url(images/icons/cf_icon_flasher_white.svg); - color: #fff; - } - - - - - /* SPARE Tab-Icons */ - - - -.ic_backup { - background-image:url(images/icons/cf_icon_backup_grey.svg); - } - -li.active .ic_backup { - background-image:url(images/icons/cf_icon_backup_white.svg); - color: #fff; - } -.ic_wizzard { - background-image:url(images/icons/cf_icon_wizard_grey.svg); - } - -li.active .ic_wizard { - background-image:url(images/icons/cf_icon_wizard_white.svg); - color: #fff; - } -.ic_advanced { - background-image:url(images/icons/cf_icon_advanced_grey.svg); - } - -li.active .ic_advanced { - background-image:url(images/icons/cf_icon_advanced_white.svg); - color: #fff; - } -.ic_mission { - background-image:url(images/icons/cf_icon_mission_grey.svg); - } - -li.active .ic_mission { - background-image:url(images/icons/cf_icon_mission_white.svg); - color: #fff; - } - - - - - - - - - -#content { - margin-top: 0px; /* 31 */ - padding: 10px; /* 10 */ - height:calc(100% - 170px); /* (port picker 105px, log 25px, tab 0px, status bar: 20px) - was: calc(100% - 171px)*/ - - background-color: white; - overflow-x: hidden; - overflow-y: auto; - border: 0px solid #848484; /* 1px solid #848484; */ - -webkit-transform: rotateX(0deg); /* DO NOT REMOVE! this fixes the UI freezing bug on MAC OS X */ -} -#status-bar { - position: fixed; - bottom: 0px; - width: calc(100% - 20px); - height: 20px; - line-height: 20px; - padding: 0 10px 0 10px; - border-top: 1px solid #7d7d79; - background-color: #bfbeb5; -} -#status-bar div { - float: left; - - padding-right: 10px; - margin-right: 10px; - border-right: 1px solid #7d7d79; -} -#status-bar .version { - float: right; - margin: 0; - padding: 0; - border: 0; -} -#cache { - display: none; -} -.data-loading { - width: 100%; - height: 100%; - background-image: url('../images/loading-bars.svg'); - background-repeat: no-repeat; - background-position: center 45%; -} -.data-loading p { - position: relative; - top: calc(45% + 45px); - text-align: center; - font-weight: bold; -} - -dialog { - background-color: white; - padding: 1em; - height: auto; - margin: auto auto; - position: absolute; - width: 50%; - border-radius: 3px; - border: 1px solid silver; -} - -/* Border of the Tab */ - - - - - - /* Tab Title */ -.tab_title { - float:left; - width:100%; - border-bottom:1px solid #59aa29; - font-size:20px; - line-height:24px; - height:30px; - font-family: 'open_sanslight', Arial; - margin-bottom:7px; - } - -/* Note */ -.note { - float:left; - background-color:#fff7cd; - border:1px solid #ffe55f; - margin-bottom:7px; - margin-top:3px; - width:100%; - border-radius: 3px; - font-size:11px; - } - -.note_spacer { - padding:5px 7px 5px 7px; - } - - - - - .tab_wrapper { - padding-left:20px; - padding-right:15px; - padding-top:15px; - padding-bottom:15px; -} - -/* Columns END> */ - -/* Spacers */ - -.spacer { - padding-left:7px; - padding-right:7px; - - } - - -.spacer_left { - padding-left:7px; - - } - -.spacer_right { - padding-right:7px; - - } - -/* Standard GUI BOX */ -.gui_box { - border: 1px solid #e4e4e4; - border-radius:5px; - background-color:#FFFFFF; - float:left; - width:100%; - margin-bottom:10px; - } - -.grey { - background-color:#f5f5f5; - - } - -.gui_box_titlebar { - background-color:#e4e4e4; - border-radius:3px 3px 0px 0px; - font-size:14px; - width:100%; - height:25px; - padding-bottom:0px; - float:left; - margin-bottom:7px; - } - -.spacer_box { - padding:10px; - margin-bottom:3px; - } - -.spacer_box_title { - padding-left:10px; - padding-right:10px; - padding-top:4px; - margin-bottom:0px; - - } - - -/* Fixed area at the Bottom */ - - - -/* DIfferent buttons */ - - - -.default_btn { - width:100%; - position:relative; - margin-bottom:7px; - margin-top:0px; - float:left; - - } - - -.default_btn a { - padding:5px 0px 5px 0px; - text-align:center; - background-color:#fff; - border-radius:4px; - border: 1px solid #59aa29; - color:#59aa29; - font-family: 'open_sanssemibold', Arial; - font-size:12px; - line-height:13px; - display:block; - transition: all ease 0.2s; - - } - -.default_btn a:hover { - background-color:#6ac435; - color:#fff; - text-shadow:0px 1px rgba(0, 0, 0, 0.25); - transition: all ease 0.2s; - - } - -.default_btn a:active { - background-color:#4d9324; - transition: all ease 0.0s; - box-shadow:inset 0px 1px 5px rgba(0, 0, 0, 0.35); - - } - -.small { - width:auto; - position:relative; - margin-bottom:7px; - margin-top:0px; - margin-right:5px; - float:left; - - } - - .small a { - padding:3px 4px 4px 4px; - text-align:center; - text-shadow:0px 1px rgba(0, 0, 0, 0.25); - background-color:#acacac; - border-radius:3px; - border: 1px solid #949494; - color:#fff; - font-family: 'open_sanssemibold', Arial; - font-size:11px; - line-height:11px; - display:block; - transition: all ease 0.2s; - - } - -.small a:hover { - background-color:#6ac435; - color:#fff; - text-shadow:0px 1px rgba(0, 0, 0, 0.25); - border: 1px solid #59aa29; - transition: all ease 0.2s; - - - } - -.small a:active { - background-color:#878787; - transition: all ease 0.0s; - box-shadow:inset 0px 1px 5px rgba(0, 0, 0, 0.35); - } - - - .green a { - background-color:#59aa29; - text-shadow:0px 1px rgba(0, 0, 0, 0.25); - color:#fff; - border: 1px solid #59aa29; - transition: all ease 0.2s; - - - } - - .green a:hover { - background-color:#6ac435; - border: 1px solid #4d9324; - text-shadow:0px 1px rgba(0, 0, 0, 0.25); - color:#fff; - transition: all ease 0.2s; - - } - - - - -/* Table styling */ - - -.cf_table { - margin-bottom:5px; - float:left; - margin-top:-5px; - font-size:11px; - } - -.cf_table td { - border:0px; - border-bottom: solid 1px #ccc; - padding-top:4px; - padding-bottom:4px; - border-style: dotted; - -} - -.noboarder td{ - border:none; - -} - -.cf_table td:last-child { - text-align:right; -} - -.gps_false { - background-color:#FF0004; - padding:1px 7px 2px 7px; - border-radius:3px; - color:#FFFFFF; - font-size:11px; - margin-left:3px; -} - -.gps_true { - background-color:#59aa29; - padding:1px 7px 2px 7px; - border-radius:3px; - color:#FFFFFF; - font-size:11px; - margin-left:3px; -} - -/* connect button */ - - -.connect_contols { - position:absolute; - left:585px; - top:19px; - height:70px; - width:60px; - } - - - -.connect_b { - float:left; - - } - - - .connect_b a { - height:50px; - width:50px; - border-radius:100px; - box-shadow:0px 1px 2px rgba(0, 0, 0, 0.35); - float:left; - margin-left: 5px; - margin-bottom:7px; - transition: none; - - } - - - .connect_b a.connect { - background-color:#56ac1d; - border:1px solid #5bbb1b; - background-image:url(images/icons/cf_icon_usb2_white.svg); - background-repeat:no-repeat; - background-size:44px; - background-position:center 6px; - transition: none; - - } - - .connect_b a.connect.active { -background-color:#e60000; - border:1px solid #fe0000; - background-image:url(images/icons/cf_icon_usb1_white.svg); - transition: none; - - - } - - - .connect_state { - float:left; - height:20px; - width:100%; - text-align:center; - color:#fff; - font-size:12px; - font-family: 'open_sansregular', Arial; - text-shadow:0px 1px rgba(0, 0, 0, 0.25); - - - } - -/* fixing padding for all Tabs*/ - -.tab-setup, .tab-landing, .tab-adjustments, .tab-auxiliary, .tab-cli, .tab-configuration, .tab-dataflash, .tab-firmware_flasher, .tab-gps, .tab-help, .tab-led-strip, .tab-logging, .tab-modes, .tab-motors, .tab-pid_tuning, .tab-ports, .tab-receiver, .tab-sensors, .tab-servos { - padding:; - } - - -/* fixing logging tab*/ -.properties { - width:800px; - } - - - .properties dl { - width:200px; - } - - - .properties dd { - width:400px; - height:auto !important; - } - \ No newline at end of file diff --git a/main_bak.html b/main_bak.html deleted file mode 100755 index 3f79446f..00000000 --- a/main_bak.html +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
- -
- -
- -
- -
- -
- -
-
- -
-
- -
-
-
- - - - - - - - - - - - - - - -
-
-
    -
  • Gyro
    • -
  • Accel
    • -
  • Mag
    • -
  • Baro
    • -
  • GPS
    • -
  • Sonar
    • -
-
-
-
    -
    • -
-
-
- -
-
Show Log
- -
-
-
-
-
-
-
    -
    • -
    • -
    • -
- - - -
-
-
-
-
-
-
-
- D: 0% U: 0% -
-
- 0 -
-
- 0 -
-
- 0 -
-
- -
-
-
-
-

Waiting for data ...

-
-
- - - -