拍照检查

python/mcu/DeviceControl.py

@@ -1274,6 +1274,8 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
             )
             return False
         _is_debug = 1 if settings.IS_DEBUG == "true" else 0
+        is_deviation = 0 if settings.IS_DEBUG == "true" else 1
+        print("控制设备==>_is_debug", _is_debug)
         match device_name:
             case "camera_high_motor":
                 # 相机电机
@@ -1281,11 +1283,11 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
                 self.to_device_move(
                     device_name=device_name,
                     value=float(value),
-                    max_speed=1400,
-                    up_speed=400,
-                    down_speed=100,
-                    _is_debug=_is_debug,
-                    is_deviation=0,
+                    # max_speed=1400,
+                    # up_speed=400,
+                    # down_speed=100,
+                    # _is_debug=_is_debug,
+                    # is_deviation=is_deviation,
                 )
             case "camera_steering":
                 print(device_name, value)
@@ -1293,27 +1295,27 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
                 self.to_device_move(
                     device_name=device_name,
                     value=float(value),
-                    _is_debug=_is_debug,
-                    is_deviation=0,
+                    # _is_debug=_is_debug,
+                    # is_deviation=is_deviation,
                 )
             case "turntable_steering":
                 # 转盘舵机
                 self.to_device_move(
                     device_name=device_name,
                     value=float(value),
-                    _is_debug=_is_debug,
-                    is_deviation=0,
+                    # _is_debug=_is_debug,
+                    # is_deviation=is_deviation,
                 )
             case "turntable_position_motor":
                 # 转盘舵机
                 self.to_device_move(
                     device_name=device_name,
                     value=float(value),
-                    max_speed=1400,
-                    up_speed=400,
-                    down_speed=100,
-                    _is_debug=_is_debug,
-                    is_deviation=0,
+                    # max_speed=1400,
+                    # up_speed=400,
+                    # down_speed=100,
+                    # _is_debug=_is_debug,
+                    # is_deviation=is_deviation,
                 )
             case "overturn_steering":
                 # 翻板舵机中位
@@ -1327,10 +1329,10 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
             case "take_picture":
                 capture_one = DigiCam()
                 try:
-                    camera_is_connect = capture_one.checkCameraConnect()
-                    if camera_is_connect is not True:
-                        self.sendSocketMessage(1,"相机未连接,请检查",device_status=-1)
-                        return
+                    # camera_is_connect = capture_one.checkCameraConnect()
+                    # if camera_is_connect is not True:
+                    #     self.sendSocketMessage(1,"相机未连接,请检查",device_status=-1)
+                    #     return
                     capture_one.getCaptureFolderPath()
                     if value > 0:
                         capture_one.auto_focus()

python/sockets/message_handler.py

@@ -65,23 +65,23 @@ async def handlerSend(
             device_ctrl.controlDevice(device_name, value)
         case "run_mcu":
             msg_type = "run_mcu"
-            try:
-                # 判断拍照软件是否初始化
-                digicam = DigiCam()
-                camera_is_connect = digicam.checkCameraConnect()
-                if camera_is_connect is not True:
-                    data = manager.jsonMessage(
-                        code=1, msg="相机未连接,请检查", msg_type=msg_type
-                    )
-                    await manager.send_personal_message(data, websocket)
-                    return
-                digicam.getCaptureFolderPath()
-            except:
-                data = manager.jsonMessage(
-                    code=1, msg="digicam未初始化,请检查", msg_type=msg_type
-                )
-                await manager.send_personal_message(data, websocket)
-                return
+            # try:
+            #     # 判断拍照软件是否初始化
+            #     digicam = DigiCam()
+            #     camera_is_connect = digicam.checkCameraConnect()
+            #     if camera_is_connect is not True:
+            #         data = manager.jsonMessage(
+            #             code=1, msg="相机未连接,请检查", msg_type=msg_type
+            #         )
+            #         await manager.send_personal_message(data, websocket)
+            #         return
+            #     digicam.getCaptureFolderPath()
+            # except:
+            #     data = manager.jsonMessage(
+            #         code=1, msg="digicam未初始化,请检查", msg_type=msg_type
+            #     )
+            #     await manager.send_personal_message(data, websocket)
+            #     return
             action_info = data.get("action", "执行左脚程序")
             goods_art_no = data.get("goods_art_no", None)
             if goods_art_no == None or goods_art_no =="":
@@ -132,23 +132,23 @@ async def handlerSend(
                 name="run_mcu_config",
             )
         case "re_take_picture":#重拍
-            try:
-                # 判断拍照软件是否初始化
-                digicam = DigiCam()
-                camera_is_connect = digicam.checkCameraConnect()
-                if camera_is_connect is not True:
-                    data = manager.jsonMessage(
-                        code=1, msg="相机未连接,请检查", msg_type=msg_type
-                    )
-                    await manager.send_personal_message(data, websocket)
-                    return
-                digicam.getCaptureFolderPath()
-            except:
-                data = manager.jsonMessage(
-                    code=1, msg="digicam未初始化,请检查", msg_type=msg_type
-                )
-                await manager.send_personal_message(data, websocket)
-                return
+            # try:
+            #     # 判断拍照软件是否初始化
+            #     digicam = DigiCam()
+            #     camera_is_connect = digicam.checkCameraConnect()
+            #     if camera_is_connect is not True:
+            #         data = manager.jsonMessage(
+            #             code=1, msg="相机未连接,请检查", msg_type=msg_type
+            #         )
+            #         await manager.send_personal_message(data, websocket)
+            #         return
+            #     digicam.getCaptureFolderPath()
+            # except:
+            #     data = manager.jsonMessage(
+            #         code=1, msg="digicam未初始化,请检查", msg_type=msg_type
+            #     )
+            #     await manager.send_personal_message(data, websocket)
+            #     return
             msg_type = "re_take_picture"
             record_id = data.get("record_id")
             session = SqlQuery()