Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00
Code Issues Wiki Activity

MISC UI implementation for battery

Browse source 
fixes #15
This commit is contained in:
cTn 2014-01-13 17:43:22 +01:00
parent f72a99f327
commit 467b228b34
4 changed files with 249 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

47
tabs/initial_setup.css
View file

@ -162,19 +162,14 @@
margin-left: 10px;
width: 145px;
border: 1px solid silver;
}
.tab-initial_setup .battery {
float: left;
display: block;
margin-left: 10px;
width: 145px;
border: 1px solid silver;
}
.tab-initial_setup .battery .head,
@ -188,14 +183,33 @@
border-bottom: 1px solid silver;
background-color: #ececec;
}
.tab-initial_setup .battery .fields {
padding: 5px;
.tab-initial_setup .battery .fields,
.tab-initial_setup .acc-trim .fields {
padding: 5px 5px 1px 5px;
}
.tab-initial_setup .battery .bat-voltage {
padding-left: 20px;
}
.tab-initial_setup .acc-trim dl {
padding: 5px;
.tab-initial_setup .battery dt {
float: left;
width: 100px;
line-height: 22px;
margin-bottom: 4px;
}
.tab-initial_setup .battery dd {
line-height: 22px;
margin-left: 100px;
margin-bottom: 4px;
}
.tab-initial_setup .battery input {
width: 70px;
height: 20px;
line-height: 20px;
border: 1px solid silver;
text-align: center;
}
.tab-initial_setup .acc-trim dt {
float: left;
@ -209,19 +223,16 @@
margin-bottom: 4px;
}
.tab-initial_setup .acc-trim input {
width: 80px;
width: 70px;
height: 20px;
line-height: 20px;
border: 1px solid silver;
text-align: center;
}
.tab-initial_setup .acc-trim a.update {
.tab-initial_setup .save_settings {
display: block;
margin-right: 5px;
margin-bottom: 5px;
margin-left: 55px;
float: right;
width: 80px;
height: 20px;
@ -233,14 +244,14 @@
border: 1px solid silver;
background-color: #ececec;
}
.tab-initial_setup .acc-trim a.update:hover {
.tab-initial_setup .save_settings:hover {
background-color: #dedcdc;
}
.tab-initial_setup .compass-wrapper {
position: absolute;
bottom: 60px;
right: 140px;
bottom: 30px;
right: 100px;
border: 1px solid silver;
border-radius: 50%;

23
tabs/initial_setup.html
View file

@ -42,22 +42,27 @@
</div>
</div>
</div>
<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" value="0" /></dd>
<dt>Max Cell Voltage:</dt><dd><input type="number" name="maxcellvoltage" step="0.1" value="0" /></dd>
<dt>Voltage Scale:</dt><dd><input type="number" name="voltagescale" min="10" max="200" value="0" /></dd>
</dl>
</div>
</div>
<div class="acc-trim">
<span class="head">Accelerometer trims</span>
<div class="fields">
<dl>
<dt>Pitch:</dt><dd><input type="number" name="pitch" value="0" /></dd>
<dt>Roll:</dt><dd><input type="number" name="roll" value="0" /></dd>
<dt>Pitch:</dt><dd><input type="number" name="pitch" min="-300" max="300" value="0" /></dd>
<dt>Roll:</dt><dd><input type="number" name="roll" min="-300" max="300" value="0" /></dd>
</dl>
<a class="update" href="#">Save</a>
</div>
</div>
<div class="battery">
<span class="head">Battery</span>
<div class="fields">
Voltage: <span class="bat-voltage">0 V</span>
</div>
</div>
<a class="save_settings" href="#">Save</a>
<div class="compass-wrapper">
<div id="compass">
<span>N</span>

43
tabs/initial_setup.js
View file

@ -4,8 +4,14 @@ function tab_initialize_initial_setup() {
send_message(MSP_codes.MSP_IDENT, MSP_codes.MSP_IDENT, false, function() {
send_message(MSP_codes.MSP_ACC_TRIM, MSP_codes.MSP_ACC_TRIM, false, function() {
send_message(MSP_codes.MSP_MISC, MSP_codes.MSP_MISC, false, function() {
var yaw_fix = 0.0;
// Fill in misc battery stuff
$('input[name="mincellvoltage"]').val(MISC.vbatmincellvoltage);
$('input[name="maxcellvoltage"]').val(MISC.vbatmaxcellvoltage);
$('input[name="voltagescale"]').val(MISC.vbatscale);
// Fill in the accel trimms from CONFIG object
$('input[name="pitch"]').val(CONFIG.accelerometerTrims[0]);
$('input[name="roll"]').val(CONFIG.accelerometerTrims[1]);
@ -114,7 +120,7 @@ function tab_initialize_initial_setup() {
});
$('a.update').click(function() {
$('a.save_settings').click(function() {
CONFIG.accelerometerTrims[0] = parseInt($('input[name="pitch"]').val());
CONFIG.accelerometerTrims[1] = parseInt($('input[name="roll"]').val());
@ -127,6 +133,38 @@ function tab_initialize_initial_setup() {
// Send over the new trims
send_message(MSP_codes.MSP_SET_ACC_TRIM, buffer_out);
MISC.vbatmincellvoltage = parseFloat($('input[name="mincellvoltage"]').val()) * 10;
MISC.vbatmaxcellvoltage = parseFloat($('input[name="maxcellvoltage"]').val()) * 10;
MISC.vbatscale = parseInt($('input[name="voltagescale"]').val());
// we also have to fill the unsupported bytes
var buffer_out = new Array();
buffer_out[0] = 0; // powerfailmeter
buffer_out[1] = 0;
buffer_out[2] = lowByte(MISC.minthrottle);
buffer_out[3] = highByte(MISC.minthrottle);
buffer_out[4] = 0; // mcfg.maxthrottle, mcfg.mincommand
buffer_out[5] = 0;
buffer_out[6] = 0;
buffer_out[7] = 0;
buffer_out[8] = lowByte(MISC.failsafe_throttle);
buffer_out[9] = highByte(MISC.failsafe_throttle);
buffer_out[10] = 0;
buffer_out[11] = 0;
buffer_out[12] = 0;
buffer_out[13] = 0;
buffer_out[14] = 0;
buffer_out[15] = 0;
buffer_out[16] = lowByte(MISC.mag_declination);
buffer_out[17] = highByte(MISC.mag_declination);
buffer_out[18] = MISC.vbatscale;
buffer_out[19] = MISC.vbatmincellvoltage;
buffer_out[20] = MISC.vbatmaxcellvoltage;
buffer_out[21] = 0; // vbatlevel_crit (unused)
// Send over new misc
send_message(MSP_codes.MSP_SET_MISC, buffer_out);
// Save changes to EEPROM
send_message(MSP_codes.MSP_EEPROM_WRITE, MSP_codes.MSP_EEPROM_WRITE);
});
@ -154,7 +192,7 @@ function tab_initialize_initial_setup() {
$('div#compass .value').html(SENSOR_DATA.kinematicsZ + '&deg;');
// Update voltage indicator
$('span.bat-voltage').html(BATTERY.voltage + ' V');
$('.bat-voltage').html(BATTERY.voltage + ' V');
// Request new data
send_message(MSP_codes.MSP_STATUS, MSP_codes.MSP_STATUS);
@ -164,4 +202,5 @@ function tab_initialize_initial_setup() {
}, 50, true);
});
});
});
}