diff --git a/pyryd/__init__.py b/pyryd/__init__.py index de4f628..6616f5f 100644 --- a/pyryd/__init__.py +++ b/pyryd/__init__.py @@ -8,7 +8,7 @@ except ImportError as e: warnings.warn(ImportWarning(e)) -VERSION = (0, 1, 3) +VERSION = (0, 1, 4) __version__ = '.'.join([str(i) for i in VERSION]) __author__ = 'Yannik25' diff --git a/pyryd/pyryd.py b/pyryd/pyryd.py index d106e63..3046157 100644 --- a/pyryd/pyryd.py +++ b/pyryd/pyryd.py @@ -21,7 +21,17 @@ def ryd_time(s: str): "overall_distance": (lambda x: int(x["carOdometer"]["distanceM"])/1000, "km"), "fuel_level": (lambda x: float(x["fuel"]["level"]["OBD_FUELLEVEL"]["l"]), "l"), "fuel_percent": (lambda x: float(x["fuel"]["level"]["OBD_FUELLEVEL"]["percent"]), "%"), - + "fuel_level_user": (lambda x: float(x["fuel"]["level"]["USER"]["l"]), "l"), + "fuel_percent_user": (lambda x: float(x["fuel"]["level"]["USER"]["percent"]), "%"), + "fuel_level_measure": (lambda x: float(x["fuel"]["level"]["MEAS"]["l"]), "l"), + "fuel_percent_measure": (lambda x: float(x["fuel"]["level"]["MEAS"]["percent"]), "%"), + "fuel_total": (lambda x: float(x["fuel"]["reportedFuelTotal"]["fuelL"]), "l"), + "car_status": (lambda x: str(x["state"]), None), + "parking_Location": (lambda x: str(x["parkingLocation"]["addressString"]), None), + "current_Location": (lambda x: list(x["curLocation"]["loc"]), None), + "current_Latitude": (lambda x: float(x["curLocation"]["loc"][1]), None), + "current_Longitude": (lambda x: float(x["curLocation"]["loc"][0]), None), + "license_Plate": (lambda x: str(x["licensePlate"]), None), } class Ryd(object):