Home Explore Help
Register Sign In
JetPlasma
/
CyberX8
Watch 2
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

add gold powersupplier

chenkui 2 months ago
parent
6550cc0e88
commit
90d84749d5
3 changed files with 27 additions and 26 deletions
Split View Show Diff Stats
  1. 15 15
      CyberX8_RT/Config/Devices/PowerSupplierCfg-Simulator.xml
  2. 9 9
      CyberX8_RT/Config/Devices/PowerSupplierCfg.xml
  3. 3 2
      CyberX8_RT/Devices/PowerSupplier/CellPowerSupplier.cs

+ 15 - 15
CyberX8_RT/Config/Devices/PowerSupplierCfg-Simulator.xml
View File 

@@ -1,59 +1,59 @@
 
 <?xml version="1.0" encoding="utf-8"?>

 <PowerSupplierConfig>

-  <PowerSupplierDeviceConfig Name="Power1" IpAddress="127.0.0.1" Port="820" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power1" IpAddress="127.0.0.1" Port="820" Type="1" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power1-1" Address="1" />

   </PowerSupplierDeviceConfig>

-  <PowerSupplierDeviceConfig Name="Power2" IpAddress="127.0.0.1" Port="821" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power2" IpAddress="127.0.0.1" Port="821" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power2-1" Address="1" />

   </PowerSupplierDeviceConfig>

-  <PowerSupplierDeviceConfig Name="Power3" IpAddress="127.0.0.1" Port="822" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power3" IpAddress="127.0.0.1" Port="822" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power3-1" Address="1" />

   </PowerSupplierDeviceConfig>

-  <PowerSupplierDeviceConfig Name="Power4" IpAddress="127.0.0.1" Port="823" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power4" IpAddress="127.0.0.1" Port="823" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power4-1" Address="1" />

   </PowerSupplierDeviceConfig>

   

-  <PowerSupplierDeviceConfig Name="Power5" IpAddress="127.0.0.1" Port="824" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power5" IpAddress="127.0.0.1" Port="824" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power5-1" Address="1" />

   </PowerSupplierDeviceConfig>

   

-  <PowerSupplierDeviceConfig Name="Power6" IpAddress="127.0.0.1" Port="825" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power6" IpAddress="127.0.0.1" Port="825" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power6-1" Address="1" />

   </PowerSupplierDeviceConfig>

   

-  <PowerSupplierDeviceConfig Name="Power7" IpAddress="127.0.0.1" Port="826" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power7" IpAddress="127.0.0.1" Port="826" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power7-1" Address="1" />

   </PowerSupplierDeviceConfig>

   

-  <PowerSupplierDeviceConfig Name="Power8" IpAddress="127.0.0.1" Port="827" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power8" IpAddress="127.0.0.1" Port="827" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power8-1" Address="1" />

   </PowerSupplierDeviceConfig>

 

-	<PowerSupplierDeviceConfig Name="Power9" IpAddress="127.0.0.1" Port="828" SendTimeout="2000" RecvTimeout="2000">

+	<PowerSupplierDeviceConfig Name="Power9" IpAddress="127.0.0.1" Port="828" Type="0" SendTimeout="2000" RecvTimeout="2000">

 		<Device Name="Power9-1" Address="1" />

 	</PowerSupplierDeviceConfig>

 

-	<PowerSupplierDeviceConfig Name="Power10" IpAddress="127.0.0.1" Port="829" SendTimeout="2000" RecvTimeout="2000">

+	<PowerSupplierDeviceConfig Name="Power10" IpAddress="127.0.0.1" Port="829" Type="0" SendTimeout="2000" RecvTimeout="2000">

 		<Device Name="Power10-1" Address="1" />

 	</PowerSupplierDeviceConfig>

 

-	<PowerSupplierDeviceConfig Name="Power11" IpAddress="127.0.0.1" Port="831" SendTimeout="2000" RecvTimeout="2000">

+	<PowerSupplierDeviceConfig Name="Power11" IpAddress="127.0.0.1" Port="831" Type="0" SendTimeout="2000" RecvTimeout="2000">

 		<Device Name="Power11-1" Address="1" />

 	</PowerSupplierDeviceConfig>

 

-	<PowerSupplierDeviceConfig Name="Power12" IpAddress="127.0.0.1" Port="832" SendTimeout="2000" RecvTimeout="2000">

+	<PowerSupplierDeviceConfig Name="Power12" IpAddress="127.0.0.1" Port="832" Type="0" SendTimeout="2000" RecvTimeout="2000">

 		<Device Name="Power12-1" Address="1" />

 	</PowerSupplierDeviceConfig>

 

-	<PowerSupplierDeviceConfig Name="Power13" IpAddress="127.0.0.1" Port="833" SendTimeout="2000" RecvTimeout="2000">

+	<PowerSupplierDeviceConfig Name="Power13" IpAddress="127.0.0.1" Port="833" Type="0" SendTimeout="2000" RecvTimeout="2000">

 		<Device Name="Power13-1" Address="1" />

 	</PowerSupplierDeviceConfig>

 

-	<PowerSupplierDeviceConfig Name="Power14" IpAddress="127.0.0.1" Port="834" SendTimeout="2000" RecvTimeout="2000">

