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
bfef60d9
Commit
bfef60d9
authored
Mar 06, 2018
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GetDataRefp, pointer stored in object
parent
674fb529
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
10 deletions
+13
-10
src/lib/rt/src/rt_plc_macro_div.h
src/lib/rt/src/rt_plc_macro_div.h
+6
-0
src/wbl/pwrb/src/pwrb_c_getdatarefp.wb_load
src/wbl/pwrb/src/pwrb_c_getdatarefp.wb_load
+5
-9
wb/lib/wb/src/wb_gcg.cpp
wb/lib/wb/src/wb_gcg.cpp
+2
-1
No files found.
src/lib/rt/src/rt_plc_macro_div.h
View file @
bfef60d9
...
@@ -195,6 +195,12 @@
...
@@ -195,6 +195,12 @@
#define GetDatap_exec(object, in)\
#define GetDatap_exec(object, in)\
memcpy( &object->Out, &in, 12);
memcpy( &object->Out, &in, 12);
/*_*
@aref getdatarefp GetDataRefp
*/
#define GetDataRefp_exec(object, in)\
memcpy( &object->ActVal, &in, sizeof(object->ActVal));
/*_*
/*_*
@aref getdatainput GetDatainput
@aref getdatainput GetDatainput
*/
*/
...
...
src/wbl/pwrb/src/pwrb_c_getdatarefp.wb_load
View file @
bfef60d9
...
@@ -49,18 +49,16 @@ SObject pwrb:Class
...
@@ -49,18 +49,16 @@ SObject pwrb:Class
!
!
! The complete name of quantity has to be supplied.
! The complete name of quantity has to be supplied.
!
!
! The GetDataRefp object
! - is a pure address reference,
! - contains no relevant information (=data) in rtdb,
! - is without executable code.
!*/
!*/
Object GetDataRefp $ClassDef 622
Object GetDataRefp $ClassDef 622
Body SysBody
Body SysBody
Attr Editor = pwr_eEditor_AttrEd
Attr Editor = pwr_eEditor_AttrEd
Attr Method = pwr_eMethod_RtAndDevBodies
Attr Method = pwr_eMethod_RtAndDevBodies
Attr Flags = pwr_mClassDef_DevOnly
EndBody
EndBody
Object RtBody $ObjBodyDef 1
Object RtBody $ObjBodyDef 1
Body SysBody
Attr StructName = "GetDataRefp"
EndBody
!/**
!/**
! Used by the PLC Editor.
! Used by the PLC Editor.
!*/
!*/
...
@@ -68,9 +66,7 @@ SObject pwrb:Class
...
@@ -68,9 +66,7 @@ SObject pwrb:Class
Body SysBody
Body SysBody
Attr PgmName = "ActVal"
Attr PgmName = "ActVal"
Attr Flags |= PWR_MASK_STATE
Attr Flags |= PWR_MASK_STATE
Attr Flags |= PWR_MASK_RTVIRTUAL
Attr Flags |= PWR_MASK_NOEDIT
Attr Flags |= PWR_MASK_DEVBODYREF
Attr Flags |= PWR_MASK_INVISIBLE
Attr TypeRef = "pwrs:Type-$DataRef"
Attr TypeRef = "pwrs:Type-$DataRef"
Attr GraphName = "VAL"
Attr GraphName = "VAL"
EndBody
EndBody
...
@@ -124,7 +120,7 @@ SObject pwrb:Class
...
@@ -124,7 +120,7 @@ SObject pwrb:Class
Attr default_mask[1] = 1
Attr default_mask[1] = 1
Attr segname_annotation = 0
Attr segname_annotation = 0
Attr devbody_annotation = 1
Attr devbody_annotation = 1
Attr compmethod =
10
Attr compmethod =
36
Attr compindex = 0
Attr compindex = 0
Attr tracemethod = 0
Attr tracemethod = 0
Attr traceindex = 0
Attr traceindex = 0
...
...
wb/lib/wb/src/wb_gcg.cpp
View file @
bfef60d9
...
@@ -11014,7 +11014,8 @@ int gcg_comp_m36( gcg_ctx gcgctx, vldh_t_node node)
...
@@ -11014,7 +11014,8 @@ int gcg_comp_m36( gcg_ctx gcgctx, vldh_t_node node)
}
}
if
(
info
.
type
==
pwr_eType_DataRef
||
info
.
flags
&
PWR_MASK_POINTER
)
{
if
(
info
.
type
==
pwr_eType_DataRef
||
info
.
flags
&
PWR_MASK_POINTER
)
{
if
(
node
->
ln
.
cid
!=
pwr_cClass_GetDatap
)
{
if
(
!
(
node
->
ln
.
cid
==
pwr_cClass_GetDatap
||
node
->
ln
.
cid
==
pwr_cClass_GetDataRefp
))
{
gcg_error_msg
(
gcgctx
,
GSX__REFPARTYPE
,
node
);
gcg_error_msg
(
gcgctx
,
GSX__REFPARTYPE
,
node
);
return
GSX__NEXTNODE
;
return
GSX__NEXTNODE
;
}
}
...
...
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