Skip to content
This repository was archived by the owner on Apr 19, 2023. It is now read-only.

Commit 4651724

Browse files
committed
Merge branch 'development'
2 parents 42d4846 + 0a3eec8 commit 4651724

29 files changed

+564
-69
lines changed

_locales/en/messages.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,9 @@
723723
"portsFunction_TELEMETRY_LTM": {
724724
"message": "LTM"
725725
},
726+
"portsFunction_TELEMETRY_MAVLINK": {
727+
"message": "MAVLink"
728+
},
726729
"portsFunction_TELEMETRY_MSP": {
727730
"message": "MSP"
728731
},
@@ -1620,5 +1623,14 @@
16201623
},
16211624
"failsafeKillSwitchHelp": {
16221625
"message": "Set this option to make the failsafe switch, configured in the modes tab, act as a direct kill switch, bypassing the selected failsafe procedure. <strong>Note:</strong> Arming is blocked with the failsafe kill switch in the ON position"
1626+
},
1627+
"mainHelpArmed": {
1628+
"message": "Motor Arming"
1629+
},
1630+
"mainHelpFailsafe": {
1631+
"message": "Failsafe Mode"
1632+
},
1633+
"mainHelpLink": {
1634+
"message": "Serial Link Status"
16231635
}
16241636
}

changelog.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<span>2015.12.15 - 1.2.1 - cleanflight</span>
1+
<span>2016.05.12 - 1.2.2 - cleanflight</span>
2+
<ul>
3+
<li>Better support for some USB VCP targets.</li>
4+
<li>Support for MAVLink telemetry.</li>
5+
</ul>
6+
<span>2016.02.22 - 1.2.1 - cleanflight</span>
27
<ul>
38
<li>Add links to STM VCP Drivers and Zadig.</li>
49
<li>Update recovery procedure on Firmware Flasher page.</li>

images/icons/cf_icon_armed_active.svg

Lines changed: 16 additions & 0 deletions
Loading

images/icons/cf_icon_armed_grey.svg

Lines changed: 16 additions & 0 deletions
Loading

images/icons/cf_icon_bat_grey.svg

Lines changed: 14 additions & 0 deletions
Loading
Lines changed: 14 additions & 0 deletions
Loading
Lines changed: 11 additions & 7 deletions
Loading

images/icons/cf_icon_link_active.svg

Lines changed: 18 additions & 0 deletions
Loading

images/icons/cf_icon_link_grey.svg

Lines changed: 18 additions & 0 deletions
Loading

js/boards.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@ var BOARD_DEFINITIONS = [
5252
name: "SP Racing F3 Mini",
5353
identifier: "SRFM",
5454
vcp: true
55+
}, {
56+
name: "SP Racing F3 EVO",
57+
identifier: "SPEV",
58+
vcp: true
59+
}, {
60+
name: "Alienflight F3",
61+
identifier: "AFF3",
62+
vcp: true
63+
}, {
64+
name: "ImmersionRC Fusion F3",
65+
identifier: "IFF3",
66+
vcp: false
5567
}, {
5668
name: "MotoLab",
5769
identifier: "MOTO",

0 commit comments

Comments
 (0)