sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/development' into blackbox-flash

10.3.x-maintenance
Nicholas Sherlock 2015-02-16 17:45:47 +13:00
parent 49741b45a8 34d72feb69
commit 7fb9f43b00
35 changed files with 1774 additions and 4748 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelog.html
View File

@ -1,14 +1,17 @@
<span>2015.01.19 - 0.61.0 - cleanflight</span>
<span>2015.02.03 - 0.61.0 - cleanflight</span>
<p>
- Support changing PID controller - there new PID controllers in 1.7.0 firmware.<br />
- Support for LED thrust ring.<br />
- Support for LED colors.<br />
- Support for displaying sonar sensor reading on the sensors tab.<br />
- UI cleanup - 'Welcome' and 'Firmware flasher' are now tabs.<br />
- New Logo. (Tom McCullough)<br />
- New 3D models (AkFreak).<br />
- Update presentation of LEDs that have multiple functions.<br />
- Added Documentation and Support panels to welcome tab.<br />
- Add support for backup and restore of LED strip configuration.<br />
- Fix for disappearing tabs in chrome 41 beta.<br />
- Various other minor improvements.<br />
</p>
<span>2015.01.08 - 0.60.0 - cleanflight</span>
<p>

BIN
images/icon_128.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

36
js/boards.js
View File

