上相机拍照增加曝光时间和增益的设置

Rs.SkyLine/Commom/GlobalVar.cs

@@ -595,5 +595,38 @@ namespace Rs.Framework
                 return SysConfigParam.GetValue<double>(nameof(TurnoverTrayLocateRRange));
             }
         }
+
+        /// <summary>
+        /// 系统语言 
+        /// </summary>
+        public static string Language
+        {
+            get
+            {
+                return SysConfigParam.GetValue<string>(nameof(Language));
+            }
+        }
+
+        /// <summary>
+        /// 上相机曝光时间 
+        /// </summary>
+        public static int UpCameraExposureTime
+        {
+            get
+            {
+                return SysConfigParam.GetValue<int>(nameof(UpCameraExposureTime));
+            }
+        }
+
+        /// <summary>
+        /// 上相机增益 
+        /// </summary>
+        public static int UpCameraGain
+        {
+            get
+            {
+                return SysConfigParam.GetValue<int>(nameof(UpCameraGain));
+            }
+        }
     }
 }

Rs.SkyLine/Flow/Camera/VisionManager.cs

@@ -40,8 +40,6 @@ namespace Rs.MotionPlat.Flow.Camera
             string cameraName = "upCamera";
             string LightName = "";
             //1、拍照
-            ImageProcess.ClearManualTrigger();
-
             string m_savePath = Path.Combine("Recipe", GlobalVar.CurRecipe, "料仓料盘产品有无");
             //IniHelper iniHelper = new IniHelper(Path.Combine(m_savePath,"default.ini"));
             //string AngleStart = iniHelper.ReadValue("ModelParam", "AngleStart", "-10");
@@ -53,6 +51,8 @@ namespace Rs.MotionPlat.Flow.Camera
             
             ImageProcess.ClearManualTrigger();
             HikCamera.Instance.SetTrigger(cameraName, ETriggerMode.Manual);
+            HikCamera.Instance.SetExposure(cameraName, GlobalVar.UpCameraExposureTime);
+            HikCamera.Instance.SetGain(cameraName, GlobalVar.UpCameraGain);
             AxisControl.LoadX.ComparePulse(2, false);
             //LightName = SysConfigParam.GetValue<string>(cameraName + "LightName");
             //if (!string.IsNullOrEmpty(LightName))

Rs.SkyLine/Flow/SubFlow/UpCameraScanBarCodeFlow.cs

@@ -142,8 +142,8 @@ namespace Rs.MotionPlat.Flow.SubFlow
                                     }
                                 }
                                 ImageProcess.ClearAutoTrigger();
-                                HikCamera.Instance.SetExposure("upCamera", GlobalVar.FlyGrabExposureTime);
+                                HikCamera.Instance.SetExposure("upCamera", GlobalVar.UpCameraExposureTime);
-                                HikCamera.Instance.SetGain("upCamera", 15);
+                                HikCamera.Instance.SetGain("upCamera", GlobalVar.UpCameraGain);
                                 HikCamera.Instance.SetTrigger("upCamera", ETriggerMode.Auto);
                                 AxisControl.LoadX.SetPosCompare(2, grabPoints.ToArray());
                                 AxisControl.LoadX.CompareStatus(out short pstatu, out int pcount);
@@ -282,9 +282,9 @@ namespace Rs.MotionPlat.Flow.SubFlow
                             {
                                 Thread.Sleep(200);
                                 ImageProcess.ClearManualTrigger();
-                                //HikCamera.Instance.SetExposure("upCamera", GlobalVar.FlyGrabExposureTime);
-                                //HikCamera.Instance.SetGain("upCamera", 15);
                                 HikCamera.Instance.SetTrigger("upCamera", ETriggerMode.Manual);
+                                HikCamera.Instance.SetExposure("upCamera", GlobalVar.UpCameraExposureTime);
+                                HikCamera.Instance.SetGain("upCamera", GlobalVar.UpCameraGain);
                                 AxisControl.LoadX.ComparePulse(2, false);
                                 logInfo = GetClassName() + $"已运动到扫码起始位";
                                 MessageQueue.Instance.Insert(logInfo);

Rs.SkyLine/SysConfig/CommonConfig.cs

@@ -33,7 +33,6 @@ namespace Rs.MotionPlat.SysConfig
             {
                 cboxUpCameraName.Items.Add(cam);
                 cboxDownLocationCameraName.Items.Add(cam);
-                cboxDownScanCameraName.Items.Add(cam);
             }
             foreach (var con in groupBox1.Controls)
             {
@@ -60,8 +59,9 @@ namespace Rs.MotionPlat.SysConfig
                 }
             }
 
-            LoadSysParam(groupBox2);
+            //LoadSysParam(groupBox2);
-            PositionHelper.BindPosition(groupBox3,"int");
+            PositionHelper.BindPosition(groupBox9,"int");
+            PositionHelper.BindPosition(groupBox10, "int");
         }
 
         private void btnSaveSpeedParam_Click(object sender, EventArgs e)