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
493676ee
Commit
493676ee
authored
Jun 09, 2011
by
Claes
Browse files
Options
Browse Files
Download
Plain Diff
Conflicts merged
parents
9593f71e
19556bab
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
411 additions
and
47 deletions
+411
-47
java/jpwr/jop/src/JopAxisarc.java
java/jpwr/jop/src/JopAxisarc.java
+14
-17
profibus/lib/cow/gtk/cow_pn_gsdml_attr_gtk.cpp
profibus/lib/cow/gtk/cow_pn_gsdml_attr_gtk.cpp
+4
-1
profibus/lib/cow/gtk/cow_pn_gsdml_attr_gtk.h
profibus/lib/cow/gtk/cow_pn_gsdml_attr_gtk.h
+2
-0
src/exp/inc/src/pwr_version.h
src/exp/inc/src/pwr_version.h
+2
-0
src/tools/pwre/src/os_linux/pwre_configure.sh
src/tools/pwre/src/os_linux/pwre_configure.sh
+29
-28
src/wbl/pwrb/src/pwrb_c_buildoptions.wb_load
src/wbl/pwrb/src/pwrb_c_buildoptions.wb_load
+106
-0
src/wbl/pwrb/src/pwrb_td_buildoptionsmask.wb_load
src/wbl/pwrb/src/pwrb_td_buildoptionsmask.wb_load
+142
-0
wb/exp/wb/src/pwr_wb_palette.cnf
wb/exp/wb/src/pwr_wb_palette.cnf
+17
-0
wb/lib/wb/src/wb_lfu.cpp
wb/lib/wb/src/wb_lfu.cpp
+95
-1
No files found.
java/jpwr/jop/src/JopAxisarc.java
View file @
493676ee
...
...
@@ -52,6 +52,7 @@ public class JopAxisarc extends JComponent {
int
lines
=
11
;
int
longQuotient
=
1
;
int
valueQuotient
=
1
;
int
textCnt
=
0
;
GeCFormat
cFormat
;
Font
font
;
public
void
setAngle1
(
float
angle1
)
{
...
...
@@ -154,8 +155,6 @@ public class JopAxisarc extends JComponent {
float
value
;
boolean
drawText
=
(
minValue
!=
maxValue
);
System
.
out
.
println
(
"w: "
+
width
+
" h: "
+
height
+
" Lines "
+
lines
+
" Len "
+
lineLength
);
if
(
widthOrig
==
0
)
widthOrig
=
width
;
...
...
@@ -167,6 +166,7 @@ public class JopAxisarc extends JComponent {
shapes
=
new
Shape
[
1
];
FontRenderContext
frc
=
g
.
getFontRenderContext
();
textCnt
=
0
;
if
(
lines
>
0
)
{
hLines
=
new
Line2D
.
Float
[
lines
];
...
...
@@ -177,7 +177,7 @@ public class JopAxisarc extends JComponent {
}
shapes
[
0
]
=
new
Arc2D
.
Float
(
0
F
,
0
F
,
width
,
height
,
angle1
,
angle2
,
Arc2D
.
PIE
);
shapes
[
0
]
=
new
Arc2D
.
Float
(
0
F
,
0
F
,
width
,
height
,
angle1
,
angle2
,
Arc2D
.
OPEN
);
float
line_angle
=
angle2
/
(
lines
-
1
);
for
(
i
=
0
;
i
<
lines
;
i
++)
{
float
sin1
=
(
float
)
Math
.
sin
(
(
angle1
+
i
*
line_angle
)
/
180
*
Math
.
PI
);
...
...
@@ -198,10 +198,11 @@ public class JopAxisarc extends JComponent {
hLines
[
i
]
=
new
Line2D
.
Float
(
x1
,
y1
,
x2
,
y2
);
if
(
drawText
&&
i
%
valueQuotient
==
0
)
{
if
(
maxValue
>
minValue
)
value
=
maxValue
-
(
maxValue
-
minValue
)
/
(
lines
-
1
)
*
i
;
else
value
=
(
minValue
-
maxValue
)
/
(
lines
-
1
)
*
i
;
value
=
minValue
+
(
maxValue
-
minValue
)
/
(
lines
-
1
)
*
i
;
// if ( maxValue > minValue)
// value = maxValue - (maxValue - minValue) / ( lines - 1) * i;
// else
// value = (minValue - maxValue) / ( lines - 1) * i;
hText
[
i
/
valueQuotient
]
=
cFormat
.
format
(
value
,
new
StringBuffer
()).
toString
();
Rectangle2D
textBounds
=
...
...
@@ -209,9 +210,8 @@ public class JopAxisarc extends JComponent {
float
textHeight
=
(
float
)
textBounds
.
getHeight
();
float
textWidth
=
(
float
)
textBounds
.
getWidth
();
yt
=
height
/
2
*
(
-
sin1
*
(
1
F
-
lineLen
)
+
1
)
+
sin1
*
textHeight
;
xt
=
width
/
2
*
(
cos1
*
(
1
F
-
lineLen
)
+
1
)
+
cos1
*
textWidth
/
2
;
xt
=
width
/
2
*
(
cos1
*
(
1
F
-
lineLen
)
+
1
)
-
cos1
*
textWidth
/
2
;
float
increment
=
(
maxValue
-
minValue
)
/
(
lines
-
1
);
System
.
out
.
println
(
"Text w: "
+
textWidth
+
" h: "
+
textHeight
);
if
(
i
%
valueQuotient
==
0
&&
!(
angle2
==
360
&&
...
...
@@ -227,11 +227,11 @@ public class JopAxisarc extends JComponent {
yt
=
yt
+
textHeight
/
2
;
xt
=
xt
-
textWidth
/
2
;
}
hTextPosY
[
i
/
valueQuotient
]
=
yt
;
hTextPosX
[
i
/
valueQuotient
]
=
xt
;
hTextPosY
[
textCnt
]
=
yt
;
hTextPosX
[
textCnt
]
=
xt
;
textCnt
++;
}
}
System
.
out
.
println
(
"Line ("
+
x1
+
","
+
y1
+
") ("
+
x2
+
","
+
y2
+
") ("
+
xt
+
","
+
yt
+
")"
);
}
}
}
...
...
@@ -243,11 +243,8 @@ public class JopAxisarc extends JComponent {
for
(
i
=
0
;
i
<
lines
;
i
++)
g
.
draw
(
hLines
[
i
]);
if
(
drawText
)
{
for
(
i
=
0
;
i
<
lines
;
i
++)
{
if
(
i
%
valueQuotient
==
0
)
{
g
.
drawString
(
hText
[
i
/
valueQuotient
],
hTextPosX
[
i
/
valueQuotient
],
hTextPosY
[
i
/
valueQuotient
]);
}
for
(
i
=
0
;
i
<
textCnt
;
i
++)
{
g
.
drawString
(
hText
[
i
],
hTextPosX
[
i
],
hTextPosY
[
i
]);
}
}
oldWidth
=
width
;
...
...
profibus/lib/cow/gtk/cow_pn_gsdml_attr_gtk.cpp
View file @
493676ee
...
...
@@ -40,7 +40,9 @@
#include "rt_pb_msg.h"
#include "cow_pn_gsdml_attr_gtk.h"
#include "cow_pn_gsdml_attrnav_gtk.h"
#include "cow_wow_gtk.h"
CoWowRecall
GsdmlAttrGtk
::
value_recall
;
void
GsdmlAttrGtk
::
message
(
char
severity
,
const
char
*
message
)
{
...
...
@@ -456,7 +458,8 @@ GsdmlAttrGtk::GsdmlAttrGtk( GtkWidget *a_parent_wid,
gtk_widget_set_size_request
(
msg_label
,
-
1
,
25
);
cmd_prompt
=
gtk_label_new
(
"value > "
);
gtk_widget_set_size_request
(
cmd_prompt
,
-
1
,
25
);
cmd_input
=
gtk_entry_new
();
cmd_entry
=
new
CoWowEntryGtk
(
&
value_recall
);
cmd_input
=
cmd_entry
->
widget
();
gtk_widget_set_size_request
(
cmd_input
,
-
1
,
25
);
g_signal_connect
(
cmd_input
,
"activate"
,
G_CALLBACK
(
activate_cmd_input
),
this
);
...
...
profibus/lib/cow/gtk/cow_pn_gsdml_attr_gtk.h
View file @
493676ee
...
...
@@ -44,6 +44,8 @@ class GsdmlAttrGtk : public GsdmlAttr {
GtkWidget
*
menubutton_changevalue
;
GtkWidget
*
menubutton_viewio
;
CoWowFocusTimerGtk
focustimer
;
static
CoWowRecall
value_recall
;
CoWowEntryGtk
*
cmd_entry
;
GsdmlAttrGtk
(
GtkWidget
*
a_parent_wid
,
void
*
a_parent_ctx
,
...
...
src/exp/inc/src/pwr_version.h
View file @
493676ee
...
...
@@ -67,6 +67,8 @@
# define SET_VERSION(a, b, c, d) ((pwr_tVersion)((a << 24) + (a << 16) + (a << 8) + a))
#endif
#define pwrv_cBuildTimeStr "31-MAY-2011 20:00:00"
#define pwrv_cPwrVersionStr "V4.8.2"
#define pwrv_cPwrVersion SET_VERSION('V', 4, 8, 2)
...
...
src/tools/pwre/src/os_linux/pwre_configure.sh
View file @
493676ee
...
...
@@ -92,6 +92,7 @@ pwre_config_check_lib()
IFS
=
:
for
file
in
$6
do
if
test
-e
$file
;
then
echo
"...Checking Yes
$1
"
echo
"export PWRE_CONF_
$2
=1"
>>
$cfile
...
...
@@ -334,40 +335,40 @@ else
#Gtk
echo
""
echo
"Mandatory :"
pwre_config_check_lib gtk GTK gtk gtk 0
/usr/lib/libgtk-x11-2.0.so
pwre_config_check_lib libantlr LIBANTLR lib wb 0
/usr/local/lib/libantlr.a
pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0
/usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a:/usr/lib/
$hwpl
-linux-gnu
/librpcsvc.a
pwre_config_check_lib libasound LIBASOUND lib lib 0
/usr/lib/libasound.so:/usr/lib/libasound.a
pwre_config_check_lib libpthread LIBPTHREAD lib lib 0
/usr/lib/libpthread.so:/usr/lib/libpthread.a:/usr/lib/
$hwpl
-linux-gnu
/libpthread.so
pwre_config_check_lib libm LIBM lib lib 0
/usr/lib/libm.so:/usr/lib/libm.a:/usr/lib/
$hwpl
-linux-gnu
/libm.so
pwre_config_check_lib libdb LIBDB lib lib 0
/usr/lib/libdb.so:/usr/lib/
$hwpl
-linux-gnu
/libdb.so
pwre_config_check_lib libdb_cxx LIBDB_CXX lib wb 0
/usr/lib/libdb_cxx.so:/usr/lib/
$hwpl
-linux-gnu
/libdb_cxx.so
pwre_config_check_lib libz LIBZ lib lib 0
/usr/lib/libz.so:/usr/lib/libz.a:/usr/lib/
$hwpl
-linux-gnu
/libz.so
pwre_config_check_lib libcrypt LIBCRYPT lib lib 0
/usr/lib/libcrypt.so:/usr/lib/libcrypt.a:/usr/lib/
$hwpl
-linux-gnu
/libcrypt.so
pwre_config_check_lib librt LIBRT lib lib 0
/usr/lib/librt.so:/usr/lib/librt.a:/usr/lib/
$hwpl
-linux-gnu
/librt.so
pwre_config_check_lib libfl LIBFL lib lib 0
/usr/lib/libfl.so:/usr/lib/libfl.a
pwre_config_check_lib libX11 LIBX11 lib lib 0
/usr/lib/libX11.so:/usr/lib/
$hwpl
-linux-gnu
/libX11.so
pwre_config_check_include antlr ANTLR 1
/usr/local/include/antlr/CommonAST.hpp
pwre_config_check_include gtk GTK 1
/usr/local/include/gtk-2.0/gtk.h:/usr/local/include/gtk-2.0/gtk/gtk.h:/usr/include/gtk-2.0/gtk/gtk.h
pwre_config_check_include jni JNI 1
$jdk
/include/jni.h
pwre_config_check_include jni JNI 0
$jdk
/include/linux/jni_md.h
pwre_config_check_lib gtk GTK gtk gtk 0
"/usr/lib/libgtk-x11-2.0.so"
pwre_config_check_lib libantlr LIBANTLR lib wb 0
"/usr/local/lib/libantlr.a"
pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0
"/usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a:/usr/lib/
$hwpl
-linux-gnu/librpcsvc.a"
pwre_config_check_lib libasound LIBASOUND lib lib 0
"/usr/lib/libasound.so:/usr/lib/libasound.a"
pwre_config_check_lib libpthread LIBPTHREAD lib lib 0
"/usr/lib/libpthread.so:/usr/lib/libpthread.a:/usr/lib/
$hwpl
-linux-gnu/libpthread.so"
pwre_config_check_lib libm LIBM lib lib 0
"/usr/lib/libm.so:/usr/lib/libm.a:/usr/lib/
$hwpl
-linux-gnu/libm.so"
pwre_config_check_lib libdb LIBDB lib lib 0
"/usr/lib/libdb.so:/usr/lib/
$hwpl
-linux-gnu/libdb.so"
pwre_config_check_lib libdb_cxx LIBDB_CXX lib wb 0
"/usr/lib/libdb_cxx.so:/usr/lib/
$hwpl
-linux-gnu/libdb_cxx.so"
pwre_config_check_lib libz LIBZ lib lib 0
"/usr/lib/libz.so:/usr/lib/libz.a:/usr/lib/
$hwpl
-linux-gnu/libz.so"
pwre_config_check_lib libcrypt LIBCRYPT lib lib 0
"/usr/lib/libcrypt.so:/usr/lib/libcrypt.a:/usr/lib/
$hwpl
-linux-gnu/libcrypt.so"
pwre_config_check_lib librt LIBRT lib lib 0
"/usr/lib/librt.so:/usr/lib/librt.a:/usr/lib/
$hwpl
-linux-gnu/librt.so"
pwre_config_check_lib libfl LIBFL lib lib 0
"/usr/lib/libfl.so:/usr/lib/libfl.a"
pwre_config_check_lib libX11 LIBX11 lib lib 0
"/usr/lib/libX11.so:/usr/lib/
$hwpl
-linux-gnu/libX11.so"
pwre_config_check_include antlr ANTLR 1
"/usr/local/include/antlr/CommonAST.hpp"
pwre_config_check_include gtk GTK 1
"/usr/local/include/gtk-2.0/gtk.h:/usr/local/include/gtk-2.0/gtk/gtk.h:/usr/include/gtk-2.0/gtk/gtk.h"
pwre_config_check_include jni JNI 1
"
$jdk
/include/jni.h"
pwre_config_check_include jni JNI 0
"
$jdk
/include/linux/jni_md.h"
echo
""
echo
"Optional :"
pwre_config_check_lib motif MRM motif motif 0
/usr/lib/libMrm.so
pwre_config_check_lib mysql MYSQL lib lib 1
/usr/lib/libmysqlclient.so:/usr/lib/mysql/libmysqlclient.so
pwre_config_check_lib mq MQ lib mq 1
/usr/lib/libdmq.so
pwre_config_check_lib wmq WMQ lib wmq 1
/usr/lib/libmqic.so
pwre_config_check_lib libpnioif PNAK lib lib 1
/usr/lib/libpnioif.a:/usr/local/lib/libpnioif.a
pwre_config_check_lib libusb LIBUSB lib libusb 1
/usr/lib/libusb-1.0.so
pwre_config_check_lib libcifx LIBCIFX lib lib 1
/usr/lib/libcifx.so.1
pwre_config_check_lib motif MRM motif motif 0
"/usr/lib/libMrm.so"
pwre_config_check_lib mysql MYSQL lib lib 1
"/usr/lib/libmysqlclient.so:/usr/lib/mysql/libmysqlclient.so"
pwre_config_check_lib mq MQ lib mq 1
"/usr/lib/libdmq.so"
pwre_config_check_lib wmq WMQ lib wmq 1
"/usr/lib/libmqic.so"
pwre_config_check_lib libpnioif PNAK lib lib 1
"/usr/lib/libpnioif.a:/usr/local/lib/libpnioif.a"
pwre_config_check_lib libusb LIBUSB lib libusb 1
"/usr/lib/libusb-1.0.so"
pwre_config_check_lib libcifx LIBCIFX lib lib 1
"/usr/lib/libcifx.so.1"
#set -o xtrace
pwre_config_check_include wmq WMQ 1
/opt/mqm/inc/cmqc.h
pwre_config_check_include cifx CIFX 1
/usr/local/include/cifx/cifxlinux.h
pwre_config_check_include wmq WMQ 1
"/opt/mqm/inc/cmqc.h"
pwre_config_check_include cifx CIFX 1
"/usr/local/include/cifx/cifxlinux.h"
export
pwre_conf_alsa
=
1
...
...
src/wbl/pwrb/src/pwrb_c_buildoptions.wb_load
0 → 100644
View file @
493676ee
!
! Proview $Id$
! Copyright (C) 2005 SSAB Oxelösund AB.
!
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License as
! published by the Free Software Foundation, either version 2 of
! the License, or (at your option) any later version.
!
! This program is distributed in the hope that it will be useful
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! GNU General Public License for more details.
!
! You should have received a copy of the GNU General Public License
! along with the program, if not, write to the Free Software
! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
!
! pwrb_c_buildoptions.wb_load -- Defines the class BuildOptions.
!
SObject pwrb:Class
!/**
! @Version 2.0
! @Group ProjectConfiguration
! @Summary Build options for plc program
! Configures the build options for the plc program.
!
! The object is configured in the Directory volume below a NodeConfig object.
!
! A BuildOptions object has to be configured when
!
! - functions declared in local object modules are called from the plc code.
! - local class volumes with functions object in c-code exist.
! - a local IO system defined in the project is used.
! - an IO system that requires intallation of a special library is used, eg
! Softing Profinet Stack PNAK, Hilscher cifX, Motion Control USBIO or
! Velleman K8055
! - function objects from the class volumes NMps, Remote, Misc or Ssabox are
! used.
!
! The object creates an option file $pwrp_exe/plc_'nodename'_'busnumber'.opt
! with options that is added to the link command. If other requirements are
! needed in this file than the BuildOptions object offers, the file can be
! edited and handled manually if no BuildOptions object is present.
!*/
Object BuildOptions $ClassDef 544
Body SysBody
Attr Editor = pwr_eEditor_AttrEd
Attr Method = pwr_eMethod_Standard
EndBody
Object RtBody $ObjBodyDef 1
Body SysBody
Attr StructName = "BuildOptions"
EndBody
!/**
! System archives and system modules.
!*/
Object SystemModules $Attribute 1
Body SysBody
Attr TypeRef = "pwrb:Type-BuildOptionsMask"
EndBody
EndObject
!/**
! Object modules.
! The normal location is $pwrp_obj. The path has to be
! included in the specification, eg
!
! $pwrp_obj/ra_plc_user.o
!*/
Object ObjectModules $Attribute 2
Body SysBody
Attr TypeRef = "pwrs:Type-$String80"
Attr Flags |= PWR_MASK_ARRAY
Attr Elements = 25
EndBody
EndObject
!/**
! Additional archives that the plc is linked to.
! The path should not be included in the specification,
! eg libproj.a. If the archive is not located on $pwrp_lib or
! /usr/lib the path should be inserted in ArchivePath.
!*/
Object Archives $Attribute 3
Body SysBody
Attr TypeRef = "pwrs:Type-$String80"
Attr Flags |= PWR_MASK_ARRAY
Attr Elements = 25
EndBody
EndObject
!/**
! Archive path.
!*/
Object ArchivePath $Attribute 4
Body SysBody
Attr TypeRef = "pwrs:Type-$String80"
Attr Flags |= PWR_MASK_ARRAY
Attr Elements = 10
EndBody
EndObject
EndObject
Object Template BuildOptions
Body RtBody
EndBody
EndObject
EndObject
EndSObject
src/wbl/pwrb/src/pwrb_td_buildoptionsmask.wb_load
0 → 100644
View file @
493676ee
!
! Proview $Id$
! Copyright (C) 2005 SSAB Oxelsund AB.
!
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License as
! published by the Free Software Foundation, either version 2 of
! the License, or (at your option) any later version.
!
! This program is distributed in the hope that it will be useful
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! GNU General Public License for more details.
!
! You should have received a copy of the GNU General Public License
! along with the program, if not, write to the Free Software
! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
!
! pwrb_buildoptionsmask.wb_load -- Defines the mask type BuildOptionsMask
!
SObject pwrb:Type
!/**
! @Version 1.0
! @Group Types
! Bitmask for build options.
!
! @b See also
! @classlink XttGraph pwrb_buildoptions.html
!*/
Object BuildOptionsMask $TypeDef 57
Body SysBody
Attr Type = pwr_eType_Mask
Attr Size = 4
Attr TypeRef = "pwrs:Type-$Mask"
Attr Elements = 1
EndBody
!/**
! Local rt_io_user.o for I/O methods of local I/O classes.
!*/
Object IoUser $Bit
Body SysBody
Attr PgmName = "IoUser"
Attr Text = "IoUser"
Attr Value = 1
EndBody
EndObject
!/**
! Local pwrp archive libpwrp.a.
!*/
Object PwrpArchive $Bit
Body SysBody
Attr PgmName = "PwrpArchive"
Attr Text = "PwrpArchive"
Attr Value = 2
EndBody
EndObject
!/**
! NMps archive.
!*/
Object NMpsArchive $Bit
Body SysBody
Attr PgmName = "NMpsArchive"
Attr Text = "NMpsArchive"
Attr Value = 4
EndBody
EndObject
!/**
! Remote archive.
!*/
Object RemoteArchive $Bit
Body SysBody
Attr PgmName = "RemoteArchive"
Attr Text = "RemoteArchive"
Attr Value = 8
EndBody
EndObject
!/**
! Misc archive.
!*/
Object MiscArchive $Bit
Body SysBody
Attr PgmName = "MiscArchive"
Attr Text = "MiscArchive"
Attr Value = 16
EndBody
EndObject
!/**
! SsabOx archive.
!*/
Object SsaboxArchive $Bit
Body SysBody
Attr PgmName = "SsaboxArchive"
Attr Text = "SsaboxArchive"
Attr Value = 32
EndBody
EndObject
!/**
! Softing PNAK Profinet stack.
!*/
Object SoftingPNAK $Bit
Body SysBody
Attr PgmName = "SoftingPNAK"
Attr Text = "SoftingPNAK"
Attr Value = 65536
EndBody
EndObject
!/**
! Hilscher cifX archive.
!*/
Object HilscherCifX $Bit
Body SysBody
Attr PgmName = "HilscherCifX"
Attr Text = "HilscherCifX"
Attr Value = 131072
EndBody
EndObject
!/**
! usblib.
!*/
Object UsbLib $Bit
Body SysBody
Attr PgmName = "UsbLib"
Attr Text = "UsbLib"
Attr Value = 262144
EndBody
EndObject
!/**
! Motion Control USBIO archive.
!*/
Object MotionControlUSBIO $Bit
Body SysBody
Attr PgmName = "MotionControlUSBIO"
Attr Text = "MotionControlUSBIO"
Attr Value = 524288
EndBody
EndObject
EndObject
EndSObject
wb/exp/wb/src/pwr_wb_palette.cnf
View file @
493676ee
...
...
@@ -307,6 +307,17 @@ palette NavigatorPalette
class Modbus_TCP_ServerModule
}
}
menu Hilscher_cifX
{
class Hilscher_cifX_Master
class Hilscher_cifX_Device
class Hilscher_cifX_Module
}
menu UDP
{
class UDP_IO
class BaseIORack
}
menu GPIO
{
class GPIO
...
...
@@ -336,6 +347,11 @@ palette NavigatorPalette
class MotionControl_USB
class MotionControl_USBIO
}
menu USB_Joystick
{
class USB_Joystick
class BaseIORack
}
}
}
menu Remote
...
...
@@ -507,6 +523,7 @@ palette ProjectNavigatorPalette
menu Node
{
class ApplDistribute
class BuildOptions
class BusConfig
class ClassVolumeLoad
class CustomBuild
...
...
wb/lib/wb/src/wb_lfu.cpp
View file @
493676ee
...
...
@@ -2061,7 +2061,8 @@ pwr_tStatus lfu_SaveDirectoryVolume(
/* Find any CustomBuild for this node */
class_vect
[
0
]
=
pwr_cClass_CustomBuild
;
class_vect
[
1
]
=
0
;
class_vect
[
1
]
=
pwr_cClass_BuildOptions
;
class_vect
[
2
]
=
0
;
objcount
=
0
;
objlist
=
0
;
...
...
@@ -2100,6 +2101,99 @@ pwr_tStatus lfu_SaveDirectoryVolume(
free
(
platform_p
);
break
;
}
case
pwr_cClass_BuildOptions
:
{
pwr_sClass_BuildOptions
*
bop
;
int
size
;
pwr_tString80
ar
,
opt
;
char
str
[
2000
]
=
""
;
FILE
*
optfile
;
sts
=
ldh_GetObjectBody
(
ldhses
,
applobjid
,
"RtBody"
,
(
void
**
)
&
bop
,
&
size
);
if
(
EVEN
(
sts
))
return
sts
;
for
(
int
i
=
0
;
i
<
(
int
)(
sizeof
(
bop
->
ArchivePath
)
/
sizeof
(
bop
->
ArchivePath
[
0
]));
i
++
)
{
dcli_trim
(
opt
,
bop
->
ArchivePath
[
i
]);
if
(
strcmp
(
opt
,
""
)
!=
0
)
sprintf
(
&
str
[
strlen
(
str
)],
"-L%s "
,
opt
);
}
for
(
int
i
=
0
;
i
<
(
int
)(
sizeof
(
bop
->
ObjectModules
)
/
sizeof
(
bop
->
ObjectModules
[
0
]));
i
++
)
{
dcli_trim
(
opt
,
bop
->
ObjectModules
[
i
]);
if
(
strcmp
(
opt
,
""
)
!=
0
)
sprintf
(
&
str
[
strlen
(
str
)],
"%s "
,
opt
);
}
if
(
bop
->
SystemModules
&
pwr_mBuildOptionsMask_IoUser
)
sprintf
(
&
str
[
strlen
(
str
)],
"$pwrp_obj/rt_io_user.o "
);
else
sprintf
(
&
str
[
strlen
(
str
)],
"$pwr_obj/rt_io_user.o "
);
for
(
int
i
=
0
;
i
<
(
int
)(
sizeof
(
bop
->
Archives
)
/
sizeof
(
bop
->
Archives
[
0
]));
i
++
)
{
dcli_trim
(
opt
,
bop
->
Archives
[
i
]);
if
(
strcmp
(
opt
,
""
)
!=
0
)
{
if
(
strncmp
(
opt
,
"lib"
,
3
)
==
0
)
strncpy
(
ar
,
&
opt
[
3
],
sizeof
(
ar
));
else
strncpy
(
ar
,
opt
,
sizeof
(
ar
));
if
(
strcmp
(
&
ar
[
strlen
(
ar
)
-
2
],
".a"
)
==
0
)
ar
[
strlen
(
ar
)
-
2
]
=
0
;
else
if
(
strcmp
(
&
ar
[
strlen
(
ar
)
-
3
],
".so"
)
==
0
)
ar
[
strlen
(
ar
)
-
3
]
=
0
;
sprintf
(
&
str
[
strlen
(
str
)],
"-l%s "
,
ar
);
}
}
if
(
bop
->
SystemModules
&
pwr_mBuildOptionsMask_PwrpArchive
)
sprintf
(
&
str
[
strlen
(
str
)],
"-lpwrp "
);
if
(
bop
->
SystemModules
&
pwr_mBuildOptionsMask_NMpsArchive
)
sprintf
(
&
str
[
strlen
(
str
)],
"-lpwr_nmps "
);
if
(
bop
->
SystemModules
&
pwr_mBuildOptionsMask_MiscArchive
)
sprintf
(
&
str
[
strlen
(
str
)],
"-lpwr_misc "
);
if
(
bop
->
SystemModules
&
pwr_mBuildOptionsMask_RemoteArchive
)
sprintf
(
&
str
[
strlen
(
str
)],
"-lpwr_remote "
);
if
(
bop
->
SystemModules
&
pwr_mBuildOptionsMask_SsaboxArchive
)
sprintf
(
&
str
[
strlen
(
str
)],
"-lpwr_ssabox "
);
sprintf
(
&
str
[
strlen
(
str
)],
"-lpwr_rt "
);
if
(
bop
->
SystemModules
&
pwr_mBuildOptionsMask_SoftingPNAK
)
sprintf
(
&
str
[
strlen
(
str
)],
"-lpnioif "
);
else
sprintf
(
&
str
[
strlen
(
str
)],
"-lpwr_pnak_dummy "
);
if
(
bop
->
SystemModules
&
pwr_mBuildOptionsMask_HilscherCifX
)
sprintf
(
&
str
[
strlen
(
str
)],
"-lcifx "
);
else
sprintf
(
&
str
[
strlen
(
str
)],
"-lpwr_cifx_dummy "
);
if
(
bop
->
SystemModules
&
pwr_mBuildOptionsMask_UsbLib
)
sprintf
(
&
str
[
strlen
(
str
)],
"-lusblib-1.0 "
);
else
sprintf
(
&
str
[
strlen
(
str
)],
"-lpwr_usb_dummy "
);
if
(
bop
->
SystemModules
&
pwr_mBuildOptionsMask_MotionControlUSBIO
)
sprintf
(
&
str
[
strlen
(
str
)],
"-lusbio "
);
else
sprintf
(
&
str
[
strlen
(
str
)],
"-lpwr_usbio_dummy "
);
free
(
(
char
*
)
bop
);
sprintf
(
fname
,
load_cNameOpt
,
"$pwrp_exe/"
,
nodename_ptr
,
*
bus_number_ptr
);
dcli_translate_filename
(
fname
,
fname
);
optfile
=
fopen
(
fname
,
"w"
);
if
(
optfile
==
0
)
{
char
msg
[
200
];
sprintf
(
msg
,
"Error, Unable to open file %s"
,
fname
);
MsgWindow
::
message
(
'E'
,
msg
,
msgw_ePop_Default
);
return
LFU__NOFILE
;
}
fprintf
(
optfile
,
"%s"
,
str
);
fclose
(
optfile
);
break
;
}
default:
;
}
}
...
...
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