Merge branch 'dev' of 192.168.192.162:D:\Users\ykcheungab.MEE1965\Documents\python\orisyssdk_git into dev

calibration_data_collection.py

@@ -18,7 +18,7 @@ def main():
     print("\n")
     print(f"Collecting data for device ID: {device_id} on test type: {test_type}, video source: {vid_source}")
     print("\n")
-    sensor = orisys.Sensor(vid_source, config_name="./config/prototype_of3.json", cal_path= f"./config/{sample_name}.npy", isstitch=True, cuda=True, verbose=True)
+    sensor = orisys.Sensor(vid_source, config_name="./config/prototype_of3.json", cal_path= f"./config/{sample_name}.npy", cuda=False, verbose=True)
 
     print(f"\n按 'q' 退出程序，按 'r' 重置光流追踪器，按 's' 开始保存，按 'e' 停止保存，按 'j' 减小力，按 'l' 增大力")
     force = 0 # kgf
@@ -60,7 +60,7 @@ def main():
         sensor.compute_deformation()
         sensor.compute_contact()
 
-        fps, flow, vnormal, img, contour, centroid, depth_map,fnormal,fshearx,fsheary = sensor.read_info(
+        fps, flow, vnormal, img, contour, centroid, depth_map = sensor.read_info(
             sensor.info.FPS,
             sensor.info.VRAW,
             sensor.info.VNORMAL,
@@ -145,8 +145,6 @@ def main():
                 print(f"Stop writing, total frames: {frame_count}")
             frame_count = 0
 
-        if key == ord("p"):
-            print(f"normal force:{fnormal}, X {fshearx}, Y{fsheary}")
         if key == ord("i"):
             save_mode_index += 1
             if save_mode_index >= len(save_mode):