From 225ca2393216ba6052e6c0041a17ea966b8d3c78 Mon Sep 17 00:00:00 2001
From: tylhk <498435443@QQ.COM>
Date: Mon, 26 May 2025 17:21:18 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E6=94=B6?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E9=97=B4=E6=88=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WPFSerialAssistant/App.config | 2 +-
WPFSerialAssistant/Core.cs | 9 ---------
WPFSerialAssistant/EventHandler.cs | 10 ++++++++--
WPFSerialAssistant/MainWindow.xaml | 10 +++-------
WPFSerialAssistant/Properties/Resources.Designer.cs | 6 +++---
WPFSerialAssistant/Properties/Settings.Designer.cs | 2 +-
WPFSerialAssistant/WPFSerialAssistant.csproj | 2 +-
7 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/WPFSerialAssistant/App.config b/WPFSerialAssistant/App.config
index e707b32..92c094c 100644
--- a/WPFSerialAssistant/App.config
+++ b/WPFSerialAssistant/App.config
@@ -2,5 +2,5 @@
-
+
diff --git a/WPFSerialAssistant/Core.cs b/WPFSerialAssistant/Core.cs
index 144a47c..f61d915 100644
--- a/WPFSerialAssistant/Core.cs
+++ b/WPFSerialAssistant/Core.cs
@@ -78,15 +78,6 @@ private void Information(string message)
#endregion
- private void RecvDataBoxAppend(string textData)
- {
- if (showRecvDataCheckBox.IsChecked == true)
- {
- this.recvDataRichTextBox.AppendText(textData);
- this.recvDataRichTextBox.ScrollToEnd();
- }
- }
-
private bool SendData()
{
string textToSend = sendDataTextBox.Text;
diff --git a/WPFSerialAssistant/EventHandler.cs b/WPFSerialAssistant/EventHandler.cs
index eac33fb..b2a2398 100644
--- a/WPFSerialAssistant/EventHandler.cs
+++ b/WPFSerialAssistant/EventHandler.cs
@@ -491,6 +491,7 @@ private void CheckTimer_Tick(object sender, EventArgs e)
private void ReceivedDataHandler(object obj)
{
+
List recvBuffer = new List();
recvBuffer.AddRange((List)obj);
@@ -506,8 +507,13 @@ private void ReceivedDataHandler(object obj)
{
if (showReceiveData)
{
- // 根据显示模式显示接收到的字节.
- recvDataRichTextBox.AppendText(Utilities.BytesToText(recvBuffer, receiveMode, serialPort.Encoding));
+ string timestamp = DateTime.Now.ToString("[yyyy-MM-dd HH:mm:ss] ");
+ // 转换数据为文本
+ string dataText = Utilities.BytesToText(recvBuffer, receiveMode, serialPort.Encoding);
+ // 拼接时间戳和数据
+ string displayText = timestamp + dataText;
+
+ recvDataRichTextBox.AppendText(displayText);
recvDataRichTextBox.ScrollToEnd();
}
diff --git a/WPFSerialAssistant/MainWindow.xaml b/WPFSerialAssistant/MainWindow.xaml
index 980454d..338e5c3 100644
--- a/WPFSerialAssistant/MainWindow.xaml
+++ b/WPFSerialAssistant/MainWindow.xaml
@@ -41,7 +41,7 @@
- 欢迎使用串口助手！
+ 欢迎使用
@@ -158,12 +158,8 @@
-
- 主要功能：
- 1. 可自由显示、隐藏的设置面板
- 2. 简洁视图模式，专注于数据收发
- 3. 软件主要配置可保存并恢复
- 快捷键提示：
+
+ 快捷键：
1. Ctrl+S: 保存接收区数据
2. Ctrl+Enter: 进/退简洁视图模式
3. Enter: 发送数据
diff --git a/WPFSerialAssistant/Properties/Resources.Designer.cs b/WPFSerialAssistant/Properties/Resources.Designer.cs
index e467f8a..54b661e 100644
--- a/WPFSerialAssistant/Properties/Resources.Designer.cs
+++ b/WPFSerialAssistant/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace WPFSerialAssistant.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -47,8 +47,8 @@ internal Resources() {
}
///
- /// 使用此强类型资源类，为所有资源查找
- /// 重写当前线程的 CurrentUICulture 属性。
+ /// 重写当前线程的 CurrentUICulture 属性，对
+ /// 使用此强类型资源类的所有资源查找执行重写。
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
diff --git a/WPFSerialAssistant/Properties/Settings.Designer.cs b/WPFSerialAssistant/Properties/Settings.Designer.cs
index 9243b31..f53e224 100644
--- a/WPFSerialAssistant/Properties/Settings.Designer.cs
+++ b/WPFSerialAssistant/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace WPFSerialAssistant.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/WPFSerialAssistant/WPFSerialAssistant.csproj b/WPFSerialAssistant/WPFSerialAssistant.csproj
index dc4cb92..4e1918e 100644
--- a/WPFSerialAssistant/WPFSerialAssistant.csproj
+++ b/WPFSerialAssistant/WPFSerialAssistant.csproj
@@ -9,7 +9,7 @@
Properties
WPFSerialAssistant
WPFSerialAssistant
- v4.5
+ v4.8
512
{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
4
From 67e31608073f2b4164b07a1530b8b8c08835ea52 Mon Sep 17 00:00:00 2001
From: tylhk <498435443@QQ.COM>
Date: Mon, 26 May 2025 17:46:42 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B8=B8=E7=94=A8?=
=?UTF-8?q?=E5=91=BD=E4=BB=A4=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WPFSerialAssistant/CommandItem.cs | 11 ++
WPFSerialAssistant/InputDialog.xaml | 14 +++
WPFSerialAssistant/InputDialog.xaml.cs | 37 +++++++
WPFSerialAssistant/MainWindow.xaml | 23 ++++-
WPFSerialAssistant/MainWindow.xaml.cs | 101 ++++++++++++++++++-
WPFSerialAssistant/WPFSerialAssistant.csproj | 13 ++-
WPFSerialAssistant/packages.config | 4 +
7 files changed, 199 insertions(+), 4 deletions(-)
create mode 100644 WPFSerialAssistant/CommandItem.cs
create mode 100644 WPFSerialAssistant/InputDialog.xaml
create mode 100644 WPFSerialAssistant/InputDialog.xaml.cs
create mode 100644 WPFSerialAssistant/packages.config
diff --git a/WPFSerialAssistant/CommandItem.cs b/WPFSerialAssistant/CommandItem.cs
new file mode 100644
index 0000000..e04cb80
--- /dev/null
+++ b/WPFSerialAssistant/CommandItem.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace WPFSerialAssistant
+{
+ [Serializable] // 关键序列化标记
+ public class CommandItem
+ {
+ public string Name { get; set; }
+ public string Value { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/WPFSerialAssistant/InputDialog.xaml b/WPFSerialAssistant/InputDialog.xaml
new file mode 100644
index 0000000..f35adc3
--- /dev/null
+++ b/WPFSerialAssistant/InputDialog.xaml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WPFSerialAssistant/InputDialog.xaml.cs b/WPFSerialAssistant/InputDialog.xaml.cs
new file mode 100644
index 0000000..09f4e78
--- /dev/null
+++ b/WPFSerialAssistant/InputDialog.xaml.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace WPFSerialAssistant
+{
+ public partial class InputDialog : Window
+ {
+ public string Answer1 { get; set; }
+ public string Answer2 { get; set; }
+
+ public InputDialog(string title, string prompt1, string prompt2)
+ {
+ InitializeComponent();
+ Title = title;
+ promptText1.Text = prompt1;
+ promptText2.Text = prompt2;
+ }
+
+ private void OkButton_Click(object sender, RoutedEventArgs e)
+ {
+ Answer1 = answerTextBox1.Text;
+ Answer2 = answerTextBox2.Text;
+ DialogResult = true; // 关闭对话框并返回true
+ }
+ }
+}
diff --git a/WPFSerialAssistant/MainWindow.xaml b/WPFSerialAssistant/MainWindow.xaml
index 338e5c3..294bf74 100644
--- a/WPFSerialAssistant/MainWindow.xaml
+++ b/WPFSerialAssistant/MainWindow.xaml
@@ -29,7 +29,8 @@
@@ -171,6 +172,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WPFSerialAssistant/MainWindow.xaml.cs b/WPFSerialAssistant/MainWindow.xaml.cs
index 98565b4..c40d1dd 100644
--- a/WPFSerialAssistant/MainWindow.xaml.cs
+++ b/WPFSerialAssistant/MainWindow.xaml.cs
@@ -1,5 +1,7 @@
-using System;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using System.Text;
//using System.Threading.Tasks;
@@ -12,6 +14,7 @@
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
+using Path = System.IO.Path;
namespace WPFSerialAssistant
{
@@ -20,10 +23,106 @@ namespace WPFSerialAssistant
///
public partial class MainWindow : Window
{
+ private static readonly string ConfigFolder =
+ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WPFSerialAssistant");
+
+ private static readonly string CommandsFilePath =
+ Path.Combine(ConfigFolder, "commands.json");
+
+ // 保存命令列表到JSON文件
+ private void SaveCommands()
+ {
+ try
+ {
+ Directory.CreateDirectory(ConfigFolder); // 确保文件夹存在
+ var commands = cmdListBox.Items.Cast().ToList();
+ string json = JsonConvert.SerializeObject(commands, Formatting.Indented);
+ File.WriteAllText(CommandsFilePath, json);
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show($"保存命令失败: {ex.Message}");
+ }
+ }
+
+ // 从JSON文件加载命令列表
+ private void LoadCommands()
+ {
+ try
+ {
+ if (File.Exists(CommandsFilePath))
+ {
+ string json = File.ReadAllText(CommandsFilePath);
+ var commands = JsonConvert.DeserializeObject>(json);
+ cmdListBox.Items.Clear();
+ foreach (var cmd in commands)
+ {
+ cmdListBox.Items.Add(cmd);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show($"加载命令失败: {ex.Message}");
+ }
+ }
+
+
public MainWindow()
{
InitializeComponent();
InitCore();
+ LoadCommands();
+ }
+
+ // 命令数据类
+ public class CommandItem
+ {
+ public string Name { get; set; }
+ public string Value { get; set; }
+ }
+
+ // 控制面板可见性
+ private void CommonCommandsViewMenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ var menuItem = sender as MenuItem;
+ menuItem.IsChecked = !menuItem.IsChecked; // 切换勾选状态
+ commonCommandsPanel.Visibility = menuItem.IsChecked ? Visibility.Visible : Visibility.Collapsed;
+ }
+
+ // 添加命令
+ private void AddCommand_Click(object sender, RoutedEventArgs e)
+ {
+ var inputDialog = new InputDialog("新建命令", "命令名称:", "命令内容:");
+ if (inputDialog.ShowDialog() == true)
+ {
+ cmdListBox.Items.Add(new CommandItem
+ {
+ Name = inputDialog.Answer1,
+ Value = inputDialog.Answer2
+ });
+ SaveCommands();
+ }
+ }
+
+ // 使用命令
+ private void CmdListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ if (cmdListBox.SelectedItem is CommandItem selectedCmd)
+ {
+ sendDataTextBox.Text = selectedCmd.Value;
+ sendDataButton.Focus();
+ }
+ }
+
+ // 删除命令
+ private void RemoveCommand_Click(object sender, RoutedEventArgs e)
+ {
+ if (cmdListBox.SelectedItem != null)
+ {
+ cmdListBox.Items.Remove(cmdListBox.SelectedItem);
+ SaveCommands();
+ }
}
}
}
diff --git a/WPFSerialAssistant/WPFSerialAssistant.csproj b/WPFSerialAssistant/WPFSerialAssistant.csproj
index 4e1918e..d984cf4 100644
--- a/WPFSerialAssistant/WPFSerialAssistant.csproj
+++ b/WPFSerialAssistant/WPFSerialAssistant.csproj
@@ -56,8 +56,8 @@
1.ico
-
- lib\Json\Net45\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
@@ -82,7 +82,11 @@
About.xaml
+
+
+ InputDialog.xaml
+
@@ -92,6 +96,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
MSBuild:Compile
Designer
@@ -125,6 +133,7 @@
ResXFileCodeGenerator
Resources.Designer.cs
+
SettingsSingleFileGenerator
Settings.Designer.cs
diff --git a/WPFSerialAssistant/packages.config b/WPFSerialAssistant/packages.config
new file mode 100644
index 0000000..0b14af3
--- /dev/null
+++ b/WPFSerialAssistant/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
From 2dd82e7167d74b25b5e7559583885742db165fd9 Mon Sep 17 00:00:00 2001
From: tylhk <498435443@QQ.COM>
Date: Mon, 26 May 2025 18:07:49 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=8F=B7?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WPFSerialAssistant/About.xaml | 11 +++---
WPFSerialAssistant/EventHandler.cs | 11 ++++--
WPFSerialAssistant/MainWindow.xaml | 14 ++++++--
WPFSerialAssistant/MainWindow.xaml.cs | 50 +++++++++++++++++++++++++++
4 files changed, 77 insertions(+), 9 deletions(-)
diff --git a/WPFSerialAssistant/About.xaml b/WPFSerialAssistant/About.xaml
index 70dd07b..7b91753 100644
--- a/WPFSerialAssistant/About.xaml
+++ b/WPFSerialAssistant/About.xaml
@@ -22,11 +22,12 @@
- 版本编号：Verison 1.3
- 更新日期：2016年01月24日 星期日
- 软件作者：Christopher Lee
- 反馈邮箱：christopherlee1993@outlook.com
- 小小说明：开放源码，采用MIT协议。望共同学习进步。
+ 版本号：1.3.2
+ 原作者：Christopher Lee
+ 原作者邮箱：christopherlee1993@outlook.com
+ 新版本贡献者：Satone
+ 项目页面：https://github.com/tylhk/SerialAssistant
+ 说明：开放源码，采用MIT协议。望共同学习进步。
diff --git a/WPFSerialAssistant/EventHandler.cs b/WPFSerialAssistant/EventHandler.cs
index b2a2398..61bf9d4 100644
--- a/WPFSerialAssistant/EventHandler.cs
+++ b/WPFSerialAssistant/EventHandler.cs
@@ -1,10 +1,13 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics;
+using System.Security.Policy;
using System.Threading;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Documents;
using System.Windows.Input;
+using static System.Net.WebRequestMethods;
namespace WPFSerialAssistant
{
@@ -142,7 +145,11 @@ private void aboutMenuItem_Click(object sender, RoutedEventArgs e)
private void helpMenuItem_Click(object sender, RoutedEventArgs e)
{
-
+ Process.Start(new ProcessStartInfo
+ {
+ FileName = "https://github.com/tylhk/SerialAssistant",
+ UseShellExecute = true
+ });
}
#endregion
@@ -361,7 +368,7 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
}
// 提示是否需要保存配置到文件中
- if (MessageBox.Show("是否在退出前保存软件配置？", "小贴士", MessageBoxButton.YesNo, MessageBoxImage.Information) == MessageBoxResult.Yes)
+ if (MessageBox.Show("是否在退出前保存软件配置？", "提示", MessageBoxButton.YesNo, MessageBoxImage.Information) == MessageBoxResult.Yes)
{
SaveConfig();
}
diff --git a/WPFSerialAssistant/MainWindow.xaml b/WPFSerialAssistant/MainWindow.xaml
index 294bf74..8871d44 100644
--- a/WPFSerialAssistant/MainWindow.xaml
+++ b/WPFSerialAssistant/MainWindow.xaml
@@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WPFSerialAssistant"
mc:Ignorable="d" WindowStartupLocation="CenterScreen"
- Title="串口助手(Version 1.3)" Height="600" Width="1024"
+ Title="串口助手" Height="600" Width="1024"
MinHeight="550" MinWidth="1024"
Icon="1.ico" Closing="Window_Closing" PreviewKeyDown="Window_KeyDown">
@@ -211,7 +211,17 @@
二进制
-
+
+
+
+
+
+
+
+
diff --git a/WPFSerialAssistant/MainWindow.xaml.cs b/WPFSerialAssistant/MainWindow.xaml.cs
index c40d1dd..9e5aa80 100644
--- a/WPFSerialAssistant/MainWindow.xaml.cs
+++ b/WPFSerialAssistant/MainWindow.xaml.cs
@@ -124,5 +124,55 @@ private void RemoveCommand_Click(object sender, RoutedEventArgs e)
SaveCommands();
}
}
+ // 字号控制参数
+ private const double DefaultFontSize = 14; // 默认字号（与XAML中FlowDocument设置一致）
+ private const double MinFontSize = 8; // 最小字号
+ private const double MaxFontSize = 36; // 最大字号
+ private const double FontStep = 2; // 字号调整步长
+
+ // 放大字号
+ private void IncreaseFontSize_Click(object sender, RoutedEventArgs e)
+ {
+ if (recvDataRichTextBox.FontSize + FontStep <= MaxFontSize)
+ {
+ recvDataRichTextBox.FontSize += FontStep;
+ UpdateDocumentFontSize(recvDataRichTextBox.Document, recvDataRichTextBox.FontSize);
+ }
+ }
+
+ // 缩小字号
+ private void DecreaseFontSize_Click(object sender, RoutedEventArgs e)
+ {
+ if (recvDataRichTextBox.FontSize - FontStep >= MinFontSize)
+ {
+ recvDataRichTextBox.FontSize -= FontStep;
+ UpdateDocumentFontSize(recvDataRichTextBox.Document, recvDataRichTextBox.FontSize);
+ }
+ }
+
+ // 重置字号
+ private void ResetFontSize_Click(object sender, RoutedEventArgs e)
+ {
+ recvDataRichTextBox.FontSize = DefaultFontSize;
+ UpdateDocumentFontSize(recvDataRichTextBox.Document, DefaultFontSize);
+ }
+
+ // 更新文档内所有文字字号（兼容已有内容）
+ private void UpdateDocumentFontSize(FlowDocument document, double newSize)
+ {
+ foreach (var block in document.Blocks)
+ {
+ if (block is Paragraph paragraph)
+ {
+ foreach (var inline in paragraph.Inlines)
+ {
+ if (inline is Run run)
+ {
+ run.FontSize = newSize;
+ }
+ }
+ }
+ }
+ }
}
}
From 124366fb32aa0734c2e3533f5b084821a74c92b0 Mon Sep 17 00:00:00 2001
From: tylhk <498435443@QQ.COM>
Date: Mon, 26 May 2025 18:37:13 +0800
Subject: [PATCH 04/13] Update README.md
---
README.md | 128 ++++++++----------------------------------------------
1 file changed, 18 insertions(+), 110 deletions(-)
diff --git a/README.md b/README.md
index 2f571b8..ea2f49e 100644
--- a/README.md
+++ b/README.md
@@ -1,127 +1,35 @@
-# WPFSerialAssitan
+# WPFSerialAssistant
+
------------------
##
+
**һC#WPFĴֲ㣬UIࡣʵ˻ĴͨѶҪĹܣ߿ԻڴԶĹܡ⣬Իڴ˿һЩĴڿ**
## Ŀҳ
-* [WPFԴĴڵ(https://github.com/ChrisLeeGit/SerialAssistant)](https://github.com/ChrisLeeGit/SerialAssistant)
-
-
-##
-* ݽգԲöģʽʾյݣַʮƵ
-* ݷֶͣ/Զ
-* 洮ڽյʾ
-* /
-* ġͼģʽ ûרעݵĽպͷ
-
-## ʹð
-**ȽϼĽܡ**
-
-
-## ͼƬ
-### ʼͼ
-
-
-### ˿ڲ
-
-
-### ص
-
-
-
-### ŵͼ
-
-
-## ʹõĿԴ
-* ʹõһԴJson.Net⣬ԷdzʹJsonʽ洢ϢJsonʽļҳΪhttp://www.newtonsoft.com/json
-## ɿ
-һVisual Studio 2015ֱ̣Cloneɡ
+- Github[WPFԴĴڵ](https://github.com/tylhk/SerialAssistant)
+- Blog[WPFSerialAssistant ](https://satone1008.cn/wp-admin/post.php?post=412&action=edit)
-## ؿԴĿ
-ͬʱһArduino̫ԶˮϵͳȻϵͳûʵʹϣƵĹܻʵˡĿڱȽۺϵˡʹ˴ͨŵķʽPC˵ĿͨšPCڿԸƬԶĿִָСԣ漰ͨõԶЭƣArduinoָϵͳƺʵ֡ȤĻҲͬԹעͬѧϰллĿйַܵ
+## ԭĿҳ
-1. Githubַhttps://github.com/ChrisLeeGit/AutomaticWaterSupplySystem
-2. CSDN Codeַhttps://code.csdn.net/u011193957/automaticwatersupplysystem
+* [WPFԴĴڵ](https://github.com/ChrisLeeGit/SerialAssistant)
-# ־
-## 2016124 Version 1.3
-###
-* ֱֶ֧뷽ʽշ
-* ַ֧ݣ绻(\n)ȣμ->ӡ˵
-* Ϣıԭ
-* ״̬ݽ״ָ̬ʾ
-
-### Bug
-* ״̬ʾ⣺Զʱ״̬ʾ
-* ߰ʱַת쳣
-
-###
-* һ汾ͻзʱҪֶASCII룬˲
-* ȶԽһ
-
-## 2016121 Version 1.2
-###
-* յĴݿѡʹijַʽʾ`ַ````˽``ʮ``ʮ`ʽ
-* ڷͿѡ`ַ``ʮ`ģʽ
-* ˿ɹIJ֣Ӧڳߴ磬˴ڱ仯
-* ݴʱһݴյݣһֵݴ߳ں̨ͷݣ̣߳˳ȶԺͿɿ
-
-### Bug
-* ijЩΪݻûеֵָٳٵò
-* ֽʾ
-* ݽȶ
-
-##
-* ηʹתַıݣ
- * ѡѡͷʽΪ`ַ`ģʽȻڷͿҪ͵ı`Hello world!`
- * ȻѡͷʽΪ`ʮ`ģʽȻıҪ͵תַASCII룬绻з`0A`
- * ٴл`ַ`ģʽʱٽзʱὫзһˡ
-
-* Է֣ʹͼΪ1msڲ˶߳ģʽʾûпٵ
-
-
-## 2015920 Version 1.1
-###
-* Զҿö˿ںŹ
-* ݵָ洢·
-* ˳ǰԶرѿĶ˿ںţѯǷù
-* ݱݹ(Ctrl+S)
-* ݽ/˳ͼģʽܣCtrl+Enter)
-* ָͨ˵˳ͼģʽ
-
-### Bug
-* ûлָñϴιرյλ
-* ˳˵Ч
-* ijر£Ӽͼģʽָʱֱ
-
-###
-* Ƴ˵棨Sò˵бݰťظ
-* ӡڡ
-* 汾Version 1.1
+##
+* ݽգԲöģʽʾյݣַʮƵ
-## 2015915 ܶ Version 1.0
-###
-* Ϣ湦ܣĿǰϢУ
- *
- * żУλ
- * λ
- * ֹͣλ
- * ֽڱ
- * ı
- * Զʱ
- * ״̬|߶+
- * ʾ״̬
+* ݷֶͣ/Զ
-* ԶϢ
+* 洮ڽյʾ
-### Bug
-* ʾϢ״̬Ӧ˵ʾһµ
+* /
-###
-* Ƴ˵(L)ΪԶò
-* Ƴ˵ģʽֶȫغԶ롰ģʽʱȥһ롰ģʽܲ˵
+* ġͼģʽ ûרעݵĽպͷ
+## ־
+### 2025/5/26
+- ӽʱ
+- ӳ
+- ֺŵ
From b6bda6197da450a4efb10051b1b7df03353d819c Mon Sep 17 00:00:00 2001
From: tylhk <498435443@QQ.COM>
Date: Tue, 27 May 2025 11:31:34 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E5=8F=B7?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WPFSerialAssistant/MainWindow.xaml.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WPFSerialAssistant/MainWindow.xaml.cs b/WPFSerialAssistant/MainWindow.xaml.cs
index 9e5aa80..cb3efef 100644
--- a/WPFSerialAssistant/MainWindow.xaml.cs
+++ b/WPFSerialAssistant/MainWindow.xaml.cs
@@ -128,7 +128,7 @@ private void RemoveCommand_Click(object sender, RoutedEventArgs e)
private const double DefaultFontSize = 14; // 默认字号（与XAML中FlowDocument设置一致）
private const double MinFontSize = 8; // 最小字号
private const double MaxFontSize = 36; // 最大字号
- private const double FontStep = 2; // 字号调整步长
+ private const double FontStep = 1; // 字号调整步长
// 放大字号
private void IncreaseFontSize_Click(object sender, RoutedEventArgs e)
From fee528dc24f694bfb007de89295c4d99ccd46a79 Mon Sep 17 00:00:00 2001
From: tylhk <498435443@QQ.COM>
Date: Tue, 27 May 2025 11:35:26 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BC=93=E5=86=B2?=
=?UTF-8?q?=E5=8C=BA=E6=AD=A3=E7=A1=AE=E8=BE=93=E5=87=BA=E6=8E=A5=E6=94=B6?=
=?UTF-8?q?=E5=8C=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WPFSerialAssistant/Core.cs | 23 ++++++++++++++++--
WPFSerialAssistant/EventHandler.cs | 34 +++++++++++----------------
WPFSerialAssistant/MainWindow.xaml.cs | 5 ++++
3 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/WPFSerialAssistant/Core.cs b/WPFSerialAssistant/Core.cs
index f61d915..41881ba 100644
--- a/WPFSerialAssistant/Core.cs
+++ b/WPFSerialAssistant/Core.cs
@@ -22,11 +22,30 @@ private void InitCore()
InitClockTimer();
InitAutoSendDataTimer();
InitSerialPort();
-
+ // 新增：初始化批量处理定时器（间隔设为100ms）
+ _batchTimer.Interval = TimeSpan.FromMilliseconds(100);
+ _batchTimer.Tick += BatchTimer_Tick;
+ _batchTimer.IsEnabled = true;
// 查找可以使用的端口号
FindPorts();
}
-
+ private void BatchTimer_Tick(object sender, EventArgs e)
+ {
+ _batchTimer.Stop();
+ lock (_batchLock)
+ {
+ if (_batchBuffer.Length > 0)
+ {
+ string timestamp = DateTime.Now.ToString("[yyyy-MM-dd HH:mm:ss] ");
+ Dispatcher.Invoke(() =>
+ {
+ recvDataRichTextBox.AppendText(timestamp + _batchBuffer.ToString() + "\n");
+ recvDataRichTextBox.ScrollToEnd();
+ });
+ _batchBuffer.Clear();
+ }
+ }
+ }
#region 状态栏
///
/// 更新时间信息
diff --git a/WPFSerialAssistant/EventHandler.cs b/WPFSerialAssistant/EventHandler.cs
index 61bf9d4..4f8dc32 100644
--- a/WPFSerialAssistant/EventHandler.cs
+++ b/WPFSerialAssistant/EventHandler.cs
@@ -498,38 +498,32 @@ private void CheckTimer_Tick(object sender, EventArgs e)
private void ReceivedDataHandler(object obj)
{
-
List recvBuffer = new List();
recvBuffer.AddRange((List)obj);
+ shouldClear = true;
if (recvBuffer.Count == 0)
{
return;
}
- // 必须应当保证全局缓冲区的数据能够被完整地备份出来，这样才能进行进一步的处理。
- shouldClear = true;
+ // 将字节数据转换为文本
+ string dataText = Utilities.BytesToText(recvBuffer, receiveMode, serialPort.Encoding);
- this.Dispatcher.Invoke(new Action(() =>
+ // 将数据暂存到批量缓冲区
+ lock (_batchLock)
{
- if (showReceiveData)
- {
- string timestamp = DateTime.Now.ToString("[yyyy-MM-dd HH:mm:ss] ");
- // 转换数据为文本
- string dataText = Utilities.BytesToText(recvBuffer, receiveMode, serialPort.Encoding);
- // 拼接时间戳和数据
- string displayText = timestamp + dataText;
-
- recvDataRichTextBox.AppendText(displayText);
- recvDataRichTextBox.ScrollToEnd();
- }
-
- dataRecvStatusBarItem.Visibility = Visibility.Collapsed;
- }));
+ _batchBuffer.Append(dataText);
+ }
- // TO-DO：
- // 处理数据，比如解析指令等等
+ // 重置批量处理定时器（停止后重新启动）
+ Dispatcher.Invoke(() =>
+ {
+ _batchTimer.Stop();
+ _batchTimer.Start();
+ });
}
+
#endregion
}
}
diff --git a/WPFSerialAssistant/MainWindow.xaml.cs b/WPFSerialAssistant/MainWindow.xaml.cs
index cb3efef..bb6d106 100644
--- a/WPFSerialAssistant/MainWindow.xaml.cs
+++ b/WPFSerialAssistant/MainWindow.xaml.cs
@@ -14,6 +14,7 @@
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
+using System.Windows.Threading;
using Path = System.IO.Path;
namespace WPFSerialAssistant
@@ -23,6 +24,10 @@ namespace WPFSerialAssistant
///
public partial class MainWindow : Window
{
+ private StringBuilder _batchBuffer = new StringBuilder(); // 合并短时间内的数据
+ private DispatcherTimer _batchTimer = new DispatcherTimer(); // 批量处理定时器
+ private readonly object _batchLock = new object(); // 线程锁
+
private static readonly string ConfigFolder =
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WPFSerialAssistant");
From 1b8f77581a0e04980cd8a5090e288a163da0f4be Mon Sep 17 00:00:00 2001
From: tylhk <498435443@QQ.COM>
Date: Tue, 27 May 2025 11:45:33 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E8=BE=93=E5=87=BA=E5=8C=BA=E8=AE=BE=E7=BD=AE=20=E8=87=AA?=
=?UTF-8?q?=E5=8A=A8=E4=BF=9D=E5=AD=98=E5=AD=97=E5=8F=B7=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 181 +++++++++++++++++---------
WPFSerialAssistant/MainWindow.xaml | 2 +-
WPFSerialAssistant/MainWindow.xaml.cs | 2 +-
3 files changed, 120 insertions(+), 65 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0d6c45d..0c2d0ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
# User-specific files
+*.rsuser
*.suo
*.user
*.userosscache
@@ -11,18 +9,22 @@
*.userprefs
# Build results
+[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
-build/
bld/
[Bb]in/
[Oo]bj/
-# Visual Studio 2015 cache/options directory
-.vs/
+# Visual Studio 2019/2022 cache/options directory
+vs/
+vscode/
+
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
# MSTest test Results
[Tt]est[Rr]esult*/
@@ -37,18 +39,24 @@ TestResult.xml
[Rr]eleasePS/
dlldata.c
-# DNX
+# .NET Core project.lock.json file
project.lock.json
-artifacts/
+project.fragment.lock.json
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
+*.iobj
*.pch
*.pdb
+*.ipdb
*.pgc
*.pgd
*.rsp
@@ -56,15 +64,7 @@ artifacts/
*.tlb
*.tli
*.tlh
-*.tmp
*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
# Chutzpah Test files
_Chutzpah*
@@ -73,14 +73,10 @@ _Chutzpah*
ipch/
*.aps
*.ncb
-*.opensdf
-*.sdf
-*.cachefile
+*.opendb
-# Visual Studio profiler
+# Visual Studio profiler files
*.psess
-*.vsp
-*.vspx
# TFS 2012 Local Workspace
$tf/
@@ -91,27 +87,36 @@ $tf/
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
-*.DotSettings.user
+*.[Rr]e[Ss]harper.user
+*.[Rr]e[Ss]harper.Caches/
# JustCode is a .NET coding add-in
-.JustCode
+JustCode
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
-*.dotCover
+dotCover
+
+# AxoCover is a Code Coverage Tool
+axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+coverage
+coveragexml
# NCrunch
_NCrunch_*
-.*crunch*.local.xml
+*crunch*.local.xml
+nCrunchTemp_*
# MightyMoose
-*.mm.*
-AutoTest.Net/
+mm.*
# Web workbench (sass)
-.sass-cache/
+sass-cache/
# Installshield output folder
[Ee]xpress/
@@ -130,55 +135,46 @@ DocProject/Help/html
publish/
# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-## TODO: Comment the next line if you want to checkin your
-## web deploy settings but do note that will include unencrypted
-## passwords
-#*.pubxml
+*.publish.xml
-*.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
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-
-# Windows Azure Build Output
-csx/
-*.build.csdef
-
-# Windows Store app package directory
+**/[Pp]ackages/*
+
+# Windows Store app package directories and files
AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
+*.cache
# Others
ClientBin/
-[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.dbproj.schemaview
+*.jfm
*.pfx
*.publishsettings
-node_modules/
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 ;-)
+# 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
@@ -196,8 +192,11 @@ UpgradeLog*.htm
# Microsoft Fakes
FakesAssemblies/
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio (NTVS)
+ntvs_analysis.dat
# Visual Studio 6 build log
*.plg
@@ -205,7 +204,63 @@ FakesAssemblies/
# Visual Studio 6 workspace options file
*.opt
-# LightSwitch generated files
-GeneratedArtifacts/
-_Pvt_Extensions/
-ModelManifest.xml
+# 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
+
+### OSX ###
+DS_Store
+AppleDouble
+LSOverride
+
+# Directories potentially created on remote AFP share
+AppleDB
+AppleDesktop
+Network Trash Folder
+Temporary Items
+apdisk
+
+### Windows ###
+Thumbs.db
+ehthumbs.db
+
+### Linux ###
+*~
+
+### Node ###
+node_modules/
+
+### JetBrains Rider ###
+idea/
+sln.iml
+
+### CodeRush ###
+cr/
+
+### Python Tools for Visual Studio (PTVS) ###
+__pycache__/
+*.pyc
+
+### Cake ###
+tools/**
+!tools/packages.config
+
+### Tabs Studio ###
+*.tss
+
+### Telerik's JustMock configuration file ###
+*.jmconfig
+
+### BizTalk build output ###
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*
\ No newline at end of file
diff --git a/WPFSerialAssistant/MainWindow.xaml b/WPFSerialAssistant/MainWindow.xaml
index 8871d44..8e7ec56 100644
--- a/WPFSerialAssistant/MainWindow.xaml
+++ b/WPFSerialAssistant/MainWindow.xaml
@@ -281,7 +281,7 @@
-
+
diff --git a/WPFSerialAssistant/MainWindow.xaml.cs b/WPFSerialAssistant/MainWindow.xaml.cs
index bb6d106..11a92b2 100644
--- a/WPFSerialAssistant/MainWindow.xaml.cs
+++ b/WPFSerialAssistant/MainWindow.xaml.cs
@@ -130,7 +130,7 @@ private void RemoveCommand_Click(object sender, RoutedEventArgs e)
}
}
// 字号控制参数
- private const double DefaultFontSize = 14; // 默认字号（与XAML中FlowDocument设置一致）
+ private const double DefaultFontSize = 12; // 默认字号（与XAML中FlowDocument设置一致）
private const double MinFontSize = 8; // 最小字号
private const double MaxFontSize = 36; // 最大字号
private const double FontStep = 1; // 字号调整步长
From aac3d1564640b8b7d895263d6ab85a45a2d9ae07 Mon Sep 17 00:00:00 2001
From: tylhk <498435443@QQ.COM>
Date: Tue, 27 May 2025 15:28:16 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=B8=BA=E8=87=AA=E5=AE=9A=E4=B9=89?=
=?UTF-8?q?=E5=91=BD=E4=BB=A4=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WPFSerialAssistant/CommandConfig.cs | 16 ++
WPFSerialAssistant/CommandSettingsWindow.xaml | 45 ++++
.../CommandSettingsWindow.xaml.cs | 200 ++++++++++++++++++
WPFSerialAssistant/MainWindow.xaml | 10 +-
WPFSerialAssistant/MainWindow.xaml.cs | 86 +++++---
WPFSerialAssistant/WPFSerialAssistant.csproj | 8 +
6 files changed, 329 insertions(+), 36 deletions(-)
create mode 100644 WPFSerialAssistant/CommandConfig.cs
create mode 100644 WPFSerialAssistant/CommandSettingsWindow.xaml
create mode 100644 WPFSerialAssistant/CommandSettingsWindow.xaml.cs
diff --git a/WPFSerialAssistant/CommandConfig.cs b/WPFSerialAssistant/CommandConfig.cs
new file mode 100644
index 0000000..023f65b
--- /dev/null
+++ b/WPFSerialAssistant/CommandConfig.cs
@@ -0,0 +1,16 @@
+// CommandConfig.cs
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WPFSerialAssistant
+{
+ public class CommandConfig
+ {
+ public List> AllPagesCommands { get; set; }
+ public int CurrentPageIndex { get; set; } = 0; // 默认显示第一页
+ public List PageNames { get; set; } = new List(); // 新增属性存储页面名称
+ }
+}
diff --git a/WPFSerialAssistant/CommandSettingsWindow.xaml b/WPFSerialAssistant/CommandSettingsWindow.xaml
new file mode 100644
index 0000000..260aec6
--- /dev/null
+++ b/WPFSerialAssistant/CommandSettingsWindow.xaml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WPFSerialAssistant/CommandSettingsWindow.xaml.cs b/WPFSerialAssistant/CommandSettingsWindow.xaml.cs
new file mode 100644
index 0000000..7312307
--- /dev/null
+++ b/WPFSerialAssistant/CommandSettingsWindow.xaml.cs
@@ -0,0 +1,200 @@
+// CommandSettingsWindow.xaml.cs
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace WPFSerialAssistant
+{
+ public partial class CommandSettingsWindow : Window
+ {
+ public List> AllPagesCommands => commandConfig.AllPagesCommands;
+ public int CurrentPageIndex => commandConfig.CurrentPageIndex;
+
+ private CommandConfig commandConfig;
+ private int currentPageIndex = 0;
+
+ public CommandSettingsWindow(CommandConfig config)
+ {
+ InitializeComponent();
+ commandConfig = config;
+
+ // 确保有至少一个页面
+ if (commandConfig.AllPagesCommands == null || commandConfig.AllPagesCommands.Count == 0)
+ {
+ commandConfig.AllPagesCommands = new List> { new List() };
+ commandConfig.PageNames.Add("页面1");
+ }
+
+ // 加载页面列表
+ for (int i = 0; i < commandConfig.AllPagesCommands.Count; i++)
+ {
+ if (commandConfig.PageNames.Count <= i)
+ {
+ commandConfig.PageNames.Add($"页面{i + 1}");
+ }
+ pageListBox.Items.Add(commandConfig.PageNames[i]);
+ }
+
+ // 选中当前页面
+ if (commandConfig.CurrentPageIndex < pageListBox.Items.Count)
+ {
+ pageListBox.SelectedIndex = commandConfig.CurrentPageIndex;
+ }
+ else
+ {
+ pageListBox.SelectedIndex = 0;
+ }
+
+ commandDataGrid.DataContext = this;
+ }
+
+ private void DeletePageButton_Click(object sender, RoutedEventArgs e)
+ {
+ if (pageListBox.SelectedIndex >= 0 && commandConfig.AllPagesCommands.Count > 1) // 确保至少有一个页面
+ {
+ int selectedIndex = pageListBox.SelectedIndex;
+ commandConfig.AllPagesCommands.RemoveAt(selectedIndex);
+ commandConfig.PageNames.RemoveAt(selectedIndex);
+ pageListBox.Items.RemoveAt(selectedIndex);
+
+ if (pageListBox.Items.Count > 0)
+ {
+ if (selectedIndex < pageListBox.Items.Count)
+ {
+ pageListBox.SelectedIndex = selectedIndex;
+ }
+ else
+ {
+ pageListBox.SelectedIndex = pageListBox.Items.Count - 1;
+ }
+ }
+ else
+ {
+ // 如果没有页面了，添加一个新页面
+ commandConfig.AllPagesCommands.Add(new List());
+ commandConfig.PageNames.Add("页面1");
+ pageListBox.Items.Add(commandConfig.PageNames[0]);
+ pageListBox.SelectedIndex = 0;
+ }
+
+ commandDataGrid.ItemsSource = CurrentCommands;
+ }
+ }
+
+ public List CurrentCommands
+ {
+ get
+ {
+ if (commandConfig.AllPagesCommands != null &&
+ commandConfig.AllPagesCommands.Count > currentPageIndex)
+ {
+ return commandConfig.AllPagesCommands[currentPageIndex];
+ }
+ return new List();
+ }
+ }
+
+ private void AddPageButton_Click(object sender, RoutedEventArgs e)
+ {
+ commandConfig.AllPagesCommands.Add(new List());
+ string newPageName = $"页面{commandConfig.AllPagesCommands.Count}";
+ commandConfig.PageNames.Add(newPageName);
+ pageListBox.Items.Add(newPageName);
+ pageListBox.SelectedIndex = commandConfig.AllPagesCommands.Count - 1;
+ }
+
+ private void PageListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ if (pageListBox.SelectedIndex >= 0)
+ {
+ currentPageIndex = pageListBox.SelectedIndex;
+ commandConfig.CurrentPageIndex = currentPageIndex; // 更新当前选中页面
+ commandDataGrid.ItemsSource = CurrentCommands;
+ }
+ }
+
+ private void AddCommandButton_Click(object sender, RoutedEventArgs e)
+ {
+ CurrentCommands.Add(new MainWindow.CommandItem { Name = "", Value = "" });
+ commandDataGrid.Items.Refresh();
+ }
+
+ private void DeleteCommandButton_Click(object sender, RoutedEventArgs e)
+ {
+ if (commandDataGrid.SelectedItem != null)
+ {
+ CurrentCommands.Remove(commandDataGrid.SelectedItem as MainWindow.CommandItem);
+ commandDataGrid.Items.Refresh();
+ }
+ }
+
+ private void SaveButton_Click(object sender, RoutedEventArgs e)
+ {
+ DialogResult = true;
+ Close();
+ }
+
+ private void PageListBox_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+ {
+ if (pageListBox.SelectedIndex >= 0)
+ {
+ var inputWindow = new InputWindow((string)pageListBox.SelectedItem);
+ if (inputWindow.ShowDialog() == true)
+ {
+ string newName = inputWindow.InputText;
+ if (!string.IsNullOrEmpty(newName))
+ {
+ int selectedIndex = pageListBox.SelectedIndex;
+ commandConfig.PageNames[selectedIndex] = newName;
+ pageListBox.Items[selectedIndex] = newName;
+ }
+ }
+ }
+ }
+ }
+
+ public class InputWindow : Window
+ {
+ public string InputText { get; set; }
+
+ public InputWindow(string initialText)
+ {
+ Title = "重命名页面";
+ Width = 300;
+ Height = 150;
+ ResizeMode = ResizeMode.NoResize;
+ WindowStartupLocation = WindowStartupLocation.CenterOwner;
+
+ var stackPanel = new StackPanel { Margin = new Thickness(10) };
+
+ var textBox = new TextBox { Text = initialText };
+ stackPanel.Children.Add(textBox);
+
+ var buttonPanel = new StackPanel { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Right };
+
+ var okButton = new Button { Content = "确定", Width = 75, Margin = new Thickness(5) };
+ okButton.Click += (sender, e) =>
+ {
+ InputText = textBox.Text;
+ DialogResult = true;
+ Close();
+ };
+ buttonPanel.Children.Add(okButton);
+
+ var cancelButton = new Button { Content = "取消", Width = 75, Margin = new Thickness(5) };
+ cancelButton.Click += (sender, e) =>
+ {
+ DialogResult = false;
+ Close();
+ };
+ buttonPanel.Children.Add(cancelButton);
+
+ stackPanel.Children.Add(buttonPanel);
+
+ Content = stackPanel;
+ }
+ }
+}
diff --git a/WPFSerialAssistant/MainWindow.xaml b/WPFSerialAssistant/MainWindow.xaml
index 8e7ec56..7d082cf 100644
--- a/WPFSerialAssistant/MainWindow.xaml
+++ b/WPFSerialAssistant/MainWindow.xaml
@@ -171,14 +171,13 @@
-
+
-
-
-
+
+
@@ -191,7 +190,8 @@
-
+
+
diff --git a/WPFSerialAssistant/MainWindow.xaml.cs b/WPFSerialAssistant/MainWindow.xaml.cs
index 11a92b2..6d5db18 100644
--- a/WPFSerialAssistant/MainWindow.xaml.cs
+++ b/WPFSerialAssistant/MainWindow.xaml.cs
@@ -29,28 +29,44 @@ public partial class MainWindow : Window
private readonly object _batchLock = new object(); // 线程锁
private static readonly string ConfigFolder =
- Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WPFSerialAssistant");
+ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WPFSerialAssistant");
private static readonly string CommandsFilePath =
Path.Combine(ConfigFolder, "commands.json");
+ private List> allPagesCommands = new List>();
+ private CommandConfig commandConfig = new CommandConfig();
// 保存命令列表到JSON文件
private void SaveCommands()
{
try
{
- Directory.CreateDirectory(ConfigFolder); // 确保文件夹存在
- var commands = cmdListBox.Items.Cast().ToList();
- string json = JsonConvert.SerializeObject(commands, Formatting.Indented);
+ // 确保文件夹存在
+ Directory.CreateDirectory(ConfigFolder);
+
+ // 将命令配置序列化为JSON字符串
+ string json = JsonConvert.SerializeObject(commandConfig, Formatting.Indented);
+
+ // 将JSON字符串写入文件
File.WriteAllText(CommandsFilePath, json);
}
+ catch (DirectoryNotFoundException ex)
+ {
+ MessageBox.Show($"保存命令失败: 文件夹 {ConfigFolder} 不存在。{ex.Message}");
+ }
+ catch (UnauthorizedAccessException ex)
+ {
+ MessageBox.Show($"保存命令失败: 没有权限访问文件 {CommandsFilePath}。{ex.Message}");
+ }
+ catch (IOException ex)
+ {
+ MessageBox.Show($"保存命令失败: 文件读写错误。{ex.Message}");
+ }
catch (Exception ex)
{
MessageBox.Show($"保存命令失败: {ex.Message}");
}
}
-
- // 从JSON文件加载命令列表
private void LoadCommands()
{
try
@@ -58,12 +74,10 @@ private void LoadCommands()
if (File.Exists(CommandsFilePath))
{
string json = File.ReadAllText(CommandsFilePath);
- var commands = JsonConvert.DeserializeObject>(json);
- cmdListBox.Items.Clear();
- foreach (var cmd in commands)
- {
- cmdListBox.Items.Add(cmd);
- }
+ commandConfig = JsonConvert.DeserializeObject(json) ?? new CommandConfig();
+
+ // 加载当前选中页面的命令
+ LoadCurrentPageCommands();
}
}
catch (Exception ex)
@@ -71,7 +85,21 @@ private void LoadCommands()
MessageBox.Show($"加载命令失败: {ex.Message}");
}
}
+ // 从JSON文件加载命令列表
+ private void LoadCurrentPageCommands()
+ {
+ cmdListBox.Items.Clear();
+ if (commandConfig.AllPagesCommands != null &&
+ commandConfig.AllPagesCommands.Count > commandConfig.CurrentPageIndex)
+ {
+ var currentCommands = commandConfig.AllPagesCommands[commandConfig.CurrentPageIndex];
+ foreach (var cmd in currentCommands)
+ {
+ cmdListBox.Items.Add(cmd);
+ }
+ }
+ }
public MainWindow()
{
@@ -95,21 +123,6 @@ private void CommonCommandsViewMenuItem_Click(object sender, RoutedEventArgs e)
commonCommandsPanel.Visibility = menuItem.IsChecked ? Visibility.Visible : Visibility.Collapsed;
}
- // 添加命令
- private void AddCommand_Click(object sender, RoutedEventArgs e)
- {
- var inputDialog = new InputDialog("新建命令", "命令名称:", "命令内容:");
- if (inputDialog.ShowDialog() == true)
- {
- cmdListBox.Items.Add(new CommandItem
- {
- Name = inputDialog.Answer1,
- Value = inputDialog.Answer2
- });
- SaveCommands();
- }
- }
-
// 使用命令
private void CmdListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
@@ -120,15 +133,26 @@ private void CmdListBox_SelectionChanged(object sender, SelectionChangedEventArg
}
}
- // 删除命令
- private void RemoveCommand_Click(object sender, RoutedEventArgs e)
+ private void SettingsButton_Click(object sender, RoutedEventArgs e)
{
- if (cmdListBox.SelectedItem != null)
+ // 确保命令配置已初始化
+ if (commandConfig.AllPagesCommands == null)
+ commandConfig.AllPagesCommands = new List>();
+
+ var settingsWindow = new CommandSettingsWindow(commandConfig);
+ if (settingsWindow.ShowDialog() == true)
{
- cmdListBox.Items.Remove(cmdListBox.SelectedItem);
+ // 更新命令配置
+ commandConfig.AllPagesCommands = settingsWindow.AllPagesCommands;
+ commandConfig.CurrentPageIndex = settingsWindow.CurrentPageIndex;
+
+ // 加载当前选中页面的命令
+ LoadCurrentPageCommands();
+
SaveCommands();
}
}
+
// 字号控制参数
private const double DefaultFontSize = 12; // 默认字号（与XAML中FlowDocument设置一致）
private const double MinFontSize = 8; // 最小字号
diff --git a/WPFSerialAssistant/WPFSerialAssistant.csproj b/WPFSerialAssistant/WPFSerialAssistant.csproj
index d984cf4..939539a 100644
--- a/WPFSerialAssistant/WPFSerialAssistant.csproj
+++ b/WPFSerialAssistant/WPFSerialAssistant.csproj
@@ -82,7 +82,11 @@
About.xaml
+
+
+ CommandSettingsWindow.xaml
+
InputDialog.xaml
@@ -96,6 +100,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
From cef71fd9f9cb62acc2dff70b5590e7257269974d Mon Sep 17 00:00:00 2001
From: tylhk <498435443@QQ.COM>
Date: Tue, 27 May 2025 16:39:40 +0800
Subject: [PATCH 09/13] Update README.MD
---
README.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/README.md b/README.md
index ea2f49e..71069f0 100644
--- a/README.md
+++ b/README.md
@@ -33,3 +33,9 @@
- ӽʱ
- ӳ
- ֺŵ
+
+### 2025/5/27
+
+- ŻֺʾǷҪֺã
+- Ż
+- ҳ
From c3ef7893d78bca21459a51f67dc15cf687e24deb Mon Sep 17 00:00:00 2001
From: tylhk <498435443@QQ.COM>
Date: Tue, 27 May 2025 17:49:57 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E9=80=82=E9=85=8D=E7=AE=80=E6=B4=81?=
=?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WPFSerialAssistant/Properties/AssemblyInfo.cs | 55 -------
WPFSerialAssistant/SAViewMode.cs | 12 +-
WPFSerialAssistant/WPFSerialAssistant.csproj | 148 +-----------------
WPFSerialAssistant/packages.config | 4 -
4 files changed, 19 insertions(+), 200 deletions(-)
delete mode 100644 WPFSerialAssistant/Properties/AssemblyInfo.cs
delete mode 100644 WPFSerialAssistant/packages.config
diff --git a/WPFSerialAssistant/Properties/AssemblyInfo.cs b/WPFSerialAssistant/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4669abc..0000000
--- a/WPFSerialAssistant/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("WPFSerialAssistant")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WPFSerialAssistant")]
-[assembly: AssemblyCopyright("Copyright © 2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-//将 ComVisible 设置为 false 将使此程序集中的类型
-//对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型，
-//请将此类型的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-//若要开始生成可本地化的应用程序，请
-// 中的 .csproj 文件中
-//例如，如果您在源文件中使用的是美国英语，
-//使用的是美国英语，请将 设置为 en-US。 然后取消
-//对以下 NeutralResourceLanguage 特性的注释。 更新
-//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
- ResourceDictionaryLocation.None, //主题特定资源词典所处位置
- //(当资源未在页面
- //或应用程序资源字典中找到时使用)
- ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
- //(当资源未在页面
- //、应用程序或任何主题专用资源字典中找到时使用)
-)]
-
-
-// 程序集的版本信息由下列四个值组成:
-//
-// 主版本
-// 次版本
-// 生成号
-// 修订号
-//
-//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
-// 方法是按如下所示使用“*”: :
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/WPFSerialAssistant/SAViewMode.cs b/WPFSerialAssistant/SAViewMode.cs
index 0fa9b61..d76c1b1 100644
--- a/WPFSerialAssistant/SAViewMode.cs
+++ b/WPFSerialAssistant/SAViewMode.cs
@@ -39,21 +39,25 @@ private void EnterCompactViewMode()
panelVisibilityStack.Push(serialPortConfigPanel.Visibility);
panelVisibilityStack.Push(autoSendConfigPanel.Visibility);
panelVisibilityStack.Push(serialCommunicationConfigPanel.Visibility);
+ panelVisibilityStack.Push(commonCommandsViewMenuItem.Visibility);
// 进入简洁视图模式
serialPortConfigPanel.Visibility = Visibility.Collapsed;
autoSendConfigPanel.Visibility = Visibility.Collapsed;
serialCommunicationConfigPanel.Visibility = Visibility.Collapsed;
+ commonCommandsPanel.Visibility = Visibility.Collapsed;
// 把对应的菜单项取消选中
serialSettingViewMenuItem.IsChecked = false;
autoSendDataSettingViewMenuItem.IsChecked = false;
serialCommunicationSettingViewMenuItem.IsChecked = false;
+ commonCommandsViewMenuItem.IsChecked = false;
// 此时无法视图模式，必须恢复到原先的视图模式才可以
serialSettingViewMenuItem.IsEnabled = false;
autoSendDataSettingViewMenuItem.IsEnabled = false;
serialCommunicationSettingViewMenuItem.IsEnabled = false;
+ commonCommandsViewMenuItem.IsEnabled = false;
// 切换至简洁视图模式，菜单项选中
compactViewMenuItem.IsChecked = true;
@@ -71,7 +75,7 @@ private void RestoreViewMode()
serialCommunicationConfigPanel.Visibility = panelVisibilityStack.Pop();
autoSendConfigPanel.Visibility = panelVisibilityStack.Pop();
serialPortConfigPanel.Visibility = panelVisibilityStack.Pop();
-
+ commonCommandsViewMenuItem.Visibility = panelVisibilityStack.Pop();
// 恢复菜单选中状态
if (serialPortConfigPanel.Visibility == Visibility.Visible)
{
@@ -88,9 +92,15 @@ private void RestoreViewMode()
serialCommunicationSettingViewMenuItem.IsChecked = true;
}
+ if (commonCommandsPanel.Visibility == Visibility.Visible)
+ {
+ commonCommandsViewMenuItem.IsChecked = true;
+ }
+
serialSettingViewMenuItem.IsEnabled = true;
autoSendDataSettingViewMenuItem.IsEnabled = true;
serialCommunicationSettingViewMenuItem.IsEnabled = true;
+ commonCommandsViewMenuItem.IsChecked = true;
compactViewMenuItem.IsChecked = false;
diff --git a/WPFSerialAssistant/WPFSerialAssistant.csproj b/WPFSerialAssistant/WPFSerialAssistant.csproj
index 939539a..97908b2 100644
--- a/WPFSerialAssistant/WPFSerialAssistant.csproj
+++ b/WPFSerialAssistant/WPFSerialAssistant.csproj
@@ -1,20 +1,7 @@
-
-
-
+
- Debug
- AnyCPU
- {DA01B86D-5BC1-4863-BAAC-71B309B09CC0}
+ net9.0-windows
WinExe
- Properties
- WPFSerialAssistant
- WPFSerialAssistant
- v4.8
- 512
- {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 4
- true
-
false
publish\
true
@@ -30,128 +17,17 @@
1.3.0.%2a
false
true
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- false
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
- false
-
-
+ true
+ true
1.ico
-
- ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
-
-
-
-
-
-
-
-
-
-
- 4.0
-
-
-
-
-
-
-
- MSBuild:Compile
- Designer
-
-
- About.xaml
-
-
-
-
- CommandSettingsWindow.xaml
-
-
-
- InputDialog.xaml
-
-
-
-
-
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- MSBuild:Compile
- Designer
-
-
- App.xaml
- Code
-
-
-
-
- MainWindow.xaml
- Code
-
-
-
-
- Code
-
-
- True
- True
- Resources.resx
-
-
- True
- Settings.settings
- True
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
+
+
+
+
-
-
-
-
@@ -190,12 +66,4 @@
-
-
\ No newline at end of file
diff --git a/WPFSerialAssistant/packages.config b/WPFSerialAssistant/packages.config
deleted file mode 100644
index 0b14af3..0000000
--- a/WPFSerialAssistant/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
From e1cac2a76ebb4d40b2b260ed357d0fefd7f9830e Mon Sep 17 00:00:00 2001
From: tylhk <498435443@QQ.COM>
Date: Wed, 28 May 2025 10:13:00 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E5=9B=9E=E9=80=80=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WPFSerialAssistant/WPFSerialAssistant.csproj | 148 ++++++++++++++++++-
1 file changed, 140 insertions(+), 8 deletions(-)
diff --git a/WPFSerialAssistant/WPFSerialAssistant.csproj b/WPFSerialAssistant/WPFSerialAssistant.csproj
index 97908b2..939539a 100644
--- a/WPFSerialAssistant/WPFSerialAssistant.csproj
+++ b/WPFSerialAssistant/WPFSerialAssistant.csproj
@@ -1,7 +1,20 @@
-
+
+
+
- net9.0-windows
+ Debug
+ AnyCPU
+ {DA01B86D-5BC1-4863-BAAC-71B309B09CC0}
WinExe
+ Properties
+ WPFSerialAssistant
+ WPFSerialAssistant
+ v4.8
+ 512
+ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ 4
+ true
+
false
publish\
true
@@ -17,17 +30,128 @@
1.3.0.%2a
false
true
- true
- true
+
+
+ AnyCPU
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+ false
+
+
+ AnyCPU
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+ false
+
+
1.ico
+
+ ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
+
+
+
+
+
+
+
+
+
+
+ 4.0
+
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ About.xaml
+
+
+
+
+ CommandSettingsWindow.xaml
+
+
+
+ InputDialog.xaml
+
+
+
+
+
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ Designer
+
+
+ App.xaml
+ Code
+
+
+
+
+ MainWindow.xaml
+ Code
+
+
+
+
+ Code
+
+
+ True
+ True
+ Resources.resx
+
+
+ True
+ Settings.settings
+ True
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
-
-
-
-
+
+
+
+
@@ -66,4 +190,12 @@
+
+
\ No newline at end of file
From 12399ef553f6f60d6d473f731b4f2b8a0f44bc7a Mon Sep 17 00:00:00 2001
From: tylhk <498435443@QQ.COM>
Date: Wed, 28 May 2025 13:19:28 +0800
Subject: [PATCH 12/13] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E7=AE=80?=
=?UTF-8?q?=E6=B4=81=E8=A7=86=E5=9B=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 266 -
.../wpfserialassistant.metadata.v9.bin | Bin 0 -> 1311 bytes
.../wpfserialassistant.projects.v9.bin | Bin 0 -> 81998 bytes
.../wpfserialassistant.strings.v9.bin | Bin 0 -> 135924 bytes
.vs/VSWorkspaceState.json | 5 +
.../17.14.552.11226/CodeChunks.db | Bin 0 -> 458752 bytes
.../17.14.552.11226/SemanticSymbols.db | Bin 0 -> 229376 bytes
.../DesignTimeBuild/.dtbcache.v2 | Bin 0 -> 109918 bytes
...094a07de-65d4-4911-abac-aa2684a9a304.vsidx | Bin 0 -> 93236 bytes
...71e071dd-c9a3-4bb1-92a8-f9d91b847523.vsidx | Bin 0 -> 15143 bytes
...8700a9cf-82a2-4201-842f-75e3a962c883.vsidx | Bin 0 -> 16542 bytes
...95bfab9f-c9f6-4f5c-8e28-d7217fdb244f.vsidx | Bin 0 -> 75988 bytes
...c2956a16-a8ab-497f-8d0f-6c9fff296552.vsidx | Bin 0 -> 16517 bytes
.../6e6915c2-696c-49ff-8dc7-9e2884e53369 | Bin 0 -> 3795 bytes
.vs/WPFSerialAssistant/v17/.futdcache.v2 | Bin 0 -> 270 bytes
.vs/WPFSerialAssistant/v17/.suo | Bin 0 -> 153600 bytes
.../v17/DocumentLayout.backup.json | 107 +
.../v17/DocumentLayout.json | 107 +
.vs/slnx.sqlite | Bin 0 -> 258048 bytes
.../WPFSerialAssistant.csproj.dtbcache.json | 1 +
WPFSerialAssistant/Core.cs | 6 +-
WPFSerialAssistant/MainWindow.xaml | 355 +-
WPFSerialAssistant/MainWindow.xaml.cs | 165 +-
WPFSerialAssistant/Properties/AssemblyInfo.cs | 55 +
WPFSerialAssistant/SASerialPort.cs | 60 +-
WPFSerialAssistant/SAViewMode.cs | 13 +-
WPFSerialAssistant/SelectDialog.xaml | 16 +
WPFSerialAssistant/SelectDialog.xaml.cs | 22 +
WPFSerialAssistant/WPFSerialAssistant.csproj | 43 +-
.../WPFSerialAssistant.csproj.user | 16 +
.../WPFSerialAssistant_TemporaryKey.pfx | Bin 0 -> 1652 bytes
.../lib/Json/Net20/Newtonsoft.Json.dll | Bin 507392 -> 0 bytes
.../lib/Json/Net35/Newtonsoft.Json.dll | Bin 465408 -> 0 bytes
.../lib/Json/Net40/Newtonsoft.Json.dll | Bin 510976 -> 0 bytes
.../lib/Json/Net45/Newtonsoft.Json.dll | Bin 520192 -> 0 bytes
.../lib/Json/Portable/Newtonsoft.Json.dll | Bin 484864 -> 0 bytes
.../lib/Json/Portable40/Newtonsoft.Json.dll | Bin 407552 -> 0 bytes
.../lib/Json/Portable40/Newtonsoft.Json.xml | 8067 -----------
WPFSerialAssistant/packages.config | 4 +
.../Newtonsoft.Json.13.0.3/.signature.p7s | Bin 0 -> 24497 bytes
packages/Newtonsoft.Json.13.0.3/LICENSE.md | 20 +
.../Newtonsoft.Json.13.0.3.nupkg | Bin 0 -> 2441966 bytes
packages/Newtonsoft.Json.13.0.3/README.md | 71 +
.../lib/net20/Newtonsoft.Json.dll | Bin 0 -> 580880 bytes
.../lib/net20}/Newtonsoft.Json.xml | 10950 ++++++++-------
.../lib/net35/Newtonsoft.Json.dll | Bin 0 -> 515856 bytes
.../lib/net35}/Newtonsoft.Json.xml | 8886 ++++++------
.../lib/net40/Newtonsoft.Json.dll | Bin 0 -> 584976 bytes
.../lib/net40}/Newtonsoft.Json.xml | 10026 +++++++-------
.../lib/net45/Newtonsoft.Json.dll | Bin 0 -> 711952 bytes
.../lib/net45/Newtonsoft.Json.xml | 11363 +++++++++++++++
.../lib/net6.0/Newtonsoft.Json.dll | Bin 0 -> 712464 bytes
.../lib/net6.0}/Newtonsoft.Json.xml | 11465 ++++++++++------
.../lib/netstandard1.0/Newtonsoft.Json.dll | Bin 0 -> 680720 bytes
.../lib/netstandard1.0}/Newtonsoft.Json.xml | 10023 +++++++++-----
.../lib/netstandard1.3/Newtonsoft.Json.dll | Bin 0 -> 699664 bytes
.../lib/netstandard1.3/Newtonsoft.Json.xml | 11173 +++++++++++++++
.../lib/netstandard2.0/Newtonsoft.Json.dll | Bin 0 -> 705296 bytes
.../lib/netstandard2.0/Newtonsoft.Json.xml | 11338 +++++++++++++++
.../Newtonsoft.Json.13.0.3/packageIcon.png | Bin 0 -> 8956 bytes
60 files changed, 64307 insertions(+), 30316 deletions(-)
delete mode 100644 .gitignore
create mode 100644 .vs/ProjectEvaluation/wpfserialassistant.metadata.v9.bin
create mode 100644 .vs/ProjectEvaluation/wpfserialassistant.projects.v9.bin
create mode 100644 .vs/ProjectEvaluation/wpfserialassistant.strings.v9.bin
create mode 100644 .vs/VSWorkspaceState.json
create mode 100644 .vs/WPFSerialAssistant/CopilotIndices/17.14.552.11226/CodeChunks.db
create mode 100644 .vs/WPFSerialAssistant/CopilotIndices/17.14.552.11226/SemanticSymbols.db
create mode 100644 .vs/WPFSerialAssistant/DesignTimeBuild/.dtbcache.v2
create mode 100644 .vs/WPFSerialAssistant/FileContentIndex/094a07de-65d4-4911-abac-aa2684a9a304.vsidx
create mode 100644 .vs/WPFSerialAssistant/FileContentIndex/71e071dd-c9a3-4bb1-92a8-f9d91b847523.vsidx
create mode 100644 .vs/WPFSerialAssistant/FileContentIndex/8700a9cf-82a2-4201-842f-75e3a962c883.vsidx
create mode 100644 .vs/WPFSerialAssistant/FileContentIndex/95bfab9f-c9f6-4f5c-8e28-d7217fdb244f.vsidx
create mode 100644 .vs/WPFSerialAssistant/FileContentIndex/c2956a16-a8ab-497f-8d0f-6c9fff296552.vsidx
create mode 100644 .vs/WPFSerialAssistant/copilot-chat/60f09ee7/sessions/6e6915c2-696c-49ff-8dc7-9e2884e53369
create mode 100644 .vs/WPFSerialAssistant/v17/.futdcache.v2
create mode 100644 .vs/WPFSerialAssistant/v17/.suo
create mode 100644 .vs/WPFSerialAssistant/v17/DocumentLayout.backup.json
create mode 100644 .vs/WPFSerialAssistant/v17/DocumentLayout.json
create mode 100644 .vs/slnx.sqlite
create mode 100644 WPFSerialAssistant/.vs/WPFSerialAssistant.csproj.dtbcache.json
create mode 100644 WPFSerialAssistant/Properties/AssemblyInfo.cs
create mode 100644 WPFSerialAssistant/SelectDialog.xaml
create mode 100644 WPFSerialAssistant/SelectDialog.xaml.cs
create mode 100644 WPFSerialAssistant/WPFSerialAssistant.csproj.user
create mode 100644 WPFSerialAssistant/WPFSerialAssistant_TemporaryKey.pfx
delete mode 100644 WPFSerialAssistant/lib/Json/Net20/Newtonsoft.Json.dll
delete mode 100644 WPFSerialAssistant/lib/Json/Net35/Newtonsoft.Json.dll
delete mode 100644 WPFSerialAssistant/lib/Json/Net40/Newtonsoft.Json.dll
delete mode 100644 WPFSerialAssistant/lib/Json/Net45/Newtonsoft.Json.dll
delete mode 100644 WPFSerialAssistant/lib/Json/Portable/Newtonsoft.Json.dll
delete mode 100644 WPFSerialAssistant/lib/Json/Portable40/Newtonsoft.Json.dll
delete mode 100644 WPFSerialAssistant/lib/Json/Portable40/Newtonsoft.Json.xml
create mode 100644 WPFSerialAssistant/packages.config
create mode 100644 packages/Newtonsoft.Json.13.0.3/.signature.p7s
create mode 100644 packages/Newtonsoft.Json.13.0.3/LICENSE.md
create mode 100644 packages/Newtonsoft.Json.13.0.3/Newtonsoft.Json.13.0.3.nupkg
create mode 100644 packages/Newtonsoft.Json.13.0.3/README.md
create mode 100644 packages/Newtonsoft.Json.13.0.3/lib/net20/Newtonsoft.Json.dll
rename {WPFSerialAssistant/lib/Json/Net20 => packages/Newtonsoft.Json.13.0.3/lib/net20}/Newtonsoft.Json.xml (78%)
create mode 100644 packages/Newtonsoft.Json.13.0.3/lib/net35/Newtonsoft.Json.dll
rename {WPFSerialAssistant/lib/Json/Net45 => packages/Newtonsoft.Json.13.0.3/lib/net35}/Newtonsoft.Json.xml (77%)
create mode 100644 packages/Newtonsoft.Json.13.0.3/lib/net40/Newtonsoft.Json.dll
rename {WPFSerialAssistant/lib/Json/Net40 => packages/Newtonsoft.Json.13.0.3/lib/net40}/Newtonsoft.Json.xml (77%)
create mode 100644 packages/Newtonsoft.Json.13.0.3/lib/net45/Newtonsoft.Json.dll
create mode 100644 packages/Newtonsoft.Json.13.0.3/lib/net45/Newtonsoft.Json.xml
create mode 100644 packages/Newtonsoft.Json.13.0.3/lib/net6.0/Newtonsoft.Json.dll
rename {WPFSerialAssistant/lib/Json/Net35 => packages/Newtonsoft.Json.13.0.3/lib/net6.0}/Newtonsoft.Json.xml (59%)
create mode 100644 packages/Newtonsoft.Json.13.0.3/lib/netstandard1.0/Newtonsoft.Json.dll
rename {WPFSerialAssistant/lib/Json/Portable => packages/Newtonsoft.Json.13.0.3/lib/netstandard1.0}/Newtonsoft.Json.xml (60%)
create mode 100644 packages/Newtonsoft.Json.13.0.3/lib/netstandard1.3/Newtonsoft.Json.dll
create mode 100644 packages/Newtonsoft.Json.13.0.3/lib/netstandard1.3/Newtonsoft.Json.xml
create mode 100644 packages/Newtonsoft.Json.13.0.3/lib/netstandard2.0/Newtonsoft.Json.dll
create mode 100644 packages/Newtonsoft.Json.13.0.3/lib/netstandard2.0/Newtonsoft.Json.xml
create mode 100644 packages/Newtonsoft.Json.13.0.3/packageIcon.png
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 0c2d0ec..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,266 +0,0 @@
-# User-specific files
-*.rsuser
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-
-# Visual Studio 2019/2022 cache/options directory
-vs/
-vscode/
-
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# .NET Core project.lock.json file
-project.lock.json
-project.fragment.lock.json
-
-# StyleCop
-StyleCopReport.xml
-
-# Files built by Visual Studio
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.iobj
-*.pch
-*.pdb
-*.ipdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp_proj
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-
-# Visual Studio profiler files
-*.psess
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.[Rr]e[Ss]harper.user
-*.[Rr]e[Ss]harper.Caches/
-
-# JustCode is a .NET coding add-in
-JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-dotCover
-
-# AxoCover is a Code Coverage Tool
-axoCover/*
-!.axoCover/settings.json
-
-# Visual Studio code coverage results
-coverage
-coveragexml
-
-# NCrunch
-_NCrunch_*
-*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-mm.*
-
-# 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
-*.publish.xml
-
-# 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
-**/[Pp]ackages/*
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
-
-# Visual Studio cache files
-*.cache
-
-# 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
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio (NTVS)
-ntvs_analysis.dat
-
-# 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
-
-### OSX ###
-DS_Store
-AppleDouble
-LSOverride
-
-# Directories potentially created on remote AFP share
-AppleDB
-AppleDesktop
-Network Trash Folder
-Temporary Items
-apdisk
-
-### Windows ###
-Thumbs.db
-ehthumbs.db
-
-### Linux ###
-*~
-
-### Node ###
-node_modules/
-
-### JetBrains Rider ###
-idea/
-sln.iml
-
-### CodeRush ###
-cr/
-
-### Python Tools for Visual Studio (PTVS) ###
-__pycache__/
-*.pyc
-
-### Cake ###
-tools/**
-!tools/packages.config
-
-### Tabs Studio ###
-*.tss
-
-### Telerik's JustMock configuration file ###
-*.jmconfig
-
-### BizTalk build output ###
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*
\ No newline at end of file
diff --git a/.vs/ProjectEvaluation/wpfserialassistant.metadata.v9.bin b/.vs/ProjectEvaluation/wpfserialassistant.metadata.v9.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7a1de802597966689274f432040a58e8ebd6fb79
GIT binary patch
literal 1311
zcmYL|du&WW6vpTFYxNp$szRlRM~FlaL_#X0Djrqp-EOO0eR)@_9*e#xRxPbX)3m7f
zo3=_ML_`E75`Um2mPUf`7xgG+inB8}?q+|xXJ)?popWa98jQ(lJpWaPd!o{3y2K$=
z_k4K&Yl+X4(>arm0`cx>xwoU!XNoGkulv*3>|gpFz(g?$S;Iy(Yzbg;2C1WonH&cy
zLtXxPQG**7>K1)>HJHMKVV;-_rHF-Tk#;5w3x}13&ZDZq>D(QTZF5tLzrAarokj9IMIF7?+t)7dgv4be0rgstvR6_{*
zhSsSHWg;ytCXzUw#_DV`5r}d}I#r5fl6Qsgap7H6h!=eH5xo&kj&GkM)y~Oms`ne2
zFCnKCB9%zvD6ENBkI8h7Q&GKcDaQUYTOCJ$stm%JeBGgXM%=ADBSeC3cvFhSurYw-6I69J=^pc(JlxZ+!=d
z>Vw*0Ay~iq-p`higVS~>M`YNI7ph1%GSZ{9*>*(SvCO)_)u_7@tB@06brFe{JZr1+
z5!2nOVI4ZRRH@?-31DxF|4hoIY?;XGY569C-7E-Okwvp9cAIBWVf4vXHLOM1h;r?4
z0cnG*8qT5S+5jzxw;eX)d(?P+D^J>2=nVF~4AH*J|Bv8heO6#9pF=DCM{p
zVZFusXzb<85cD;go-y@lL%-`wzr^f5WS$nyb%aMl6;eX{iVm+~e*hsjz+{EQ(inb8BT;_3^Pf-E?Yy1PzC1eEv
literal 0
HcmV?d00001
diff --git a/.vs/ProjectEvaluation/wpfserialassistant.projects.v9.bin b/.vs/ProjectEvaluation/wpfserialassistant.projects.v9.bin
new file mode 100644
index 0000000000000000000000000000000000000000..35754afd2015eb326cf43f9c2b931a6b9fe18c18
GIT binary patch
literal 81998
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
b{?x=G;NR3CP6Y8lh`u|P-2+qpOzM9CR#m`2
literal 0
HcmV?d00001
diff --git a/.vs/ProjectEvaluation/wpfserialassistant.strings.v9.bin b/.vs/ProjectEvaluation/wpfserialassistant.strings.v9.bin
new file mode 100644
index 0000000000000000000000000000000000000000..800622d2d57a2d77ea7407810d074aceab24e058
GIT binary patch
literal 135924
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