initial support for current sensor code from Lux
parent
f704d0f82d
commit
d68bd29191
|
@ -208,11 +208,20 @@
|
|||
"message": "Info"
|
||||
},
|
||||
"initialSetupBattery": {
|
||||
"message": "Battery:"
|
||||
"message": "Battery voltage:"
|
||||
},
|
||||
"initialSetupBatteryValue": {
|
||||
"message": "$1 V"
|
||||
},
|
||||
"initialSetupDrawn": {
|
||||
"message": "Capacity drawn:"
|
||||
},
|
||||
"initialSetupDrawing": {
|
||||
"message": "Current draw:"
|
||||
},
|
||||
"initialSetupBatteryMahValue": {
|
||||
"message": "$1 mAh"
|
||||
},
|
||||
"initialSetupRSSI": {
|
||||
"message": "RSSI:"
|
||||
},
|
||||
|
|
|
@ -78,7 +78,7 @@ var GPS_DATA = {
|
|||
|
||||
var ANALOG = {
|
||||
voltage: 0,
|
||||
pMeterSum: 0,
|
||||
mAhdrawn: 0,
|
||||
rssi: 0,
|
||||
amperage: 0
|
||||
};
|
||||
|
|
|
@ -239,9 +239,9 @@ MSP.process_data = function(code, message_buffer, message_length) {
|
|||
break;
|
||||
case MSP_codes.MSP_ANALOG:
|
||||
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.amperage = data.getUint16(5, 1);
|
||||
ANALOG.amperage = data.getUint16(5, 1) * 1000; // convert from A to mA
|
||||
break;
|
||||
case MSP_codes.MSP_RC_TUNING:
|
||||
RC_tuning.RC_RATE = parseFloat((data.getUint8(0) / 100).toFixed(2));
|
||||
|
|
|
@ -298,16 +298,16 @@
|
|||
.tab-initial_setup .info dt {
|
||||
float: left;
|
||||
|
||||
width: 50px;
|
||||
width: 100px;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
}
|
||||
.tab-initial_setup .info dd {
|
||||
width: 40px;
|
||||
width: 70px;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
|
||||
margin-left: 50px;
|
||||
margin-left: 100px;
|
||||
}
|
||||
.tab-initial_setup .update {
|
||||
display: block;
|
||||
|
|
|
@ -71,6 +71,17 @@
|
|||
</div>
|
||||
<a class="update" href="#" i18n="initialSetupButtonSave"></a>
|
||||
<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">
|
||||
<span class="head" i18n="initialSetupMagHead"></span>
|
||||
<div class="fields">
|
||||
|
@ -80,14 +91,5 @@
|
|||
</div>
|
||||
</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>
|
|
@ -244,6 +244,8 @@ function tab_initialize_initial_setup() {
|
|||
function update_ui() {
|
||||
// Update voltage indicator
|
||||
$('.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)]));
|
||||
|
||||
// Update cube
|
||||
|
|
Loading…
Reference in New Issue