Wrap charging point update items in new encoding function and check cellular signal type

Author: developerfromjokela

tculink/carwings_proto/applications/cp.py

@@ -208,7 +208,7 @@ def handle_cp(xml_data, files):
                                     'lat': chg['coordinates']['lat'],
                                     'lon': chg['coordinates']['long'],
                                     'dynamic_field': 'DC charger'
-                                })
+                        })
                         name_items.append(chg.get('name', 'Charging Station')[:32])
                         secondary_items.append(chg.get('name', 'Charging Station')[:32])
                         for station in [plug for plug in chg["evses"] if plug["connectors"][0]['standard'] == "CHADEMO"]:
@@ -503,18 +503,18 @@ def handle_cp(xml_data, files):
 
                 cpinfo_obj = {
                     'poi_id': charger['ID'],
-                    'name': unidecode(charger['AddressInfo'].get('Title', 'Charging Station') or "Charging Station")[:30],
+                    'name': encode_utf8(charger['AddressInfo'].get('Title', 'Charging Station') or "Charging Station", limit=31),
                     'code': '',
-                    'county': unidecode(charger["AddressInfo"].get("Town", '') or "")[:30],
-                    'region': unidecode(charger["AddressInfo"].get('StateOrProvince', '') or "")[:30],
-                    'city': unidecode(charger["AddressInfo"].get("Town", '') or "")[:30],
-                    'town': unidecode(charger["AddressInfo"].get("Postcode", '') or "")[:30],
+                    'county': encode_utf8(charger["AddressInfo"].get("Town", '') or "", limit=31),
+                    'region': encode_utf8(charger["AddressInfo"].get('StateOrProvince', '') or "", limit=31),
+                    'city': encode_utf8(charger["AddressInfo"].get("Town", '') or "", limit=31),
+                    'town': encode_utf8(charger["AddressInfo"].get("Postcode", '') or "", limit=31),
                     'meta1': '',
                     'meta2': '',
                     'meta3': '',
                     'lat': charger["AddressInfo"]["Latitude"],
                     'lon': charger["AddressInfo"]["Longitude"],
-                    'address': unidecode(charger["AddressInfo"].get("AddressLine1", "") or "")[:30],
+                    'address': encode_utf8(charger["AddressInfo"].get("AddressLine1", "") or "", limit=30),
                     'mesh_id': 65535,
                     'phone': phone_num,
                     'sites': [],

tculink/carwings_proto/autodj/channels.py

@@ -209,8 +209,8 @@
 
 def translate_chan_name(chan, non_unicode=False):
     new_chan = chan.copy()
-    new_chan['name1'] = str(_(chan['name1']))[:31]
-    new_chan['name2'] = str(_(chan['name2']))[:127]
+    new_chan['name1'] = str(_(chan['name1']))
+    new_chan['name2'] = str(_(chan['name2']))
     if non_unicode:
         new_chan['name1'] = unidecode(new_chan['name1'])
         new_chan['name2'] = unidecode(new_chan['name2'])

tculink/carwings_proto/dataobjects.py

@@ -34,6 +34,7 @@ def construct_fvtchn_payload(channels):
 
     return payload
 
+# codes: 0xb, 0xc
 def construct_gnrlms_payload(code, title, message):
     payload = bytearray()
     payload += b'\x00'*9
@@ -417,6 +418,7 @@ def build_autodj_payload(
             raise ValueError("Footer type 2 data must be 10 bytes")
         payload.extend(footer['data'])
     elif ftype in (3, 8):
+        # reference to itemFlag1 in footer type 3
         payload += (footer['data'] & 0xFF).to_bytes(1, "big")  # uint8
     elif ftype == 4:
         len1 = footer['len1']
@@ -428,6 +430,8 @@ def build_autodj_payload(
         payload += (len2 & 0xFF).to_bytes(1, "big")  # uint8
         payload.extend(data2)
     elif ftype == 6:
+        # data is array of itemFlag1 values, which also have fifth bit as 1 in mapPointFlag.
+        # This sorts AutoDJ items in order you specify them here. using their itemFlag1.
         data = footer['data']
         l = len(data)
         if l > 255:
@@ -445,6 +449,8 @@ def build_autodj_payload(
     elif ftype == 10:
         a = footer['a']
         b = footer['b']
+        # data is array of itemFlag1 values, which also have fifth bit as 1 in mapPointFlag.
+        # This sorts AutoDJ items in order you specify them here. using their itemFlag1.
         data = footer['data']
         l = len(data)
         if l > 255:

tculink/carwings_proto/utils.py

@@ -52,6 +52,8 @@ def update_car_info(xml_data):
                     car_obj.odometer = odometer
                 if signal_level is None:
                     signal_level = -1
+                if type(signal_level) != int:
+                    signal_level = 0
                 car_obj.signal_level = signal_level
                 car_obj.carrier = carrier
                 if status is not None: