diff --git a/_locales/en/messages.json b/_locales/en/messages.json index c10783c3..1261a53d 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -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:" }, diff --git a/js/data_storage.js b/js/data_storage.js index 1541a636..3af5498a 100644 --- a/js/data_storage.js +++ b/js/data_storage.js @@ -78,7 +78,7 @@ var GPS_DATA = { var ANALOG = { voltage: 0, - pMeterSum: 0, + mAhdrawn: 0, rssi: 0, amperage: 0 }; diff --git a/js/msp.js b/js/msp.js index a38afe7a..ca58ea80 100644 --- a/js/msp.js +++ b/js/msp.js @@ -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)); diff --git a/tabs/initial_setup.css b/tabs/initial_setup.css index f54784c3..32509333 100644 --- a/tabs/initial_setup.css +++ b/tabs/initial_setup.css @@ -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; diff --git a/tabs/initial_setup.html b/tabs/initial_setup.html index 1fb60ee2..3bd1166f 100644 --- a/tabs/initial_setup.html +++ b/tabs/initial_setup.html @@ -71,6 +71,17 @@
+