autoverse-cli 0.16.3__tar.gz → 0.16.5__tar.gz

{autoverse_cli-0.16.3 → autoverse_cli-0.16.5}/PKG-INFO

@@ -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 → autoverse_cli-0.16.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "autoverse-cli"
-version = "0.16.3"
+version = "0.16.5"
 dependencies = [
   "boto3",
   "cantools"

{autoverse_cli-0.16.3 → autoverse_cli-0.16.5}/src/autoverse_cli.egg-info/PKG-INFO

@@ -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 → autoverse_cli-0.16.5}/src/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

{autoverse_cli-0.16.3 → autoverse_cli-0.16.5}/src/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

{autoverse_cli-0.16.3 → autoverse_cli-0.16.5}/src/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:

{autoverse_cli-0.16.3 → autoverse_cli-0.16.5}/src/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')