revise the control plane to support multidrone cmd assignment and del…

…ete the redundant numpy lib in requirements.txt
cmusatyalab · Oct 18, 2024 · 54970a7 · 54970a7
1 parent 74b9312
commit 54970a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cnc/server/control_plane.py b/cnc/server/control_plane.py
@@ -152,7 +152,7 @@ def listen_cmdrs(args, drones, redis):
             # download the script
             script_url = extras.cmd.script_url
             logger.info(f"script url:  {script_url}")
-            kml, dsl = download_script(script_url)
+            dsl, kml = download_script(script_url)
 
             # compile the mission
             drone_list_revised = "&".join(drone_list)
@@ -180,9 +180,10 @@ def listen_cmdrs(args, drones, redis):
                 f"commands",
                 {"commander": extras.commander_id, "drone": drone_id, "value": text_format.MessageToString(extras_copy),}
             )
+            logger.debug(f"Updated redis under stream commands at key {key}")
 
         sock.send(b'ACK')
-        logger.debug(f"Updated redis under stream commands at key {key}")
+
 
     sock.close()
 

diff --git a/droneDSL/python/requirements.txt b/droneDSL/python/requirements.txt
@@ -1,5 +1,4 @@
 aenum==3.1.15
 gabriel_protocol==2.0.1
 numpy==1.24.4
-numpy==1.21.5
-scipy==1.8.0
+scipy==1.14.1