Skip to content

Commit

Permalink
added support for octo
Browse files Browse the repository at this point in the history
  • Loading branch information
Mauro Mombelli committed Oct 29, 2015
1 parent 742f957 commit 4f5be6c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"minimum_chrome_version": "38",
"version": "0.63.4",
"version": "0.63.5",
"author": "Hydra,Mauro",
"name": "Tiltflight - Configurator",
"short_name": "tiltflight",
Expand Down
5 changes: 3 additions & 2 deletions tabs/servos.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ TABS.servos.initialize = function (callback) {
<tr> \
<td style="text-align: center">' + name + '</td>\
<td class="min"><input type="number" min="100" max="2000" value="' + SERVO_CONFIG[obj].min + '" /></td>\
<td class="middle"><input type="number" min="1000" max="2000" value="' + SERVO_CONFIG[obj].middle +'" /></td>\
<td class="middle"><input type="number" min="500" max="2500" value="' + SERVO_CONFIG[obj].middle +'" /></td>\
<td class="max"><input type="number" min="1000" max="3000" value="' + SERVO_CONFIG[obj].max +'" /></td>\
<td class="minLimit"><input type="number" min="0" max="90" value="' + SERVO_CONFIG[obj].minLimit +'" /></td>\
<td class="maxLimit"><input type="number" min="0" max="90" value="' + SERVO_CONFIG[obj].maxLimit +'" /></td>\
Expand Down Expand Up @@ -235,7 +235,7 @@ TABS.servos.initialize = function (callback) {
$('div.tab-servos table.fields tr:not(:first)').remove();

var model = $('div.tab-servos strong.model');
var supported_models = [1, 4, 5, 8, 14, 20, 21, 23];
var supported_models = [1, 4, 5, 8, 14, 20, 21, 23, 24];

switch (CONFIG.multiType) {
case 1: // TRI
Expand Down Expand Up @@ -315,6 +315,7 @@ TABS.servos.initialize = function (callback) {
process_servos('Roll Servo', '', 1, 2);
break;
case 23: // Tilting servo
case 24: // Tilting servo
model.text('Tilting pitch');

process_servos('Pitch Servo', '', 0, 3);
Expand Down
13 changes: 9 additions & 4 deletions tabs/tilt_arm.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,40 @@
<th>Enable</th>
<th>Value</th>
</tr>
<tr><td></td></tr>
<tr class='even'>
<td>Servo to Arm GearRatio</td>
<td></td>
<td><input id="GEAR_RATIO" type="number" min=0 max=2 step=0.01 /></td>
</tr>
<tr><td></td></tr>
<tr class='odd'>
<td>Tilt control channel</td>
<td></td>
<td><select id='CHANNELS'></select></td>
</tr>
<tr><td></td></tr>
<tr class='even' title='divider witch is applied to the RC input on the PITCH channel; 1 does nothing, 10 and the body will not visibly PITCH'>
<td>Body pitch suppressor</td>
<td>Body pitch angle divider</td>
<td><input id="PITCH_ENABLE" type="checkbox" /></td>
<td><input id="PITCH_VALUE" type="number" min=1 max=512 /></td>
</tr>
<tr><td></td></tr>
<tr class='odd' title='help to keep altitude when accelerating; higer value add more THRUST'>
<td>Thrust compensation for servo inclinantion<br>WARNING: EXPERIMENTAL AND UNSTABLE</td>
<td>Thrust compensation for servo inclinantion<br>NOTE: not fully tested. Use carefully</td>
<td><input id="THRUST_ENABLE" type="checkbox"/></td>
<td>0%<input id="THRUST_VALUE" type="range" min=0 max=100 />100% <input readonly class="slider-value" type="text" id="THRUST_VALUE_TEXT" value="NaN"></td>
</tr>
<!--
<tr class='even'>
<td>Thrust compensation for body inclinantion<br>WARNING: EXPERIMENTAL AND UNSTABLE</td>
<td>Thrust compensation for body inclinantion<br>NOTE: not fully tested. Use carefully</td>
<td><input id="THRUST_BODY_ENABLE" type="checkbox" /></td>
<td></td>
</tr>
-->
<tr><td></td></tr>
<tr class='odd'>
<td>Yaw and roll compensation<br>WARNING: EXPERIMENTAL AND UNSTABLE</td>
<td>Yaw and roll compensation<br>NOTE: not fully tested. Use carefully</td>
<td><input id="YAWROLL_ENABLE" type="checkbox"/></td>
<td></td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion tabs/tilt_arm.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ TABS.tilt_arm.initialize = function (callback) {

function process_html() {

if (CONFIG.multiType != 23){ // QuadXTiltArm
if (CONFIG.multiType != 23 && CONFIG.multiType != 24){ // QuadXTiltArm
$('div.tab-tilt-arm strong.model').text(chrome.i18n.getMessage('tiltArmModelNoSupport'));
$('#TILT_TABLE').hide();
}
Expand Down

0 comments on commit 4f5be6c

Please sign in to comment.