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
7096ed03
Commit
7096ed03
authored
Apr 11, 2018
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Script functions class prefix added
parent
ad93213b
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
312 additions
and
195 deletions
+312
-195
src/lib/co/src/co_ccm.c
src/lib/co/src/co_ccm.c
+70
-44
src/lib/co/src/co_ccm.h
src/lib/co/src/co_ccm.h
+3
-1
src/lib/rt/src/rt_rtt_command.c
src/lib/rt/src/rt_rtt_command.c
+18
-18
wb/lib/wb/src/wb_wccm.cpp
wb/lib/wb/src/wb_wccm.cpp
+39
-39
wb/lib/wb/src/wb_wnav_command.cpp
wb/lib/wb/src/wb_wnav_command.cpp
+18
-18
xtt/lib/ge/src/ge_graph_command.cpp
xtt/lib/ge/src/ge_graph_command.cpp
+140
-51
xtt/lib/xtt/src/xtt_logging.cpp
xtt/lib/xtt/src/xtt_logging.cpp
+3
-3
xtt/lib/xtt/src/xtt_xnav_command.cpp
xtt/lib/xtt/src/xtt_xnav_command.cpp
+21
-21
No files found.
src/lib/co/src/co_ccm.c
View file @
7096ed03
...
...
@@ -272,36 +272,36 @@ static int ccm_func_even( void *filectx, ccm_sArg *arg_list, int arg_count, int
#define CCM_SYSFUNC_MAX 200
static
ccm_sSysFunc
ccm_sysfunc
[
CCM_SYSFUNC_MAX
]
=
{
{
"printf"
,
&
ccm_func_printf
},
{
"scanf"
,
&
ccm_func_scanf
},
{
"ask"
,
&
ccm_func_ask
},
{
"say"
,
&
ccm_func_say
},
{
"fprintf"
,
&
ccm_func_fprintf
},
{
"sprintf"
,
&
ccm_func_sprintf
},
{
"fgets"
,
&
ccm_func_fgets
},
{
"fclose"
,
&
ccm_func_fclose
},
{
"fopen"
,
&
ccm_func_fopen
},
{
"exit"
,
&
ccm_func_exit
},
{
"element"
,
&
ccm_func_element
},
{
"felement"
,
&
ccm_func_felement
},
{
"extract"
,
&
ccm_func_extract
},
{
"edit"
,
&
ccm_func_edit
},
{
"verify"
,
&
ccm_func_verify
},
{
"time"
,
&
ccm_func_time
},
{
"system"
,
&
ccm_func_system
},
{
"strlen"
,
&
ccm_func_strlen
},
{
"strchr"
,
&
ccm_func_strchr
},
{
"strrchr"
,
&
ccm_func_strrchr
},
{
"strstr"
,
&
ccm_func_strstr
},
{
"toupper"
,
&
ccm_func_toupper
},
{
"tolower"
,
&
ccm_func_tolower
},
{
"translate_filename"
,
&
ccm_func_translate_filename
},
{
"get_pwr_config"
,
&
ccm_func_get_pwr_config
},
{
"get_node_name"
,
&
ccm_func_get_node_name
},
{
"get_language"
,
&
ccm_func_get_language
},
{
"ODD"
,
&
ccm_func_odd
},
{
"EVEN"
,
&
ccm_func_even
},
{
""
,
0
}};
{
"std"
,
"printf"
,
&
ccm_func_printf
},
{
"std"
,
"scanf"
,
&
ccm_func_scanf
},
{
"std"
,
"ask"
,
&
ccm_func_ask
},
{
"std"
,
"say"
,
&
ccm_func_say
},
{
"std"
,
"fprintf"
,
&
ccm_func_fprintf
},
{
"std"
,
"sprintf"
,
&
ccm_func_sprintf
},
{
"std"
,
"fgets"
,
&
ccm_func_fgets
},
{
"std"
,
"fclose"
,
&
ccm_func_fclose
},
{
"std"
,
"fopen"
,
&
ccm_func_fopen
},
{
"std"
,
"exit"
,
&
ccm_func_exit
},
{
"std"
,
"element"
,
&
ccm_func_element
},
{
"std"
,
"felement"
,
&
ccm_func_felement
},
{
"std"
,
"extract"
,
&
ccm_func_extract
},
{
"std"
,
"edit"
,
&
ccm_func_edit
},
{
"std"
,
"verify"
,
&
ccm_func_verify
},
{
"std"
,
"time"
,
&
ccm_func_time
},
{
"std"
,
"system"
,
&
ccm_func_system
},
{
"std"
,
"strlen"
,
&
ccm_func_strlen
},
{
"std"
,
"strchr"
,
&
ccm_func_strchr
},
{
"std"
,
"strrchr"
,
&
ccm_func_strrchr
},
{
"std"
,
"strstr"
,
&
ccm_func_strstr
},
{
"std"
,
"toupper"
,
&
ccm_func_toupper
},
{
"std"
,
"tolower"
,
&
ccm_func_tolower
},
{
"std"
,
"translate_filename"
,
&
ccm_func_translate_filename
},
{
"std"
,
"get_pwr_config"
,
&
ccm_func_get_pwr_config
},
{
"std"
,
"get_node_name"
,
&
ccm_func_get_node_name
},
{
"std"
,
"get_language"
,
&
ccm_func_get_language
},
{
"std"
,
"ODD"
,
&
ccm_func_odd
},
{
"std"
,
"EVEN"
,
&
ccm_func_even
},
{
""
,
""
,
0
}};
/************* TEST *********************/
...
...
@@ -613,9 +613,10 @@ int ccm_varname_parse(
}
int
ccm_register_function
(
const
char
*
name
,
int
(
*
sysfunc
)
(
void
*
,
ccm_sArg
*
,
int
,
int
*
,
ccm_tFloat
*
,
ccm_tInt
*
,
char
*
)
const
char
*
classname
,
const
char
*
name
,
int
(
*
sysfunc
)
(
void
*
,
ccm_sArg
*
,
int
,
int
*
,
ccm_tFloat
*
,
ccm_tInt
*
,
char
*
)
)
{
ccm_sSysFunc
*
sysfunc_p
;
...
...
@@ -623,7 +624,8 @@ int ccm_register_function(
i
=
0
;
for
(
sysfunc_p
=
ccm_sysfunc
;
sysfunc_p
->
sysfunc
;
sysfunc_p
++
)
{
if
(
strcmp
(
sysfunc_p
->
name
,
name
)
==
0
)
if
(
strcmp
(
sysfunc_p
->
classname
,
classname
)
==
0
&&
strcmp
(
sysfunc_p
->
name
,
name
)
==
0
)
return
CCM__ALREADYREG
;
i
++
;
}
...
...
@@ -631,6 +633,7 @@ int ccm_register_function(
if
(
i
>=
CCM_SYSFUNC_MAX
-
1
)
return
CCM__SYSFUNCEXCEED
;
strcpy
(
sysfunc_p
->
classname
,
classname
);
strcpy
(
sysfunc_p
->
name
,
name
);
sysfunc_p
->
sysfunc
=
sysfunc
;
...
...
@@ -5229,17 +5232,40 @@ static int ccm_function_exec(
}
else
{
int
fclass_found
=
0
;
char
fclass
[
20
];
char
fname
[
80
];
char
*
s
;
int
len
;
if
(
(
s
=
strstr
(
name
,
"::"
)))
{
len
=
(
int
)(
s
-
name
);
strncpy
(
fclass
,
name
,
len
);
fclass
[
len
]
=
0
;
strncpy
(
fname
,
s
+
2
,
sizeof
(
fname
));
fclass_found
=
1
;
}
/* Search i system function list */
for
(
sysfunc_p
=
ccm_sysfunc
;
sysfunc_p
->
sysfunc
;
sysfunc_p
++
)
{
if
(
strcmp
(
name
,
sysfunc_p
->
name
)
==
0
)
{
if
(
func
)
*
func
=
sysfunc_p
->
sysfunc
;
sts
=
(
sysfunc_p
->
sysfunc
)(
(
void
*
)
filectx
,
arg_list
,
arg_count
,
return_decl
,
return_float
,
return_int
,
return_string
);
return
sts
;
}
for
(
sysfunc_p
=
ccm_sysfunc
;
sysfunc_p
->
sysfunc
;
sysfunc_p
++
)
{
if
(
!
fclass_found
)
{
if
(
strcmp
(
name
,
sysfunc_p
->
name
)
==
0
)
{
if
(
func
)
*
func
=
sysfunc_p
->
sysfunc
;
sts
=
(
sysfunc_p
->
sysfunc
)(
(
void
*
)
filectx
,
arg_list
,
arg_count
,
return_decl
,
return_float
,
return_int
,
return_string
);
return
sts
;
}
}
else
{
if
(
strcmp
(
fclass
,
sysfunc_p
->
classname
)
==
0
&&
strcmp
(
fname
,
sysfunc_p
->
name
)
==
0
)
{
if
(
func
)
*
func
=
sysfunc_p
->
sysfunc
;
sts
=
(
sysfunc_p
->
sysfunc
)(
(
void
*
)
filectx
,
arg_list
,
arg_count
,
return_decl
,
return_float
,
return_int
,
return_string
);
return
sts
;
}
}
}
/* Search for an application function */
...
...
src/lib/co/src/co_ccm.h
View file @
7096ed03
...
...
@@ -195,6 +195,7 @@ typedef struct ccm_sFuncCtx_ {
typedef
struct
{
char
classname
[
32
];
char
name
[
32
];
int
(
*
sysfunc
)
(
void
*
,
ccm_sArg
*
,
int
,
int
*
,
ccm_tFloat
*
,
ccm_tInt
*
,
char
*
);
...
...
@@ -210,6 +211,7 @@ typedef struct ccm_sSingeLineCtx_ {
}
*
ccm_tSingleLineCtx
;
int
ccm_register_function
(
const
char
*
classname
,
const
char
*
name
,
int
(
*
sysfunc
)
(
void
*
,
ccm_sArg
*
,
int
,
int
*
,
ccm_tFloat
*
,
ccm_tInt
*
,
char
*
)
...
...
@@ -310,4 +312,4 @@ void ccm_singleline_free(
}
#endif
#endif
\ No newline at end of file
#endif
src/lib/rt/src/rt_rtt_command.c
View file @
7096ed03
...
...
@@ -8128,41 +8128,41 @@ int rtt_commandmode_start(
if
(
!
rtt_ccm_func_registred
)
{
sts
=
ccm_register_function
(
"GetInput"
,
rtt_getinput_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
GetInput"
,
rtt_getinput_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"PlaceCursor"
,
rtt_placecursor_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
PlaceCursor"
,
rtt_placecursor_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"LineErase"
,
rtt_lineerase_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
LineErase"
,
rtt_lineerase_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetCurrentTitle"
,
rtt_getcurrenttitle_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
GetCurrentTitle"
,
rtt_getcurrenttitle_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetCurrentText"
,
rtt_getcurrenttext_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
GetCurrentText"
,
rtt_getcurrenttext_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetCurrentObject"
,
rtt_getcurrentobject_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
GetCurrentObject"
,
rtt_getcurrentobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetChild"
,
rtt_getchild_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
GetChild"
,
rtt_getchild_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetParent"
,
rtt_getparent_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
GetParent"
,
rtt_getparent_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetNextSibling"
,
rtt_getnextsibling_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
GetNextSibling"
,
rtt_getnextsibling_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetClassList"
,
rtt_getclasslist_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
GetClassList"
,
rtt_getclasslist_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetRootList"
,
rtt_getrootlist_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
GetRootList"
,
rtt_getrootlist_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetNodeObject"
,
rtt_getnodeobject_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
GetNodeObject"
,
rtt_getnodeobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetNextObject"
,
rtt_getnextobject_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
GetNextObject"
,
rtt_getnextobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetObjectClass"
,
rtt_getobjectclass_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
GetObjectClass"
,
rtt_getobjectclass_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"MessageError"
,
rtt_messageerror_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
MessageError"
,
rtt_messageerror_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"MessageInfo"
,
rtt_messageinfo_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
MessageInfo"
,
rtt_messageinfo_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"CutObjectName"
,
rtt_cutobjectname_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
CutObjectName"
,
rtt_cutobjectname_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetAttribute"
,
rtt_getattribute_func
);
sts
=
ccm_register_function
(
"
Rtt"
,
"
GetAttribute"
,
rtt_getattribute_func
);
if
(
EVEN
(
sts
))
return
sts
;
rtt_ccm_func_registred
=
1
;
}
...
...
wb/lib/wb/src/wb_wccm.cpp
View file @
7096ed03
...
...
@@ -2058,83 +2058,83 @@ int wccm_register(
if
(
!
wccm_ccm_func_registred
)
{
sts
=
ccm_register_function
(
"GetAttribute"
,
wccm_getattribute_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetAttribute"
,
wccm_getattribute_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetChild"
,
wccm_getchild_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetChild"
,
wccm_getchild_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetParent"
,
wccm_getparent_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetParent"
,
wccm_getparent_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetNextSibling"
,
wccm_getnextsibling_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetNextSibling"
,
wccm_getnextsibling_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetClassList"
,
wccm_getclasslist_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetClassList"
,
wccm_getclasslist_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetNextObject"
,
wccm_getnextobject_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetNextObject"
,
wccm_getnextobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetClassListAttrRef"
,
wccm_getclasslistattrref_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetClassListAttrRef"
,
wccm_getclasslistattrref_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetNextAttrRef"
,
wccm_getnextattrref_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetNextAttrRef"
,
wccm_getnextattrref_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetRootList"
,
wccm_getrootlist_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetRootList"
,
wccm_getrootlist_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetObjectClass"
,
wccm_getobjectclass_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetObjectClass"
,
wccm_getobjectclass_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"RenameObject"
,
wccm_renameobject_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
RenameObject"
,
wccm_renameobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"MoveObject"
,
wccm_moveobject_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
MoveObject"
,
wccm_moveobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetTemplateObject"
,
wccm_gettemplateobject_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetTemplateObject"
,
wccm_gettemplateobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetNextTemplateAttrRef"
,
wccm_getnexttemplateattrref_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetNextTemplateAttrRef"
,
wccm_getnexttemplateattrref_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetVolumeList"
,
wccm_getvolumelist_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetVolumeList"
,
wccm_getvolumelist_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetNextVolume"
,
wccm_getnextvolume_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetNextVolume"
,
wccm_getnextvolume_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetVolumeClass"
,
wccm_getvolumeclass_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetVolumeClass"
,
wccm_getvolumeclass_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"CutObjectName"
,
wccm_cutobjectname_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
CutObjectName"
,
wccm_cutobjectname_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetNodeObject"
,
wccm_getnodeobject_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetNodeObject"
,
wccm_getnodeobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"ObjectExist"
,
wccm_objectexist_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
ObjectExist"
,
wccm_objectexist_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetProjectName"
,
wccm_getprojectname_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetProjectName"
,
wccm_getprojectname_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"SetAttribute"
,
wccm_setattribute_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
SetAttribute"
,
wccm_setattribute_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"CheckSystemGroup"
,
wccm_checksystemgroup_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
CheckSystemGroup"
,
wccm_checksystemgroup_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetNextFreeUserVid"
,
wccm_getnextfreeuservid_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetNextFreeUserVid"
,
wccm_getnextfreeuservid_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"CheckNewVid"
,
wccm_checknewvid_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
CheckNewVid"
,
wccm_checknewvid_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"CheckNewVolumeName"
,
wccm_checknewvolumename_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
CheckNewVolumeName"
,
wccm_checknewvolumename_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetCurrentVolume"
,
wccm_getcurrentvolume_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetCurrentVolume"
,
wccm_getcurrentvolume_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"StringToObjectName"
,
wccm_stringtoobjectname_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
StringToObjectName"
,
wccm_stringtoobjectname_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetHardware"
,
wccm_gethardware_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetHardware"
,
wccm_gethardware_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetOpSys"
,
wccm_getopsys_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetOpSys"
,
wccm_getopsys_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetVersion"
,
wccm_getversion_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetVersion"
,
wccm_getversion_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"CreateObject"
,
wccm_createobject_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
CreateObject"
,
wccm_createobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"OpenPlcPgm"
,
wccm_openplcpgm_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
OpenPlcPgm"
,
wccm_openplcpgm_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"ClosePlcPgm"
,
wccm_closeplcpgm_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
ClosePlcPgm"
,
wccm_closeplcpgm_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"CreatePlcObject"
,
wccm_createplcobject_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
CreatePlcObject"
,
wccm_createplcobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"SetPlcObjectAttr"
,
wccm_setplcobjectattr_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
SetPlcObjectAttr"
,
wccm_setplcobjectattr_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"CreatePlcConnection"
,
wccm_createplcconnection_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
CreatePlcConnection"
,
wccm_createplcconnection_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"PlcConnect"
,
wccm_plcconnect_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
PlcConnect"
,
wccm_plcconnect_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"InLib"
,
wccm_inlib_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
InLib"
,
wccm_inlib_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_create_external_var
(
"cmd_status"
,
CCM_DECL_INT
,
0
,
1
,
...
...
wb/lib/wb/src/wb_wnav_command.cpp
View file @
7096ed03
...
...
@@ -7280,41 +7280,41 @@ int WNav::readcmdfile( char *incommand)
if
(
!
ccm_func_registred
)
{
sts
=
ccm_register_function
(
"GetCurrentText"
,
wnav_getcurrenttext_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetCurrentText"
,
wnav_getcurrenttext_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetCurrentObject"
,
wnav_getcurrentobject_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetCurrentObject"
,
wnav_getcurrentobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetCurrentVolume"
,
wnav_getcurrentvolume_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetCurrentVolume"
,
wnav_getcurrentvolume_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"MessageError"
,
wnav_messageerror_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
MessageError"
,
wnav_messageerror_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"MessageInfo"
,
wnav_messageinfo_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
MessageInfo"
,
wnav_messageinfo_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"IsW1"
,
wnav_isw1_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
IsW1"
,
wnav_isw1_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"IsW2"
,
wnav_isw2_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
IsW2"
,
wnav_isw2_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"EditMode"
,
wnav_editmode_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
EditMode"
,
wnav_editmode_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"MessageDialog"
,
wnav_messagedialog_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
MessageDialog"
,
wnav_messagedialog_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"ConfirmDialog"
,
wnav_confirmdialog_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
ConfirmDialog"
,
wnav_confirmdialog_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"ContinueDialog"
,
wnav_continuedialog_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
ContinueDialog"
,
wnav_continuedialog_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"PromptDialog"
,
wnav_promptdialog_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
PromptDialog"
,
wnav_promptdialog_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"SetDialogSize"
,
wnav_setdialogsize_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
SetDialogSize"
,
wnav_setdialogsize_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"OpenGraph"
,
wnav_opengraph_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
OpenGraph"
,
wnav_opengraph_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"CloseGraph"
,
wnav_closegraph_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
CloseGraph"
,
wnav_closegraph_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"SetSubwindow"
,
wnav_setsubwindow_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
SetSubwindow"
,
wnav_setsubwindow_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetIoDeviceData"
,
wnav_getiodevicedata_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
GetIoDeviceData"
,
wnav_getiodevicedata_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"SetIoDeviceData"
,
wnav_setiodevicedata_func
);
sts
=
ccm_register_function
(
"
Wb"
,
"
SetIoDeviceData"
,
wnav_setiodevicedata_func
);
if
(
EVEN
(
sts
))
return
sts
;
ccm_func_registred
=
1
;
...
...
xtt/lib/ge/src/ge_graph_command.cpp
View file @
7096ed03
This diff is collapsed.
Click to expand it.
xtt/lib/xtt/src/xtt_logging.cpp
View file @
7096ed03
...
...
@@ -656,11 +656,11 @@ int XttLogging::start()
*
s
=
0
;
if
(
!
log_ccm_registred
)
{
sts
=
ccm_register_function
(
"GetA"
,
logccm_geta_func
);
sts
=
ccm_register_function
(
"
Logging"
,
"
GetA"
,
logccm_geta_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetD"
,
logccm_getd_func
);
sts
=
ccm_register_function
(
"
Logging"
,
"
GetD"
,
logccm_getd_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetI"
,
logccm_getd_func
);
sts
=
ccm_register_function
(
"
Logging"
,
"
GetI"
,
logccm_getd_func
);
if
(
EVEN
(
sts
))
return
sts
;
log_ccm_registred
=
1
;
}
...
...
xtt/lib/xtt/src/xtt_xnav_command.cpp
View file @
7096ed03
...
...
@@ -9475,47 +9475,47 @@ int XNav::readcmdfile( char *incommand, char *buffer)
if
(
!
ccm_func_registred
)
{
sts
=
ccm_register_function
(
"GetCurrentText"
,
xnav_getcurrenttext_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetCurrentText"
,
xnav_getcurrenttext_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetCurrentObject"
,
xnav_getcurrentobject_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetCurrentObject"
,
xnav_getcurrentobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetChild"
,
xnav_getchild_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetChild"
,
xnav_getchild_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetParent"
,
xnav_getparent_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetParent"
,
xnav_getparent_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetNextSibling"
,
xnav_getnextsibling_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetNextSibling"
,
xnav_getnextsibling_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetClassList"
,
xnav_getclasslist_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetClassList"
,
xnav_getclasslist_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetRootList"
,
xnav_getrootlist_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetRootList"
,
xnav_getrootlist_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetNodeObject"
,
xnav_getnodeobject_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetNodeObject"
,
xnav_getnodeobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetNextObject"
,
xnav_getnextobject_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetNextObject"
,
xnav_getnextobject_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetObjectClass"
,
xnav_getobjectclass_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetObjectClass"
,
xnav_getobjectclass_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"MessageError"
,
xnav_messageerror_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
MessageError"
,
xnav_messageerror_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"MessageInfo"
,
xnav_messageinfo_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
MessageInfo"
,
xnav_messageinfo_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"CutObjectName"
,
xnav_cutobjectname_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
CutObjectName"
,
xnav_cutobjectname_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetAttribute"
,
xnav_getattribute_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetAttribute"
,
xnav_getattribute_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"SetAttribute"
,
xnav_setattribute_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
SetAttribute"
,
xnav_setattribute_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"ConfirmDialog"
,
xnav_confirmdialog_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
ConfirmDialog"
,
xnav_confirmdialog_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetUser"
,
xnav_getuser_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetUser"
,
xnav_getuser_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetPrivileges"
,
xnav_getprivileges_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetPrivileges"
,
xnav_getprivileges_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetGraphInstance"
,
xnav_getgraphinstance_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetGraphInstance"
,
xnav_getgraphinstance_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"GetGraphInstanceNext"
,
xnav_getgraphinstancenext_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
GetGraphInstanceNext"
,
xnav_getgraphinstancenext_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_register_function
(
"Quit"
,
xnav_quit_func
);
sts
=
ccm_register_function
(
"
Xtt"
,
"
Quit"
,
xnav_quit_func
);
if
(
EVEN
(
sts
))
return
sts
;
sts
=
ccm_create_external_var
(
"GLOW__SUBTERMINATED"
,
CCM_DECL_INT
,
0
,
GLOW__SUBTERMINATED
,
0
);
...
...
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