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
b9faf8ae
Commit
b9faf8ae
authored
9 years ago
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into 5.4.0
parents
1ee04328
94c01676
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
78 additions
and
327 deletions
+78
-327
remote/exe/rs_remotehandler/src/rs_remotehandler.c
remote/exe/rs_remotehandler/src/rs_remotehandler.c
+1
-1
src/lib/co/src/co_ccm.c
src/lib/co/src/co_ccm.c
+1
-1
wb/exp/com/src/wb_create_iolist.pwr_com
wb/exp/com/src/wb_create_iolist.pwr_com
+74
-323
wb/lib/wb/src/wb_lfu.cpp
wb/lib/wb/src/wb_lfu.cpp
+2
-2
No files found.
remote/exe/rs_remotehandler/src/rs_remotehandler.c
View file @
b9faf8ae
...
...
@@ -194,7 +194,7 @@ static void AddTransports()
{
sts
=
gdh_ObjidToPointer
(
objid
,
&
objref
);
sprintf
(
tp
[
tpcount
].
path
,
"rs_remote_qcom"
);
tp
[
tpcount
].
id
=
((
pwr_sClass_RemnodeQCom
*
)
objref
)
->
My
Queue
;
tp
[
tpcount
].
id
=
((
pwr_sClass_RemnodeQCom
*
)
objref
)
->
Receive
Queue
;
tp
[
tpcount
].
disable
=
&
((
pwr_sClass_RemnodeQCom
*
)
objref
)
->
Disable
;
tp
[
tpcount
].
restart_limit
=
&
((
pwr_sClass_RemnodeQCom
*
)
objref
)
->
RestartLimit
;
tp
[
tpcount
].
restarts
=
&
((
pwr_sClass_RemnodeQCom
*
)
objref
)
->
RestartCount
;
...
...
This diff is collapsed.
Click to expand it.
src/lib/co/src/co_ccm.c
View file @
b9faf8ae
...
...
@@ -611,7 +611,7 @@ int ccm_varname_parse(
}
sscanf
(
elementstr
,
"%d"
,
element
);
*
s
=
'\0'
;
if
(
(
*
element
<
0
)
||
(
*
element
>
1
000
)
)
if
(
(
*
element
<
0
)
||
(
*
element
>
5
000
)
)
{
return
0
;
}
...
...
This diff is collapsed.
Click to expand it.
wb/exp/com/src/wb_create_iolist.pwr_com
View file @
b9faf8ae
This diff is collapsed.
Click to expand it.
wb/lib/wb/src/wb_lfu.cpp
View file @
b9faf8ae
...
...
@@ -2371,7 +2371,7 @@ pwr_tStatus lfu_SaveDirectoryVolume(
nodename_ptr
,
nodename_ptr
);
if
(
*
components_ptr
&
pwr_mDistrComponentMask_ApplFile
)
fprintf
(
file
,
"appl %s W "
pwr_cNameAppl
" $pwrp_load/
\n
"
,
nodename_ptr
,
"$pwrp_
cnf
/"
,
nodename_ptr
,
*
bus_number_ptr
);
nodename_ptr
,
"$pwrp_
load
/"
,
nodename_ptr
,
*
bus_number_ptr
);
if
(
*
components_ptr
&
pwr_mDistrComponentMask_PwrpAliasFile
)
fprintf
(
file
,
"appl %s W $pwrp_load/pwrp_alias.dat $pwrp_load/pwrp_alias.dat
\n
"
,
nodename_ptr
);
...
...
@@ -2382,7 +2382,7 @@ pwr_tStatus lfu_SaveDirectoryVolume(
if
(
*
components_ptr
&
pwr_mDistrComponentMask_XMLFiles
)
fprintf
(
file
,
"appl %s W $pwrp_load/*.xml
\n
"
,
nodename_ptr
);
if
(
*
components_ptr
&
pwr_mDistrComponentMask_XttHelpFile
)
{
fprintf
(
file
,
"appl %s W $pwrp_
cnf/%s/xtt_help.dat:$pwrp_cnf
/xtt_help.dat $pwrp_load/xtt_help.dat
\n
"
,
fprintf
(
file
,
"appl %s W $pwrp_
load/%s/xtt_help.dat:$pwrp_load
/xtt_help.dat $pwrp_load/xtt_help.dat
\n
"
,
nodename_ptr
,
nodename_ptr
);
}
if
(
*
components_ptr
&
pwr_mDistrComponentMask_XttResourceFile
)
{
...
...
This diff is collapsed.
Click to expand 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