Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Thick-Common
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
潘栩锋
Thick-Common
Commits
f230d817
Commit
f230d817
authored
Apr 07, 2021
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 flyad7 的 timegrid 里面的时间为最后一个数据的时间。与AD盒逻辑一致
parent
c4205399
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
FLYAD7.cs
Project.FLY.FlyADBase/FLY.Simulation.Flyad7/FLYAD7.cs
+2
-0
FlyAD7.cs
Project.FLY.FlyADBase/FlyADBase/FlyAD7.cs
+8
-5
No files found.
Project.FLY.FlyADBase/FLY.Simulation.Flyad7/FLYAD7.cs
View file @
f230d817
...
@@ -913,6 +913,8 @@ namespace FLY.Simulation.Flyad7
...
@@ -913,6 +913,8 @@ namespace FLY.Simulation.Flyad7
}
}
}
}
public
int
HardwareVersion
{
get
;
set
;
}
=
2
;
struct
SyncPos2Item
struct
SyncPos2Item
{
{
public
bool
At01
;
//? or At10
public
bool
At01
;
//? or At10
...
...
Project.FLY.FlyADBase/FlyADBase/FlyAD7.cs
View file @
f230d817
...
@@ -376,6 +376,8 @@ namespace FlyADBase
...
@@ -376,6 +376,8 @@ namespace FlyADBase
calSpeed
.
Reset
();
calSpeed
.
Reset
();
Init2
();
Init2
();
lastTimeGridTime
=
DateTime
.
MinValue
;
}
}
#
region
FObj
#
region
FObj
...
@@ -801,15 +803,16 @@ namespace FlyADBase
...
@@ -801,15 +803,16 @@ namespace FlyADBase
data
=
pack
.
data
;
data
=
pack
.
data
;
advPushTimeGrid
(
dt
,
data
);
advPushTimeGrid
(
dt
,
data
);
double
ts_ms
=
1.28
;
TimeSpan
ts
=
TimeSpan
.
FromTicks
((
long
)(
1.28
*
TimeSpan
.
TicksPerMillisecond
));
//long ticks = (long)((ts_ms * data.Length) * TimeSpan.TicksPerMillisecond);
if
(
lastTimeGridTime
!=
DateTime
.
MinValue
)
//dt -= TimeSpan.FromTicks(ticks);
ts
=
TimeSpan
.
FromTicks
((
dt
-
lastTimeGridTime
).
Ticks
/
data
.
Length
);
lastTimeGridTime
=
dt
;
TimeGridEvent
?.
Invoke
(
TimeGridEvent
?.
Invoke
(
this
,
this
,
new
TimeGridEventArgs
(
new
TimeGridEventArgs
(
dt
,
dt
,
TimeSpan
.
FromTicks
((
long
)(
ts_ms
*
TimeSpan
.
TicksPerMillisecond
))
,
ts
,
data
));
data
));
}
}
break
;
break
;
...
@@ -1343,7 +1346,7 @@ namespace FlyADBase
...
@@ -1343,7 +1346,7 @@ namespace FlyADBase
/// ad值不会被机架修正
/// ad值不会被机架修正
/// </summary>
/// </summary>
public
event
TimeGridEventHandler
TimeGridEvent
;
public
event
TimeGridEventHandler
TimeGridEvent
;
DateTime
lastTimeGridTime
;
/// <summary>
/// <summary>
...
...
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