autoverse-cli 0.16.3__py3-none-any.whl → 0.16.5__py3-none-any.whl

{autoverse_cli-0.16.3.dist-info → autoverse_cli-0.16.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: autoverse-cli
-Version: 0.16.3
+Version: 0.16.5
 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.16.3.dist-info → autoverse_cli-0.16.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 avrs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avrs/app_version.py,sha256=zu22QUZLavQ9q8sH6Z1j-mxD9RCq7eBaIuhCb3CnSrE,856
+avrs/app_version.py,sha256=FSfaNh9PIfyPHjI6y9IUZ48DEAYK_p-ULtAd_jtmcoA,856
 avrs/argparse_help.py,sha256=EoEaohGXZXqJvs1dFEzbo9vh47CYdHdSY2Im2Ps2iFo,945
 avrs/avrs.py,sha256=DtiZYOpQ5KzbQmf4oigQ34VGefaOkTRpATDeAGkd6UQ,4657
 avrs/can_tool.py,sha256=IBoctKobBJ3wCq4ZdtuXuXH4AMEUxazCfYT6YP0Luw8,7161
@@ -7,11 +7,11 @@ avrs/can_tool_util.py,sha256=G3q21dTGMLc09SDq_RieoW7kSn-kXPkXxPDjavPh4hQ,7710
 avrs/cfg.py,sha256=kMn08Z4Ms1PAu2-U1QI8weEJeIVEppP4A4_tFfwnjtg,2924
 avrs/launcher.py,sha256=kk1lyHHLgFZ4zsFfa_zV5f1kYbUODT6wEILJ8TZ16rQ,9353
 avrs/launcher_util.py,sha256=sO3k_z3A-HIQdJVkVXNXUAE_MGFwAYiZUqQBoFwOqew,5325
-avrs/race_cloud.py,sha256=8kZ6hR_-GwS2CSW6dLyRk9iDOCgO9XnBU6DJfxz1ppM,19843
-avrs/race_cloud_bridge_can.py,sha256=QXdJxGwkdL9ZNLs4EquHEmF1fU3P8rsjc4uekFPHlw8,2349
+avrs/race_cloud.py,sha256=W6qdevbEeu2k-qaUmvx4cQTbIIcd6qBzX-T-9rqmbgw,20124
+avrs/race_cloud_bridge_can.py,sha256=B57luTKl0CxNpHKTiHRiKnkI8GVjcLuu4mPmrHJvsn0,2887
 avrs/race_cloud_cfg_util.py,sha256=H3MLxkb-PBwFVXdA5IBGzWGjLeD-uBvPqIgkh7RGjfo,7214
 avrs/race_cloud_fwd_api.py,sha256=HuLE5kfmzVq08aP3tlEh3f8WNjGL5N3K5EbXg9uQomo,1506
-avrs/race_cloud_util.py,sha256=goLwVczPoGpM5wu-01lIk5bdahMg3riYcIP2xpbXH_M,13104
+avrs/race_cloud_util.py,sha256=WwhmqxKIQJMxf4L4ReAJrW1Reu1A8tLfmYeEwTZDl-k,13184
 avrs/simconfig.py,sha256=UZc4FrxVHUkk2e9IglSpuojXkaL_nPrJW7trbEGgOOo,2907
 avrs/simconfig_util.py,sha256=1RmnmhK5C4HlCicTQeqn-1ORz3Xrku_QMt1Fqr9XjZs,4839
 avrs/tests.py,sha256=3JeYBjn0tRqHXERDROfzmYuW1KXeCcKur5Bw-EIegto,153
@@ -38,9 +38,9 @@ avrs/requests/toggle_hud.py,sha256=sV5t5QZc4uvRihPVk8jEKZiQNsyF9tsUwq5b4jjZplc,3
 avrs/requests/vd.py,sha256=gdt5XCdCCVdECL3qt8y-PKDrlArjeY_lxtT4VpZmAJo,1804
 avrs/requests/vehicle_input.py,sha256=R1b1xkRtOBkwyU6OSN4bWVlYsIUroZG0WKbYbc4pEH8,729
 avrs/requests/vehicle_replay.py,sha256=nCAE21VNyKoeIjjXBGAihgOLO7zYHcu-HWvPZYxdQ2c,11099
-autoverse_cli-0.16.3.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
-autoverse_cli-0.16.3.dist-info/METADATA,sha256=DdiVUYH38rzMF3PM-jEAC0g45vPaY3234HYQo27Dtow,3342
-autoverse_cli-0.16.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-autoverse_cli-0.16.3.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
-autoverse_cli-0.16.3.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
-autoverse_cli-0.16.3.dist-info/RECORD,,
+autoverse_cli-0.16.5.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
+autoverse_cli-0.16.5.dist-info/METADATA,sha256=tiHjwU5918K0nra1CuKC1TpTUWlbBt5Ry9Fe-atn1Ok,3342
+autoverse_cli-0.16.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+autoverse_cli-0.16.5.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
+autoverse_cli-0.16.5.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
+autoverse_cli-0.16.5.dist-info/RECORD,,

avrs/app_version.py

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

avrs/race_cloud.py

@@ -331,9 +331,12 @@ class AvrsRaceCloud(AvrsApiRequest):
             logger.info('enabling qos for slot {} with ip {}'.format(slot, args.ip))
             enable_peer_qos(slot, args.ip)
             logger.info('connecting vcans for incoming connection')
-            connect_peer_vcan(slot, args.ip, 0)
-            connect_peer_vcan(slot, args.ip, 1)
-            connect_peer_vcan(slot, args.ip, 2)
+            out = connect_peer_vcan(slot, args.ip, 0)
+            logger.info('connected first vcan result: {} {}'.format(out.out, out.err))
+            out = connect_peer_vcan(slot, args.ip, 1)
+            logger.info('connected second vcan result: {} {}'.format(out.out, out.err))
+            out = connect_peer_vcan(slot, args.ip, 2)
+            logger.info('connected second vcan result: {} {}'.format(out.out, out.err))
 
         # go ahead and restart forwarding script here
         # stop it if its already running

avrs/race_cloud_bridge_can.py

@@ -6,6 +6,18 @@ import logging
 
 BUFFER_SIZE = 512
 
+CAN_FRAME_FORMATS = [
+    '=H', # 0 bytes should never happen
+    '=HB',
+    '=HBB',
+    '=HBBB',
+    '=HBBBB',
+    '=HBBBBB',
+    '=HBBBBBB',
+    '=HBBBBBBB',
+    '=HBBBBBBBB'
+]
+
 class UdpTxCanListener(can.Listener):
     def __init__(self, target_port, target_ip):
         self.target_port = target_port
@@ -14,7 +26,10 @@ class UdpTxCanListener(can.Listener):
 
     def on_message_received(self, msg):
         #print('l got m {}'.format(msg))
-        data = struct.pack('=HBBBBBBBB', msg.arbitration_id, *msg.data)
+
+        # we are getting data that is not 8 bytes (dlc probably not 8) so 
+        # we need to zero-bad or something
+        data = struct.pack(CAN_FRAME_FORMATS[len(msg.data)], msg.arbitration_id, *msg.data)
         self.s.sendto(data, (self.target_ip, self.target_port))
 
 def can_bridge_loop(args):
@@ -31,14 +46,21 @@ def can_bridge_loop(args):
             while True:
                 try:
                     data, server = s.recvfrom(BUFFER_SIZE)
+
+                    l = len(data)
+
+                    # ensure data is expected size
+                    if l > 9 or l < 2:
+                        continue
+
                     #print('got udp data {}'.format(data))
-                    up = struct.unpack('=HBBBBBBBB', data)
+                    up = struct.unpack(CAN_FRAME_FORMATS[l - 1], data)
 
                     tx_msg = can.Message(
                         arbitration_id=up[0], 
                         data=up[1:], 
                         is_extended_id=False, 
-                        dlc=8)
+                        dlc=l - 1) # len is rx size - 1 bc we add id to front
 
                     bus.send(tx_msg)
                 except Exception as e:

