Merge pull request #139 from maruina/master

Fix #137

Author: mrpollo

droneapi/lib/__init__.py

@@ -173,20 +173,23 @@ class Battery(object):
     """
     Battery info available
 
-    :param battery_voltage: Battery voltage in millivolts
-    :param battery_current: Battery current, in 10 * milliamperes, -1: autopilot does not measure the current
-    :param battery_level: Remaining battery energy, -1: autopilot estimate the remaining battery
+    :param voltage: Battery voltage in millivolts.
+    :param current: Battery current, in 10 * milliamperes. ``None`` if the autopilot does not support current measurement.
+    :param level: Remaining battery energy. ``None`` if the autopilot cannot estimate the remaining battery.
     """
     def __init__(self, voltage, current, level):
-        self.voltage = float(voltage) / 1000.0
-        if current != -1:
-            self.current = float(current) / 100.0
+        self.voltage = voltage / 1000.0
+        if current == -1:
+            self.current = None
         else:
-            self.current = current
-        self.level = level
+            self.current = current / 100.0
+        if level == -1:
+            self.level = None
+        else:
+            self.level = level
 
     def __str__(self):
-        return "Battery voltage: {}, current: {}, level: {}".format(self.voltage, self.current, self.level)
+        return "Battery:voltage={},current={},level={}".format(self.voltage, self.current, self.level)
 
 
 class VehicleMode(object):