@ -3,51 +3,43 @@
var BOARD_DEFINITIONS = [
{
name: "CC3D",
identifier: "CC3D",
serialPortCount: 3
identifier: "CC3D"
}, {
name: "ChebuzzF3",
identifier: "CHF3",
serialPortCount: 3
identifier: "CHF3"
}, {
name: "CJMCU",
identifier: "CJM1",
serialPortCount: 2
identifier: "CJM1"
}, {
name: "EUSTM32F103RB",
identifier: "EUF1",
serialPortCount: 4
identifier: "EUF1"
}, {
name: "Naze/Flip32+",
identifier: "AFNA",
serialPortCount: 4
identifier: "AFNA"
}, {
name: "Naze32Pro",
identifier: "AFF3",
serialPortCount: 3
identifier: "AFF3"
}, {
name: "Olimexino",
identifier: "OLI1",
serialPortCount: 4
identifier: "OLI1"
}, {
name: "Port103R",
identifier: "103R",
serialPortCount: 4
identifier: "103R"
}, {
name: "Sparky",
identifier: "SPKY",
serialPortCount: 4
identifier: "SPKY"
}, {
name: "STM32F3Discovery",
identifier: "SDF3",
serialPortCount: 3
identifier: "SDF3"
}, {
name: "SP Racing F3",
identifier: "SRF3"
}
];
var DEFAULT_BOARD_DEFINITION = {
name: "Unknown",
identifier: "????",
serialPortCount: 1
identifier: "????"
};
var BOARD = {

2
js/data_storage.js
View File

@ -1,7 +1,7 @@
'use strict';
var CONFIGURATOR = {
'releaseDate': 1422552160231, // new Date().getTime() - 2015.01.29
'releaseDate': 1422922675433, // new Date().getTime() - 2015.01.29
'apiVersionAccepted': 1.2,
'backupRestoreMinApiVersionAccepted': 1.5,
'pidControllerChangeMinApiVersion': 1.5,

23
js/msp.js
View File

@ -488,9 +488,9 @@ var MSP = {
BF_CONFIG.mixerConfiguration = data.getUint8(0);
BF_CONFIG.features = data.getUint32(1, 1);
BF_CONFIG.serialrx_type = data.getUint8(5);
BF_CONFIG.board_align_roll = data.getInt16(6, 1);
BF_CONFIG.board_align_pitch = data.getInt16(8, 1);
BF_CONFIG.board_align_yaw = data.getInt16(10, 1);
BF_CONFIG.board_align_roll = data.getInt16(6, 1); // -180 - 360
BF_CONFIG.board_align_pitch = data.getInt16(8, 1); // -180 - 360
BF_CONFIG.board_align_yaw = data.getInt16(10, 1); // -180 - 360
BF_CONFIG.currentscale = data.getInt16(12, 1);
BF_CONFIG.currentoffset = data.getUint16(14, 1);
break;
@ -559,8 +559,8 @@ var MSP = {
case MSP_codes.MSP_CF_SERIAL_CONFIG:
SERIAL_CONFIG.ports = [];
var offset = 0;
var serialPortCount = data.byteLength - (4 * 4);
for (var i = 0; offset < serialPortCount; i++) {
var serialPortCount = (data.byteLength - (4 * 4)) / 2;
for (var i = 0; i < serialPortCount; i++) {
var serialPort = {
identifier: data.getUint8(offset++, 1),
scenario: data.getUint8(offset++, 1)
@ -622,7 +622,12 @@ var MSP = {
break;
case MSP_codes.MSP_CHANNEL_FORWARDING:
for (var i = 0; i < 8; i ++) {
SERVO_CONFIG[i].indexOfChannelToForward = data.getUint8(i);
var channelIndex = data.getUint8(i);
if (channelIndex < 255) {
SERVO_CONFIG[i].indexOfChannelToForward;
} else {
SERVO_CONFIG[i].indexOfChannelToForward = undefined;
}
}
break;
@ -931,7 +936,11 @@ MSP.crunch = function (code) {
break;
case MSP_codes.MSP_SET_CHANNEL_FORWARDING:
for (var i = 0; i < SERVO_CONFIG.length; i++) {
buffer.push(SERVO_CONFIG[i].indexOfChannelToForward);
var out = SERVO_CONFIG[i].indexOfChannelToForward;
if (out == undefined) {
out = 255; // Cleanflight defines "CHANNEL_FORWARDING_DISABLED" as "(uint8_t)0xFF"
}
buffer.push(out);
}
break;
case MSP_codes.MSP_SET_CF_SERIAL_CONFIG:

112
resources/models/fallback.json
View File

File diff suppressed because one or more lines are too long

538
resources/models/hex_plus.json
View File

File diff suppressed because one or more lines are too long

530
resources/models/hex_x.json
View File

File diff suppressed because one or more lines are too long

457
resources/models/quad_atail.json
View File

File diff suppressed because one or more lines are too long

457
resources/models/quad_vtail.json
View File

File diff suppressed because one or more lines are too long

534
resources/models/quad_x.json
View File

File diff suppressed because one or more lines are too long

494
resources/models/tricopter.json
View File

File diff suppressed because one or more lines are too long

556
resources/models/y4.json
View File

File diff suppressed because one or more lines are too long

710
resources/models/y6.json
View File

File diff suppressed because one or more lines are too long

0
resources/motor_order/svg_model_motors.rb → support/svg_model_motors.rb
View File

6
tabs/configuration.html
View File

@ -56,19 +56,19 @@
<div class="groupTitle" i18n="configurationBoardAlignment"></div>
<div class="number">
<label>
<input type="number" name="board_align_roll" step="1" min="-180" max="180" />
<input type="number" name="board_align_roll" step="1" min="-180" max="360" />
<span i18n="configurationBoardAlignmentRoll"></span>
</label>
</div>
<div class="number">
<label>
<input type="number" name="board_align_pitch" step="1" min="-180" max="180" />
<input type="number" name="board_align_pitch" step="1" min="-180" max="360" />
<span i18n="configurationBoardAlignmentPitch"></span>
</label>
</div>
<div class="number">
<label>
<input type="number" name="board_align_yaw" step="1" min="-180" max="180" />
<input type="number" name="board_align_yaw" step="1" min="-180" max="360" />
<span i18n="configurationBoardAlignmentYaw"></span>
</label>
</div>

1
tabs/pid_tuning.css
View File

@ -54,7 +54,6 @@
}
.tab-pid_tuning .controller select {
width: 100%;
padding-left: calc(100% - 35px);
height: 20px;
line-height: 20px;
}

12
tabs/pid_tuning.html
View File

@ -2,12 +2,12 @@
<div class="controller">
<span class="head" i18n="pidTuningControllerHead"></span>
<select name="controller">
<option value="0">MultiWii (Old)</option>
<option value="1">MultiWii (rewrite)</option>
<option value="2">LuxFloat</option>
<option value="3">MultiWii (2.3 - latest)</option>
<option value="4">MultiWii (2.3 - hybrid)</option>
<option value="5">Harakiri</option>
<option value="0">0 - MultiWii (Old)</option>
<option value="1">1 - MultiWii (rewrite)</option>
<option value="2">2 - LuxFloat</option>
<option value="3">3 - MultiWii (2.3 - latest)</option>
<option value="4">4 - MultiWii (2.3 - hybrid)</option>
<option value="5">5 - Harakiri</option>
</select>
</div>
<div class="clear-both"></div>

2
tabs/ports.js
View File

@ -61,7 +61,7 @@ TABS.ports.initialize = function (callback, scrollPosition) {
var ports_e = $('.tab-ports .ports');
var port_configuration_template_e = $('#tab-ports-templates .portConfiguration');
for (var portIndex = 0; portIndex < board_definition.serialPortCount; portIndex++) {
for (var portIndex = 0; portIndex < SERIAL_CONFIG.ports.length; portIndex++) {
var port_configuration_e = port_configuration_template_e.clone();
var serialPort = SERIAL_CONFIG.ports[portIndex];

7
tabs/servos.js
View File

@ -163,9 +163,12 @@ TABS.servos.initialize = function (callback) {
var selection = $('.channel input', this);
var val = selection.index(selection.filter(':checked'));
var channelIndex = parseInt(selection.index(selection.filter(':checked')));
if (channelIndex == -1) {
channelIndex = undefined;
}
SERVO_CONFIG[info.obj].indexOfChannelToForward = parseInt(val);
SERVO_CONFIG[info.obj].indexOfChannelToForward = channelIndex;
SERVO_CONFIG[info.obj].middle = parseInt($('.middle input', this).val());