rambo 3 miesięcy temu
rodzic
commit
f2aa66bfc7
2 zmienionych plików z 10 dodań i 7 usunięć
  1. 1 1
      python/action.json
  2. 9 6
      python/mcu/capture/smart_shooter_class.py

+ 1 - 1
python/action.json

@@ -73,7 +73,7 @@
         "turntable_position": 100.0,
         "turntable_angle": 0.0,
         "shoe_upturn": true,
-        "pre_delay": 0.0,
+        "pre_delay": 3.0,
         "after_delay": 0.0,
         "led_switch": false,
         "is_wait": false,

+ 9 - 6
python/mcu/capture/smart_shooter_class.py

@@ -297,14 +297,17 @@ class SmartShooter(metaclass=SingletonType):
             high_iso = camera_configs.get("high", 6400)
             print("LOW_ISO", low_iso)
             print("HIGH_ISO", high_iso)
-            if str(low_iso).lower() != "auto" and str(high_iso).lower() != "auto":
-                # 等于auto就不设置
-                if enable_status == True:
+            # 等于auto就不设置
+            if enable_status == True:
+                if str(high_iso).lower() != "auto":
                     await self.setCameraProperty(property="ISO", value=str(high_iso))
-                if enable_status == False:
+                else:
+                    print("high_iso 等于auto就不设置")
+            if enable_status == False:
+                if str(low_iso).lower() != "auto":
                     await self.setCameraProperty(property="ISO", value=str(low_iso))
-            else:
-                print("等于auto就不设置")
+                else:
+                    print("low_iso 等于auto就不设置")
             socket, context = self.__create_req()
             req = {}
             req["msg_type"] = "Request"