Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

ViewModel/MainWindowViewModel.cs

@@ -123,7 +123,8 @@ namespace DyeingComputer.ViewModel
             lk++;
         }
 
-        public SerialPort port = new SerialPort();//创建串口
+        public static SerialPort port = new SerialPort();//创建串口
+
         void UPort()
         {
             try
@@ -140,19 +141,17 @@ namespace DyeingComputer.ViewModel
                 LogGing.LogGingDATA("800_SerialPort_Not");
                 LogGing.LogGingDATA(e.Message);
             }
+            ModbusFactory factory = new ModbusFactory();
 
           
+            IModbusMaster master = factory.CreateRtuMaster(port);
            
-            // var factory = new ModbusFactory();
-             //  IModbusMaster master = factory.CreateRtuMaster(port);
-            // IModbusSerialMaster master = ModbusSerialMaster.CreateRtu(port);
-            byte slaveId = 1;
-            ushort startAddress = 100;
-            ushort[] registers = new ushort[] { 1, 2, 3 };
+           // byte slaveId = 1;
+          //  ushort startAddress = 1;
+         //   ushort[] registers = new ushort[] { 1, 2, 3 };
 
             // write three registers
-
-            var master = ModbusRtuMaster.CreateSerial("COM1", 9600, Parity.None, 8, StopBits.One);
+          //  master.WriteMultipleRegisters(slaveId, startAddress, registers);
         }
 
 
@@ -172,8 +171,10 @@ namespace DyeingComputer.ViewModel
             SQLiteHelpers.Close();
         }
 
-    void IO_data()//刷新
+        void IO_data()//刷新
         {
+
+
             updata_dtm("1001", lk);
             updata_dtd("2001", Convert.ToBoolean(1));
             updata_dta("4001",10000+lk);