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

Merge pull request #973 from McGiverGim/bf-add_current_motors

Browse source 
Add current info to motors tab
This commit is contained in:
Michael Keller 2018-03-16 06:27:51 +13:00 • committed by GitHub
commit bc796baf46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
locales/en/messages.json
View file

@ -1758,6 +1758,25 @@
"message": "Qty"
},
"motorsVoltage": {
"message": "Voltage:"
},
"motorsADrawing": {
"message": "Amperage:"
},
"motorsmAhDrawn": {
"message": "Amp. drawn:"
},
"motorsVoltageValue": {
"message": "$1 V"
},
"motorsADrawingValue": {
"message": "$1 A"
},
"motorsmAhDrawnValue": {
"message": "$1 mAh"
},
"motorsText":{
"message": "Motors"
},

17
src/css/tabs/motors.css
View file

@ -108,6 +108,23 @@
background-color: #00D800;
}
/* Power info */
.tab-motors .power_info {
float: left;
margin-left: 1em;
}
.tab-motors .power_info .power_text {
font-weight: bold;
}
.tab-motors .power_info .power_value {
margin-right: 10px;
width: 50px;
display: inline-block;
text-align: right;
}
/*Motors*/
.tab-motors svg {

16
src/js/tabs/motors.js
View file

@ -230,6 +230,11 @@ TABS.motors.initialize = function (callback) {
accel_offset = [0, 0, 0],
accel_offset_established = false;
// cached elements
var motor_voltage_e = $('.motors-bat-voltage'),
motor_mah_drawing_e = $('.motors-bat-mah-drawing'),
motor_mah_drawn_e = $('.motors-bat-mah-drawn');
var raw_data_text_ements = {
x: [],
@ -310,7 +315,7 @@ TABS.motors.initialize = function (callback) {
var rate = parseInt($('.tab-motors select[name="rate"]').val(), 10);
var scale = parseFloat($('.tab-motors select[name="scale"]').val());
GUI.interval_kill_all(['motor_and_status_pull']);
GUI.interval_kill_all(['motor_and_status_pull','motors_power_data_pull_slow']);
switch(TABS.motors.sensor) {
case "gyro":
@ -393,6 +398,15 @@ TABS.motors.initialize = function (callback) {
}
});
// Amperage
function power_data_pull() {
motor_voltage_e.text(i18n.getMessage('motorsVoltageValue', [ANALOG.voltage]));
motor_mah_drawing_e.text(i18n.getMessage('motorsADrawingValue', [ANALOG.amperage.toFixed(2)]));
motor_mah_drawn_e.text(i18n.getMessage('motorsmAhDrawnValue', [ANALOG.mAhdrawn]));
}
GUI.interval_add('motors_power_data_pull_slow', power_data_pull, 250, true); // 4 fps
$('a.reset_max').click(function () {
gyro_max_read = [0, 0, 0];
accel_max_read = [0, 0, 0];

7
src/tabs/motors.html
View file

@ -99,6 +99,13 @@
</div>
</div>
</div>
<div class="power_info">
<span i18n="motorsVoltage" class="power_text"></span><span class="motors-bat-voltage power_value"></span>
<span i18n="motorsADrawing" class="power_text"></span><span class="motors-bat-mah-drawing power_value"></span>
<span i18n="motorsmAhDrawn" class="power_text"></span><span class="motors-bat-mah-drawn power_value"></span>
</div>
</div>
</div>
<div class="gui_box motorblock">