Merge branch 'change-profiles-with-programmin' into master

pull/1384/head
Darren Lines 3 years ago committed by GitHub
commit 61f13a3205
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -560,7 +560,7 @@
"message": "Settings restored to <strong>default</strong>"
},
"initialSetupEepromSaved": {
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>"
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>: Setup"
},
"RX_PPM": {
@ -1009,7 +1009,7 @@
"message": "Craft name. Can be displayed by OSD and by compatible RC systems."
},
"configurationEepromSaved": {
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>"
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>: Configuration"
},
"configurationButtonSave": {
"message": "Save and Reboot"
@ -1216,7 +1216,7 @@
"message": "PID data <strong>refreshed</strong>"
},
"pidTuningEepromSaved": {
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>"
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>: PID Tuning"
},
"receiverHelp": {
@ -1280,7 +1280,7 @@
"message": "RC Tuning data <strong>refreshed</strong>"
},
"receiverEepromSaved": {
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>"
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>: Receiver"
},
"auxiliaryHelp": {
@ -1528,9 +1528,11 @@
"message": "Save"
},
"adjustmentsEepromSaved": {
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>"
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>: Adjustments"
},
"programmingEepromSaved": {
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>: Programming"
},
"transponderNotSupported": {
"message": "Your flight controller's firmware does not support transponder functionality."
},
@ -1556,7 +1558,7 @@
"message": "Transponder data is <span style=\"color: red\">invalid</span>"
},
"transponderEepromSaved": {
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>"
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>: Transponder"
},
"servosChangeDirection": {
"message": "Change Direction in TX To Match"
@ -2012,7 +2014,7 @@
"message": "Save"
},
"ledStripEepromSaved": {
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>"
"message": "EEPROM <span style=\"color: #37a8db\">saved</span>: LED"
},
"controlAxisRoll": {
@ -3251,6 +3253,9 @@
"osdElement_WIND_SPEED_VERTICAL_HELP": {
"message": "Shows estimated vertical wind speed and direction (up or down)."
},
"osdElement_ACTIVE_PROFILE": {
"message": "Show the active profile"
},
"osdElement_LEVEL_PIDS": {
"message": "Level PIDs"
},

@ -1243,11 +1243,17 @@ var FC = {
hasOperand: [true, true],
output: "boolean"
},
41: {
name: "LOITER RADIUS OVERRIDE",
hasOperand: [true, false],
output: "boolean"
},
42: {
name: "SET PROFILE",
hasOperand: [true, false],
output: "boolean"
},
}
},
getOperandTypes: function () {
@ -1307,6 +1313,7 @@ var FC = {
33: "CRSF SNR",
34: "GPS Valid Fix",
35: "Loiter Radius [cm]",
36: "Active Profile",
}
},
3: {

@ -13250,48 +13250,48 @@ MAX7456
01010101
01010101
01010101
01010000
00000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01001010
10100000
00000101
00100000
00001010
10100001
00101010
10100101
01011000
00100101
00000001
01011000
00100100
10101000
01011000
00100100
10000010
00011000
00100100
10000010
00011000
00100100
10101000
01011000
00100100
10000001
01011000
00100100
10000101
01011000
00100101
00010101
01011000
00101010
10101010
10101000
01000000
00000000
00000001
01010101
01010101
01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -13253,48 +13253,48 @@ MAX7456
01010101
01010101
01010101
01010000
00000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01001010
10100000
00000101
00100000
00001010
10100001
00101010
10100101
01011000
00100101
00000001
01011000
00100100
10101000
01011000
00100100
10000010
00011000
00100100
10000010
00011000
00100100
10101000
01011000
00100100
10000001
01011000
00100100
10000101
01011000
00100101
00010101
01011000
00101010
10101010
10101000
01000000
00000000
00000001
01010101
01010101
01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -13256,48 +13256,48 @@ MAX7456
01010101
01010101
01010101
01010000
00000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01001010
10100000
00000101
00100000
00001010
10100001
00101010
10100101
01011000
00100101
00000001
01011000
00100100
10101000
01011000
00100100
10000010
00011000
00100100
10000010
00011000
00100100
10101000
01011000
00100100
10000001
01011000
00100100
10000101
01011000
00100101
00010101
01011000
00101010
10101010
10101000
01000000
00000000
00000001
01010101
01010101
01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -13250,48 +13250,48 @@ MAX7456
01010101
01010101
01010101
01010000
00000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01001010
10100000
00000101
00100000
00001010
10100001
00101010
10100101
01011000
00100101
00000001
01011000
00100100
10101000
01011000
00100100
10000010
00011000
00100100
10000010
00011000
00100100
10101000
01011000
00100100
10000001
01011000
00100100
10000101
01011000
00100101
00010101
01011000
00101010
10101010
10101000
01000000
00000000
00000001
01010101
01010101
01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -124,7 +124,8 @@ SYM_HEADING_E | SYM.HEADING_E | Heading graph East
SYM_HEADING_W | SYM.HEADING_W | Heading graph West | 203 | 0xCB
SYM_HEADING_DIVIDED_LINE | SYM.HEADING_DIVIDED_LINE | Heading graphic | 204 | 0xCC
SYM_HEADING_LINE | SYM.HEADING_LINE | Heading graphic | 205 | 0xCD
SYM_MAX | SYM.MAX | Max icon | 206 | 0xCE
SYM_MAX | SYM.MAX | Max icon | 206 | 0xCE
SYM_PROFILE | SYM.PROFILE | Profile icon | 207 | 0xCF
| | | |
SYM_LOGO_START | | INAV Logo | 257 - 280 | 0x101 - 0x118
SYM_AH_LEFT | SYM.AH_LEFT | AHI Arrow left | 300 | 0x12C

@ -13250,51 +13250,51 @@ MAX7456
01010101
01010101
01010101
01000000
00000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
00101010
10100000
00000001
00000000
00001010
10101000
00101010
10100000
00000000
00000000
00001010
10101000
00101010
10101010
10101000
00101010
00000010
10101000
00101010
00101000
10101000
00101010
00101000
10101000
00101010
00000010
10101000
00101010
00101010
10101000
00101010
00101010
10101000
00101010
10101010
10101000
00101010
10101010
10101000
01000000
00000000
00000001
01010101
01010101
01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -13247,51 +13247,51 @@ MAX7456
01010101
01010101
01010101
01000000
00000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
00101010
10100000
00000001
00000000
00001010
10101000
00101010
10100000
00000000
00000000
00001010
10101000
00101010
10101010
10101000
00101010
00000010
10101000
00101010
00101000
10101000
00101010
00101000
10101000
00101010
00000010
10101000
00101010
00101010
10101000
00101010
00101010
10101000
00101010
10101010
10101000
00101010
10101010
10101000
01000000
00000000
00000001
01010101
01010101
01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -13250,51 +13250,51 @@ MAX7456
01010101
01010101
01010101
01010000
00000101
01010101
01001010
10100000
00000101
00100000
00001010
10100001
00101010
10100101
01011000
00100101
00000001
01011000
00100100
10101000
01011000
00100100
10000010
00011000
00100100
10000010
00011000
00100100
10101000
01011000
00100100
10000001
01011000
00100100
10000101
01011000
00100101
00010101
01011000
00100101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01011000
00101010
10101010
10101000
01000000
00000000
00000001
01010101
01010101
01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -13253,48 +13253,48 @@ MAX7456
01010101
01010101
01010101
01010000
00000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01001010
10100000
00000101
00100000
00001010
10100001
00101010
10100101
01011000
00100101
00000001
01011000
00100100
10101000
01011000
00100100
10000010
00011000
00100100
10000010
00011000
00100100
10101000
01011000
00100100
10000001
01011000
00100100
10000101
01011000
00100101
00010101
01011000
00101010
10101010
10101000
01000000
00000000
00000001
01010101
01010101
01010101

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -86,7 +86,6 @@
<option value="19" i18n="adjustmentsFunction19"></option>
<option value="20" i18n="adjustmentsFunction20"></option>
<option value="21" i18n="adjustmentsFunction21"></option>
<option value="22" i18n="adjustmentsFunction22"></option>
<option value="23" i18n="adjustmentsFunction23"></option>
<option value="24" i18n="adjustmentsFunction24"></option>
<option value="25" i18n="adjustmentsFunction25"></option>

@ -100,6 +100,7 @@ SYM.AH_NM = 0x3F;
SYM.WH_NM = 0x70;
SYM.VTX_POWER = 0x27;
SYM.MAX = 0xCE;
SYM.PROFILE = 0xCF;
SYM.AH_AIRCRAFT0 = 0x1A2;
SYM.AH_AIRCRAFT1 = 0x1A3;
@ -1715,6 +1716,13 @@ OSD.constants = {
{
name: 'osdGroupPIDs',
items: [
{
name: 'ACTIVE_PROFILE',
id: 128,
preview: function(osd_data) {
return FONT.symbol(SYM.PROFILE) + '1';
}
},
{
name: 'ROLL_PIDS',
id: 16,

@ -54,6 +54,7 @@ TABS.programming.initialize = function (callback, scrollPosition) {
$('#save-button').click(function () {
saveChainer.execute();
GUI.log(chrome.i18n.getMessage('programmingEepromSaved'));
});
helper.mspBalancedInterval.add('logic_conditions_pull', 100, 1, function () {

Loading…
Cancel
Save