diff --git a/.gitignore b/.gitignore index 4c4c4ab..1b66666 100644 --- a/.gitignore +++ b/.gitignore @@ -380,4 +380,5 @@ x86/ *.log *.tmp *.pdb -*.ilk \ No newline at end of file +*.ilk +/头罩视野slove/.vs/头罩视野slove.slnx/DesignTimeBuild/.dtbcache.v2 diff --git a/头罩视野slove/.vs/头罩视野slove.slnx/DesignTimeBuild/.dtbcache.v2 b/头罩视野slove/.vs/头罩视野slove.slnx/DesignTimeBuild/.dtbcache.v2 deleted file mode 100644 index 18cd436..0000000 Binary files a/头罩视野slove/.vs/头罩视野slove.slnx/DesignTimeBuild/.dtbcache.v2 and /dev/null differ diff --git a/头罩视野slove/头罩视野/.gitignore b/头罩视野slove/头罩视野/.gitignore new file mode 100644 index 0000000..1b66666 --- /dev/null +++ b/头罩视野slove/头罩视野/.gitignore @@ -0,0 +1,384 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Oo]ut/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# 编译输出 +bin/ +obj/ +[Dd]ebug/ +[Rr]elease/ +x64/ +x86/ + +# VS 缓存 +.vs/ +*.user +*.suo +*.userosscache + +# 其他 +*.log +*.tmp +*.pdb +*.ilk +/头罩视野slove/.vs/头罩视野slove.slnx/DesignTimeBuild/.dtbcache.v2 diff --git a/头罩视野slove/头罩视野/Services/Function.cs b/头罩视野slove/头罩视野/Services/Function.cs index 4bf830c..60b5322 100644 --- a/头罩视野slove/头罩视野/Services/Function.cs +++ b/头罩视野slove/头罩视野/Services/Function.cs @@ -11,8 +11,8 @@ namespace 头罩视野.Services { public class Function { - ModbusMaster master; - IModbusMaster modbusMaster; + ModbusMaster modbusMaster; + IModbusMaster modbusmodbusMaster; DataChange dc = new DataChange(); public enum ButtonType { @@ -26,14 +26,14 @@ namespace 头罩视野.Services 整形, 浮点型 } - public Function(ModbusMaster master_in) + public Function(ModbusMaster modbusMaster_in) { - this.master = master_in; + this.modbusMaster = modbusMaster_in; } - public Function(IModbusMaster modbusMaster) + public Function(IModbusMaster modbusmodbusMaster) { - this.modbusMaster = modbusMaster; + this.modbusmodbusMaster = modbusmodbusMaster; } public void BtnClickFunction(ButtonType buttonType, ushort address) @@ -43,25 +43,25 @@ namespace 头罩视野.Services switch (buttonType) { case ButtonType.复归型: - master.WriteSingleCoil(1, address, true); + modbusmodbusMaster.WriteSingleCoil(1, address, true); Thread.Sleep(100); - master.WriteSingleCoil(1, address, false); + modbusmodbusMaster.WriteSingleCoil(1, address, false); Thread.Sleep(100); break; case ButtonType.切换型: - if (master.ReadCoils(1, address, 1)[0]) + if (modbusmodbusMaster.ReadCoils(1, address, 1)[0]) { - master.WriteSingleCoil(1, address, false); Thread.Sleep(100); + modbusmodbusMaster.WriteSingleCoil(1, address, false); Thread.Sleep(100); } else - { master.WriteSingleCoil(1, address, true); Thread.Sleep(100); } + { modbusmodbusMaster.WriteSingleCoil(1, address, true); Thread.Sleep(100); } break; case ButtonType.置位型: - master.WriteSingleCoil(1, address, true); + modbusmodbusMaster.WriteSingleCoil(1, address, true); Thread.Sleep(100); break; case ButtonType.复位型: - master.WriteSingleCoil(1, address, false); + modbusmodbusMaster.WriteSingleCoil(1, address, false); Thread.Sleep(100); break; default: @@ -82,25 +82,25 @@ namespace 头罩视野.Services switch (buttonType) { case ButtonType.复归型: - modbusMaster.WriteSingleCoil(1, address, true); + modbusmodbusMaster.WriteSingleCoil(1, address, true); Thread.Sleep(100); - modbusMaster.WriteSingleCoil(1, address, false); + modbusmodbusMaster.WriteSingleCoil(1, address, false); Thread.Sleep(100); break; case ButtonType.切换型: - if (modbusMaster.ReadCoils(1, address, 1)[0]) + if (modbusmodbusMaster.ReadCoils(1, address, 1)[0]) { - modbusMaster.WriteSingleCoil(1, address, false); Thread.Sleep(100); + modbusmodbusMaster.WriteSingleCoil(1, address, false); Thread.Sleep(100); } else - { modbusMaster.WriteSingleCoil(1, address, true); Thread.Sleep(100); } + { modbusmodbusMaster.WriteSingleCoil(1, address, true); Thread.Sleep(100); } break; case ButtonType.置位型: - modbusMaster.WriteSingleCoil(1, address, true); + modbusmodbusMaster.WriteSingleCoil(1, address, true); Thread.Sleep(100); break; case ButtonType.复位型: - modbusMaster.WriteSingleCoil(1, address, false); + modbusmodbusMaster.WriteSingleCoil(1, address, false); Thread.Sleep(100); break; default: @@ -125,7 +125,7 @@ namespace 头罩视野.Services if (UIInputDialog.ShowInputDoubleDialog(ref value, UIStyle.Inherited, desc: "请输入值", showMask: false)) { - master.WriteMultipleRegisters(1, address, dc.SplitFloatToUShortArray((float)value)); + modbusmodbusMaster.WriteMultipleRegisters(1, address, dc.SplitFloatToUShortArray((float)value)); } break; case DataType.整形: @@ -133,7 +133,7 @@ namespace 头罩视野.Services if (UIInputDialog.ShowInputIntegerDialog(ref value_int, UIStyle.Inherited, desc: "请输入数据：")) { - master.WriteMultipleRegisters(1, address, dc.intToushorts(value_int)); + modbusmodbusMaster.WriteMultipleRegisters(1, address, dc.intToushorts(value_int)); } break; default: @@ -160,14 +160,14 @@ namespace 头罩视野.Services if (UIInputDialog.ShowInputDoubleDialog(ref value, UIStyle.Inherited,3, desc: "请输入值", showMask: false)) { - modbusMaster.WriteMultipleRegisters(1, address, dc.SplitFloatToUShortArray((float)value)); + modbusmodbusMaster.WriteMultipleRegisters(1, address, dc.SplitFloatToUShortArray((float)value)); } break; case DataType.整形: int value_int = inPutValue.ToInt(); if (UIInputDialog.ShowInputIntegerDialog(ref value_int, UIStyle.Inherited, desc: "请输入数据：")) { - modbusMaster.WriteMultipleRegisters(1, address, dc.intToushorts(value_int)); + modbusmodbusMaster.WriteMultipleRegisters(1, address, dc.intToushorts(value_int)); } break; default: @@ -197,14 +197,14 @@ namespace 头罩视野.Services if (UIInputDialog.ShowInputDoubleDialog(ref value, UIStyle.Inherited, 3, desc: "请输入值", showMask: false)) { - modbusMaster.WriteMultipleRegisters(1, address, dc.SplitFloatToUShortArray((float)value)); + modbusmodbusMaster.WriteMultipleRegisters(1, address, dc.SplitFloatToUShortArray((float)value)); } break; case DataType.整形: int value_int = inPutValue.ToInt(); if (UIInputDialog.ShowInputIntegerDialog(ref value_int, UIStyle.Inherited, desc: "请输入数据：")) { - modbusMaster.WriteMultipleRegisters(1, address, dc.intToushorts(value_int)); + modbusmodbusMaster.WriteMultipleRegisters(1, address, dc.intToushorts(value_int)); } break; default: diff --git a/头罩视野slove/头罩视野/Views/PageTest.xaml.cs b/头罩视野slove/头罩视野/Views/PageTest.xaml.cs index e84b5ce..692cf5a 100644 --- a/头罩视野slove/头罩视野/Views/PageTest.xaml.cs +++ b/头罩视野slove/头罩视野/Views/PageTest.xaml.cs @@ -28,13 +28,14 @@ namespace 头罩视野.Views private TcpClient _tcpClient => ModbusResourceManager.Instance.TcpClient; private IModbusMaster _modbusMaster => ModbusResourceManager.Instance.ModbusMaster; - + DispatcherTimer _timer; DataChange c = new DataChange(); Function ma; public PageTest() { InitializeComponent(); - + InitializeModbusTcp(); + _timer = InitDispatcherTimer(); } //复位btn @@ -53,7 +54,7 @@ namespace 头罩视野.Views { ma.BtnClickFunction(Function.ButtonType.切换型, 1); } - //反转 + //反转 private void Button_Click_Res(object sender, RoutedEventArgs e) { ma.BtnClickFunction(Function.ButtonType.复归型, 10); @@ -79,7 +80,7 @@ namespace 头罩视野.Views private void Button_Click_Print(object sender, RoutedEventArgs e) { - + ma.BtnClickFunction(Function.ButtonType.复归型, 103); } @@ -92,7 +93,7 @@ namespace 头罩视野.Views } private void RadioButton_Unchecked(object sender, RoutedEventArgs e) - { + { ma.BtnClickFunction(Function.ButtonType.切换型, 41); @@ -151,7 +152,7 @@ namespace 头罩视野.Views ShowError($"读取数据失败：{ex.Message}"); } } - // 地址， 根据格式显示字符长度 32：2 16：1 ，绑定页面的name 值，F2 保留两位小数，单位 + // 地址， 根据格式显示字符长度 32：2 16：1 ，绑定页面的name 值，F2 保留两位小数，单位 private async Task ReadAndUpdateFloatAsync(int address, int length, System.Windows.Controls.TextBox control, string format, string unit) { try @@ -287,8 +288,9 @@ namespace 头罩视野.Views } private void Page_Loaded(object sender, RoutedEventArgs e) { - - InitializeModbusTcp(); + + //InitializeModbusTcp(); + _timer.Start(); } } } diff --git a/头罩视野slove/头罩视野/Views/RecordPage.xaml.cs b/头罩视野slove/头罩视野/Views/RecordPage.xaml.cs index 9a2ced7..bd67d7e 100644 --- a/头罩视野slove/头罩视野/Views/RecordPage.xaml.cs +++ b/头罩视野slove/头罩视野/Views/RecordPage.xaml.cs @@ -148,6 +148,8 @@ namespace 头罩视野.Views // 写入数据 int row = 2; foreach (var item in dataList) + + { sheet.Cells[row, 1].Value = item.Id; sheet.Cells[row, 2].Value = item.Time; diff --git a/头罩视野slove/头罩视野/Views/VisiData.xaml b/头罩视野slove/头罩视野/Views/VisiData.xaml index c0d90b5..c62094a 100644 --- a/头罩视野slove/头罩视野/Views/VisiData.xaml +++ b/头罩视野slove/头罩视野/Views/VisiData.xaml @@ -7,7 +7,7 @@ mc:Ignorable="d" d:DesignHeight="769" d:DesignWidth="1024" Background="#F5F7FA" - Title="VisiData" Loaded="Page_Loaded" > + Title="VisiData" Loaded="Page_Loaded" >