Merge pull request #1 from Blueion76/master

Add Oil Level, Fix Distance to Empty sensor & minor naming changes

pyfiat/brands.py

@@ -79,7 +79,7 @@ class Brand:
 FIAT_US = Brand(
     name="FIAT_US",
     region=REGION_US,
-    login_api_key="3_etlYkCXNEhz4_KJVYDqnK1CqxQjvJStJMawBohJU2ch3kp30b0QCJtLCzxJ93N-M",
+    login_api_key="3_WfFvlZJwcSdOD0LFQCngUV3W390R4Yshpuq3RsZvnV4VG0c9Q6R0RtDwcXc8dTrI",
     login_url="https://login-us.fiat.com",
     token_url=[TOKEN_URL_US, TOKEN_URL_EU],
     api=API_US,
@@ -95,7 +95,7 @@ class Brand:
     token_url=[TOKEN_URL_EU, TOKEN_URL_US],
     api=API_EU,
     auth=[AUTH_EU, AUTH_US],
-    locale=LOCALE_US,
+    locale=LOCALE_EU,
 )
 
 FIAT_CANADA = Brand(
@@ -122,23 +122,23 @@ class Brand:
 
 ALFA_ROMEO_ASIA = Brand(
     name="ALFA_ROMEO_ASIA",
-    region=REGION_US,
+    region=REGION_EU,
     login_api_key="4_PSQeADnQ4p5XOaDgT0B5pA",
     login_url="https://login-iap.alfaromeo.com",
-    token_url=[TOKEN_URL_US, TOKEN_URL_EU],
-    api=API_US,
-    auth=[AUTH_US, AUTH_EU],
-    locale=LOCALE_US,
+    token_url=[TOKEN_URL_EU, TOKEN_URL_US],
+    api=API_EU,
+    auth=[AUTH_EU, AUTH_US],
+    locale=LOCALE_EU,
 )
 
 ALFA_ROMEO_EU = Brand(
     name="ALFA_ROMEO_EU",
-    region=REGION_US,
+    region=REGION_EU,
     login_api_key="3_h8sj2VQI-KYXiunPq9a1QuAA4yWkY0r5AD1u8A8B1RPn_Cvl54xcoc2-InH5onJ1",
     login_url="https://login.alfaromeo.com",
     token_url=[TOKEN_URL_EU, TOKEN_URL_US],
-    api=API_US,
-    auth=[AUTH_US, AUTH_EU],
+    api=API_EU,
+    auth=[AUTH_EU, AUTH_US],
     locale=LOCALE_EU,
 )
 
@@ -183,7 +183,7 @@ class Brand:
     token_url=[TOKEN_URL_EU, TOKEN_URL_US],
     api=API_EU,
     auth=[AUTH_EU, AUTH_US],
-    locale=LOCALE_US,
+    locale=LOCALE_EU,
 )
 
 MASERATI_US_CANADA = Brand(
@@ -233,22 +233,22 @@ class Brand:
 DODGE_US = Brand(
     name="DODGE_US",
     region=REGION_US,
-    login_api_key="3_etlYkCXNEhz4_KJVYDqnK1CqxQjvJStJMawBohJU2ch3kp30b0QCJtLCzxJ93N-M",
-    login_url="https://accounts.us1.gigya.com",
+    login_api_key="4_dSRvo6ZIpp8_St7BF9VHGA",
+    login_url="https://login-us.dodge.com",
     token_url=[TOKEN_URL_US, TOKEN_URL_EU],
     api=API_US,
-    auth=[AUTH_EU, AUTH_US],
+    auth=[AUTH_US, AUTH_EU],
     locale=LOCALE_US,
 )
 
 RAM_US = Brand(
     name="RAM_US",
     region=REGION_US,
     login_api_key="3_7YjzjoSb7dYtCP5-D6FhPsCciggJFvM14hNPvXN9OsIiV1ujDqa4fNltDJYnHawO",
-    login_url="https://accounts.us1.gigya.com",
+    login_url="https://login-us.ramtrucks.com",
     token_url=[TOKEN_URL_US, TOKEN_URL_EU],
     api=API_US,
-    auth=[AUTH_EU, AUTH_US],
+    auth=[AUTH_US, AUTH_EU],
     locale=LOCALE_US,
 )
 

pyfiat/client.py

@@ -101,7 +101,10 @@ class Vehicle:
     distance_to_empty: int = None
     distance_to_empty_unit: str = None
     battery_voltage: float = None
-
+    oil_level: int = None
+    fuel_low: bool = None
+    fuel_amount: int = None
+
     # EV related
     plugged_in: bool = None
     ev_running: bool = None
@@ -161,14 +164,18 @@ def _update_vehicle(v: Vehicle, p: dict) -> Vehicle:
         vi, "distanceToService", "distanceToService", "value")
     v.distance_to_service_unit = sg(
         vi, "distanceToService", "distanceToService", "unit")
-    v.distance_to_empty = sg(batt, "distanceToEmpty", "value")
-    v.distance_to_empty_unit = sg(batt, "distanceToEmpty", "unit")
-
+    v.distance_to_empty = sg(vi, "fuel", "distanceToEmpty", "value")
+    v.distance_to_empty_unit = sg(vi, "fuel", "distanceToEmpty", "unit")
+    v.fuel_low = sg(vi, "fuel", "isFuelLevelLow")
+    v.fuel_amount = sg(vi, "fuel", "fuelAmountLevel")
+    v.oil_level = sg(vi, "oilLevel", "oilLevel")
+
     v.ignition_on = sg_eq(ev, "ON", "ignitionStatus")
     v.time_to_fully_charge_l3 = sg(batt, "timeToFullyChargeL3")
     v.time_to_fully_charge_l2 = sg(batt, "timeToFullyChargeL2")
     v.odometer = sg(vi, "odometer", "odometer", "value")
     v.odometer_unit = sg(vi, "odometer", "odometer", "unit")
+
 
     if "tyrePressure" in vi:
         tp = {x["type"]: x for x in vi["tyrePressure"]}

setup.py

@@ -32,6 +32,6 @@
         include=["pyfiat", "pyfiat.*"]
     ),
     url="https://github.com/OlgaNovg/pyfiat",
-    version="0.1.8",
+    version="0.1.9",
     zip_safe=False,
 )