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

display current draw in A not mA

Browse source
This commit is contained in:
cTn 2014-05-30 01:41:27 +02:00
parent d68bd29191
commit 46cf844e7e
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
_locales/en/messages.json
View file

@ -222,6 +222,9 @@
"initialSetupBatteryMahValue": { "initialSetupBatteryMahValue": {
"message": "$1 mAh" "message": "$1 mAh"
}, },
"initialSetupBatteryAValue": {
"message": "$1 A"
},
"initialSetupRSSI": { "initialSetupRSSI": {
"message": "RSSI:" "message": "RSSI:"
}, },

2
js/msp.js
View file

@ -241,7 +241,7 @@ MSP.process_data = function(code, message_buffer, message_length) {
ANALOG.voltage = data.getUint8(0) / 10.0; ANALOG.voltage = data.getUint8(0) / 10.0;
ANALOG.mAhdrawn = data.getUint16(1, 1); ANALOG.mAhdrawn = data.getUint16(1, 1);
ANALOG.rssi = data.getUint16(3, 1); // 0-1023 ANALOG.rssi = data.getUint16(3, 1); // 0-1023
ANALOG.amperage = data.getUint16(5, 1) * 1000; // convert from A to mA ANALOG.amperage = data.getUint16(5, 1) / 100; // A
break; break;
case MSP_codes.MSP_RC_TUNING: case MSP_codes.MSP_RC_TUNING:
RC_tuning.RC_RATE = parseFloat((data.getUint8(0) / 100).toFixed(2)); RC_tuning.RC_RATE = parseFloat((data.getUint8(0) / 100).toFixed(2));

2
tabs/initial_setup.html
View file

@ -77,7 +77,7 @@
<dl> <dl>
<dt i18n="initialSetupBattery"></dt><dd class="bat-voltage">0 V</dd> <dt i18n="initialSetupBattery"></dt><dd class="bat-voltage">0 V</dd>
<dt i18n="initialSetupDrawn"></dt><dd class="bat-mah-drawn">0 mAh</dd> <dt i18n="initialSetupDrawn"></dt><dd class="bat-mah-drawn">0 mAh</dd>
<dt i18n="initialSetupDrawing"></dt><dd class="bat-mah-drawing">0 mAh</dd> <dt i18n="initialSetupDrawing"></dt><dd class="bat-mah-drawing">0 A</dd>
<dt i18n="initialSetupRSSI"></dt><dd class="rssi">0 %</dd> <dt i18n="initialSetupRSSI"></dt><dd class="rssi">0 %</dd>
</dl> </dl>
</div> </div>

2
tabs/initial_setup.js
View file

@ -245,7 +245,7 @@ function tab_initialize_initial_setup() {
// Update voltage indicator // Update voltage indicator
$('.bat-voltage').text(chrome.i18n.getMessage('initialSetupBatteryValue', [ANALOG.voltage])); $('.bat-voltage').text(chrome.i18n.getMessage('initialSetupBatteryValue', [ANALOG.voltage]));
$('.bat-mah-drawn').text(chrome.i18n.getMessage('initialSetupBatteryMahValue', [ANALOG.mAhdrawn])); $('.bat-mah-drawn').text(chrome.i18n.getMessage('initialSetupBatteryMahValue', [ANALOG.mAhdrawn]));
$('.bat-mah-drawing').text(chrome.i18n.getMessage('initialSetupBatteryMahValue', [ANALOG.amperage])); $('.bat-mah-drawing').text(chrome.i18n.getMessage('initialSetupBatteryAValue', [ANALOG.amperage.toFixed(2)]));
$('.rssi').text(chrome.i18n.getMessage('initialSetupRSSIValue', [((ANALOG.rssi / 1023) * 100).toFixed(0)])); $('.rssi').text(chrome.i18n.getMessage('initialSetupRSSIValue', [((ANALOG.rssi / 1023) * 100).toFixed(0)]));
// Update cube // Update cube