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
b1f720d7
Commit
b1f720d7
authored
Aug 16, 2012
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Type Text8102 and class DataArithmL added
parent
4dfe3bd2
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
5 deletions
+21
-5
src/exe/co_convert/src/cnv_wbltoh.cpp
src/exe/co_convert/src/cnv_wbltoh.cpp
+1
-0
src/exp/inc/src/pwr.h
src/exp/inc/src/pwr.h
+4
-0
wb/exp/wb/src/pwr_wb_palette.cnf
wb/exp/wb/src/pwr_wb_palette.cnf
+1
-0
wb/lib/wb/src/wb_gcg.cpp
wb/lib/wb/src/wb_gcg.cpp
+12
-2
wb/lib/wb/src/wb_gre.cpp
wb/lib/wb/src/wb_gre.cpp
+1
-1
wb/lib/wb/src/wb_wattnav.cpp
wb/lib/wb/src/wb_wattnav.cpp
+1
-1
wb/lib/wb/src/wb_wnav.cpp
wb/lib/wb/src/wb_wnav.cpp
+1
-1
No files found.
src/exe/co_convert/src/cnv_wbltoh.cpp
View file @
b1f720d7
...
@@ -1050,6 +1050,7 @@ int CnvWblToH::check_typename( char *type_volume, char *type_name)
...
@@ -1050,6 +1050,7 @@ int CnvWblToH::check_typename( char *type_volume, char *type_name)
"pwr_tString1"
,
"pwr_tString1"
,
"pwr_tText256"
,
"pwr_tText256"
,
"pwr_tText1024"
,
"pwr_tText1024"
,
"pwr_tText8192"
,
"pwr_tURL"
,
"pwr_tURL"
,
"pwr_tOpSysEnum"
,
"pwr_tOpSysEnum"
,
"pwr_tPrivMask"
,
"pwr_tPrivMask"
,
...
...
src/exp/inc/src/pwr.h
View file @
b1f720d7
...
@@ -451,6 +451,10 @@ typedef char pwr_tText256 [256]; //!< 256 byte text type.
...
@@ -451,6 +451,10 @@ typedef char pwr_tText256 [256]; //!< 256 byte text type.
@aref text1024 Text1024
@aref text1024 Text1024
*/
*/
typedef
char
pwr_tText1024
[
1024
];
//!< 1024 byte text type.
typedef
char
pwr_tText1024
[
1024
];
//!< 1024 byte text type.
/*_*
@aref text8192 Text8192
*/
typedef
char
pwr_tText8192
[
8192
];
//!< 8192 byte text type.
/*_*
/*_*
@aref url URL
@aref url URL
*/
*/
...
...
wb/exp/wb/src/pwr_wb_palette.cnf
View file @
b1f720d7
...
@@ -672,6 +672,7 @@ palette PlcEditorPalette
...
@@ -672,6 +672,7 @@ palette PlcEditorPalette
class Curve
class Curve
class DArithm
class DArithm
class DataArithm
class DataArithm
class DataArithmL
class Demux
class Demux
class Div
class Div
class Equal
class Equal
...
...
wb/lib/wb/src/wb_gcg.cpp
View file @
b1f720d7
...
@@ -12466,11 +12466,21 @@ int gcg_comp_m42( gcg_ctx gcgctx, vldh_t_node node)
...
@@ -12466,11 +12466,21 @@ int gcg_comp_m42( gcg_ctx gcgctx, vldh_t_node node)
int
error_line_size
=
sizeof
(
error_line
);
int
error_line_size
=
sizeof
(
error_line
);
char
pointer_name
[
80
];
char
pointer_name
[
80
];
int
codesize
;
int
codesize
;
int
buff_size
;
#define DATAA_BUFF_SIZE 16000
#define DATAA_BUFF_SIZE 16000
#define DATAA_BUFF_SIZEL 48000
ldhses
=
(
node
->
hn
.
wind
)
->
hw
.
ldhses
;
ldhses
=
(
node
->
hn
.
wind
)
->
hw
.
ldhses
;
switch
(
node
->
ln
.
cid
)
{
case
pwr_cClass_dataarithml
:
buff_size
=
DATAA_BUFF_SIZEL
;
break
;
default:
buff_size
=
DATAA_BUFF_SIZE
;
}
/* Get c-expression stored in devbody */
/* Get c-expression stored in devbody */
sts
=
ldh_GetObjectPar
(
ldhses
,
sts
=
ldh_GetObjectPar
(
ldhses
,
node
->
ln
.
oid
,
node
->
ln
.
oid
,
...
@@ -12486,12 +12496,12 @@ int gcg_comp_m42( gcg_ctx gcgctx, vldh_t_node node)
...
@@ -12486,12 +12496,12 @@ int gcg_comp_m42( gcg_ctx gcgctx, vldh_t_node node)
sprintf
(
pointer_name
,
"%c%s"
,
GCG_PREFIX_REF
,
sprintf
(
pointer_name
,
"%c%s"
,
GCG_PREFIX_REF
,
vldh_IdToStr
(
0
,
node
->
ln
.
oid
));
vldh_IdToStr
(
0
,
node
->
ln
.
oid
));
newstr
=
(
char
*
)
calloc
(
1
,
DATAA_BUFF_SIZE
);
newstr
=
(
char
*
)
calloc
(
1
,
buff_size
);
if
(
!
newstr
)
if
(
!
newstr
)
return
FOE__NOMEMORY
;
return
FOE__NOMEMORY
;
sts
=
dataarithm_convert
(
expression
,
newstr
,
pointer_name
,
sts
=
dataarithm_convert
(
expression
,
newstr
,
pointer_name
,
DATAA_BUFF_SIZE
,
error_line
,
&
error_line_size
,
&
error_num
,
buff_size
,
error_line
,
&
error_line_size
,
&
error_num
,
&
codesize
);
&
codesize
);
if
(
EVEN
(
sts
))
if
(
EVEN
(
sts
))
{
{
...
...
wb/lib/wb/src/wb_gre.cpp
View file @
b1f720d7
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
#include "wb_tra.h"
#include "wb_tra.h"
#define ANNOT_LEN_MAX
1024
#define ANNOT_LEN_MAX
8192
#define ANNOT_NR_MAX 8
#define ANNOT_NR_MAX 8
...
...
wb/lib/wb/src/wb_wattnav.cpp
View file @
b1f720d7
...
@@ -1074,7 +1074,7 @@ int WAttNav::set_attr_value( brow_tObject node, char *name, char *value_str)
...
@@ -1074,7 +1074,7 @@ int WAttNav::set_attr_value( brow_tObject node, char *name, char *value_str)
{
{
WItem
*
base_item
;
WItem
*
base_item
;
int
sts
;
int
sts
;
char
buff
[
1024
];
char
buff
[
8192
];
int
size
;
int
size
;
// Check that object still exist
// Check that object still exist
...
...
wb/lib/wb/src/wb_wnav.cpp
View file @
b1f720d7
...
@@ -301,7 +301,7 @@ void wnav_attrvalue_to_string( ldh_tSesContext ldhses, int type_id, void *value
...
@@ -301,7 +301,7 @@ void wnav_attrvalue_to_string( ldh_tSesContext ldhses, int type_id, void *value
pwr_tObjid
objid
;
pwr_tObjid
objid
;
pwr_sAttrRef
*
attrref
;
pwr_sAttrRef
*
attrref
;
int
sts
;
int
sts
;
static
char
str
[
2048
];
static
char
str
[
8192
];
switch
(
type_id
)
{
switch
(
type_id
)
{
case
pwr_eType_Boolean
:
{
case
pwr_eType_Boolean
:
{
...
...
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