Bladeren bron

fix gold power supplier set current and step issue

chenkui 3 weken geleden
bovenliggende
commit
69a0c70b7c

+ 3 - 0
CyberX8_RT/Devices/EFEM/EfemBase.cs

@@ -107,6 +107,9 @@ namespace CyberX8_RT.Devices.EFEM
         public abstract bool GotoMap(ModuleName mod, Hand hand,string extend="EX");
         public abstract bool Map(ModuleName mod);
 
+        public abstract bool Pause();
+
+        public abstract bool Resume();
         public abstract bool RequestMapResult(ModuleName mod);
         public abstract bool Vacuum(ModuleName mod,bool VacuumState);
         public abstract bool SetPinUp(ModuleName mod);

+ 12 - 0
CyberX8_RT/Devices/EFEM/JetEfem.cs

@@ -496,6 +496,18 @@ namespace CyberX8_RT.Devices.EFEM
             return false;
         }
 
+        public override bool Pause()
+        {
+            LOG.WriteLog(eEvent.ERR_EFEM_COMMON_FAILED, Module.ToString(), $"System cannot support Pause");
+            return false;
+        }
+
+        public override bool Resume()
+        {
+            LOG.WriteLog(eEvent.ERR_EFEM_COMMON_FAILED, Module.ToString(), $"System cannot support Resume");
+            return false;
+        }
+
         public override bool RequestMapResult(ModuleName mod)
         {
             LOG.WriteLog(eEvent.ERR_EFEM_COMMON_FAILED, Module.ToString(), $"System cannot support RequestMapResult");

+ 12 - 0
CyberX8_RT/Devices/EFEM/SunWayEfem.cs

@@ -374,6 +374,18 @@ namespace CyberX8_RT.Devices.EFEM
             return false;
         }
 
+        public override bool Pause()
+        {
+            LOG.WriteLog(eEvent.ERR_EFEM_COMMON_FAILED, Module.ToString(), $"System cannot support Pause");
+            return false;
+        }
+
+        public override bool Resume()
+        {
+            LOG.WriteLog(eEvent.ERR_EFEM_COMMON_FAILED, Module.ToString(), $"System cannot support Resume");
+            return false;
+        }
+
         public override bool RequestMapResult(ModuleName mod)
         {
             LOG.WriteLog(eEvent.ERR_EFEM_COMMON_FAILED, Module.ToString(), $"System cannot support RequestMapResult");

+ 10 - 0
CyberX8_RT/Devices/EFEM/SunWayRobot.cs

@@ -310,6 +310,16 @@ namespace CyberX8_RT.Devices.EFEM
             return WriteCommand(cmd);
         }
 
+        public override bool Pause()
+        {
+            return true;
+        }
+
+        public override bool Resume()
+        {
+            return true;
+        }
+
         public override bool ClearError()
         {
             return true;

+ 3 - 3
Framework/Common/Device/PowerSupplier/PowerSupplierGoldModbusDevice.cs

@@ -134,8 +134,8 @@ namespace MECF.Framework.Common.Device.PowerSupplier
             for (int i = 0; i < stepDatas.Count; i++)
             {
                 PowerSupplierStepPeriodData data = stepDatas[i];
-                command.Datas[0 + STEP_PERIOD_LENGTH * i] = (ushort)(Math.Round(data.Voltage * scale,0)/0x10000);
-                command.Datas[1 + STEP_PERIOD_LENGTH * i] = (ushort)(Math.Round(data.Voltage * scale,0) %0x10000);
+                command.Datas[0 + STEP_PERIOD_LENGTH * i] = (ushort)(Math.Round(data.Voltage * 1000,0)/0x10000);
+                command.Datas[1 + STEP_PERIOD_LENGTH * i] = (ushort)(Math.Round(data.Voltage * 1000,0) %0x10000);
                 command.Datas[2 + STEP_PERIOD_LENGTH * i] = (ushort)(Math.Round(data.Current * scale, 0)/0x10000);
                 command.Datas[3 + STEP_PERIOD_LENGTH * i] = (ushort)(Math.Round(data.Current * scale, 0) % 0x10000);
                 command.Datas[4 + STEP_PERIOD_LENGTH * i] = 0;
@@ -181,7 +181,7 @@ namespace MECF.Framework.Common.Device.PowerSupplier
             command.Channel = channel;
             command.CommandCode = 0x10;
             command.Address = (ushort)(CURRENT_SETTING_ADDRESS);
-            command.RegisterCount = 4;//2N N-寄存器地址数据
+            command.RegisterCount = 2;//2N N-寄存器地址数据
             ushort[] ushorts = new ushort[2];
             ushorts[0] = (ushort)(currentValue / 0x10000);//高位
             ushorts[1] = (ushort)(currentValue % 0x10000);//低位