Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
etherlabmaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ICS Control System Infrastructure
etherlabmaster
Commits
47603961
Commit
47603961
authored
14 years ago
by
Florian Pose
Browse files
Options
Downloads
Patches
Plain Diff
Fixed frame statistics overflow (to be verified).
parent
7548b62f
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
TODO
+0
-1
0 additions, 1 deletion
TODO
master/device.c
+1
-1
1 addition, 1 deletion
master/device.c
tool/CommandMaster.cpp
+1
-1
1 addition, 1 deletion
tool/CommandMaster.cpp
with
2 additions
and
3 deletions
TODO
+
0
−
1
View file @
47603961
...
...
@@ -21,7 +21,6 @@ Version 1.5.0:
- Implement ranges for slaves and domains.
* Fix casting away constness during expected WC calculation.
* Include SoE drive_no in ethercat tool.
* Fix frame statistics overflow.
Future issues:
...
...
This diff is collapsed.
Click to expand it.
master/device.c
+
1
−
1
View file @
47603961
...
...
@@ -315,7 +315,7 @@ void ec_device_send(
u32
tx_frame_rate
=
(
u32
)
(
device
->
tx_count
-
device
->
last_tx_count
)
*
1000
;
u32
tx_byte_rate
=
(
device
->
tx_bytes
-
device
->
last_tx_bytes
)
*
1000
;
(
device
->
tx_bytes
-
device
->
last_tx_bytes
);
u64
loss
=
device
->
tx_count
-
device
->
rx_count
;
s32
loss_rate
=
(
s32
)
(
loss
-
device
->
last_loss
)
*
1000
;
for
(
i
=
0
;
i
<
EC_RATE_COUNT
;
i
++
)
{
...
...
This diff is collapsed.
Click to expand it.
tool/CommandMaster.cpp
+
1
−
1
View file @
47603961
...
...
@@ -160,7 +160,7 @@ void CommandMaster::execute(const StringVector &args)
<<
setprecision
(
1
)
<<
fixed
;
for
(
j
=
0
;
j
<
EC_RATE_COUNT
;
j
++
)
{
cout
<<
setw
(
5
)
<<
data
.
devices
[
i
].
tx_byte_rates
[
j
]
/
1024
000
.0
;
<<
data
.
devices
[
i
].
tx_byte_rates
[
j
]
/
1024.0
;
if
(
j
<
EC_RATE_COUNT
-
1
)
{
cout
<<
" "
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment