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
83a094cb
Commit
83a094cb
authored
Aug 15, 2018
by
wangjunqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复柱箱默认保护温度
parent
c4156cc6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
GCModbusSlave.cs
GcDevicePc/Common/GCModbusSlave.cs
+1
-1
RealColTab.cs
GcDevicePc/ConfigMethod/RealColTab.cs
+3
-1
No files found.
GcDevicePc/Common/GCModbusSlave.cs
View file @
83a094cb
...
...
@@ -142,7 +142,7 @@ namespace GcDevicePc.Common
{
case
1
:
//进度
{
if
((
ushort
)
SharedSpace
.
Data
.
typesint
==
2
||
(
ushort
)
SharedSpace
.
Data
.
typesint
==
3
)
if
((
ushort
)
SharedSpace
.
Data
.
typesint
==
1
||
(
ushort
)
SharedSpace
.
Data
.
typesint
==
2
)
{
value
=
(
ushort
)((
globaldata
.
m_hmibuffer
.
gcinfo
.
batruncount
*
1.0f
)/
(
ushort
)(
SharedSpace
.
MControl
.
dateend
/
SharedSpace
.
MControl
.
zhouqi
)*
1000
);
...
...
GcDevicePc/ConfigMethod/RealColTab.cs
View file @
83a094cb
...
...
@@ -62,7 +62,9 @@ namespace GcDevicePc.ConfigMethod
int
ProNum
=
this
.
methodconfig
.
col
.
u16ColProNum
;
OSetTemp
.
Text
=
this
.
methodconfig
.
col
.
fColTempSet
.
ToString
();
OActTemp
.
Text
=
this
.
methodconfig
.
col
.
fColTempActual
.
ToString
();
OMAXTemp
.
Text
=
this
.
methodconfig
.
col
.
fHigestTemp
.
ToString
();
OMAXTemp
.
Text
=
(
this
.
methodconfig
.
col
.
fHigestTemp
==
0.0f
)
?
this
.
hwconfig
.
hwconfiginfo
.
u16ColPTemp
.
ToString
()
:
this
.
methodconfig
.
col
.
fHigestTemp
.
ToString
();
OBalTime
.
Text
=
this
.
methodconfig
.
col
.
fBalanceTime
.
ToString
();
tb
后运行温度
.
Text
=
this
.
methodconfig
.
col
.
fBehindRunTemp
.
ToString
();
tb
后运行时间
.
Text
=
this
.
methodconfig
.
col
.
fBehindRunTime
.
ToString
();
...
...
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