Browse Source

新增了波形发生功能

l2736 2 weeks ago
parent
commit
817c2ba7ec

+ 1 - 1
.gitignore

@@ -13,7 +13,7 @@ x86/
 bld/
 [Bb]in/
 [Oo]bj/
-[Ll]og/
+
 
 Prerequisites/
 Setup Files/

+ 22 - 0
Client/IViewModel/ViewModels/Log/LogItemViewModel.cs

@@ -0,0 +1,22 @@
+using IViewModel.Models;
+using System;
+
+namespace IViewModel.ViewModels
+{
+    public class LogItemViewModel:ViewModelBase<LogItemModel>
+    {
+        public LogItemViewModel(string message, LogType logType= LogType.Info)
+        {
+            UpDateModel(new LogItemModel()
+            {
+                DateTime = DateTime.Now,
+                Message = message,
+                LogType = logType
+            });
+        }
+
+        public DateTime DateTime => Model.DateTime;
+        public string Message => Model.Message;
+        public LogType LogType => Model.LogType;
+    }
+}

+ 38 - 0
Client/IViewModel/ViewModels/Log/LogViewModel.cs

@@ -0,0 +1,38 @@
+using Avalonia.Collections;
+using IViewModel.Models;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IViewModel.ViewModels
+{
+    internal class LogViewModel:DisplayViewModelBase<IModel.IModel>
+    {
+        public AvaloniaList<IndexValueItemViewModel<LogItemViewModel>> Logs { get; } = new AvaloniaList<IndexValueItemViewModel<LogItemViewModel>>();
+        private LogViewModel()
+        {
+            ButtonVisibily = false;
+            GetEvent<Models.LogItemModel>().Subscrip((sender, args) =>
+            {
+                Tools.DispatherInovke.Inovke(() => Logs.Add(new IndexValueItemViewModel<LogItemViewModel>(Logs.Count + 1, new LogItemViewModel(args.Data.Message, args.Data.LogType))));
+            });
+            GetEvent(nameof(Models.LogItemModel)).Subscrip((sender, args) =>
+            {
+                if(args.Data.Length >=2 && args.Data[0] is string msg && args.Data[1] is LogType type)
+                {
+                    AddLog(msg, type);
+                }
+            });
+        }
+        static LogViewModel()
+        {
+
+        }
+        public void AddLog(string msg,LogType logType = LogType.Info)
+        {
+            Tools.DispatherInovke.Inovke(() => Logs.Add(new IndexValueItemViewModel<LogItemViewModel>(Logs.Count + 1, new LogItemViewModel(msg, logType))));
+        }
+        public static LogViewModel Instance { get; } = new LogViewModel();
+    }
+}

BIN
Fpga/FPGA/Fpga_Main.vi


BIN
Fpga/FPGA/伺服控制/DropTable.vi


BIN
Fpga/FPGA/伺服控制/SignalGen.vi


BIN
Fpga/FPGA/伺服控制/ZeroChange.vi


BIN
Fpga/FPGA/伺服控制/三角波生成.vi


BIN
Fpga/FPGA/伺服控制/信号发生数据初始化.vi


BIN
Fpga/FPGA/伺服控制/方波生成.vi


BIN
Fpga/FPGA/自由度/求八缸位移.vi


BIN
Fpga/FPGA/通道定义/加速度通道定义.vi


BIN
Fpga/FPGA/通道定义/外部输入通道定义.vi


+ 1 - 1
Fpga/fpga.aliases

@@ -2,4 +2,4 @@
 RT CompactRIO终端 = "0.0.0.0"
 
 [我的电脑]
-我的电脑 = "172.30.128.1"
+我的电脑 = "172.23.16.1"

+ 1 - 1
Fpga/fpga.lvlps

@@ -1,2 +1,2 @@
 [ÏîÄ¿´°¿ÚÊý¾Ý(_D)]
-ProjectExplorer.ClassicPosition[String] = "170,1497,961,1975"
+ProjectExplorer.ClassicPosition[String] = "468,1204,1259,1682"

File diff suppressed because it is too large
+ 1 - 0
Fpga/fpga.lvproj


BIN
Fpga/三角波.vi


File diff suppressed because it is too large
+ 6947 - 10247
Service/ShakerService/Shaker.lvbitx


Some files were not shown because too many files changed in this diff