From 2c3e7ec5d0d2b6624455b13b5fd29c69bb3efbe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Tue, 31 May 2022 16:52:56 +0800
Subject: [PATCH] =?UTF-8?q?morkt=E7=A7=BB=E6=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BPASmartClient.DRCoffee/CoffeeMachine.cs | 4 +
BPASmartClient.Device/BaseDevice.cs | 8 +
BPASmartClient.Helper/ExpandMethod.cs | 47 +-
.../BPASmartClient.JAKA.csproj | 14 +
BPASmartClient.JAKA/JakaMachine.cs | 83 ++
.../BPASmartClient.JakaRobot.csproj | 13 +
BPASmartClient.JakaRobot/JaKaHelper.cs | 371 ++++++
BPASmartClient.JakaRobot/jakaAPI.cs | 1063 +++++++++++++++++
BPASmartClient.JakaRobot/jkType.cs | 364 ++++++
.../BPASmartClient.Juicer.csproj | 14 +
BPASmartClient.Juicer/JuicerMachine.cs | 61 +
BPASmartClient.Lebai/LebaiRobot.cs | 3 +
BPASmartClient.MCU/BPASmartClient.MCU.csproj | 14 +
BPASmartClient.MCU/MCUMachine.cs | 71 ++
BPASmartClient.MORKSM.BK.PLC/PLCMachine.cs | 6 +-
BPASmartClient.Model/BaseEvent.cs | 2 +
BPASmartClient.Model/PLC/ReadModel.cs | 2 +
BPASmartClient.Model/单片机/SCChipEvent.cs | 21 +-
BPASmartClient.Model/果汁机/JuicerModel.cs | 66 +
.../节卡机器人/JakaModel.cs | 51 +
.../BPASmartClient.MorkTLebaiJC.csproj | 4 +
BPASmartClient.MorkT.Lebai.JC/Class1.cs | 8 -
.../Control_MORKJC2.cs | 865 ++++++++++++++
.../PolymerBatching.cs | 152 +++
.../BPASmartClient.MorkTJAKAJC.csproj | 4 +
BPASmartClient.Morkt.JAKA.JC/Class1.cs | 8 -
.../Control_MORKJC.cs | 828 +++++++++++++
BPASmartClient.Morkt.JAKA.JC/GVL_MORKJC.cs | 8 +
.../PolymerBatching.cs | 152 +++
BPASmartClient.Peripheral/BasePeripheral.cs | 10 +
BPASmartClient.Peripheral/IPeripheral.cs | 2 +
BPASmartClient.SCChip/Protocal/IC_CMD.cs | 1 +
BPASmartClient.SerialPort/JuicerHelper.cs | 113 ++
BPASmartClient.SerialPort/MCUSerialHelper.cs | 140 +++
SmartClient.sln | 98 +-
35 files changed, 4614 insertions(+), 57 deletions(-)
create mode 100644 BPASmartClient.JAKA/BPASmartClient.JAKA.csproj
create mode 100644 BPASmartClient.JAKA/JakaMachine.cs
create mode 100644 BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj
create mode 100644 BPASmartClient.JakaRobot/JaKaHelper.cs
create mode 100644 BPASmartClient.JakaRobot/jakaAPI.cs
create mode 100644 BPASmartClient.JakaRobot/jkType.cs
create mode 100644 BPASmartClient.Juicer/BPASmartClient.Juicer.csproj
create mode 100644 BPASmartClient.Juicer/JuicerMachine.cs
create mode 100644 BPASmartClient.MCU/BPASmartClient.MCU.csproj
create mode 100644 BPASmartClient.MCU/MCUMachine.cs
create mode 100644 BPASmartClient.Model/果汁机/JuicerModel.cs
create mode 100644 BPASmartClient.Model/节卡机器人/JakaModel.cs
delete mode 100644 BPASmartClient.MorkT.Lebai.JC/Class1.cs
create mode 100644 BPASmartClient.MorkT.Lebai.JC/Control_MORKJC2.cs
create mode 100644 BPASmartClient.MorkT.Lebai.JC/PolymerBatching.cs
delete mode 100644 BPASmartClient.Morkt.JAKA.JC/Class1.cs
create mode 100644 BPASmartClient.Morkt.JAKA.JC/Control_MORKJC.cs
create mode 100644 BPASmartClient.Morkt.JAKA.JC/GVL_MORKJC.cs
create mode 100644 BPASmartClient.Morkt.JAKA.JC/PolymerBatching.cs
create mode 100644 BPASmartClient.SerialPort/JuicerHelper.cs
create mode 100644 BPASmartClient.SerialPort/MCUSerialHelper.cs
diff --git a/BPASmartClient.DRCoffee/CoffeeMachine.cs b/BPASmartClient.DRCoffee/CoffeeMachine.cs
index 37b886dc..fe7df2c0 100644
--- a/BPASmartClient.DRCoffee/CoffeeMachine.cs
+++ b/BPASmartClient.DRCoffee/CoffeeMachine.cs
@@ -243,5 +243,9 @@ namespace BPASmartClient.DRCoffee
public override void WriteData(string address, object value)
{
}
+
+ //public override void ReadData(string address)
+ //{
+ //}
}
}
diff --git a/BPASmartClient.Device/BaseDevice.cs b/BPASmartClient.Device/BaseDevice.cs
index c511c86f..df5ad193 100644
--- a/BPASmartClient.Device/BaseDevice.cs
+++ b/BPASmartClient.Device/BaseDevice.cs
@@ -13,6 +13,8 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Collections.ObjectModel;
+using BPASmartClient.Model.单片机;
+using BPASmartClient.EventBus;
namespace BPASmartClient.Device
{
@@ -110,6 +112,11 @@ namespace BPASmartClient.Device
#endregion
+ ///
+ /// 写控制
+ ///
+ ///
+ ///
public void WriteControl(string address, object value)
{
if (peripherals != null)
@@ -536,5 +543,6 @@ namespace BPASmartClient.Device
IEnumerable property = from pi in t.GetProperties() where pi.Name.ToLower() == field.ToLower() select pi;
return property.First().GetValue(info, null);
}
+
}
}
diff --git a/BPASmartClient.Helper/ExpandMethod.cs b/BPASmartClient.Helper/ExpandMethod.cs
index 97336f6e..4265b59c 100644
--- a/BPASmartClient.Helper/ExpandMethod.cs
+++ b/BPASmartClient.Helper/ExpandMethod.cs
@@ -79,37 +79,20 @@ namespace BPASmartClient.Helper
}
-
- /////
- ///// 保存数据
- /////
- //public static void Save(this T ot)
- //{
- // string outjson = JsonConvert.SerializeObject(ot);
- // var str = ot.GetType().GenericTypeArguments;
- // if (str != null && str.Length > 0)
- // {
- // File.WriteAllText(LocaPath.GetInstance.Getpath(str[0].Name), outjson);
- // }
-
- //}
-
- /////
- ///// 获取保存的数据
- /////
- //public static void Read(this object ot)
- //{
- // var str = ot.GetType().GenericTypeArguments;
- // if (str != null && str.Length > 0)
- // {
- // string pa = LocaPath.GetInstance.Getpath(str[0].Name);
- // if (File.Exists(pa))
- // {
- // string JsonString = File.ReadAllText(pa);
- // var result = JsonConvert.DeserializeObject