Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
f2b7eea5
Commit
f2b7eea5
authored
Jul 16, 2019
by
Marcus Nordenberg
Committed by
Claes Sjöfors
Mar 03, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Profinet: Subslot fix
parent
93795b97
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
7 deletions
+10
-7
profibus/lib/rt/src/rt_pn_iface.cpp
profibus/lib/rt/src/rt_pn_iface.cpp
+10
-7
No files found.
profibus/lib/rt/src/rt_pn_iface.cpp
View file @
f2b7eea5
...
@@ -445,13 +445,16 @@ void pack_download_req(T_PNAK_SERVICE_REQ_RES* ServiceReqRes,
...
@@ -445,13 +445,16 @@ void pack_download_req(T_PNAK_SERVICE_REQ_RES* ServiceReqRes,
break
;
break
;
}
}
// Ignore Interface subslots as they break the device configuration
// Third time's a charm, only subslots up to 0x7FFF are included in the AR
for
(
ii
=
0
;
ii
<
num_modules
;
ii
++
)
{
// according to an old picture i found :)
for
(
std
::
vector
<
GsdmlSubslotData
*>::
iterator
it
for
(
ii
=
0
;
ii
<
num_modules
;
ii
++
)
=
dev_data
->
slot_data
[
ii
]
->
subslot_data
.
begin
();
{
it
!=
dev_data
->
slot_data
[
ii
]
->
subslot_data
.
end
();)
{
for
(
std
::
vector
<
GsdmlSubslotData
*>::
iterator
it
=
// Don't add expectedsubmoduleblock if there's no IOCR
dev_data
->
slot_data
[
ii
]
->
subslot_data
.
begin
();
if
((
*
it
)
->
data_record
.
empty
()
&&
((
*
it
)
->
io_input_length
==
0
&&
(
*
it
)
->
io_output_length
==
0
))
{
it
!=
dev_data
->
slot_data
[
ii
]
->
subslot_data
.
end
();)
{
if
((
*
it
)
->
subslot_number
>
0x7FFF
)
{
delete
*
it
;
delete
*
it
;
it
=
dev_data
->
slot_data
[
ii
]
->
subslot_data
.
erase
(
it
);
it
=
dev_data
->
slot_data
[
ii
]
->
subslot_data
.
erase
(
it
);
}
}
...
...
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