Add 'Adjustments' tab.
Cleanup 'Auxilary' tab code. Rename other tabs to have shorter titles.10.3.x-maintenance
Dominic Clifton
parent
36f447b4da
commit
902da2f91d
|
|
@ -36,30 +36,33 @@
|
|||
"message": "Initial Setup"
|
||||
},
|
||||
"tab2": {
|
||||
"message": "PID Tuning"
|
||||
"message": "PID"
|
||||
},
|
||||
"tab3": {
|
||||
"message": "Receiver"
|
||||
},
|
||||
"tab4": {
|
||||
"message": "Auxiliary Configuration"
|
||||
"message": "Auxiliary"
|
||||
},
|
||||
"tab5": {
|
||||
"message": "Servos"
|
||||
"message": "Adjustments"
|
||||
},
|
||||
"tab6": {
|
||||
"message": "GPS"
|
||||
"message": "Servos"
|
||||
},
|
||||
"tab7": {
|
||||
"message": "Motor Testing"
|
||||
"message": "GPS"
|
||||
},
|
||||
"tab8": {
|
||||
"message": "Raw Sensor Data"
|
||||
"message": "Motors"
|
||||
},
|
||||
"tab9": {
|
||||
"message": "CLI"
|
||||
"message": "Sensors"
|
||||
},
|
||||
"tab10": {
|
||||
"message": "CLI"
|
||||
},
|
||||
"tab11": {
|
||||
"message": "Logging"
|
||||
},
|
||||
|
||||
|
|
@ -370,6 +373,101 @@
|
|||
"message": "EEPROM <span style=\"color: green\">saved</span>"
|
||||
},
|
||||
|
||||
"adjustmentsHelp": {
|
||||
"message": "Configure adjustment switches. See the 'in-flight adjustments' section of the manual for details. The changes that adjustment functions make are not saved automatically. There are 4 slots. Each switch used to concurrently make adjustments requires exclusive use of a slot."
|
||||
},
|
||||
"adjustmentsExamples": {
|
||||
"message": "Examples"
|
||||
},
|
||||
"adjustmentsExample1": {
|
||||
"message": "Use Slot 1 and a 3POS switch on AUX1 to select between Pitch/Roll P, I and D and another 3POS switch on AUX2 to increase or decrease the value when held up or down."
|
||||
},
|
||||
"adjustmentsExample2": {
|
||||
"message": "Use Slot 2 and a 3POS switch on AUX4 to select enable Rate Profile Selection via the same 3POS switch on the same channel."
|
||||
},
|
||||
"adjustmentsColumnEnable": {
|
||||
"message": "If enabled"
|
||||
},
|
||||
"adjustmentsColumnUsingSlot": {
|
||||
"message": "using slot"
|
||||
},
|
||||
"adjustmentsColumnWhenChannel": {
|
||||
"message": "when channel"
|
||||
},
|
||||
"adjustmentsColumnIsInRange": {
|
||||
"message": "is in range"
|
||||
},
|
||||
"adjustmentsColumnThenApplyFunction": {
|
||||
"message": "then apply"
|
||||
},
|
||||
"adjustmentsColumnViaChannel": {
|
||||
"message": "via channel"
|
||||
},
|
||||
"adjustmentsSlot0": {
|
||||
"message": "Slot 1"
|
||||
},
|
||||
"adjustmentsSlot1": {
|
||||
"message": "Slot 2"
|
||||
},
|
||||
"adjustmentsSlot2": {
|
||||
"message": "Slot 3"
|
||||
},
|
||||
"adjustmentsSlot3": {
|
||||
"message": "Slot 4"
|
||||
},
|
||||
"adjustmentsMin": {
|
||||
"message": "Min"
|
||||
},
|
||||
"adjustmentsMax": {
|
||||
"message": "Max"
|
||||
},
|
||||
"adjustmentsFunction0": {
|
||||
"message": "No changes"
|
||||
},
|
||||
"adjustmentsFunction1": {
|
||||
"message": "RC Rate Adjustment"
|
||||
},
|
||||
"adjustmentsFunction2": {
|
||||
"message": "RC Expo Adjustment"
|
||||
},
|
||||
"adjustmentsFunction3": {
|
||||
"message": "Throttle Expo Adjustment"
|
||||
},
|
||||
"adjustmentsFunction4": {
|
||||
"message": "Pitch & Roll Rate Adjustment"
|
||||
},
|
||||
"adjustmentsFunction5": {
|
||||
"message": "Yaw Rate Adjustment"
|
||||
},
|
||||
"adjustmentsFunction6": {
|
||||
"message": "Pitch P Adjustment"
|
||||
},
|
||||
"adjustmentsFunction7": {
|
||||
"message": "Pitch I Adjustment"
|
||||
},
|
||||
"adjustmentsFunction8": {
|
||||
"message": "Pitch D Adjustment"
|
||||
},
|
||||
"adjustmentsFunction9": {
|
||||
"message": "Yaw P Adjustment"
|
||||
},
|
||||
"adjustmentsFunction10": {
|
||||
"message": "Yaw I Adjustment"
|
||||
},
|
||||
"adjustmentsFunction11": {
|
||||
"message": "Yaw D Adjustment"
|
||||
},
|
||||
"adjustmentsFunction12": {
|
||||
"message": "Rate Profile Selection"
|
||||
},
|
||||
"adjustmentsSave": {
|
||||
"message": "Save"
|
||||
},
|
||||
"adjustmentsEepromSaved": {
|
||||
"message": "EEPROM <span style=\"color: green\">saved</span>"
|
||||
},
|
||||
|
||||
|
||||
"servosModel": {
|
||||
"message": "Model:"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ var AUX_CONFIG = [];
|
|||
var AUX_CONFIG_IDS = [];
|
||||
|
||||
var MODE_RANGES = [];
|
||||
var ADJUSTMENT_RANGES = [];
|
||||
|
||||
var SERVO_CONFIG = [];
|
||||
|
||||
|
|
|
|||
26
js/msp.js
26
js/msp.js
|
|
@ -9,6 +9,9 @@ var MSP_codes = {
|
|||
MSP_SET_CHANNEL_FORWARDING: 33,
|
||||
MSP_MODE_RANGES: 34,
|
||||
MSP_SET_MODE_RANGE: 35,
|
||||
MSP_ADJUSTMENT_RANGES: 52,
|
||||
MSP_SET_ADJUSTMENT_RANGE: 53,
|
||||
|
||||
|
||||
// Multiwii MSP commands
|
||||
MSP_IDENT: 100,
|
||||
|
|
@ -321,6 +324,26 @@ MSP.process_data = function(code, message_buffer, message_length) {
|
|||
MODE_RANGES.push(modeRange);
|
||||
}
|
||||
break;
|
||||
case MSP_codes.MSP_ADJUSTMENT_RANGES:
|
||||
ADJUSTMENT_RANGES = []; // empty the array as new data is coming in
|
||||
|
||||
var adjustmentRangeCount = data.byteLength / 6; // 6 bytes per item.
|
||||
|
||||
var offset = 0;
|
||||
for (var i = 0; offset < data.byteLength && i < adjustmentRangeCount; i++) {
|
||||
var adjustmentRange = {
|
||||
slotIndex: data.getUint8(offset++, 1),
|
||||
auxChannelIndex: data.getUint8(offset++, 1),
|
||||
range: {
|
||||
start: 900 + (data.getUint8(offset++, 1) * 25),
|
||||
end: 900 + (data.getUint8(offset++, 1) * 25)
|
||||
},
|
||||
adjustmentFunction: data.getUint8(offset++, 1),
|
||||
auxSwitchChannelIndex: data.getUint8(offset++, 1)
|
||||
};
|
||||
ADJUSTMENT_RANGES.push(adjustmentRange);
|
||||
}
|
||||
break;
|
||||
case MSP_codes.MSP_MISC: // 22 bytes
|
||||
MISC.PowerTrigger1 = data.getInt16(0, 1);
|
||||
MISC.minthrottle = data.getUint16(2, 1); // 0-2000
|
||||
|
|
@ -407,6 +430,9 @@ MSP.process_data = function(code, message_buffer, message_length) {
|
|||
case MSP_codes.MSP_SET_MODE_RANGE:
|
||||
console.log('Mode range saved');
|
||||
break;
|
||||
case MSP_codes.MSP_SET_ADJUSTMENT_RANGE:
|
||||
console.log('Adjustment range saved');
|
||||
break;
|
||||
case MSP_codes.MSP_SET_BOX:
|
||||
console.log('AUX Configuration saved');
|
||||
break;
|
||||
|
|
|
|||
15
main.html
15
main.html
|
|
@ -13,6 +13,7 @@
|
|||
<link type="text/css" rel="stylesheet" href="./tabs/pid_tuning.css" media="all" />
|
||||
<link type="text/css" rel="stylesheet" href="./tabs/receiver.css" media="all" />
|
||||
<link type="text/css" rel="stylesheet" href="./tabs/auxiliary_configuration.css" media="all" />
|
||||
<link type="text/css" rel="stylesheet" href="./tabs/adjustments.css" media="all" />
|
||||
<link type="text/css" rel="stylesheet" href="./tabs/servos.css" media="all" />
|
||||
<link type="text/css" rel="stylesheet" href="./tabs/gps.css" media="all" />
|
||||
<link type="text/css" rel="stylesheet" href="./tabs/motor_outputs.css" media="all" />
|
||||
|
|
@ -46,6 +47,7 @@
|
|||
<script type="text/javascript" src="./tabs/pid_tuning.js"></script>
|
||||
<script type="text/javascript" src="./tabs/receiver.js"></script>
|
||||
<script type="text/javascript" src="./tabs/auxiliary_configuration.js"></script>
|
||||
<script type="text/javascript" src="./tabs/adjustments.js"></script>
|
||||
<script type="text/javascript" src="./tabs/servos.js"></script>
|
||||
<script type="text/javascript" src="./tabs/gps.js"></script>
|
||||
<script type="text/javascript" src="./tabs/motor_outputs.js"></script>
|
||||
|
|
@ -108,12 +110,13 @@
|
|||
<li class="tab_pid_tuning"><a href="#" i18n="tab2"></a></li>
|
||||
<li class="tab_receiver"><a href="#" i18n="tab3"></a></li>
|
||||
<li class="tab_auxiliary_configuration"><a href="#" i18n="tab4"></a></li>
|
||||
<li class="tab_servos"><a href="#" i18n="tab5"></a></li>
|
||||
<li class="tab_gps"><a href="#" i18n="tab6"></a></li>
|
||||
<li class="tab_motor_outputs"><a href="#" i18n="tab7"></a></li>
|
||||
<li class="tab_sensors"><a href="#" i18n="tab8"></a></li>
|
||||
<li class="tab_cli"><a href="#" i18n="tab9"></a></li>
|
||||
<li class="tab_logging"><a href="#" i18n="tab10"></a></li>
|
||||
<li class="tab_adjustments"><a href="#" i18n="tab5"></a></li>
|
||||
<li class="tab_servos"><a href="#" i18n="tab6"></a></li>
|
||||
<li class="tab_gps"><a href="#" i18n="tab7"></a></li>
|
||||
<li class="tab_motor_outputs"><a href="#" i18n="tab8"></a></li>
|
||||
<li class="tab_sensors"><a href="#" i18n="tab9"></a></li>
|
||||
<li class="tab_cli"><a href="#" i18n="tab10"></a></li>
|
||||
<li class="tab_logging"><a href="#" i18n="tab11"></a></li>
|
||||
</ul>
|
||||
<div class="clear-both"></div>
|
||||
</div>
|
||||
|
|
|
|||
5
main.js
5
main.js
|
|
@ -94,6 +94,9 @@ $(document).ready(function () {
|
|||
case 'tab_auxiliary_configuration':
|
||||
TABS.auxiliary_configuration.initialize(content_ready);
|
||||
break;
|
||||
case 'tab_adjustments':
|
||||
TABS.adjustments.initialize(content_ready);
|
||||
break;
|
||||
case 'tab_servos':
|
||||
TABS.servos.initialize(content_ready);
|
||||
break;
|
||||
|
|
@ -270,4 +273,4 @@ function bytesToSize(bytes) {
|
|||
}
|
||||
|
||||
return bytes;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,125 @@
|
|||
.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;
|
||||
}
|
||||
|
||||
.tab-adjustments .adjustment .functionSelection {
|
||||
width: 5%;
|
||||
}
|
||||
|
||||
.tab-adjustments .adjustment .adjustmentSlot {
|
||||
width: 5%;
|
||||
}
|
||||
|
||||
.tab-adjustments .adjustment .functionSwitchChannel {
|
||||
width: 5%;
|
||||
}
|
||||
|
||||
.tab-adjustments > .buttons {
|
||||
width: calc(100% - 20px);
|
||||
|
||||
margin-top: 10px;
|
||||
bottom: 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;
|
||||
}
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
<div class="tab-adjustments">
|
||||
<div class="help">
|
||||
<p i18n="adjustmentsHelp"></p>
|
||||
<p i18n="adjustmentsExamples"></p>
|
||||
<ul>
|
||||
<li i18n="adjustmentsExample1"></li>
|
||||
<li i18n="adjustmentsExample2"></li>
|
||||
</ul>
|
||||
</div>
|
||||
<table class="adjustments">
|
||||
<thead>
|
||||
<tr>
|
||||
<td class="column-enable" i18n="adjustmentsColumnEnable">
|
||||
</td>
|
||||
<td i18n="adjustmentsColumnWhenChannel">
|
||||
</td>
|
||||
<td i18n="adjustmentsColumnIsInRange">
|
||||
</td>
|
||||
<td i18n="adjustmentsColumnThenApplyFunction">
|
||||
</td>
|
||||
<td i18n="adjustmentsColumnUsingSlot">
|
||||
</td>
|
||||
<td i18n="adjustmentsColumnViaChannel">
|
||||
</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="buttons">
|
||||
<a class="save" href="#" i18n="adjustmentsSave"></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="tab-adjustments-templates">
|
||||
<table class="adjustments">
|
||||
<tbody>
|
||||
<tr class="adjustment">
|
||||
<td class="info">
|
||||
<div class="enabling">
|
||||
<input type="checkbox" class="enable"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="channelInfo">
|
||||
<div>
|
||||
<select class="channel">
|
||||
<option value=""></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="limits">
|
||||
<p class="lowerLimit"><span i18n="adjustmentsMin"></span>: <span class="lowerLimitValue"></span></p>
|
||||
<p class="upperLimit"><span i18n="adjustmentsMax"></span>: <span class="upperLimitValue"></span></p>
|
||||
</div>
|
||||
</td>
|
||||
<td class="range">
|
||||
<div class="channel-slider pips-channel-range">
|
||||
<div class="marker"></div>
|
||||
</div>
|
||||
</td>
|
||||
<td class="functionSelection">
|
||||
<select class="function">
|
||||
<option value="0" i18n="adjustmentsFunction0"></option>
|
||||
<option value="1" i18n="adjustmentsFunction1"></option>
|
||||
<option value="2" i18n="adjustmentsFunction2"></option>
|
||||
<option value="3" i18n="adjustmentsFunction3"></option>
|
||||
<option value="4" i18n="adjustmentsFunction4"></option>
|
||||
<option value="5" i18n="adjustmentsFunction5"></option>
|
||||
<option value="6" i18n="adjustmentsFunction6"></option>
|
||||
<option value="7" i18n="adjustmentsFunction7"></option>
|
||||
<option value="8" i18n="adjustmentsFunction8"></option>
|
||||
<option value="9" i18n="adjustmentsFunction9"></option>
|
||||
<option value="10" i18n="adjustmentsFunction10"></option>
|
||||
<option value="11" i18n="adjustmentsFunction11"></option>
|
||||
<option value="12" i18n="adjustmentsFunction12"></option>
|
||||
</select>
|
||||
</td>
|
||||
<td class="adjustmentSlot">
|
||||
<select class="slot">
|
||||
<option value="0" i18n="adjustmentsSlot0"></option>
|
||||
<option value="1" i18n="adjustmentsSlot1"></option>
|
||||
<option value="2" i18n="adjustmentsSlot2"></option>
|
||||
<option value="3" i18n="adjustmentsSlot3"></option>
|
||||
</select>
|
||||
</td>
|
||||
<td class="functionSwitchChannel">
|
||||
<select class="channel">
|
||||
<option value=""></option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,266 @@
|
|||
'use strict';
|
||||
|
||||
TABS.adjustments = {};
|
||||
TABS.adjustments.initialize = function (callback) {
|
||||
GUI.active_tab_ref = this;
|
||||
GUI.active_tab = 'adjustments';
|
||||
googleAnalytics.sendAppView('Adjustments');
|
||||
|
||||
function get_adjustment_ranges() {
|
||||
MSP.send_message(MSP_codes.MSP_ADJUSTMENT_RANGES, false, false, get_box_ids);
|
||||
}
|
||||
|
||||
function get_box_ids() {
|
||||
MSP.send_message(MSP_codes.MSP_BOXIDS, false, false, get_rc_data);
|
||||
}
|
||||
|
||||
function get_rc_data() {
|
||||
MSP.send_message(MSP_codes.MSP_RC, false, false, load_html);
|
||||
}
|
||||
|
||||
function load_html() {
|
||||
$('#content').load("./tabs/adjustments.html", process_html);
|
||||
}
|
||||
|
||||
MSP.send_message(MSP_codes.MSP_BOXNAMES, false, false, get_adjustment_ranges);
|
||||
|
||||
function addAdjustment(adjustmentIndex, adjustmentRange, auxChannelCount) {
|
||||
|
||||
var template = $('#tab-adjustments-templates .adjustments .adjustment');
|
||||
var newAdjustment = template.clone();
|
||||
|
||||
$(newAdjustment).attr('id', 'adjustment-' + adjustmentIndex);
|
||||
$(newAdjustment).data('index', adjustmentIndex);
|
||||
|
||||
//
|
||||
// update selected slot
|
||||
//
|
||||
|
||||
var channelList = $(newAdjustment).find('.adjustmentSlot .slot');
|
||||
channelList.val(adjustmentRange.slotIndex);
|
||||
|
||||
//
|
||||
// populate source channel select box
|
||||
//
|
||||
|
||||
var channelList = $(newAdjustment).find('.channelInfo .channel');
|
||||
var channelOptionTemplate = $(channelList).find('option');
|
||||
channelOptionTemplate.remove();
|
||||
for (var channelIndex = 0; channelIndex < auxChannelCount; channelIndex++) {
|
||||
var channelOption = channelOptionTemplate.clone();
|
||||
channelOption.text('AUX ' + (channelIndex + 1));
|
||||
channelOption.val(channelIndex);
|
||||
channelList.append(channelOption);
|
||||
}
|
||||
channelList.val(adjustmentRange.auxChannelIndex);
|
||||
|
||||
//
|
||||
// update selected function
|
||||
//
|
||||
|
||||
var channelList = $(newAdjustment).find('.functionSelection .function');
|
||||
channelList.val(adjustmentRange.adjustmentFunction);
|
||||
|
||||
//
|
||||
// populate function channel select box
|
||||
//
|
||||
|
||||
var channelList = $(newAdjustment).find('.functionSwitchChannel .channel');
|
||||
var channelOptionTemplate = $(channelList).find('option');
|
||||
channelOptionTemplate.remove();
|
||||
for (var channelIndex = 0; channelIndex < auxChannelCount; channelIndex++) {
|
||||
var channelOption = channelOptionTemplate.clone();
|
||||
channelOption.text('AUX ' + (channelIndex + 1));
|
||||
channelOption.val(channelIndex);
|
||||
channelList.append(channelOption);
|
||||
}
|
||||
channelList.val(adjustmentRange.auxSwitchChannelIndex);
|
||||
|
||||
//
|
||||
// configure range
|
||||
//
|
||||
|
||||
var channel_range = {
|
||||
'min': [ 900 ],
|
||||
'max': [ 2100 ]
|
||||
};
|
||||
|
||||
var rangeValues = [900, 2100]; // select the full range by default
|
||||
if (adjustmentRange.range != undefined) {
|
||||
rangeValues = [adjustmentRange.range.start, adjustmentRange.range.end];
|
||||
}
|
||||
|
||||
var rangeElement = $(newAdjustment).find('.range');
|
||||
|
||||
$(rangeElement).find('.channel-slider').noUiSlider({
|
||||
start: rangeValues,
|
||||
behaviour: 'snap-drag',
|
||||
step: 25,
|
||||
connect: true,
|
||||
range: channel_range,
|
||||
format: wNumb({
|
||||
decimals: 0,
|
||||
})
|
||||
});
|
||||
|
||||
var elementName = '#adjustment-' + adjustmentIndex;
|
||||
$(newAdjustment).find('.channel-slider').Link('lower').to($(newAdjustment).find('.lowerLimitValue'));
|
||||
$(newAdjustment).find('.channel-slider').Link('upper').to($(newAdjustment).find('.upperLimitValue'));
|
||||
|
||||
$(rangeElement).find(".pips-channel-range").noUiSlider_pips({
|
||||
mode: 'values',
|
||||
values: [900, 1000, 1200, 1400, 1500, 1600, 1800, 2000, 2100],
|
||||
density: 4,
|
||||
stepped: true
|
||||
});
|
||||
|
||||
//
|
||||
// add the enable/disable behavior
|
||||
//
|
||||
|
||||
var enableElement = $(newAdjustment).find('.enable');
|
||||
$(enableElement).data('adjustmentElement', newAdjustment);
|
||||
$(enableElement).change(function() {
|
||||
var adjustmentElement = $(this).data('adjustmentElement');
|
||||
if ($(this).prop("checked")) {
|
||||
$(adjustmentElement).find(':input').prop("disabled", false);
|
||||
$(adjustmentElement).find('.channel-slider').removeAttr("disabled");
|
||||
} else {
|
||||
$(adjustmentElement).find(':input').prop("disabled", true);
|
||||
$(adjustmentElement).find('.channel-slider').attr("disabled", "disabled");
|
||||
}
|
||||
|
||||
// keep this element enabled
|
||||
$(this).prop("disabled", false);
|
||||
});
|
||||
|
||||
var isEnabled = (adjustmentRange.range.start != adjustmentRange.range.end);
|
||||
$(enableElement).prop("checked", isEnabled).change();
|
||||
|
||||
return newAdjustment;
|
||||
}
|
||||
|
||||
function process_html() {
|
||||
|
||||
var auxChannelCount = RC.active_channels - 4;
|
||||
|
||||
var modeTableBodyElement = $('.tab-adjustments .adjustments tbody')
|
||||
for (var adjustmentIndex = 0; adjustmentIndex < ADJUSTMENT_RANGES.length; adjustmentIndex++) {
|
||||
var newAdjustment = addAdjustment(adjustmentIndex, ADJUSTMENT_RANGES[adjustmentIndex], auxChannelCount);
|
||||
modeTableBodyElement.append(newAdjustment);
|
||||
}
|
||||
|
||||
// translate to user-selected language
|
||||
localize();
|
||||
|
||||
// UI Hooks
|
||||
$('a.save').click(function () {
|
||||
|
||||
// update internal data structures based on current UI elements
|
||||
var requiredAdjustmentRangeCount = ADJUSTMENT_RANGES.length;
|
||||
|
||||
ADJUSTMENT_RANGES = [];
|
||||
|
||||
var defaultAdjustmentRange = {
|
||||
slotIndex: 0,
|
||||
auxChannelIndex: 0,
|
||||
range: {
|
||||
start: 900,
|
||||
end: 900
|
||||
},
|
||||
adjustmentFunction: 0,
|
||||
auxSwitchChannelIndex: 0
|
||||
};
|
||||
|
||||
$('.adjustments .adjustment').each(function () {
|
||||
var adjustmentElement = $(this);
|
||||
|
||||
if ($(adjustmentElement).find('.enable').prop("checked")) {
|
||||
var rangeValues = $(this).find('.range .channel-slider').val();
|
||||
var adjustmentRange = {
|
||||
slotIndex: parseInt($(this).find('.adjustmentSlot .slot').val()),
|
||||
auxChannelIndex: parseInt($(this).find('.channelInfo .channel').val()),
|
||||
range: {
|
||||
start: rangeValues[0],
|
||||
end: rangeValues[1]
|
||||
},
|
||||
adjustmentFunction: parseInt($(this).find('.functionSelection .function').val()),
|
||||
auxSwitchChannelIndex: parseInt($(this).find('.functionSwitchChannel .channel').val()),
|
||||
};
|
||||
ADJUSTMENT_RANGES.push(adjustmentRange);
|
||||
} else {
|
||||
ADJUSTMENT_RANGES.push(defaultAdjustmentRange);
|
||||
}
|
||||
});
|
||||
|
||||
for (var adjustmentRangeIndex = ADJUSTMENT_RANGES.length; adjustmentRangeIndex < requiredAdjustmentRangeCount; adjustmentRangeIndex++) {
|
||||
ADJUSTMENT_RANGES.push(defaultAdjustmentRange);
|
||||
}
|
||||
|
||||
//
|
||||
// send data to FC
|
||||
//
|
||||
|
||||
var nextFunction = send_next_adjustment_range;
|
||||
|
||||
var adjustmentRangeIndex = 0;
|
||||
|
||||
send_next_adjustment_range();
|
||||
|
||||
|
||||
function send_next_adjustment_range() {
|
||||
|
||||
var adjustmentRange = ADJUSTMENT_RANGES[adjustmentRangeIndex];
|
||||
|
||||
var ADJUSTMENT_val_buffer_out = [];
|
||||
ADJUSTMENT_val_buffer_out.push(adjustmentRangeIndex);
|
||||
ADJUSTMENT_val_buffer_out.push(adjustmentRange.slotIndex);
|
||||
ADJUSTMENT_val_buffer_out.push(adjustmentRange.auxChannelIndex);
|
||||
ADJUSTMENT_val_buffer_out.push((adjustmentRange.range.start - 900) / 25);
|
||||
ADJUSTMENT_val_buffer_out.push((adjustmentRange.range.end - 900) / 25);
|
||||
ADJUSTMENT_val_buffer_out.push(adjustmentRange.adjustmentFunction);
|
||||
ADJUSTMENT_val_buffer_out.push(adjustmentRange.auxSwitchChannelIndex);
|
||||
|
||||
// prepare for next iteration
|
||||
adjustmentRangeIndex++;
|
||||
if (adjustmentRangeIndex == requiredAdjustmentRangeCount) {
|
||||
nextFunction = save_to_eeprom;
|
||||
|
||||
}
|
||||
MSP.send_message(MSP_codes.MSP_SET_ADJUSTMENT_RANGE, ADJUSTMENT_val_buffer_out, false, nextFunction);
|
||||
}
|
||||
|
||||
function save_to_eeprom() {
|
||||
MSP.send_message(MSP_codes.MSP_EEPROM_WRITE, false, false, function () {
|
||||
GUI.log(chrome.i18n.getMessage('adjustmentsEepromSaved'));
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
// data pulling functions used inside interval timer
|
||||
function get_rc_data() {
|
||||
MSP.send_message(MSP_codes.MSP_RC, false, false, update_ui);
|
||||
}
|
||||
|
||||
function update_ui() {
|
||||
}
|
||||
|
||||
// update ui instantly on first load
|
||||
update_ui();
|
||||
|
||||
// enable data pulling
|
||||
GUI.interval_add('aux_data_pull', get_rc_data, 50);
|
||||
|
||||
// status data pulled via separate timer with static speed
|
||||
GUI.interval_add('status_pull', function () {
|
||||
MSP.send_message(MSP_codes.MSP_STATUS);
|
||||
}, 250, true);
|
||||
|
||||
if (callback) callback();
|
||||
}
|
||||
};
|
||||
|
||||
TABS.adjustments.cleanup = function (callback) {
|
||||
if (callback) callback();
|
||||
};
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
.tab-auxiliary_configuration .mode.on:nth-child(odd) .info {
|
||||
background: #BAE2BC;
|
||||
}
|
||||
}
|
||||
|
||||
.tab-auxiliary_configuration .mode.off .info {
|
||||
background: #E86969;
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
background: #E7AEAE;
|
||||
}
|
||||
|
||||
#templates {
|
||||
#tab-auxiliary_configuration-templates {
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div id="templates">
|
||||
<div id="tab-auxiliary_configuration-templates">
|
||||
<table class="modes">
|
||||
<tbody>
|
||||
<tr class="mode">
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ TABS.auxiliary_configuration.initialize = function (callback) {
|
|||
MSP.send_message(MSP_codes.MSP_BOXNAMES, false, false, get_mode_ranges);
|
||||
|
||||
function createMode(modeIndex, modeId) {
|
||||
var modeTemplate = $('#templates .mode');
|
||||
var modeTemplate = $('#tab-auxiliary_configuration-templates .mode');
|
||||
var newMode = modeTemplate.clone();
|
||||
|
||||
var modeName = AUX_CONFIG[modeIndex];
|
||||
|
|
@ -43,7 +43,7 @@ TABS.auxiliary_configuration.initialize = function (callback) {
|
|||
|
||||
function configureRangeTemplate(auxChannelCount) {
|
||||
|
||||
var rangeTemplate = $('#templates .range');
|
||||
var rangeTemplate = $('#tab-auxiliary_configuration-templates .range');
|
||||
|
||||
var channelList = $(rangeTemplate).find('.channel');
|
||||
var channelOptionTemplate = $(channelList).find('option');
|
||||
|
|
@ -54,7 +54,7 @@ TABS.auxiliary_configuration.initialize = function (callback) {
|
|||
channelOption.val(channelIndex);
|
||||
channelList.append(channelOption);
|
||||
}
|
||||
channelList.select(0);
|
||||
channelList.val(0);
|
||||
}
|
||||
|
||||
function addRangeToMode(modeElement, auxChannelIndex, range) {
|
||||
|
|
@ -72,11 +72,11 @@ TABS.auxiliary_configuration.initialize = function (callback) {
|
|||
|
||||
var rangeIndex = $(modeElement).find('.range').length;
|
||||
|
||||
var range = $('#templates .range').clone();
|
||||
range.attr('id', 'mode-' + modeIndex + '-range-' + rangeIndex);
|
||||
var rangeElement = $('#tab-auxiliary_configuration-templates .range').clone();
|
||||
rangeElement.attr('id', 'mode-' + modeIndex + '-range-' + rangeIndex);
|
||||
modeElement.find('.ranges').append(range);
|
||||
|
||||
$(range).find('.channel-slider').noUiSlider({
|
||||
$(rangeElement).find('.channel-slider').noUiSlider({
|
||||
start: rangeValues,
|
||||
behaviour: 'snap-drag',
|
||||
step: 25,
|
||||
|
|
@ -91,7 +91,7 @@ TABS.auxiliary_configuration.initialize = function (callback) {
|
|||
$(elementName + ' .channel-slider').Link('lower').to($(elementName + ' .lowerLimitValue'));
|
||||
$(elementName + ' .channel-slider').Link('upper').to($(elementName + ' .upperLimitValue'));
|
||||
|
||||
$(range).find(".pips-channel-range").noUiSlider_pips({
|
||||
$(rangeElement).find(".pips-channel-range").noUiSlider_pips({
|
||||
mode: 'values',
|
||||
values: [900, 1000, 1200, 1400, 1500, 1600, 1800, 2000, 2100],
|
||||
density: 4,
|
||||
|
|
@ -110,8 +110,6 @@ TABS.auxiliary_configuration.initialize = function (callback) {
|
|||
}
|
||||
|
||||
function process_html() {
|
||||
|
||||
$('.boxes').hide();
|
||||
|
||||
var auxChannelCount = RC.active_channels - 4;
|
||||
|
||||
|
|
@ -180,7 +178,6 @@ TABS.auxiliary_configuration.initialize = function (callback) {
|
|||
MODE_RANGES = [];
|
||||
|
||||
$('.modes .mode').each(function () {
|
||||
//var _this = this;
|
||||
var modeElement = $(this);
|
||||
var modeId = modeElement.data('id');
|
||||
|
||||
|
|
@ -210,8 +207,10 @@ TABS.auxiliary_configuration.initialize = function (callback) {
|
|||
};
|
||||
MODE_RANGES.push(defaultModeRange);
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// send data to FC
|
||||
//
|
||||
|
||||
var nextFunction = send_next_mode_range;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue