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
dc10e44d
Commit
dc10e44d
authored
Jun 14, 2018
by
wangwanxh@sina.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wang_master' of
https://gitee.com/wangwanxh/Vocs
into wang_master
parents
d2bdff5d
bb1a29a3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
GCModbusSlave.cs
GcDevicePc/Common/GCModbusSlave.cs
+8
-3
StartForm.Designer.cs
GcDevicePc/StartForm.Designer.cs
+2
-0
No files found.
GcDevicePc/Common/GCModbusSlave.cs
View file @
dc10e44d
...
...
@@ -113,6 +113,11 @@ namespace GcDevicePc.Common
{
switch
(
address
)
{
case
3
:
{
value
=
SharedSpace
.
Data
.
change
==
true
?
(
ushort
)
1
:
(
ushort
)
0
;
}
break
;
case
4
:
{
value
=
globaldata
.
m_hmibuffer
.
gcinfo
.
HMIMac
[
0
];
...
...
GcDevicePc/StartForm.Designer.cs
View file @
dc10e44d
...
...
@@ -39,6 +39,7 @@
//
// bgpicture
//
this
.
bgpicture
.
BackColor
=
System
.
Drawing
.
Color
.
Black
;
this
.
bgpicture
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
bgpicture
.
Image
=
((
System
.
Drawing
.
Image
)(
resources
.
GetObject
(
"bgpicture.Image"
)));
this
.
bgpicture
.
ImageLocation
=
""
;
...
...
@@ -96,6 +97,7 @@
//
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
6F
,
12F
);
this
.
AutoScaleMode
=
System
.
Windows
.
Forms
.
AutoScaleMode
.
Font
;
this
.
BackColor
=
System
.
Drawing
.
Color
.
Black
;
this
.
ClientSize
=
new
System
.
Drawing
.
Size
(
479
,
403
);
this
.
Controls
.
Add
(
this
.
offlinebth
);
this
.
Controls
.
Add
(
this
.
label2
);
...
...
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