Merge pull request #323 from dan557/development

Add Current and Voltage readout on configuration tab
cleanflight · Feb 5, 2016 · ebd77db · ebd77db
2 parents e2c4a62 + 9453528
commit ebd77db
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -614,6 +614,9 @@
     "configurationBatteryVoltage": {
         "message": "Battery Voltage"
     },
+    "configurationBatteryCurrent": {
+        "message": "Battery Current"
+    },
     "configurationBatteryMinimum": {
         "message": "Minimum Cell Voltage"
     },

diff --git a/tabs/configuration.html b/tabs/configuration.html
@@ -246,6 +246,11 @@
                             i18n="configurationBatteryScale"></span>
                         </label>
                     </div>
+                     <div class="number">
+                        <label> <input type="text" name="batteryvoltage" readonly class="disabled" /> <span
+                            i18n="configurationBatteryVoltage"></span>
+                        </label>
+                    </div>
                 </div>
             </div>
             <div class="gui_box grey">
@@ -275,6 +280,10 @@
                             i18n="configurationCurrentOffset"></span>
                         </label>
                     </div>
+                    <div class="number">
+                        <label> <input type="text" name="batterycurrent" readonly class="disabled" /> <span
+                            i18n="configurationBatteryCurrent"></span>
+                    </div>
                     <div class="checkbox">
                         <div class="numberspacer">
                             <input type="checkbox" name="multiwiicurrentoutput" class="toggle" />

diff --git a/tabs/configuration.js b/tabs/configuration.js
@@ -70,6 +70,13 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
             next_callback();
         }
     }
+    //Update Analog/Battery Data
+    function load_analog() {
+        MSP.send_message(MSP_codes.MSP_ANALOG, false, false, function () {
+	    $('input[name="batteryvoltage"]').val([ANALOG.voltage.toFixed(1)]);
+	    $('input[name="batterycurrent"]').val([ANALOG.amperage.toFixed(2)]);
+            });
+    }
 
     function load_html() {
         $('#content').load("./tabs/configuration.html", process_html);
@@ -381,7 +388,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
         $('input[name="midthrottle"]').val(MISC.midrc);
         $('input[name="maxthrottle"]').val(MISC.maxthrottle);
         $('input[name="mincommand"]').val(MISC.mincommand);
-
+        
         // fill battery
         $('input[name="mincellvoltage"]').val(MISC.vbatmincellvoltage);
         $('input[name="maxcellvoltage"]').val(MISC.vbatmaxcellvoltage);
@@ -581,7 +588,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
         GUI.interval_add('status_pull', function status_pull() {
             MSP.send_message(MSP_codes.MSP_STATUS);
         }, 250, true);
-
+        GUI.interval_add('config_load_analog', load_analog, 250, true); // 4 fps
         GUI.content_ready(callback);
     }
 };