Skip to content

P
proview
Commit fdd1f3a9 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Merge branch 'master' of claes@pwrcvs:/data1/git/pwr

parents 4ebaac87 30995693
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 19963 additions and 807 deletions
abb/wbl/mcomp/src/abb.wb_load
View file @ fdd1f3a9
Volume ABB $ClassVolume 0.0.250.2
Body SysBody 01-JAN-1970 01:00:00.00
Attr NextOix = "_X3943"
Attr NextCix = "_X40"
Attr NextCix = "_X41"
Attr NextTix[0] = "_X3"
EndBody
Object Type $TypeHier 1749 12-OCT-2005 13:25:10.29
......@@ -35568,7 +35568,7 @@ ABB ACS800 Aggregate
EndObject
EndObject
Object Template ABB_ACS_Pb_Slave 2156888064 01-JAN-1970 01:00:00.00
Body RtBody 08-NOV-2007 17:33:02.02
Body RtBody 26-NOV-2010 09:20:04.88
Attr Super.Specification = "ABB ACS800 Profibus slave"
Attr Super.DataSheet = "$pwr_lang/dsh/abb_acs800.html"
Attr Super.GSDfile = "$pwr_exe/abb_acs_pb_slave.gsd"
......@@ -35577,11 +35577,55 @@ ABB ACS800 Aggregate
Attr Super.StallAction = 1
Attr Super.ErrorSoftLimit = 15
Attr Super.ErrorHardLimit = 50
Attr Super.WdFact1 = 100
Attr Super.WdFact1 = 10
Attr Super.WdFact2 = 10
EndBody
EndObject
EndObject
!/**
! @Version 1.0
! @Group Profibus
! @Summary Profinet device ABB ACS800
! Profinet device object for frequency converter ABB ACS800.
!
! The device object is configured below a Profinet controller object in
! the node hierarchy.
!
! @b Configuration
! Use the 'Configure Device' method in the popup menu of the object
! to configure the slave.
!*/
Object ABB_ACS_PnDevice $ClassDef 40 26-NOV-2010 09:17:17.99
Body SysBody 26-NOV-2010 09:17:04.29
Attr Editor = 0
Attr Method = 0
Attr Flags = 10256
EndBody
Object RtBody $ObjBodyDef 1 26-NOV-2010 09:17:04.32
Body SysBody 26-NOV-2010 09:17:23.87
Attr StructName = "ABB_ACS_PnDevice"
Attr NextAix = "_X3"
EndBody
Object Super $Attribute 2 26-NOV-2010 09:17:04.32
Body SysBody 26-NOV-2010 09:17:44.45
Attr PgmName = "Super"
Attr Flags = 393216
Attr TypeRef = "Profibus:Class-PnDevice"
EndBody
EndObject
EndObject
Object Template ABB_ACS_PnDevice 2158198784 01-JAN-1970 01:00:00.00
Body RtBody 26-NOV-2010 09:19:26.26
Attr Super.Specification = "ABB ACS800 Profibus slave"
Attr Super.DataSheet = "$pwr_lang/dsh/abb_acs800.html"
Attr Super.GSDMLfile = "$pwr_exe/GSDML-V2.0-ABBdrives-RETA02-20070621.xml"
Attr Super.Process = 1
Attr Super.ErrorSoftLimit = 100
Attr Super.ErrorHardLimit = 1000
Attr Super.ByteOrdering = 1
EndBody
EndObject
EndObject
Object ABB_ACS_PPO5_IoModule $ClassDef 38 02-JUL-2010 08:20:23.32
Body SysBody 02-JUL-2010 08:20:30.45
Attr Editor = 0
bcomp/wbl/bcomp/src/basecomponent.wb_load
View file @ fdd1f3a9
This diff is collapsed.
bcomp/wbl/bcomp/src/pwr_basefcppo3fo.flw
View file @ fdd1f3a9
This diff is collapsed.
othermanu/wbl/mcomp/src/othermanufacturer.wb_load
View file @ fdd1f3a9
Volume OtherManufacturer $ClassVolume 0.0.250.1
Body SysBody 01-JAN-1970 01:00:00.00
Attr NextOix = "_X2251"
Attr NextCix = "_X41"
Attr NextOix = "_X2883"
Attr NextCix = "_X51"
Attr NextTix[0] = "_X2"
EndBody
Object Type $TypeHier 1758 09-OCT-2007 14:20:45.77
profibus/exe/profinet_viewer/src/pn_viewer_pnac.cpp
View file @ fdd1f3a9
......@@ -59,7 +59,7 @@ PnViewerPNAC::PnViewerPNAC( pwr_tStatus *sts)
/* Get configs for device */
s = socket(AF_INET, SOCK_DGRAM, 0);
strncpy(ifr.ifr_name, "eth0", sizeof(ifr.ifr_name));
strncpy(ifr.ifr_name, "eth1", sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGIFADDR, &ifr) >= 0) {
strcpy(dev_data.ip_address, inet_ntoa(((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr));
}
......@@ -73,7 +73,7 @@ PnViewerPNAC::PnViewerPNAC( pwr_tStatus *sts)
strcpy(dev_data.device_name, "dumle");
dev_data.device_num = PN_DEVICE_REFERENCE_THIS_STATION;
strcpy(dev_data.device_text, "controller");
strcpy(dev_data.device_text, "eth1");
dev_data.vendor_id = 279; // Softing vendor id
dev_data.device_id = 0;
strcpy(dev_data.version, "1.0");
......
profibus/lib/rt/src/os_linux/rt_io_m_pncontrollersoftingpnak.cpp
View file @ fdd1f3a9
......@@ -134,7 +134,7 @@ static pwr_tStatus IoAgentInit (
gethostname(hname, 40);
s = socket(AF_INET, SOCK_DGRAM, 0);
strncpy(ifr.ifr_name, "eth1", sizeof(ifr.ifr_name));
strncpy(ifr.ifr_name, op->EthernetDevice, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGIFADDR, &ifr) >= 0) {
strcpy(dev_data->ip_address, inet_ntoa(((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr));
}
......@@ -147,7 +147,7 @@ static pwr_tStatus IoAgentInit (
strcpy(dev_data->device_name, hname);
dev_data->device_num = PN_DEVICE_REFERENCE_THIS_STATION;
strcpy(dev_data->device_text, "controller");
strcpy(dev_data->device_text, op->EthernetDevice);
dev_data->vendor_id = 279; // Softing vendor id
dev_data->device_id = 0;
strcpy(dev_data->version, "1.0");
......
profibus/lib/rt/src/os_linux/rt_pn_iface.cpp
View file @ fdd1f3a9
......@@ -442,7 +442,7 @@ void pack_download_req(T_PNAK_SERVICE_REQ_RES *ServiceReqRes, GsdmlDeviceData *d
sprintf(pSDR->DeviceName, dev_data->device_name);
if (device_ref == PN_DEVICE_REFERENCE_THIS_STATION) {
sprintf(pSDR->InterfaceName, "eth1");
sprintf(pSDR->InterfaceName, dev_data->device_text);
pSDR->Flag = PN_SERVICE_DOWNLOAD_FLAG_AUTO_CONTROL_RES;
ar_property = 0;
pSDR->InstanceLowByte = 0;
......@@ -453,6 +453,8 @@ void pack_download_req(T_PNAK_SERVICE_REQ_RES *ServiceReqRes, GsdmlDeviceData *d
PROFINET_AR_PROPERTY_PARAMETER_SERVER_CM |
PROFINET_AR_PROPERTY_DATA_RATE_100MBIT;
pSDR->InstanceLowByte = 1;
if (dev_data->device_id == 1288)
pSDR->InstanceLowByte = 0;
}
no_items = sscanf(dev_data->version, "%hhi.%hhi", &high_byte, &low_byte);
......@@ -882,6 +884,10 @@ int unpack_get_alarm_con(T_PNAK_SERVICE_DESCRIPTION* pSdb, io_sAgentLocal *local
dev->Alarm.ModuleIdentNumber = module_ident_number;
dev->Alarm.SubmoduleIdentNumber = submodule_ident_number;
dev->Alarm.Specifier = alarm_spec;
dev->Alarm.ManuSpecLength = data_length;
if (data_length > 0) {
memcpy(dev->Alarm.Data, data, MIN(data_length, sizeof(dev->Alarm.Data)));
}
}
}
......
profibus/lib/rt/src/os_linux/rt_pn_iface.h
View file @ fdd1f3a9
......@@ -36,6 +36,8 @@
#endif
#define PN_MAX_MANU_SPEC_DIAGS 200
void pack_set_ip_settings_req(T_PNAK_SERVICE_REQ_RES *ServiceReqRes, PnDeviceInfo *dev_info);
void pack_set_device_name_req(T_PNAK_SERVICE_REQ_RES *ServiceReqRes, PnDeviceInfo *dev_info);
......
profibus/wbl/mcomp/src/profibus.wb_load
View file @ fdd1f3a9
This diff is collapsed.
siemens/wbl/mcomp/src/pwr_sinamics_g120_tgm1fo.flw 0 → 100644
View file @ fdd1f3a9
This diff is collapsed.
siemens/wbl/mcomp/src/siemens.wb_load
View file @ fdd1f3a9
This diff is collapsed.
src/lib/rt/src/rt_io_base.c
View file @ fdd1f3a9
This diff is collapsed.
src/tools/pwre/src/os_freebsd/pwre.source
View file @ fdd1f3a9
......@@ -52,6 +52,25 @@ if [ $1 = $cmd ]; then
return
fi
if [ "$pwre_os" == "" ]; then
# Set default values for os and hw
unamestr=`eval uname`
machine=`eval uname -m`
if [ $unamestr == "Darwin" ]; then
export pwre_os="os_macos"
export pwre_hw="hw_x86_64"
elif [ $unamestr == "FreeBSD" ]; then
export pwre_os="os_freebsd"
export pwre_hw="hw_x86_64"
else
if [ $machine != "x86_64" ]; then
machine="x86"
fi
export pwre_os="os_linux"
export pwre_hw="hw_"$machine
fi
fi
$pwre_bin/pwre.pl $@
......
src/tools/pwre/src/os_linux/pwre.source
View file @ fdd1f3a9
......@@ -52,6 +52,25 @@ if [ $1 = $cmd ]; then
return
fi
if [ "$pwre_os" == "" ]; then
# Set default values for os and hw
unamestr=`eval uname`
machine=`eval uname -m`
if [ $unamestr == "Darwin" ]; then
export pwre_os="os_macos"
export pwre_hw="hw_x86_64"
elif [ $unamestr == "FreeBSD" ]; then
export pwre_os="os_freebsd"
export pwre_hw="hw_x86_64"
else
if [ $machine != "x86_64" ]; then
machine="x86"
fi
export pwre_os="os_linux"
export pwre_hw="hw_"$machine
fi
fi
$pwre_bin/pwre.pl $@
......
src/tools/pwre/src/os_macos/pwre.source
View file @ fdd1f3a9
......@@ -52,6 +52,25 @@ if [ $1 = $cmd ]; then
return
fi
if [ "$pwre_os" == "" ]; then
# Set default values for os and hw
unamestr=`eval uname`
machine=`eval uname -m`
if [ $unamestr == "Darwin" ]; then
export pwre_os="os_macos"
export pwre_hw="hw_x86_64"
elif [ $unamestr == "FreeBSD" ]; then
export pwre_os="os_freebsd"
export pwre_hw="hw_x86_64"
else
if [ $machine != "x86_64" ]; then
machine="x86"
fi
export pwre_os="os_linux"
export pwre_hw="hw_"$machine
fi
fi
$pwre_bin/pwre.pl $@
......
wb/exp/wb/src/pwr_wb_palette.cnf
View file @ fdd1f3a9
......@@ -182,6 +182,7 @@ palette NavigatorPalette
menu Siemens
{
class Siemens_Motor_1LA
class Siemens_G120_Tgm1
}
menu Suco
{
......@@ -276,6 +277,7 @@ palette NavigatorPalette
class Siemens_DiagRepeater
class Siemens_ET200S_IM151
class Siemens_ET200M_IM153
class Sinamics_G120_PbSlave
}
}
menu Profinet
......@@ -287,6 +289,10 @@ palette NavigatorPalette
menu Devices
{
class PnDevice
class Siemens_ET200S_PnDevice
class Siemens_ET200M_PnDevice
class Sinamics_G120_PnDevice
class ABB_ACS_PnDevice
}
}
menu Modbus_TCP
......@@ -1017,6 +1023,10 @@ palette PlcEditorPalette
class ABB_DiffPressureSensor_265DSFo
class ABB_FlowSensor_FXE4000Fo
}
menu Siemens
{
class Sinamics_G120_Tgm1Fo
}
menu OtherManufacturer
{
class Eurotherm_TC3001Fo
......
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