Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 15:25:36 +03:00
Code Issues Wiki Activity

info box with voltage & rssi on initial setup

Browse source
This commit is contained in:
cTn 2014-04-03 14:33:30 +02:00
parent 2977f9725b
commit e0510603d8
4 changed files with 69 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/msp.js
View file

@ -244,7 +244,7 @@ MSP.process_data = function(code, message_buffer, message_length) {
case MSP_codes.MSP_ANALOG: case MSP_codes.MSP_ANALOG:
ANALOG.voltage = data.getUint8(0) / 10.0; ANALOG.voltage = data.getUint8(0) / 10.0;
ANALOG.power = data.getUint16(1, 1); ANALOG.power = data.getUint16(1, 1);
ANALOG.rssi = data.getUint16(3, 1); ANALOG.rssi = data.getUint16(3, 1); // 0-1023
ANALOG.amperage = data.getUint16(5, 1); ANALOG.amperage = data.getUint16(5, 1);
break; break;
case MSP_codes.MSP_RC_TUNING: case MSP_codes.MSP_RC_TUNING:

61
tabs/initial_setup.css
View file

@ -161,7 +161,8 @@
.tab-initial_setup .battery, .tab-initial_setup .battery,
.tab-initial_setup .throttle, .tab-initial_setup .throttle,
.tab-initial_setup .acc-trim, .tab-initial_setup .acc-trim,
.tab-initial_setup .magnetometer { .tab-initial_setup .magnetometer,
.tab-initial_setup .info {
float: left; float: left;
display: block; display: block;
@ -169,13 +170,15 @@
border: 1px solid silver; border: 1px solid silver;
} }
.tab-initial_setup .magnetometer { .tab-initial_setup .magnetometer,
.tab-initial_setup .info {
margin-top: 10px; margin-top: 10px;
} }
.tab-initial_setup .battery .head, .tab-initial_setup .battery .head,
.tab-initial_setup .throttle .head, .tab-initial_setup .throttle .head,
.tab-initial_setup .acc-trim .head, .tab-initial_setup .acc-trim .head,
.tab-initial_setup .magnetometer .head { .tab-initial_setup .magnetometer .head,
.tab-initial_setup .info .head {
display: block; display: block;
text-align: center; text-align: center;
@ -187,7 +190,8 @@
} }
.tab-initial_setup .battery .fields, .tab-initial_setup .battery .fields,
.tab-initial_setup .throttle .fields, .tab-initial_setup .throttle .fields,
.tab-initial_setup .magnetometer .fields { .tab-initial_setup .magnetometer .fields,
.tab-initial_setup .info .fields {
padding: 5px 5px 3px 5px; padding: 5px 5px 3px 5px;
} }
.tab-initial_setup .acc-trim .fields { .tab-initial_setup .acc-trim .fields {
@ -196,12 +200,10 @@
.tab-initial_setup .magnetometer .fields { .tab-initial_setup .magnetometer .fields {
padding: 5px 5px 5px 5px; padding: 5px 5px 5px 5px;
} }
.tab-initial_setup .battery .bat-voltage {
padding-left: 20px;
}
.tab-initial_setup .battery dt { .tab-initial_setup .battery dt {
float: left; float: left;
width: 100px;
width: 105px;
height: 22px; height: 22px;
margin-bottom: 2px; margin-bottom: 2px;
@ -211,13 +213,13 @@
.tab-initial_setup .battery dd { .tab-initial_setup .battery dd {
height: 22px; height: 22px;
margin-left: 100px; margin-left: 105px;
margin-bottom: 2px; margin-bottom: 2px;
line-height: 22px; line-height: 22px;
} }
.tab-initial_setup .battery input { .tab-initial_setup .battery input {
width: 70px; width: 60px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
@ -226,7 +228,8 @@
} }
.tab-initial_setup .throttle dt { .tab-initial_setup .throttle dt {
float: left; float: left;
width: 85px;
width: 90px;
height: 22px; height: 22px;
margin-bottom: 2px; margin-bottom: 2px;
@ -236,13 +239,13 @@
.tab-initial_setup .throttle dd { .tab-initial_setup .throttle dd {
height: 22px; height: 22px;
margin-left: 85px; margin-left: 90px;
margin-bottom: 2px; margin-bottom: 2px;
line-height: 22px; line-height: 22px;
} }
.tab-initial_setup .throttle input { .tab-initial_setup .throttle input {
width: 70px; width: 60px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
@ -251,7 +254,8 @@
} }
.tab-initial_setup .acc-trim dt { .tab-initial_setup .acc-trim dt {
float: left; float: left;
width: 40px;
width: 65px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
@ -260,11 +264,11 @@
.tab-initial_setup .acc-trim dd { .tab-initial_setup .acc-trim dd {
height: 22px; height: 22px;
margin-left: 40px; margin-left: 65px;
margin-bottom: 2px; margin-bottom: 2px;
} }
.tab-initial_setup .acc-trim input { .tab-initial_setup .acc-trim input {
width: 70px; width: 60px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
@ -273,7 +277,8 @@
} }
.tab-initial_setup .magnetometer dt { .tab-initial_setup .magnetometer dt {
float: left; float: left;
width: 100px;
width: 90px;
height: 20px; height: 20px;
line-height: 22px; line-height: 22px;
@ -283,22 +288,36 @@
height: 20px; height: 20px;
line-height: 22px; line-height: 22px;
margin-left: 100px; margin-left: 90px;
margin-bottom: 2px; margin-bottom: 2px;
} }
.tab-initial_setup .magnetometer input { .tab-initial_setup .magnetometer input {
width: 70px; width: 60px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
border: 1px solid silver; border: 1px solid silver;
text-align: center; text-align: center;
} }
.tab-initial_setup .info dt {
float: left;
width: 50px;
height: 20px;
line-height: 20px;
}
.tab-initial_setup .info dd {
width: 40px;
height: 20px;
line-height: 20px;
margin-left: 50px;
}
.tab-initial_setup .update { .tab-initial_setup .update {
display: block; display: block;
float: left; float: right;
margin: 10px 0 0 10px; margin: 10px 3px 0 0;
width: 80px; width: 80px;
height: 20px; height: 20px;

40
tabs/initial_setup.html
View file

@ -42,18 +42,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="left" style="width: 510px"> <div class="left" style="width: 515px">
<div class="battery">
<span class="head">Battery</span>
<div class="fields">
<dl>
<dt>Voltage:</dt><dd class="bat-voltage">0 V</dd>
<dt>Min Cell Voltage:</dt><dd><input type="number" name="mincellvoltage" step="0.1" min="1" max="5" /></dd>
<dt>Max Cell Voltage:</dt><dd><input type="number" name="maxcellvoltage" step="0.1" min="1" max="5" /></dd>
<dt>Voltage Scale:</dt><dd><input type="number" name="voltagescale" step="1" min="10" max="200" /></dd>
</dl>
</div>
</div>
<div class="throttle"> <div class="throttle">
<span class="head">Throttle Settings</span> <span class="head">Throttle Settings</span>
<div class="fields"> <div class="fields">
@ -65,6 +54,16 @@
</dl> </dl>
</div> </div>
</div> </div>
<div class="battery">
<span class="head">Battery</span>
<div class="fields">
<dl>
<dt>Min Cell Voltage:</dt><dd><input type="number" name="mincellvoltage" step="0.1" min="1" max="5" /></dd>
<dt>Max Cell Voltage:</dt><dd><input type="number" name="maxcellvoltage" step="0.1" min="1" max="5" /></dd>
<dt>Voltage Scale:</dt><dd><input type="number" name="voltagescale" step="1" min="10" max="200" /></dd>
</dl>
</div>
</div>
<div class="acc-trim"> <div class="acc-trim">
<span class="head">Accelerometer trims</span> <span class="head">Accelerometer trims</span>
<div class="fields"> <div class="fields">
@ -76,11 +75,22 @@
</div> </div>
<a class="update" href="#">Save</a> <a class="update" href="#">Save</a>
</div> </div>
<div class="magnetometer"> <div class="left" style="width: 515px">
<span class="head">Magnetometer</span> <div class="magnetometer">
<span class="head">Magnetometer</span>
<div class="fields">
<dl>
<dt>Declination:</dt><dd><input type="number" name="mag_declination" step="0.1" min="-180" max="180" /></dd>
</dl>
</div>
</div>
</div>
<div class="info">
<span class="head">Info</span>
<div class="fields"> <div class="fields">
<dl> <dl>
<dt>Declination:</dt><dd><input type="number" name="mag_declination" step="0.1" min="-180" max="180" /></dd> <dt>Battery:</dt><dd class="bat-voltage">0 V</dd>
<dt>RSSI:</dt><dd class="rssi">0 %</dd>
</dl> </dl>
</div> </div>
</div> </div>

5
tabs/initial_setup.js
View file

@ -95,7 +95,7 @@ function tab_initialize_initial_setup() {
break; break;
} }
$('span.model').html('Model: ' + str); $('span.model').text('Model: ' + str);
// UI Hooks // UI Hooks
$('a.calibrateAccel').click(function() { $('a.calibrateAccel').click(function() {
@ -236,7 +236,8 @@ function tab_initialize_initial_setup() {
function update_ui() { function update_ui() {
// Update voltage indicator // Update voltage indicator
$('.bat-voltage').html(ANALOG.voltage + ' V'); $('.bat-voltage').text(ANALOG.voltage + ' V');
$('.rssi').text(((ANALOG.rssi / 1023) * 100).toFixed(0) + ' %');
// Update cube // Update cube
var cube = $('div#cube'); var cube = $('div#cube');