Skip to content

Commit

Permalink
refactor: change default value to None
Browse files Browse the repository at this point in the history
  • Loading branch information
alandtse committed Feb 16, 2020
1 parent d3afe61 commit 4ec8d9b
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 37 deletions.
8 changes: 4 additions & 4 deletions teslajsonpy/battery_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def __init__(self, data: Dict, controller) -> None:
"""
super().__init__(data, controller)
self.__battery_level: int = 0
self.__battery_level: int = None
self.__charging_state: bool = None
self.__charge_port_door_open: bool = None
self.type: Text = "battery sensor"
Expand Down Expand Up @@ -85,9 +85,9 @@ def __init__(self, data: Dict, controller) -> None:
"""
super().__init__(data, controller)
self.__battery_range = 0
self.__est_battery_range = 0
self.__ideal_battery_range = 0
self.__battery_range = None
self.__est_battery_range = None
self.__ideal_battery_range = None
self.type = "range sensor"
self.__rated = True
self.measurement = "LENGTH_MILES"
Expand Down
4 changes: 2 additions & 2 deletions teslajsonpy/binary_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def __init__(self, data: Dict, controller):
"""
super().__init__(data, controller)
self.__state = False
self.__state = None

self.type = "parking brake sensor"
self.hass_type = "binary_sensor"
Expand Down Expand Up @@ -90,7 +90,7 @@ def __init__(self, data, controller):
"""
super().__init__(data, controller)
self.__state = False
self.__state = None

self.type = "charger sensor"
self.hass_type = "binary_sensor"
Expand Down
16 changes: 8 additions & 8 deletions teslajsonpy/charger.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def __init__(self, data, controller):
"""
super().__init__(data, controller)
self.__manual_update_time = 0
self.__charger_state = False
self.__charger_state = None
self.type = "charger switch"
self.hass_type = "switch"
self.name = self._name()
Expand Down Expand Up @@ -87,7 +87,7 @@ def __init__(self, data, controller):
"""Initialize the charger range switch."""
super().__init__(data, controller)
self.__manual_update_time = 0
self.__maxrange_state = False
self.__maxrange_state = None
self.type = "maxrange switch"
self.hass_type = "switch"
self.name = self._name()
Expand Down Expand Up @@ -154,12 +154,12 @@ def __init__(self, data: Dict, controller) -> None:
self.name: Text = self._name()
self.uniq_name: Text = self._uniq_name()
self.bin_type: hex = 0xC
self.__added_range = 0
self.__charging_rate = 0
self.__time_to_full = 0
self.__charge_current_request = 0
self.__charger_actual_current = 0
self.__charger_voltage = 0
self.__added_range = None
self.__charging_rate = None
self.__time_to_full = None
self.__charge_current_request = None
self.__charger_actual_current = None
self.__charger_voltage = None

async def async_update(self) -> None:
"""Update the battery state."""
Expand Down
18 changes: 9 additions & 9 deletions teslajsonpy/climate.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ def __init__(self, data, controller):
"""
super().__init__(data, controller)
self.__is_auto_conditioning_on = False
self.__inside_temp = 0
self.__outside_temp = 0
self.__driver_temp_setting = 0
self.__passenger_temp_setting = 0
self.__is_climate_on = False
self.__fan_status = 0
self.__is_auto_conditioning_on = None
self.__inside_temp = None
self.__outside_temp = None
self.__driver_temp_setting = None
self.__passenger_temp_setting = None
self.__is_climate_on = None
self.__fan_status = None
self.__manual_update_time = 0

self.type = "HVAC (climate) system"
Expand Down Expand Up @@ -161,8 +161,8 @@ def __init__(self, data, controller):
"""
super().__init__(data, controller)
self.__inside_temp = 0
self.__outside_temp = 0
self.__inside_temp = None
self.__outside_temp = None

self.type = "temperature sensor"
self.measurement = "C"
Expand Down
26 changes: 13 additions & 13 deletions teslajsonpy/gps.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ def __init__(self, data, controller):
"""
super().__init__(data, controller)
self.__longitude = 0
self.__latitude = 0
self.__heading = 0
self.__speed = 0
self.__longitude = None
self.__latitude = None
self.__heading = None
self.__speed = None
self.__location = {}

self.last_seen = 0
Expand All @@ -48,6 +48,13 @@ def __init__(self, data, controller):

def get_location(self):
"""Return the current location."""
if self.__longitude and self.__latitude and self.__heading:
self.__location = {
"longitude": self.__longitude,
"latitude": self.__latitude,
"heading": self.__heading,
"speed": self.__speed,
}
return self.__location

async def async_update(self):
Expand All @@ -59,13 +66,6 @@ async def async_update(self):
self.__latitude = data["latitude"]
self.__heading = data["heading"]
self.__speed = data["speed"] if data["speed"] else 0
if self.__longitude and self.__latitude and self.__heading:
self.__location = {
"longitude": self.__longitude,
"latitude": self.__latitude,
"heading": self.__heading,
"speed": self.__speed,
}

@staticmethod
def has_battery():
Expand Down Expand Up @@ -93,7 +93,7 @@ def __init__(self, data, controller):
"""
super().__init__(data, controller)
self.__odometer = 0
self.__odometer = None
self.type = "mileage sensor"
self.measurement = "LENGTH_MILES"
self.hass_type = "sensor"
Expand Down Expand Up @@ -124,7 +124,7 @@ def has_battery():

def get_value(self):
"""Return the odometer reading."""
return round(self.__odometer, 1)
return round(self.__odometer, 1) if self.__odometer else None

@property
def device_class(self) -> Text:
Expand Down
2 changes: 1 addition & 1 deletion teslajsonpy/lock.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def __init__(self, data, controller):
"""
super().__init__(data, controller)
self.__manual_update_time = 0
self.__lock_state = False
self.__lock_state = None

self.type = "charger door lock"
self.hass_type = "lock"
Expand Down

0 comments on commit 4ec8d9b

Please sign in to comment.