Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
G
GC_Branch
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
周磊
GC_Branch
Commits
6ab7294e
Commit
6ab7294e
authored
Jul 26, 2018
by
wangjunqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复组分越界的bug
parent
2ad631d4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
480 additions
and
225 deletions
+480
-225
GCModbusSlave.cs
GcDevicePc/Common/GCModbusSlave.cs
+474
-218
DataState.cs
GcDevicePc/DataState.cs
+1
-1
GcDataTh.cs
GcDevicePc/ProThread/GcDataTh.cs
+0
-1
HMISearch.cs
GcDevicePc/ProThread/HMISearch.cs
+2
-2
Program.cs
GcDevicePc/Program.cs
+1
-1
RestartHmi.cs
GcDevicePc/RestartHmi.cs
+2
-2
No files found.
GcDevicePc/Common/GCModbusSlave.cs
View file @
6ab7294e
This diff is collapsed.
Click to expand it.
GcDevicePc/DataState.cs
View file @
6ab7294e
...
@@ -110,7 +110,7 @@ namespace GcDevicePc
...
@@ -110,7 +110,7 @@ namespace GcDevicePc
tempshow
.
Text
=
"运行时间/总时间"
;
tempshow
.
Text
=
"运行时间/总时间"
;
if
(
globaldata
.
MethodRun_Statue
==
4
||
globaldata
.
MethodRun_Statue
==
5
)
if
(
globaldata
.
MethodRun_Statue
==
4
||
globaldata
.
MethodRun_Statue
==
5
)
// tempshow.SubItems.Add((globaldata.RunTime_Now/60.0f).ToString("0.0") + "/" + (globaldata.RunTotal_Now/60.0f).ToString("0.0"));
// tempshow.SubItems.Add((globaldata.RunTime_Now/60.0f).ToString("0.0") + "/" + (globaldata.RunTotal_Now/60.0f).ToString("0.0"));
tempshow
.
SubItems
.
Add
((
globaldata
.
m_dpbuffer
.
ShowList
.
showtime
.
runtimenow
/
60.0f
).
ToString
(
"0.0
"
)
+
"/"
+
(
globaldata
.
m_dpbuffer
.
ShowList
.
showtime
.
alltime
/
60.0f
).
ToString
(
"0.
0"
));
tempshow
.
SubItems
.
Add
((
globaldata
.
m_dpbuffer
.
ShowList
.
showtime
.
runtimenow
/
60.0f
).
ToString
(
"0.0
0"
)
+
"/"
+
(
globaldata
.
m_dpbuffer
.
ShowList
.
showtime
.
alltime
/
60.0f
).
ToString
(
"0.0
0"
));
else
else
tempshow
.
SubItems
.
Add
(
"未运行"
);
tempshow
.
SubItems
.
Add
(
"未运行"
);
...
...
GcDevicePc/ProThread/GcDataTh.cs
View file @
6ab7294e
...
@@ -849,6 +849,5 @@ namespace GcDevicePc.ProThread
...
@@ -849,6 +849,5 @@ namespace GcDevicePc.ProThread
}
}
}
}
}
}
}
}
GcDevicePc/ProThread/HMISearch.cs
View file @
6ab7294e
...
@@ -106,8 +106,8 @@ namespace GcDevicePc.ProThread
...
@@ -106,8 +106,8 @@ namespace GcDevicePc.ProThread
try
try
{
{
client
=
new
UdpClient
(
new
IPEndPoint
(
IPAddress
.
Any
,
0
));
//
client = new UdpClient(new IPEndPoint(IPAddress.Any, 0));
//
client = new UdpClient(new IPEndPoint(IPAddress.Parse(this._localip), 0));
client
=
new
UdpClient
(
new
IPEndPoint
(
IPAddress
.
Parse
(
this
.
_localip
),
0
));
endpoint
=
new
IPEndPoint
(
IPAddress
.
Parse
(
"255.255.255.255"
),
233
);
endpoint
=
new
IPEndPoint
(
IPAddress
.
Parse
(
"255.255.255.255"
),
233
);
// endpoint = new IPEndPoint(IPAddress.Parse("192.168.10.230"), 233);
// endpoint = new IPEndPoint(IPAddress.Parse("192.168.10.230"), 233);
client
.
Send
(
sendBytes
,
sendBytes
.
Length
,
endpoint
);
client
.
Send
(
sendBytes
,
sendBytes
.
Length
,
endpoint
);
...
...
GcDevicePc/Program.cs
View file @
6ab7294e
...
@@ -13,7 +13,7 @@ namespace GcDevicePc
...
@@ -13,7 +13,7 @@ namespace GcDevicePc
Application
.
SetCompatibleTextRenderingDefault
(
false
);
Application
.
SetCompatibleTextRenderingDefault
(
false
);
bool
createNew
;
bool
createNew
;
// Application.Run(new DebugForm());
{
{
using
(
System
.
Threading
.
Mutex
mutex
=
new
System
.
Threading
.
Mutex
(
true
,
Application
.
ProductName
,
out
createNew
))
using
(
System
.
Threading
.
Mutex
mutex
=
new
System
.
Threading
.
Mutex
(
true
,
Application
.
ProductName
,
out
createNew
))
{
{
...
...
GcDevicePc/RestartHmi.cs
View file @
6ab7294e
...
@@ -21,9 +21,9 @@ namespace GcDevicePc
...
@@ -21,9 +21,9 @@ namespace GcDevicePc
{
{
int
ret
=
1
;
int
ret
=
1
;
FileServerClient
singlesend
=
new
FileServerClient
();
FileServerClient
singlesend
=
new
FileServerClient
();
singlesend
.
WtClientInit
(
"192.168.1
0.230
"
,
911
);
singlesend
.
WtClientInit
(
"192.168.1
.88
"
,
911
);
ret
=
singlesend
.
WtHMICloseRro
(
"WtMainProc"
);
ret
=
singlesend
.
WtHMICloseRro
(
"WtMainProc"
);
if
(
ret
==
1
)
//
if (ret == 1)
{
{
MessageBox
.
Show
(
"停止HMI成功!"
);
MessageBox
.
Show
(
"停止HMI成功!"
);
ret
=
singlesend
.
WtHMIRunPro
(
"GcDevice.exe"
,
globaldata
.
exeremoteFolder
);
ret
=
singlesend
.
WtHMIRunPro
(
"GcDevice.exe"
,
globaldata
.
exeremoteFolder
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment