diff --git a/main.py b/main.py index a812796..5c39bfa 100644 --- a/main.py +++ b/main.py @@ -588,7 +588,18 @@ def compute_laser_position(circle_center, laser_point, radius, method): dy = ly - cy return dx / (circle_r / 100.0), -dy / (circle_r / 100.0) - +def compute_laser_position_v2(circle_center, laser_point): + print(f"circle_center : {circle_center}") + cx, cy = circle_center + lx, ly = 320,230 + # lx, ly = laser_point + dx = lx - cx + dy = ly - cy + r = 22.16 * 5 + target_x = dx/r*100 + target_y = dy/r*100 + print(f"lx:{lx} ly: {ly} cx: {cx} cy: {cy} dx: {dx} dy: {dy} result_x: {target_x} result_y: {-target_y}") + return (target_x, -target_y) # ==================== TCP 通信线程 ==================== def connect_server(): @@ -851,7 +862,7 @@ def cmd_str(): disp.show(result_img) # 计算偏移与距离 - dx, dy = compute_laser_position(center, (x, y), radius, method) + dx, dy = compute_laser_position_v2(center, (x, y)) distance_m = estimate_distance(best_radius1) # 读取电量