autoverse-cli 0.19.0__py3-none-any.whl → 0.19.2__py3-none-any.whl

{autoverse_cli-0.19.0.dist-info → autoverse_cli-0.19.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autoverse-cli
-Version: 0.19.0
+Version: 0.19.2
 Summary: The Autoverse CLI
 Author-email: Dan Kamrath <dan.kamrath@autonomalabs.com>
 License: # End-User License Agreement (EULA) of the Autonoma AutoVerse CLI

{autoverse_cli-0.19.0.dist-info → autoverse_cli-0.19.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
-autoverse_cli-0.19.0.dist-info/licenses/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
+autoverse_cli-0.19.2.dist-info/licenses/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
 avrs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avrs/app_version.py,sha256=P8bNLtTFrbCmZ5Aak95aifacIqysumPvX1zE0BDUn9g,856
+avrs/app_version.py,sha256=9HOwvP_qRAr_iBVpC5Jdv8VmdrAUvDijln6ttB42CZo,856
 avrs/argparse_help.py,sha256=EoEaohGXZXqJvs1dFEzbo9vh47CYdHdSY2Im2Ps2iFo,945
 avrs/avrs.py,sha256=oTtEGdiKJUw03EpKKvgwWahbr9OxxJW3uSrCuFt7DDg,4755
 avrs/can_tool.py,sha256=IBoctKobBJ3wCq4ZdtuXuXH4AMEUxazCfYT6YP0Luw8,7161
@@ -10,7 +10,7 @@ avrs/launcher.py,sha256=kk1lyHHLgFZ4zsFfa_zV5f1kYbUODT6wEILJ8TZ16rQ,9353
 avrs/launcher_util.py,sha256=sO3k_z3A-HIQdJVkVXNXUAE_MGFwAYiZUqQBoFwOqew,5325
 avrs/race_cloud.py,sha256=F95_ssdiKpkmTQQkqllaLJJFAnLK3NEfRiQZcofgDGo,20125
 avrs/race_cloud_bridge_can.py,sha256=K3is7GFzWo2KBojr6V65kz138UfkVFXXofVxSAziArY,2888
-avrs/race_cloud_cfg_util.py,sha256=U_MlWiG7COXg7XQkMZ5OiF4N8iUOhLLPGwhp_zmBSR8,10238
+avrs/race_cloud_cfg_util.py,sha256=2FmS2_F2swNva7La0zObnYn4KHoerZtkOiYkNTRtkQs,10807
 avrs/race_cloud_fwd_api.py,sha256=HuLE5kfmzVq08aP3tlEh3f8WNjGL5N3K5EbXg9uQomo,1506
 avrs/race_cloud_util.py,sha256=WwhmqxKIQJMxf4L4ReAJrW1Reu1A8tLfmYeEwTZDl-k,13184
 avrs/simconfig.py,sha256=UZc4FrxVHUkk2e9IglSpuojXkaL_nPrJW7trbEGgOOo,2907
@@ -40,9 +40,9 @@ avrs/requests/teleport.py,sha256=5x2eJAv3zloYO27ghCkIiIuvLgVQHhO-UrUMYDfI9Ro,140
 avrs/requests/toggle_hud.py,sha256=sV5t5QZc4uvRihPVk8jEKZiQNsyF9tsUwq5b4jjZplc,397
 avrs/requests/vd.py,sha256=Rd0mCc89m2yKjftVf0cMHMFbJG4iFd09KzrI-DsCLgI,2606
 avrs/requests/vehicle_input.py,sha256=R1b1xkRtOBkwyU6OSN4bWVlYsIUroZG0WKbYbc4pEH8,729
-avrs/requests/vehicle_replay.py,sha256=nCAE21VNyKoeIjjXBGAihgOLO7zYHcu-HWvPZYxdQ2c,11099
-autoverse_cli-0.19.0.dist-info/METADATA,sha256=FJnntav9hf9Mk0di9lzQkCHomK5Y9bqlg1yaBDj8Kn8,3364
-autoverse_cli-0.19.0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-autoverse_cli-0.19.0.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
-autoverse_cli-0.19.0.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
-autoverse_cli-0.19.0.dist-info/RECORD,,
+avrs/requests/vehicle_replay.py,sha256=8kFzR0u7DSxedgtV6_Bl1XgPxMptupUa0TqEhqiejWY,11105
+autoverse_cli-0.19.2.dist-info/METADATA,sha256=gK95qMMDiMsYXMmll5d56rBRvhG35ouYvQ6zFnlMDKA,3364
+autoverse_cli-0.19.2.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+autoverse_cli-0.19.2.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
+autoverse_cli-0.19.2.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
+autoverse_cli-0.19.2.dist-info/RECORD,,

avrs/app_version.py

@@ -2,7 +2,7 @@ import http.client
 import json
 
 def get_app_version():
-    return '0.19.0'
+    return '0.19.2'
 
 def check_app_is_latest():
     pass

avrs/race_cloud_cfg_util.py

@@ -66,10 +66,10 @@ def register_received_vehicle(team_name, slot, cfg_data, bsu_vcan, kistler_vcan,
     #logger.info('disabling hud for received vehicle config')
     #eav24['body']['bHudEnabled'] = False
 
-    logger.info('setting bsu vcan to: {}, kistler to: {}, and badenia to: {}'.format(
+    logger.info('setting primary vcan to: {}, secondary to: {}, and <unused> to: {}'.format(
         bsu_vcan, kistler_vcan, badenia_vcan))
-    eav24['body']['bsuCanName'] = bsu_vcan
-    eav24['body']['kistlerCanName'] = kistler_vcan
+    eav24['body']['primaryCanName'] = bsu_vcan
+    eav24['body']['secondaryCanName'] = kistler_vcan
     eav24['body']['badeniaCanName'] = badenia_vcan
 
     # limit can rates to conserve resources
@@ -202,7 +202,7 @@ def register_received_vehicle(team_name, slot, cfg_data, bsu_vcan, kistler_vcan,
         print(msg)
         return
 
-    start_landmark = 'MvStart{}'.format(slot)
+    start_landmark = 'PitsSlot{}'.format(slot)
 
     entry_exists = False
     for i in cfg_files.files['yas']['autoSpawnObjects']:
@@ -248,10 +248,23 @@ def prepare_vehicle_cfg(cfg_path):
     if eav24 is None:
         return (False, 'no eav24 payload found', None, None, None)
 
-    bsu_vcan = eav24['body']['bsuCanName']
-    kistler_vcan = eav24['body']['kistlerCanName']
+
+
+    bsu_vcan = eav24['body'].get('primaryCanName', '')
+    if bsu_vcan == '':
+        logger.info('primaryCanName key not found, trying old bsuCanName')
+        bsu_vcan = eav24['body'].get('bsuCanName', '')
+    kistler_vcan = eav24['body'].get('secondaryCanName', '')
+    if kistler_vcan == '':
+        logger.info('secondaryCanName key not found, trying old kistlerCanName')
+        kistler_vcan = eav24['body'].get('kistlerCanName', '')
     badenia_vcan = eav24['body']['badeniaCanName']
 
+    if bsu_vcan == '':
+        logger.error('could not find either primaryCanName or bsuCanName')
+    if kistler_vcan == '':
+        logger.error('could not find either secondaryCanName or kistlerCanName')
+
     logger.info('detected vcan names from sent config: bsu {}, kistler {}, badenia {}'.format(
         bsu_vcan, kistler_vcan, badenia_vcan))
 

avrs/requests/vehicle_replay.py

@@ -130,8 +130,8 @@ class SpawnReplayVehicle(AvrsApiRequest):
         }
 
         eav_init_pld = {
-            "bEnableBsuCan": False,
-            "bEnableKistlerCan": False,
+            "bEnablePrimaryCan": False,
+            "bEnableSecondaryCan": False,
             "bEnableBadeniaCan": False,
             "bHudEnabled": False,
             "bLidarEnabled": True,