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
74725c52
Commit
74725c52
authored
Aug 09, 2021
by
frank
🏀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完整地修改了会显示25000的问题
修改了会在单窗口显示的时间轴错乱的bug
parent
2f538301
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
6 deletions
+36
-6
AboutForm.cs
GcDevicePc/AboutForm.cs
+1
-1
MoudbusOperation.cs
GcDevicePc/Common/MoudbusOperation.cs
+1
-1
MDIBase.cs
GcDevicePc/MDIBase.cs
+1
-1
ChannelDataTh.cs
GcDevicePc/ProThread/ChannelDataTh.cs
+8
-0
GcDataTh.cs
GcDevicePc/ProThread/GcDataTh.cs
+25
-3
No files found.
GcDevicePc/AboutForm.cs
View file @
74725c52
...
...
@@ -42,7 +42,7 @@ namespace GcDevicePc
this
.
fid1ver
.
Text
=
this
.
FID1version
;
this
.
fid2ver
.
Text
=
this
.
FID2version
;
this
.
tcdver
.
Text
=
this
.
TCD1version
;
this
.
PCver
.
Text
=
this
.
Hmiversion
+
"/1.7.
5
"
;
this
.
PCver
.
Text
=
this
.
Hmiversion
+
"/1.7.
6
"
;
}
}
}
GcDevicePc/Common/MoudbusOperation.cs
View file @
74725c52
...
...
@@ -318,7 +318,7 @@ namespace GcDevicePc.Common
private
bool
bFirstMaxTim1
=
true
;
public
void
Get_Channel_Data
()
{
UInt16
[]
dest
=
new
UInt16
[
channel_num
];
UInt16
[]
dest
=
new
UInt16
[
channel_num
*
2
];
UInt32
[]
timev
=
new
UInt32
[
30
];
float
[]
fidv
=
new
float
[
30
];
...
...
GcDevicePc/MDIBase.cs
View file @
74725c52
...
...
@@ -842,7 +842,7 @@ namespace GcDevicePc
/// 1.0.2.3 添加了周期完成后,重新绘图功能
private
void
timer1_Tick
(
object
sender
,
EventArgs
e
)
{
this
.
Text
=
String
.
Format
(
"{0}-1.7.
5
{1}"
,
globaldata
.
AppName
,
Formstr
);
this
.
Text
=
String
.
Format
(
"{0}-1.7.
6
{1}"
,
globaldata
.
AppName
,
Formstr
);
HmiStatus
.
Text
=
bEnglishLanguage
==
false
?
String
.
Format
(
"状态:{0}"
,
statestr
)
:
String
.
Format
(
"State:{0}"
,
statestr
);
...
...
GcDevicePc/ProThread/ChannelDataTh.cs
View file @
74725c52
...
...
@@ -95,8 +95,16 @@ namespace GcDevicePc.ProThread
{
while
(!
channeldata_mre
.
WaitOne
(
500
))
{
try
{
ReadChannelData
();
}
catch
(
Exception
ex
)
{
Log
.
Info
(
"ReadChannelData线程 重启"
);
}
}
}
private
void
ReadChannelData
()
...
...
GcDevicePc/ProThread/GcDataTh.cs
View file @
74725c52
...
...
@@ -248,14 +248,30 @@ namespace GcDevicePc.ProThread
#endif
//j++;
//Get_Channel1_ValueNum++;
lock
(
globaldata
.
m_signalbuffer
.
Draw_Port
)
{
if
(
globaldata
.
m_signalbuffer
.
Draw_Port
.
Count
<
globaldata
.
MAX_ARRAY_LEN
)
{
globaldata
.
m_signalbuffer
.
Draw_Port
.
Add
(
globaldata
.
m_signalbuffer
.
Channel1_Port
);
}
if
(
globaldata
.
m_signalbuffer
.
Save_Port
.
Count
<
globaldata
.
MAX_ARRAY_LEN
)
{
else
{
globaldata
.
m_signalbuffer
.
Draw_Port
.
Clear
();
}
}
lock
(
globaldata
.
m_signalbuffer
.
Save_Port
)
{
if
(
globaldata
.
m_signalbuffer
.
Save_Port
.
Count
<
globaldata
.
MAX_ARRAY_LEN
)
{
globaldata
.
m_signalbuffer
.
Save_Port
.
Add
(
globaldata
.
m_signalbuffer
.
Channel1_Port
);
}
else
{
globaldata
.
m_signalbuffer
.
Save_Port
.
Clear
();
}
}
if
(
globaldata
.
m_pcbuffer
.
gcpcinfo
.
pcworkinfo
.
sendtohw
)
{
...
...
@@ -292,7 +308,13 @@ namespace GcDevicePc.ProThread
}
}
}
else
{
if
(
Math
.
Abs
(
tmp
-
fDetMax_Time
)
<
0x00FFFFFF
)
{
bFirstMaxTim1
=
true
;
}
}
}
}
}
...
...
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