+	<PowerSupplierDeviceConfig Name="Power14" IpAddress="127.0.0.1" Port="834" Type="0" SendTimeout="2000" RecvTimeout="2000">

 		<Device Name="Power14-1" Address="1" />

 	</PowerSupplierDeviceConfig>

   

-  <PowerSupplierDeviceConfig Name="CMMPower1" IpAddress="127.0.0.1" Port="835" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="CMMPower1" IpAddress="127.0.0.1" Port="835" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="CMMPower1-1" Address="1" />

   </PowerSupplierDeviceConfig>

 </PowerSupplierConfig>

+ 9 - 9
CyberX8_RT/Config/Devices/PowerSupplierCfg.xml
View File 

@@ -1,30 +1,30 @@
 
 <?xml version="1.0" encoding="utf-8"?>

 <PowerSupplierConfig>

-  <PowerSupplierDeviceConfig Name="Power1" IpAddress="10.0.10.101" Port="820" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power1" IpAddress="10.0.10.101" Port="820" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power1-1" Address="1" />

   </PowerSupplierDeviceConfig>

-  <PowerSupplierDeviceConfig Name="Power2" IpAddress="10.0.10.102" Port="820" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power2" IpAddress="10.0.10.102" Port="820" Type="1" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power2-1" Address="1" />

   </PowerSupplierDeviceConfig>

-  <PowerSupplierDeviceConfig Name="Power3" IpAddress="10.0.10.103" Port="820" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power3" IpAddress="10.0.10.103" Port="820" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power3-1" Address="1" />

   </PowerSupplierDeviceConfig>

-  <PowerSupplierDeviceConfig Name="Power4" IpAddress="10.0.10.104" Port="820" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power4" IpAddress="10.0.10.104" Port="820" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power4-1" Address="1" />

   </PowerSupplierDeviceConfig>

-  <PowerSupplierDeviceConfig Name="Power5" IpAddress="10.0.10.105" Port="820" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power5" IpAddress="10.0.10.105" Port="820" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power5-1" Address="1" />

   </PowerSupplierDeviceConfig>

-  <PowerSupplierDeviceConfig Name="Power6" IpAddress="10.0.10.106" Port="820" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power6" IpAddress="10.0.10.106" Port="820" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power6-1" Address="1" />

   </PowerSupplierDeviceConfig>

-  <PowerSupplierDeviceConfig Name="Power7" IpAddress="10.0.10.107" Port="820" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power7" IpAddress="10.0.10.107" Port="820" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power7-1" Address="1" />

   </PowerSupplierDeviceConfig>

-  <PowerSupplierDeviceConfig Name="Power8" IpAddress="10.0.10.108" Port="820" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="Power8" IpAddress="10.0.10.108" Port="820" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="Power8-1" Address="1" />

   </PowerSupplierDeviceConfig>

-  <PowerSupplierDeviceConfig Name="CMMPower1" IpAddress="127.0.10.1" Port="505" SendTimeout="2000" RecvTimeout="2000"> 

+  <PowerSupplierDeviceConfig Name="CMMPower1" IpAddress="127.0.10.1"  Port="505" Type="0" SendTimeout="2000" RecvTimeout="2000"> 

     <Device Name="CMMPower1-1" Address="2" />

   </PowerSupplierDeviceConfig>

 </PowerSupplierConfig>

+ 3 - 2
CyberX8_RT/Devices/PowerSupplier/CellPowerSupplier.cs
View File 

@@ -43,6 +43,7 @@ namespace CyberX8_RT.Devices.PowerSupplier
 
         private const int CURRENT_UNIT_SCALE = 10000;

         private const int CURRENT_DEVICE_UNIT_SCALE = 1000;

         private const int VOLTAGE_DEVICE_SCALE = 10000;

+        private const int STEP_VOLTAGE_SCALE = 1000;

         #endregion

 

         #region 内部变量

@@ -509,7 +510,7 @@ namespace CyberX8_RT.Devices.PowerSupplier
 
         public bool SetCurrent(double current)

         {

             PowerSupplierDeviceConfigManager.Instance.SetPowerRunmodelControl(Module, _channel, (byte)PowerRunModelEnum.Normal);

-            ushort setPoint = (ushort)Math.Round(CURRENT_DEVICE_UNIT_SCALE * current, 0);

+            int setPoint = (int)Math.Round(CURRENT_DEVICE_UNIT_SCALE * current, 0);

             bool result= PowerSupplierDeviceConfigManager.Instance.SetChannelCurrent(Module, _channel, setPoint);

             _sendDateTime = DateTime.Now;

             if (result)

@@ -596,7 +597,7 @@ namespace CyberX8_RT.Devices.PowerSupplier
 
         {

             List<PowerSupplierStepPeriodData> powerSupplierStepPeriodDatas = (List<PowerSupplierStepPeriodData>)args[1];

 

-            bool result=PowerSupplierDeviceConfigManager.Instance.SetStepPeriod(Module, _channel, powerSupplierStepPeriodDatas,CURRENT_DEVICE_UNIT_SCALE);

+            bool result=PowerSupplierDeviceConfigManager.Instance.SetStepPeriod(Module, _channel, powerSupplierStepPeriodDatas,STEP_VOLTAGE_SCALE,CURRENT_DEVICE_UNIT_SCALE);

             _sendDateTime = DateTime.Now;

             if (result)

             {