重构代码,删除不再使用的LCM类型定义文件,更新导入路径,添加图像处理功能到主程序和任务1中,并在适当位置调用图像处理器的销毁方法。

This commit is contained in:
Havoc 2025-05-12 00:05:54 +08:00
parent db35c7a282
commit 4d924d889a
5 changed files with 14 additions and 14 deletions

13
main.py
View File

@ -9,14 +9,11 @@ import sys
import os import os
import time import time
from threading import Thread, Lock from threading import Thread, Lock
# For keyboard input
import tty
import termios
import sys import sys
from robot_control_cmd_lcmt import robot_control_cmd_lcmt from utils.robot_control_cmd_lcmt import robot_control_cmd_lcmt
from robot_control_response_lcmt import robot_control_response_lcmt from utils.robot_control_response_lcmt import robot_control_response_lcmt
from utils.image_raw import ImageProcessor
from task_1.task_1 import run_task_1 from task_1.task_1 import run_task_1
@ -24,6 +21,8 @@ def main():
Ctrl = Robot_Ctrl() Ctrl = Robot_Ctrl()
Ctrl.run() Ctrl.run()
msg = robot_control_cmd_lcmt() msg = robot_control_cmd_lcmt()
image_processor = ImageProcessor()
image_processor.run()
try: try:
print("Recovery stand") print("Recovery stand")
@ -41,6 +40,7 @@ def main():
pass pass
Ctrl.quit() Ctrl.quit()
image_processor.destroy()
sys.exit() sys.exit()
@ -107,7 +107,6 @@ class Robot_Ctrl(object):
self.rec_thread.join() self.rec_thread.join()
self.send_thread.join() self.send_thread.join()
# Main function # Main function
if __name__ == '__main__': if __name__ == '__main__':
main() main()

View File

@ -1,7 +1,7 @@
import time import time
import cv2
def run_task_1(ctrl, msg, image_processor):
def run_task_1(ctrl, msg):
print('Running task 1...') print('Running task 1...')
# 右前方 # 右前方
@ -23,8 +23,8 @@ def run_task_1(ctrl, msg):
time.sleep(0.2) time.sleep(0.2)
# TAG take photo # TAG take photo
# while True: image = image_processor.get_current_image()
# pass cv2.imwrite('photo.jpg', image)
# msg.mode = 11 # msg.mode = 11
# msg.gait_id = 26 # msg.gait_id = 26

View File

@ -46,11 +46,12 @@ class ImageProcessor:
except KeyboardInterrupt: except KeyboardInterrupt:
pass pass
self.image_subscriber.destroy_node()
rclpy.shutdown()
def get_current_image(self): def get_current_image(self):
return self.image_subscriber.cv_image return self.image_subscriber.cv_image
def destroy(self):
self.image_subscriber.destroy_node()
rclpy.shutdown()
""" DEBUG """ """ DEBUG """