Skip to content

P
proview
Commit f476cffd authored by claes's avatar claes
Browse files
Options

Module profibus added and kernel renamed to rt

parent d75851b6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 349 additions and 95 deletions
abb/wbl/mcomp/src/abb.wb_load
View file @ f476cffd
...@@ -22223,7 +22223,7 @@ ABB ACS800 Aggregate ...@@ -22223,7 +22223,7 @@ ABB ACS800 Aggregate
Body SysBody 01-JAN-1970 01:00:00.00 Body SysBody 01-JAN-1970 01:00:00.00
Attr PgmName = "Super" Attr PgmName = "Super"
Attr Flags = 393216 Attr Flags = 393216
Attr TypeRef = "pwrb:Class-Pb_Module" Attr TypeRef = "Profibus:Class-Pb_Module"
EndBody EndBody
EndObject EndObject
!/** !/**
......
siemens/wbl/mcomp/src/siemens.wb_load
View file @ f476cffd
...@@ -52,7 +52,7 @@ Volume Siemens $ClassVolume 0.0.250.3 ...@@ -52,7 +52,7 @@ Volume Siemens $ClassVolume 0.0.250.3
! Profibus module ET200 with two analog inputs. ! Profibus module ET200 with two analog inputs.
! !
! See also ! See also
! @classlink Pb_Module pwrb_pb_module.html ! @classlink Pb_Module profibus_pb_module.html
!*/ !*/
Object Siemens_ET200S_Ai2 $ClassDef 2 06-OCT-2005 14:40:44.00 Object Siemens_ET200S_Ai2 $ClassDef 2 06-OCT-2005 14:40:44.00
Body SysBody 01-JAN-1970 01:00:00.00 Body SysBody 01-JAN-1970 01:00:00.00
...@@ -69,7 +69,7 @@ Volume Siemens $ClassVolume 0.0.250.3 ...@@ -69,7 +69,7 @@ Volume Siemens $ClassVolume 0.0.250.3
Body SysBody 01-JAN-1970 01:00:00.00 Body SysBody 01-JAN-1970 01:00:00.00
Attr PgmName = "Super" Attr PgmName = "Super"
Attr Flags = 393216 Attr Flags = 393216
Attr TypeRef = "pwrb:Class-Pb_Module" Attr TypeRef = "Profibus:Class-Pb_Module"
EndBody EndBody
EndObject EndObject
Object Ch $Attribute 2 06-OCT-2005 14:40:44.00 Object Ch $Attribute 2 06-OCT-2005 14:40:44.00
...@@ -119,7 +119,7 @@ Volume Siemens $ClassVolume 0.0.250.3 ...@@ -119,7 +119,7 @@ Volume Siemens $ClassVolume 0.0.250.3
! Profibus module ET200 with two analog outputs. ! Profibus module ET200 with two analog outputs.
! !
! See also ! See also
! @classlink Pb_Module pwrb_pb_module.html ! @classlink Pb_Module profibus_pb_module.html
!*/ !*/
Object Siemens_ET200S_Ao2 $ClassDef 3 06-OCT-2005 14:40:44.00 Object Siemens_ET200S_Ao2 $ClassDef 3 06-OCT-2005 14:40:44.00
Body SysBody 01-JAN-1970 01:00:00.00 Body SysBody 01-JAN-1970 01:00:00.00
...@@ -136,7 +136,7 @@ Volume Siemens $ClassVolume 0.0.250.3 ...@@ -136,7 +136,7 @@ Volume Siemens $ClassVolume 0.0.250.3
Body SysBody 01-JAN-1970 01:00:00.00 Body SysBody 01-JAN-1970 01:00:00.00
Attr PgmName = "Super" Attr PgmName = "Super"
Attr Flags = 393216 Attr Flags = 393216
Attr TypeRef = "pwrb:Class-Pb_Module" Attr TypeRef = "Profibus:Class-Pb_Module"
EndBody EndBody
EndObject EndObject
Object Ch $Attribute 4 06-OCT-2005 14:40:44.00 Object Ch $Attribute 4 06-OCT-2005 14:40:44.00
...@@ -181,7 +181,7 @@ Volume Siemens $ClassVolume 0.0.250.3 ...@@ -181,7 +181,7 @@ Volume Siemens $ClassVolume 0.0.250.3
! Profibus module ET200 with four digital inputs. ! Profibus module ET200 with four digital inputs.
! !
! See also ! See also
! @classlink Pb_Module pwrb_pb_module.html ! @classlink Pb_Module profibus_pb_module.html
!*/ !*/
Object Siemens_ET200S_Di4 $ClassDef 4 06-OCT-2005 14:40:44.00 Object Siemens_ET200S_Di4 $ClassDef 4 06-OCT-2005 14:40:44.00
Body SysBody 01-JAN-1970 01:00:00.00 Body SysBody 01-JAN-1970 01:00:00.00
...@@ -198,7 +198,7 @@ Volume Siemens $ClassVolume 0.0.250.3 ...@@ -198,7 +198,7 @@ Volume Siemens $ClassVolume 0.0.250.3
Body SysBody 01-JAN-1970 01:00:00.00 Body SysBody 01-JAN-1970 01:00:00.00
Attr PgmName = "Super" Attr PgmName = "Super"
Attr Flags = 393216 Attr Flags = 393216
Attr TypeRef = "pwrb:Class-Pb_Module" Attr TypeRef = "Profibus:Class-Pb_Module"
EndBody EndBody
EndObject EndObject
Object Ch $Attribute 4 06-OCT-2005 14:40:44.00 Object Ch $Attribute 4 06-OCT-2005 14:40:44.00
...@@ -224,7 +224,7 @@ Volume Siemens $ClassVolume 0.0.250.3 ...@@ -224,7 +224,7 @@ Volume Siemens $ClassVolume 0.0.250.3
! Profibus module ET200 with four digital outputs. ! Profibus module ET200 with four digital outputs.
! !
! See also ! See also
! @classlink Pb_Module pwrb_pb_module.html ! @classlink Pb_Module profibus_pb_module.html
!*/ !*/
Object Siemens_ET200S_Do4 $ClassDef 5 06-OCT-2005 14:40:44.00 Object Siemens_ET200S_Do4 $ClassDef 5 06-OCT-2005 14:40:44.00
Body SysBody 01-JAN-1970 01:00:00.00 Body SysBody 01-JAN-1970 01:00:00.00
...@@ -241,7 +241,7 @@ Volume Siemens $ClassVolume 0.0.250.3 ...@@ -241,7 +241,7 @@ Volume Siemens $ClassVolume 0.0.250.3
Body SysBody 01-JAN-1970 01:00:00.00 Body SysBody 01-JAN-1970 01:00:00.00
Attr PgmName = "Super" Attr PgmName = "Super"
Attr Flags = 393216 Attr Flags = 393216
Attr TypeRef = "pwrb:Class-Pb_Module" Attr TypeRef = "Profibus:Class-Pb_Module"
EndBody EndBody
EndObject EndObject
Object Ch $Attribute 4 06-OCT-2005 14:40:44.00 Object Ch $Attribute 4 06-OCT-2005 14:40:44.00
......
src/exp/rt/src/pwr_volumelist.dat
View file @ f476cffd
...@@ -4,6 +4,7 @@ nmps 0.0.1.1 ...@@ -4,6 +4,7 @@ nmps 0.0.1.1
tlog 0.0.1.2 tlog 0.0.1.2
remote 0.0.1.4 remote 0.0.1.4
basecomponent 0.0.0.10 basecomponent 0.0.0.10
profibus 0.0.250.7
othermanufacturer 0.2.250.1 othermanufacturer 0.2.250.1
abb 0.0.250.2 abb 0.0.250.2
siemens 0.0.250.3 siemens 0.0.250.3
......
src/lib/rt/src/rt_io_base_methods.c
View file @ f476cffd
...@@ -2,26 +2,8 @@ ...@@ -2,26 +2,8 @@
#include "rt_io_base.h" #include "rt_io_base.h"
pwr_dImport pwr_BindIoMethods(Node); pwr_dImport pwr_BindIoMethods(Node);
pwr_dImport pwr_BindIoMethods(Pb_Profiboard);
pwr_dImport pwr_BindIoMethods(Pb_DP_Slave);
pwr_dImport pwr_BindIoMethods(Pb_Module);
pwr_dImport pwr_BindIoMethods(Pb_Di);
pwr_dImport pwr_BindIoMethods(Pb_Do);
pwr_dImport pwr_BindIoMethods(Pb_Ai);
pwr_dImport pwr_BindIoMethods(Pb_Ao);
pwr_dImport pwr_BindIoMethods(Pb_Ii);
pwr_dImport pwr_BindIoMethods(Pb_Io);
pwr_BindIoClasses(Base) = { pwr_BindIoClasses(Base) = {
pwr_BindIoClass(Node), pwr_BindIoClass(Node),
pwr_BindIoClass(Pb_Profiboard),
pwr_BindIoClass(Pb_DP_Slave),
pwr_BindIoClass(Pb_Module),
pwr_BindIoClass(Pb_Di),
pwr_BindIoClass(Pb_Do),
pwr_BindIoClass(Pb_Ai),
pwr_BindIoClass(Pb_Ao),
pwr_BindIoClass(Pb_Ii),
pwr_BindIoClass(Pb_Io),
pwr_NullClass pwr_NullClass
}; };
src/tools/pwre/src/os_linux/pwre.pl
View file @ f476cffd
...@@ -175,13 +175,13 @@ sub build_kernel () ...@@ -175,13 +175,13 @@ sub build_kernel ()
_module("xtt"); _module("xtt");
build_all("copy"); build_all("copy");
merge(); merge();
_module("kernel"); _module("rt");
build_all("copy"); build_all("copy");
merge(); merge();
_module("wb"); _module("wb");
build_all("copy"); build_all("copy");
merge(); merge();
_module("kernel"); _module("rt");
build_all("lib"); build_all("lib");
merge(); merge();
_module("xtt"); _module("xtt");
...@@ -196,7 +196,7 @@ sub build_kernel () ...@@ -196,7 +196,7 @@ sub build_kernel ()
_module("wb"); _module("wb");
build_all("exe"); build_all("exe");
merge(); merge();
_module("kernel"); _module("rt");
build_all("exe"); build_all("exe");
merge(); merge();
} }
...@@ -222,6 +222,9 @@ sub build_all_modules () ...@@ -222,6 +222,9 @@ sub build_all_modules ()
_module("java"); _module("java");
build_all(); build_all();
merge(); merge();
_module("profibus");
build_all();
merge();
_module("ssabox"); _module("ssabox");
build_all(); build_all();
merge(); merge();
...@@ -245,7 +248,7 @@ sub build_all_modules () ...@@ -245,7 +248,7 @@ sub build_all_modules ()
merge(); merge();
# Relink method dependent programs # Relink method dependent programs
_module("kernel"); _module("rt");
my($exe_dir) = $ENV{"pwr_exe"}; my($exe_dir) = $ENV{"pwr_exe"};
system("rm $exe_dir/rt_io_comm"); system("rm $exe_dir/rt_io_comm");
_build("exe", "rt_io_comm", "all"); _build("exe", "rt_io_comm", "all");
...@@ -263,7 +266,7 @@ sub build_all_modules () ...@@ -263,7 +266,7 @@ sub build_all_modules ()
sub create_all_modules () sub create_all_modules ()
{ {
_module("kernel"); _module("rt");
create(); create();
_module("xtt"); _module("xtt");
create(); create();
...@@ -279,6 +282,8 @@ sub create_all_modules () ...@@ -279,6 +282,8 @@ sub create_all_modules ()
create(); create();
_module("bcomp"); _module("bcomp");
create(); create();
_module("profibus");
create();
_module("ssabox"); _module("ssabox");
create(); create();
_module("othermanu"); _module("othermanu");
...@@ -342,7 +347,7 @@ sub build_all () ...@@ -342,7 +347,7 @@ sub build_all ()
# } # }
if ( $module eq "kernel") { if ( $module eq "rt") {
if ( $copy == 1) { if ( $copy == 1) {
_build("exp", "inc", "all"); _build("exp", "inc", "all");
_build("exp", "com", "all"); _build("exp", "com", "all");
...@@ -373,7 +378,7 @@ sub build_all () ...@@ -373,7 +378,7 @@ sub build_all ()
_build("wbl", "remote", "init copy"); _build("wbl", "remote", "init copy");
merge("inc/pwr_remoteclasses.h"); merge("inc/pwr_remoteclasses.h");
} }
_module("kernel"); _module("rt");
_build("lib", "rt", "all"); _build("lib", "rt", "all");
_build("exp", "rt", "all"); _build("exp", "rt", "all");
_build("lib", "msg_dummy", "all"); _build("lib", "msg_dummy", "all");
...@@ -432,45 +437,6 @@ sub build_all () ...@@ -432,45 +437,6 @@ sub build_all ()
} }
#
# build_ssab()
#
sub build_ssab ()
{
if (!defined($ENV{"pwre_env"})) {
print("++ Environment is not initialized!\n");
exit 1;
}
printf("--\n");
printf("-- Build ssab\n");
show();
# my($tmp);
# print("-- Copy include files from VMS [n]? ");
# $tmp = <STDIN>;
# chomp($tmp);
# if ($tmp =~ /^[yY]/) {
# copy();
# }
_build("wbl", "tlog", "copy");
_build("msg", "rs", "all");
_build("lib", "rs", "all");
_build("exe", "rs*", "all");
_build("wbl", "nmps", "lib");
_build("wbl", "tlog", "lib");
_build("wbl", "ssab", "lib");
_build("wbl", "nmps", "exe");
_build("wbl", "tlog", "exe");
_build("wbl", "ssab", "exe");
}
# #
# copy() # copy()
# #
...@@ -522,7 +488,7 @@ sub create() ...@@ -522,7 +488,7 @@ sub create()
create_dir($newdir . "/jpwr"); create_dir($newdir . "/jpwr");
create_dir($newdir . "/wbl"); create_dir($newdir . "/wbl");
if ($module eq "kernel") { if ($module eq "rt") {
$newdir = $root . "/exp"; $newdir = $root . "/exp";
create_base($newdir); create_base($newdir);
} }
...@@ -743,8 +709,8 @@ sub merge () ...@@ -743,8 +709,8 @@ sub merge ()
} }
my($file) = $_[0]; my($file) = $_[0];
# if ($module eq "kernel") { # if ($module eq "rt") {
# printf("++\n++ No merge for module kernel needed\n"); # printf("++\n++ No merge for module rt needed\n");
# exit 1; # exit 1;
# } # }
$eroot .= "/" . $ENV{"pwre_os"}; $eroot .= "/" . $ENV{"pwre_os"};
...@@ -814,7 +780,7 @@ sub _module() ...@@ -814,7 +780,7 @@ sub _module()
$ENV{"pwre_module"} = $modu; $ENV{"pwre_module"} = $modu;
$ENV{"pwre_bmodule"} = $modu; $ENV{"pwre_bmodule"} = $modu;
if ( $modu eq "kernel") { if ( $modu eq "rt") {
# $ENV{"pwre_bmodule"} = "exp"; # $ENV{"pwre_bmodule"} = "exp";
$ENV{"pwre_sroot"} = $sroot . "/src"; $ENV{"pwre_sroot"} = $sroot . "/src";
} }
...@@ -970,12 +936,6 @@ sub usage_create_all_modules () ...@@ -970,12 +936,6 @@ sub usage_create_all_modules ()
printf("++ create_all_modules : Create build trees for all modules\n"); printf("++ create_all_modules : Create build trees for all modules\n");
} }
sub usage_build_ssab ()
{
printf("++\n");
printf("++ build_ssab : Builds additional components\n");
}
sub usage_copy () sub usage_copy ()
{ {
printf("++\n"); printf("++\n");
......
src/tools/pwre/src/os_linux/pwre.source
View file @ f476cffd
...@@ -25,8 +25,8 @@ if [ $1 = $cmd ]; then ...@@ -25,8 +25,8 @@ if [ $1 = $cmd ]; then
if [ "$env" = "" ]; then if [ "$env" = "" ]; then
echo "++ init what?" echo "++ init what?"
else else
export pwre_module=kernel export pwre_module=rt
export pwre_bmodule=kernel export pwre_bmodule=rt
if $pwre_bin/pwre.pl _exists $2; then if $pwre_bin/pwre.pl _exists $2; then
set_env `$pwre_bin/pwre.pl _print $2` set_env `$pwre_bin/pwre.pl _print $2`
else else
...@@ -41,8 +41,8 @@ cmd="module" ...@@ -41,8 +41,8 @@ cmd="module"
if [ $1 = $cmd ]; then if [ $1 = $cmd ]; then
echo "module..." echo "module..."
if [ -z $2 ]; then if [ -z $2 ]; then
export pwre_module="kernel" export pwre_module="rt"
export pwre_bmodule="kernel" export pwre_bmodule="rt"
else else
export pwre_module=$2 export pwre_module=$2
export pwre_bmodule=$2 export pwre_bmodule=$2
......
src/tools/pwre/src/os_linux/pwre_function
View file @ f476cffd
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Environment variables # Environment variables
# #
# $pwre_croot Common source root, pwr # $pwre_croot Common source root, pwr
# $pwre_kroot Kernel source root, pwr/src # $pwre_kroot Rt source root, pwr/src
# $pwre_sroot Module source root, eg. pwr/ssabox # $pwre_sroot Module source root, eg. pwr/ssabox
# $pwre_broot Common build root # $pwre_broot Common build root
# $pwre_module Module name in source tree, eg. 'ssabox' # $pwre_module Module name in source tree, eg. 'ssabox'
...@@ -50,7 +50,7 @@ set_env() ...@@ -50,7 +50,7 @@ set_env()
fi fi
module=$pwre_module module=$pwre_module
if [ $module = "kernel" ]; then if [ $module = "rt" ]; then
module=src module=src
fi fi
sroot=${1%/*} sroot=${1%/*}
......
ssabox/wbl/mcomp/src/ssabox.wb_load
View file @ f476cffd
This diff is collapsed.
wb/lib/wb/src/wb_i_base_methods.c
View file @ f476cffd
/* /*
* Proview $Id: wb_i_base_methods.c,v 1.8 2005-12-30 15:36:36 claes Exp $ * Proview $Id: wb_i_base_methods.c,v 1.9 2006-01-16 14:58:28 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -56,7 +56,6 @@ pwr_dImport pwr_BindMethods(WebHandler); ...@@ -56,7 +56,6 @@ pwr_dImport pwr_BindMethods(WebHandler);
pwr_dImport pwr_BindMethods(PlcProcess); pwr_dImport pwr_BindMethods(PlcProcess);
pwr_dImport pwr_BindMethods(PlcThread); pwr_dImport pwr_BindMethods(PlcThread);
pwr_dImport pwr_BindMethods(NodeConfig); pwr_dImport pwr_BindMethods(NodeConfig);
pwr_dImport pwr_BindMethods(Pb_DP_Slave);
pwr_dExport pwr_BindClasses(Base) = { pwr_dExport pwr_BindClasses(Base) = {
pwr_BindClass(ASup), pwr_BindClass(ASup),
...@@ -94,7 +93,6 @@ pwr_dExport pwr_BindClasses(Base) = { ...@@ -94,7 +93,6 @@ pwr_dExport pwr_BindClasses(Base) = {
pwr_BindClass(PlcProcess), pwr_BindClass(PlcProcess),
pwr_BindClass(PlcThread), pwr_BindClass(PlcThread),
pwr_BindClass(NodeConfig), pwr_BindClass(NodeConfig),
pwr_BindClass(Pb_DP_Slave),
pwr_NullClass pwr_NullClass
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7