diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs
new file mode 100644
index 0000000..e445caf
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ForceWaterControl.cs
@@ -0,0 +1,21 @@
+using DataBlockHelper.DBHelpers;
+using Mesnac.Action.Base;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.ManualControl
+{
+ public class ForceWaterControl : ChemicalWeighingAction, IAction
+ {
+ public void Run(RuntimeParameter runtime)
+ {
+ base.RunIni(runtime); //必须要调用
+
+
+
+ }
+ }
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
index d8ce551..75ad2f9 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
@@ -541,6 +541,7 @@
+
diff --git a/DataBlockHelper/DBHelpers/DB2119Helper.cs b/DataBlockHelper/DBHelpers/DB2119Helper.cs
index 484cf1f..310200a 100644
--- a/DataBlockHelper/DBHelpers/DB2119Helper.cs
+++ b/DataBlockHelper/DBHelpers/DB2119Helper.cs
@@ -12,7 +12,7 @@ namespace DataBlockHelper.DBHelpers
{
public DB2119Helper()
{
- bytes = PlcConnect.Instance.Read("DB2119.0.0", 106).Content;
+ bytes = PlcConnect.Instance.Read("DB2119.0.0", 138).Content;
}
public WaterTempEntity Hotwater_A => new WaterTempEntity(0, bytes);
@@ -22,6 +22,9 @@ namespace DataBlockHelper.DBHelpers
public SprialTempEntity Spiral_A => new SprialTempEntity(40, bytes);
public SprialTempEntity Spiral_B => new SprialTempEntity(62, bytes);
public SprialTempEntity Spiral_C => new SprialTempEntity(84, bytes);
-
+ public ForceWaterEntity Force_HA => new ForceWaterEntity(106, bytes);
+ public ForceWaterEntity Force_HB => new ForceWaterEntity(114, bytes);
+ public ForceWaterEntity Force_CA => new ForceWaterEntity(122, bytes);
+ public ForceWaterEntity Force_CB => new ForceWaterEntity(130, bytes);
}
}
diff --git a/DataBlockHelper/DataBlockHelper.csproj b/DataBlockHelper/DataBlockHelper.csproj
index b154cb5..8497862 100644
--- a/DataBlockHelper/DataBlockHelper.csproj
+++ b/DataBlockHelper/DataBlockHelper.csproj
@@ -82,6 +82,7 @@
+
diff --git a/DataBlockHelper/Entity/DB2119Entity/ForceWaterEntity.cs b/DataBlockHelper/Entity/DB2119Entity/ForceWaterEntity.cs
new file mode 100644
index 0000000..17d34eb
--- /dev/null
+++ b/DataBlockHelper/Entity/DB2119Entity/ForceWaterEntity.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataBlockHelper.Entity.DB2119Entity
+{
+ public class ForceWaterEntity
+ {
+ public ForceWaterEntity(ushort startSet, byte[] bytes)
+ {
+ // OperateResult read = PlcConnect.Instance.Read("DB2102." + startSet + ".0", 2);
+
+ byte[] content = bytes.Skip(startSet).Take(8).ToArray();
+
+ addValue = PlcConnect.Instance.ByteTransform.TransInt16(content, 0);
+ remainValue = PlcConnect.Instance.ByteTransform.TransInt16(content, 2);
+ forceBin = PlcConnect.Instance.ByteTransform.TransInt16(content, 4);
+
+ byte byt = content[6];
+
+ forceOn = byt.GetBit(0);
+ startIn = byt.GetBit(1);
+ startOut = byt.GetBit(2);
+
+ }
+
+ public short addValue { get; set; }
+ public short remainValue { get; set; }
+ public short forceBin { get; set; }
+ public bool forceOn { get; set; }
+ public bool startIn { get; set; }
+ public bool startOut { get; set; }
+ }
+}
diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
index 406f9c5..9e44a67 100644
--- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
+++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
@@ -32,6 +32,7 @@
+
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/WaterForceControl.xml b/Main/MCEdit/Data/MCProject/nodeForm/WaterForceControl.xml
new file mode 100644
index 0000000..7f968bf
--- /dev/null
+++ b/Main/MCEdit/Data/MCProject/nodeForm/WaterForceControl.xml
@@ -0,0 +1,976 @@
+
+