Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement
This commit is contained in:
commit
60baf3554a
2 files changed
+12
No files matched your search
@@ -236,6 +236,14 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
|
|||||||
}
|
}
|
||||||
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
|
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
|
||||||
}//系统设置表
|
}//系统设置表
|
||||||
|
else if (SYSAPI == "SC859")
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
|
||||||
|
}//信息
|
||||||
else if (SYSAPI == "SC910")
|
else if (SYSAPI == "SC910")
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -263,6 +271,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
|
|||||||
};
|
};
|
||||||
await portclient.SetupAsync(new TouchSocketConfig()
|
await portclient.SetupAsync(new TouchSocketConfig()
|
||||||
.SetMaxBufferSize(1024 * 1024 * 100)
|
.SetMaxBufferSize(1024 * 1024 * 100)
|
||||||
|
.SetMinBufferSize(1024 * 1024 * 10)
|
||||||
.SetSerialPortOption(new SerialPortOption()
|
.SetSerialPortOption(new SerialPortOption()
|
||||||
{
|
{
|
||||||
BaudRate = BAUD,//波特率
|
BaudRate = BAUD,//波特率
|
||||||
|
|||||||
@@ -158,6 +158,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{//串口
|
{//串口
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -254,6 +255,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{//串口
|
{//串口
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SysSet_view = true;
|
SysSet_view = true;
|
||||||
@@ -283,6 +285,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{//串口
|
{//串口
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ParameterSet_view = true;
|
ParameterSet_view = true;
|
||||||
|
|||||||
Reference in new issue
Block a user