dictionary bug fixes

ut-ras · Jun 21, 2023 · eaba007 · eaba007
1 parent 5c12609
commit eaba007
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 7 deletions.
diff --git a/.main.py.swp b/.main.py.swp
diff --git a/bounding_box/__pycache__/__init__.cpython-39.pyc b/bounding_box/__pycache__/__init__.cpython-39.pyc
diff --git a/bounding_box/__pycache__/bounding_box.cpython-39.pyc b/bounding_box/__pycache__/bounding_box.cpython-39.pyc
diff --git a/bounding_box/bounding_box.py b/bounding_box/bounding_box.py
@@ -76,7 +76,7 @@ def get_y_center(self):
 	def get_depth(self):
 		return self.__depth_value__
 
-	def get_coord(self):
+	def get_position(self):
 		return self.__coord__
 
 	# def get_x_coord(self):

diff --git a/communication/__pycache__/__init__.cpython-39.pyc b/communication/__pycache__/__init__.cpython-39.pyc
diff --git a/communication/__pycache__/communication.cpython-39.pyc b/communication/__pycache__/communication.cpython-39.pyc
diff --git a/object_detection/__pycache__/__init__.cpython-39.pyc b/object_detection/__pycache__/__init__.cpython-39.pyc
diff --git a/object_detection/object_detection.py b/object_detection/object_detection.py
@@ -96,7 +96,7 @@ def render_boxes(self, image, output, boundingbox_list):
 			bounding_box.set_y_value(y1, y2)
 			bounding_box.calculate_height()
 			bounding_box.calculate_width()
-			bounding_box.set_time(time.time())
+			bounding_box.set_time()
 			boundingbox_list.append(bounding_box)
 
 

diff --git a/object_log/armorplate.py b/object_log/armorplate.py
@@ -5,6 +5,7 @@
 import numpy as np
 from prediction import prediction as pred
 from bounding_box import bounding_box as bb
+import time
 
 class ArmorPlate:
     MAX_ASSOC_PLATES = 5
@@ -36,7 +37,7 @@ def __init__(self):
         self.plate_seen_this_iter = False
         # self.time_buffer = 0
         self.next_position = None
-        self.last_time = None
+        self.last_time = time.time()
         self.assoc_boxes = [] # used for history
         self.kf = pred.Prediction()
 

diff --git a/prediction/prediction.py b/prediction/prediction.py
@@ -62,13 +62,13 @@ def getVA(self):
 
         vel = {
             "x_vel":self.filter.x[1],
-            "x_acc":self.filter.x[2],
-            "y_vel":self.filter.x[5],
+            "y_vel":self.filter.x[2],
+            "z_vel":self.filter.x[5],
         }
 
         acc = {
-                        "y_acc":self.filter.x[6],
-            "z_vel":self.filter.x[9],
+            "x_acc":self.filter.x[6],
+            "y_acc":self.filter.x[9],
             "z_acc":self.filter.x[10],
         }
 

diff --git a/test.py b/test.py
@@ -0,0 +1,7 @@
+from communication import communication as com
+import numpy as np
+com.initialize_communication()
+com.send_turret_data(xPos = np.float32(1), yPos = np.float32(2), zPos = np.float32(3),
+xVel = np.float32(4),yVel = np.float32(5), zVel = np.float32(6),
+xAcc = np.float32(7), yAcc = np.float32(8), zAcc = np.float32(9),
+hasTarget=True)