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

Merge pull request #489 from basdelfos/main_battery_usage_bar 

Added OSD configuration for Main Battery Usage progressbar
10.3.x-maintenance
Michael Keller 2017-05-05 09:12:13 +12:00 committed by GitHub
parent a1b21178f0 87a473c2e3
commit 8a5ed307dd
8 changed files with 82279 additions and 82264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main.css
View File

@ -48,13 +48,13 @@ a.disabled {
background-image: url(images/icons/cf_icon_info_grey.svg);
background-size: contain;
background-position: center;
transition: none;
transition: none;
}
.helpicon:hover {
opacity: 0.9;
background-image: url(images/icons/cf_icon_info_green.svg);
transition: none;
transition: none;
}
.cf_doc_version_bt a {
@ -868,14 +868,14 @@ li.active .ic_mission {
}
#content {
margin-top: 0px;
padding: 0px;
margin-top: 0px;
padding: 0px;
height: calc(100% - 150px);
/* (port picker 105px, log CLOSED 25px, status bar: 20px + padding) - was: calc(100% - 171px)*/
background-color: white;
overflow-x: hidden;
overflow-y: auto;
border: 0px solid #848484;
border: 0px solid #848484;
-webkit-transform: rotateX(0deg); /* DO NOT REMOVE! this fixes the UI freezing bug on MAC OS X */
transition: all 0.3s;
}
@ -1142,7 +1142,7 @@ dialog {
background-color: #FFFFFF;
float: left;
width: calc(100% - 2px);
margin-bottom: 10px;
margin-bottom: 50px;
font-family: 'open_sansregular', Arial;
}
@ -1616,7 +1616,7 @@ dialog {
margin-left: 14px;
height: 10px;
width: 30px;
/* width: 30px; */
/* width: 30px; */
}
@ -1665,7 +1665,7 @@ dialog {
}
.armedicon,
.failsafeicon,
.failsafeicon,
.linkicon {
float: left;
margin-left: 8px;
@ -1677,7 +1677,7 @@ dialog {
opacity: 0.8;
background-size: contain;
background-position: center;
transition: none;
transition: none;
}
.armedicon {
@ -1686,7 +1686,7 @@ dialog {
.failsafeicon {
background-image: url(images/icons/cf_icon_failsafe_grey.svg);
}
.linkicon {
background-image: url(images/icons/cf_icon_link_grey.svg);
}
@ -1835,5 +1835,5 @@ input {
overflow-x: hidden;
overflow-y: auto;
}
}

32770
resources/osd/betaflight.mcm
View File

File diff suppressed because it is too large Load Diff

32770
resources/osd/bold.mcm
View File

File diff suppressed because it is too large Load Diff

32770
resources/osd/default.mcm
View File

File diff suppressed because it is too large Load Diff

654
resources/osd/digital.mcm
View File

@ -8831,379 +8831,379 @@ MAX7456
01010101
01010101
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010000
01010101
01010101
01001010
01010101
01010101
01001000
01010101
01010101
01001000
01010101
01010101
01001000
01010101
01010101
01001000
01010101
01010101
01001000
01010101
01010101
01001000
01010101
01010101
01001000
01010101
01010101
01001000
01010101
01010101
01001010
01010101
01010101
01010000
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
01010100
00000000
01010101
01010100
10101000
01010101
00000000
00000000
00000001
00101000
00000000
10100001
00001010
10101010
10000001
00101000
00000000
10100001
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
00000000
00000000
00000001
00101000
00000000
10100001
00001010
10101010
10000001
00101000
00000000
10100001
00000000
00000000
00000001
01010100
10101000
01010101
01010100
00000000
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
00000000
00000000
00000001
00101000
00000000
10100001
00001010
10101010
10000001
00101000
00000000
10100001
00000000
00000000
00000001
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
00000000
00000000
00000001
00101000
00000000
10100001
00001010
10101010
10000001
00101000
00000000
10100001
00000000
00000000
00000001
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010100
00000000
01010101
01010100
10101000
01010101
00000000
00000000
00000001
00101000
00000000
10100001
00001010
10101010
10000001
00101000
00000000
10100001
00000000
00000000
00000001
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
00101000
00000000
10100001
00001010
10101010
10000001
00101000
10101010
10101010
10101010
10101010
10101010
10101010
10101010
10101010
10101010
10101010
10101010
10101010
10101010
10101010
10101010
00000000
00000000
00000000
10101010
10101010
10101010
00000000
00000000
00000000
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
00000000
00000000
00000000
10101010
10101010
10101010
00000000
00000000
00000000
10101010
10100001
01010101
10101010
10100001
01010101
10101010
10100001
01010101
10101010
10100001
01010101
10101010
10100001
01010101
10101010
10100001
01010101
00000000
00000000
00000000
10101010
10101010
10101010
00000000
00000000
00000001
01010100
10101000
01010101
01010100
00000000
01010101
01010100
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
00000000
00000000
00000000
10101010
10101010
10101010
00000000
00000000
00000000
01010101
01010100
10101000
01010101
01010100
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
00000000
00000000
00000000
10101010
10101010
10101010
00000000
00000000
00000000
01010101
01010100
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
00000000
00000000
00000000
10101010
10101010
10101010
00000000
00000000
00000000
00010101
01010101
01010101
00010101
01010101
01010101
00010101
01010101
01010101
00010101
01010101
01010101
00010101
01010101
01010101
00010101
01010101
01010101
00000000
00000000
00000000
10101010
10101010
10101010
00000000
00000000
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010100
00000000
01010101
01010100
10101000
01010101
01010100
00000000
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
00000101
01010101
01010101
10100001
01010101
01010101
00100001
01010101
01010101
00100001
01010101
01010101
00100001
01010101
01010101
00100001
01010101
01010101
00100001
01010101
01010101
00100001
01010101
01010101
00100001
01010101
01010101
00100001
01010101
01010101
10100001
01010101
01010101
00000101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101
01010101

32770
resources/osd/extra_large.mcm
View File

File diff suppressed because it is too large Load Diff

32770
resources/osd/large.mcm
View File

File diff suppressed because it is too large Load Diff

17
tabs/osd.js
View File

@ -20,7 +20,11 @@ SYM.MAH = 0x07;
SYM.METRE = 0xC;
SYM.FEET = 0xF;
SYM.GPS_SAT = 0x1F;
SYM.PB_START = 0x8A;
SYM.PB_FULL = 0x8B;
SYM.PB_EMPTY = 0x8D;
SYM.PB_END = 0x8E;
SYM.PB_CLOSE = 0x8F;
var FONT = FONT || {};
@ -416,6 +420,12 @@ OSD.constants = {
default_position: -1,
positionable: true,
preview: '-00.0'
},
MAIN_BATT_USAGE: {
name: 'MAIN_BATT_USAGE',
default_position: -17,
positionable: true,
preview: FONT.symbol(SYM.PB_START) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_END) + FONT.symbol(SYM.PB_EMPTY) + FONT.symbol(SYM.PB_CLOSE)
}
}
};
@ -461,6 +471,11 @@ OSD.chooseFields = function () {
F.PITCH_ANGLE,
F.ROLL_ANGLE
]);
if (semver.gte(CONFIG.apiVersion, "1.36.0")) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.MAIN_BATT_USAGE
]);
}
}
}
}