avrs/race_cloud_util.py

@@ -28,7 +28,7 @@ BASH_KILL_PROCESS_SCRIPT = '''
 '''
 
 BASH_KILL_BY_LAUNCH_SCRIPT = '''
-    ps -x | grep "{launch_phrase}" | awk '{ print $1 }' | xargs -L1 kill
+    ps -x | grep "{launch_phrase}" | awk '{{ print $1 }}' | xargs -L1 kill
 '''
 
 DEFAULT_RMW_QOS = '''
@@ -124,7 +124,7 @@ CONNECT_PEER_VCAN_SCRIPT = '''
     REMOTE_PORT={remote_port}
     LOCAL_PORT={local_port}
     VCAN_NAME={vcan_name}
-    LOCK_FILE=$HOME/.$VCAN_NAME.vcanlock"
+    LOCK_FILE="$HOME/.$VCAN_NAME.vcanlock"
     LOG_FILE="$HOME/.$VCAN_NAME.vcanlog"
     if [[ -z $VCAN_NAME ]]; then
         VCAN_NAME=vcan$PEER_ID
@@ -315,6 +315,7 @@ def reset_race_cloud_connection():
     reset_rmw_qos()
     reset_rmw_cyclone_qos()
     logger.info('removing vcanlog and vcanlock files')
+    run_process(['bash', '-c', 'rm ~/.simslot*']) # remove slot reservations
     run_process(['bash', '-c', 'rm ~/.*.vcanlog*']) # remove slot reservations
     run_process(['bash', '-c', 'rm ~/.*.vcanlock']) # remove lock files
     logger.info('stopping race-cloud bridge-can')