Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-15 04:15:28 +03:00
Code Wiki Activity

initial support for current sensor code from Lux

Browse source
This commit is contained in:
cTn 2014-05-29 20:16:32 +02:00
parent f704d0f82d
commit d68bd29191
6 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
_locales/en/messages.json
View file

@ -208,11 +208,20 @@
"message": "Info" "message": "Info"
}, },
"initialSetupBattery": { "initialSetupBattery": {
"message": "Battery:" "message": "Battery voltage:"
}, },
"initialSetupBatteryValue": { "initialSetupBatteryValue": {
"message": "$1 V" "message": "$1 V"
}, },
"initialSetupDrawn": {
"message": "Capacity drawn:"
},
"initialSetupDrawing": {
"message": "Current draw:"
},
"initialSetupBatteryMahValue": {
"message": "$1 mAh"
},
"initialSetupRSSI": { "initialSetupRSSI": {
"message": "RSSI:" "message": "RSSI:"
}, },

2
js/data_storage.js
View file

@ -78,7 +78,7 @@ var GPS_DATA = {
var ANALOG = { var ANALOG = {
voltage: 0, voltage: 0,
pMeterSum: 0, mAhdrawn: 0,
rssi: 0, rssi: 0,
amperage: 0 amperage: 0
}; };

4
js/msp.js
View file

@ -239,9 +239,9 @@ MSP.process_data = function(code, message_buffer, message_length) {
break; break;
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.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); ANALOG.amperage = data.getUint16(5, 1) * 1000; // convert from A to mA
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));

6
tabs/initial_setup.css
View file

@ -298,16 +298,16 @@
.tab-initial_setup .info dt { .tab-initial_setup .info dt {
float: left; float: left;
width: 50px; width: 100px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
} }
.tab-initial_setup .info dd { .tab-initial_setup .info dd {
width: 40px; width: 70px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
margin-left: 50px; margin-left: 100px;
} }
.tab-initial_setup .update { .tab-initial_setup .update {
display: block; display: block;

20
tabs/initial_setup.html
View file

@ -71,6 +71,17 @@
</div> </div>
<a class="update" href="#" i18n="initialSetupButtonSave"></a> <a class="update" href="#" i18n="initialSetupButtonSave"></a>
<div class="clear-both"></div> <div class="clear-both"></div>
<div class="info">
<span class="head" i18n="initialSetupInfoHead"></span>
<div class="fields">
<dl>
<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="initialSetupDrawing"></dt><dd class="bat-mah-drawing">0 mAh</dd>
<dt i18n="initialSetupRSSI"></dt><dd class="rssi">0 %</dd>
</dl>
</div>
</div>
<div class="magnetometer"> <div class="magnetometer">
<span class="head" i18n="initialSetupMagHead"></span> <span class="head" i18n="initialSetupMagHead"></span>
<div class="fields"> <div class="fields">
@ -80,14 +91,5 @@
</div> </div>
</div> </div>
<div class="clear-both"></div> <div class="clear-both"></div>
<div class="info">
<span class="head" i18n="initialSetupInfoHead"></span>
<div class="fields">
<dl>
<dt i18n="initialSetupBattery"></dt><dd class="bat-voltage">0 V</dd>
<dt i18n="initialSetupRSSI"></dt><dd class="rssi">0 %</dd>
</dl>
</div>
</div>
</div> </div>
</div> </div>

2
tabs/initial_setup.js
View file

@ -244,6 +244,8 @@ function tab_initialize_initial_setup() {
function update_ui() { function update_ui() {
// 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-drawing').text(chrome.i18n.getMessage('initialSetupBatteryMahValue', [ANALOG.amperage]));
$('.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