From 1908ab07d60764c7a0ba9b7412279dda74a21a69 Mon Sep 17 00:00:00 2001 From: liuwf Date: Tue, 27 Aug 2024 18:31:11 +0800 Subject: [PATCH] =?UTF-8?q?change-=E5=BC=95=E5=85=A5=E5=96=B7=E7=A0=81?= =?UTF-8?q?=E6=9C=BADLL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SlnMesnac.Common/DLL/FJ500_ExtData.dll | Bin 0 -> 6144 bytes SlnMesnac.Common/GunHelper.cs | 17 ++++++++++++++--- SlnMesnac.Common/SlnMesnac.Common.csproj | 6 ++++++ SlnMesnac.Library/FJ500_ExtData.dll | Bin 0 -> 6144 bytes SlnMesnac.WPF/ViewModel/ProdMgmtViewModel.cs | 2 +- 5 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 SlnMesnac.Common/DLL/FJ500_ExtData.dll create mode 100644 SlnMesnac.Library/FJ500_ExtData.dll diff --git a/SlnMesnac.Common/DLL/FJ500_ExtData.dll b/SlnMesnac.Common/DLL/FJ500_ExtData.dll new file mode 100644 index 0000000000000000000000000000000000000000..f234dc90518a6b24eadd168d7a32d530c2c91a49 GIT binary patch literal 6144 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 public void SendData(string data) { + string[] data1 = new string[] { "123" }; + // string[] data = new string[] { "202408101111" }; + fj500sF.SendData( data1, 2); + + + byte[] buffer = GetBytesByCommand(data); serialPort.Write(buffer, 0, buffer.Length); diff --git a/SlnMesnac.Common/SlnMesnac.Common.csproj b/SlnMesnac.Common/SlnMesnac.Common.csproj index 526ea2e..1b54830 100644 --- a/SlnMesnac.Common/SlnMesnac.Common.csproj +++ b/SlnMesnac.Common/SlnMesnac.Common.csproj @@ -14,4 +14,10 @@ + + + DLL\FJ500_ExtData.dll + + + diff --git a/SlnMesnac.Library/FJ500_ExtData.dll b/SlnMesnac.Library/FJ500_ExtData.dll new file mode 100644 index 0000000000000000000000000000000000000000..f234dc90518a6b24eadd168d7a32d530c2c91a49 GIT binary patch literal 6144 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 => StartProdPlan(obj)); StopProdPlanCommand = new RelayCommand(obj => StopProdPlan(obj)); _logger = App.ServiceProvider.GetService>();