Interface unification

zabuldon · Feb 7, 2018 · 6c25e1a · 6c25e1a
1 parent 9453433
commit 6c25e1a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/teslajsonpy/BatterySensor.py b/teslajsonpy/BatterySensor.py
@@ -26,9 +26,10 @@ def update(self):
     def has_battery():
         return False
 
-    def battery_level(self):
+    def get_value(self):
         return self.__battery_level
 
+
 class Range(VehicleDevice):
     def __init__(self, data, controller):
         super().__init__(data, controller)
@@ -55,15 +56,15 @@ def update(self):
         if data:
             if data['gui_distance_units'] == "mi/hr":
                 self.measurement = 'LENGTH_MILES'
-            else: #"km/hr"
+            else:
                 self.measurement = 'LENGTH_KILOMETERS'
             self.__rated = (data['gui_range_display'] == "Rated")
 
     @staticmethod
     def has_battery():
         return False
 
-    def range_level(self):
+    def get_value(self):
         if self.__rated:
             return self.__battery_range
         else:

diff --git a/teslajsonpy/GPS.py b/teslajsonpy/GPS.py
@@ -39,6 +39,7 @@ def update(self):
     def has_battery():
         return False
 
+
 class Odometer(VehicleDevice):
     def __init__(self, data, controller):
         super().__init__(data, controller)
@@ -50,6 +51,7 @@ def __init__(self, data, controller):
         self.uniq_name = self._uniq_name()
         self.bin_type = 0xB
         self.update()
+        self.__rated = True
 
     def update(self):
         self._controller.update(self._id)
@@ -60,13 +62,13 @@ def update(self):
         if data:
             if data['gui_distance_units'] == "mi/hr":
                 self.measurement = 'LENGTH_MILES'
-            else: #"km/hr"
+            else:
                 self.measurement = 'LENGTH_KILOMETERS'
             self.__rated = (data['gui_range_display'] == "Rated")
 
     @staticmethod
     def has_battery():
         return False
 
-    def mileage(self):
-        return self.__odometer
+    def get_value(self):
+        return round(self.__odometer, 1)