etherlabmaster: tools/Master.cpp@8b00e63fff90 (annotated)

922 fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	1	/*****************************************************************************
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	2	*
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	3	* $Id$
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	4	*
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	5	****************************************************************************/
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	6
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	7	#include <sys/types.h>
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	8	#include <sys/stat.h>
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	9	#include <fcntl.h>
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	10	#include <errno.h>
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	11	#include <sys/ioctl.h>
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	12
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	13	#include <iostream>
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	14	#include <iomanip>
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	15	#include <sstream>
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	16	using namespace std;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	17
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	18	#include "Master.h"
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	19
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	20	/****************************************************************************/
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	21
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	22	Master::Master()
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	23	{
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	24	index = 0;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	25	fd = -1;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	26	}
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	27
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	28	/****************************************************************************/
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	29
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	30	Master::~Master()
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	31	{
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	32	close();
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	33	}
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	34
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	35	/****************************************************************************/
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	36
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	37	void Master::open(unsigned int index)
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	38	{
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	39	stringstream deviceName;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	40
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	41	Master::index = index;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	42
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	43	deviceName << "/dev/EtherCAT" << index;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	44
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	45	if ((fd = ::open(deviceName.str().c_str(), O_RDONLY)) == -1) {
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	46	stringstream err;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	47	err << "Failed to open master device " << deviceName.str() << ": "
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	48	<< strerror(errno);
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	49	throw MasterException(err.str());
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	50	}
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	51	}
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	52
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	53	/****************************************************************************/
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	54
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	55	void Master::close()
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	56	{
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	57	if (fd == -1)
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	58	return;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	59
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	60	::close(fd);
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	61	}
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	62
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	63	/****************************************************************************/
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	64
949 e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	65	void Master::outputData(int domainIndex)
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	66	{
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	67	if (domainIndex == -1) {
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	68	unsigned int numDomains = domainCount(), i;
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	69
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	70	for (i = 0; i < numDomains; i++) {
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	71	outputDomainData(i);
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	72	}
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	73	} else {
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	74	outputDomainData(domainIndex);
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	75	}
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	76	}
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	77
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	78	/****************************************************************************/
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	79
948 1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	80	void Master::showDomains(int domainIndex)
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	81	{
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	82	if (domainIndex == -1) {
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	83	unsigned int numDomains = domainCount(), i;
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	84
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	85	for (i = 0; i < numDomains; i++) {
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	86	showDomain(i);
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	87	}
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	88	} else {
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	89	showDomain(domainIndex);
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	90	}
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	91	}
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	92
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	93	/****************************************************************************/
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	94
922 fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	95	void Master::listSlaves()
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	96	{
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	97	unsigned int numSlaves = slaveCount(), i;
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	98	ec_ioctl_slave_t slave;
922 fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	99	uint16_t lastAlias, aliasIndex;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	100
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	101	lastAlias = 0;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	102	aliasIndex = 0;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	103	for (i = 0; i < numSlaves; i++) {
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	104	getSlave(&slave, i);
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	105	cout << setw(2) << i << " ";
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	106
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	107	if (slave.alias) {
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	108	lastAlias = slave.alias;
922 fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	109	aliasIndex = 0;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	110	}
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	111	if (lastAlias) {
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	112	cout << setw(10) << "#" << lastAlias << ":" << aliasIndex;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	113	}
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	114
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	115	cout << " " << slaveState(slave.state) << " ";
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	116
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	117	if (strlen(slave.name)) {
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	118	cout << slave.name;
922 fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	119	} else {
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	120	cout << "0x" << hex << setfill('0') << slave.vendor_id
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	121	<< ":0x" << slave.product_code;
922 fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	122	}
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	123
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	124	cout << endl;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	125	}
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	126	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	127
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	128	/****************************************************************************/
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	129
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	130	void Master::listPdos(int slavePosition)
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	131	{
936 30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	132	if (slavePosition == -1) {
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	133	unsigned int numSlaves = slaveCount(), i;
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	134
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	135	for (i = 0; i < numSlaves; i++) {
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	136	listSlavePdos(i, true);
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	137	}
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	138	} else {
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	139	listSlavePdos(slavePosition, false);
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	140	}
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	141	}
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	142
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	143	/****************************************************************************/
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	144
938 5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	145	void Master::generateXml(int slavePosition)
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	146	{
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	147	if (slavePosition == -1) {
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	148	unsigned int numSlaves = slaveCount(), i;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	149
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	150	for (i = 0; i < numSlaves; i++) {
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	151	generateSlaveXml(i);
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	152	}
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	153	} else {
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	154	generateSlaveXml(slavePosition);
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	155	}
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	156	}
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	157
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	158	/****************************************************************************/
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	159
949 e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	160	void Master::outputDomainData(unsigned int domainIndex)
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	161	{
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	162	ec_ioctl_domain_t domain;
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	163	ec_ioctl_data_t data;
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	164	unsigned char *processData;
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	165	unsigned int i;
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	166
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	167	getDomain(&domain, domainIndex);
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	168
950 8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	169	if (!domain.data_size)
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	170	return;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	171
949 e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	172	processData = new unsigned char[domain.data_size];
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	173
950 8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	174	try {
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	175	getData(&data, domainIndex, domain.data_size, processData);
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	176	} catch (MasterException &e) {
949 e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	177	delete [] processData;
950 8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	178	throw e;
949 e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	179	}
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	180
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	181	for (i = 0; i < data.data_size; i++)
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	182	cout << processData[i];
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	183	cout.flush();
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	184
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	185	delete [] processData;
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	186	}
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	187
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	188	/****************************************************************************/
e424c0074c67 Implemented 'data' command. Florian Pose <fp@igh-essen.com> parents: 948 diff changeset	189
948 1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	190	void Master::showDomain(unsigned int domainIndex)
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	191	{
950 8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	192	ec_ioctl_domain_t domain;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	193	unsigned char *processData;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	194	ec_ioctl_data_t data;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	195	unsigned int i, j;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	196	ec_ioctl_domain_fmmu_t fmmu;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	197	unsigned int dataOffset;
948 1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	198
950 8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	199	getDomain(&domain, domainIndex);
948 1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	200
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	201	cout << "Domain" << domainIndex << ":"
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	202	<< " LogBaseAddr 0x"
950 8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	203	<< hex << setfill('0') << setw(8) << domain.logical_base_address
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	204	<< ", Size " << dec << setfill(' ') << setw(3) << domain.data_size
948 1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	205	<< ", WorkingCounter "
950 8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	206	<< dec << setw(3) << domain.working_counter
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	207	<< " of " << setw(3) << domain.expected_working_counter << endl;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	208
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	209	if (!domain.data_size)
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	210	return;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	211
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	212	processData = new unsigned char[domain.data_size];
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	213
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	214	try {
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	215	getData(&data, domainIndex, domain.data_size, processData);
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	216	} catch (MasterException &e) {
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	217	delete [] processData;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	218	throw e;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	219	}
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	220
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	221	for (i = 0; i < domain.fmmu_count; i++) {
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	222	getFmmu(&fmmu, domainIndex, i);
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	223
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	224	cout << " " << (fmmu.fmmu_dir ? "Inputs" : "Outputs")
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	225	<< " from slave config " << fmmu.slave_config_alias
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	226	<< ":" << fmmu.slave_config_position
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	227	<< ", LogAddr 0x"
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	228	<< hex << setfill('0') << setw(8) << fmmu.logical_address
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	229	<< ", Size "
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	230	<< dec << setfill(' ') << setw(3) << fmmu.data_size
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	231	<< endl;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	232
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	233	dataOffset = fmmu.logical_address - domain.logical_base_address;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	234	if (dataOffset + fmmu.data_size > domain.data_size) {
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	235	stringstream err;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	236	err << "Fmmu information corrupted!";
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	237	delete [] processData;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	238	throw MasterException(err.str());
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	239	}
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	240
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	241	cout << " " << hex << setfill('0');
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	242	for (j = 0; j < fmmu.data_size; j++) {
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	243	cout << setw(2)
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	244	<< (unsigned int) *(processData + dataOffset + j) << " ";
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	245	}
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	246	cout << endl;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	247	}
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	248
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	249	delete [] processData;
948 1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	250	}
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	251
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	252	/****************************************************************************/
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	253
936 30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	254	void Master::listSlavePdos(uint16_t slavePosition, bool printSlave)
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	255	{
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	256	ec_ioctl_slave_t slave;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	257	ec_ioctl_sync_t sync;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	258	ec_ioctl_pdo_t pdo;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	259	ec_ioctl_pdo_entry_t entry;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	260	unsigned int i, j, k;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	261
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	262	getSlave(&slave, slavePosition);
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	263
936 30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	264	if (printSlave)
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	265	cout << "=== Slave " << slavePosition << " ===" << endl;
30fddfce8db6 Added multi-slave support. Florian Pose <fp@igh-essen.com> parents: 935 diff changeset	266
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	267	for (i = 0; i < slave.sync_count; i++) {
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	268	getSync(&sync, slavePosition, i);
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	269
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	270	cout << "SM" << i << ":"
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	271	<< " PhysAddr 0x"
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	272	<< hex << setfill('0') << setw(4) << sync.physical_start_address
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	273	<< ", DefaultSize "
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	274	<< dec << setfill(' ') << setw(4) << sync.default_size
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	275	<< ", ControlRegister 0x"
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	276	<< hex << setfill('0') << setw(2)
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	277	<< (unsigned int) sync.control_register
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	278	<< ", Enable " << dec << (unsigned int) sync.enable
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	279	<< endl;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	280
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	281	for (j = 0; j < sync.pdo_count; j++) {
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	282	getPdo(&pdo, slavePosition, i, j);
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	283
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	284	cout << " " << (pdo.dir ? "T" : "R") << "xPdo 0x"
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	285	<< hex << setfill('0') << setw(4) << pdo.index
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	286	<< " \"" << pdo.name << "\"" << endl;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	287
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	288	for (k = 0; k < pdo.entry_count; k++) {
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	289	getPdoEntry(&entry, slavePosition, i, j, k);
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	290
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	291	cout << " Pdo entry 0x"
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	292	<< hex << setfill('0') << setw(4) << entry.index
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	293	<< ":" << hex << setfill('0') << setw(2)
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	294	<< (unsigned int) entry.subindex
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	295	<< ", " << dec << (unsigned int) entry.bit_length
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	296	<< " bit, \"" << entry.name << "\"" << endl;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	297	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	298	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	299	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	300	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	301
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	302	/****************************************************************************/
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	303
938 5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	304	void Master::generateSlaveXml(uint16_t slavePosition)
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	305	{
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	306	ec_ioctl_slave_t slave;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	307	ec_ioctl_sync_t sync;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	308	ec_ioctl_pdo_t pdo;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	309	ec_ioctl_pdo_entry_t entry;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	310	unsigned int i, j, k;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	311
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	312	getSlave(&slave, slavePosition);
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	313
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	314	cout
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	315	<< "<?xml version=\"1.0\" ?>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	316	<< " <EtherCATInfo>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	317	<< " <!-- Slave " << slave.position << " -->" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	318	<< " <Vendor>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	319	<< " <Id>" << slave.vendor_id << "</Id>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	320	<< " </Vendor>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	321	<< " <Descriptions>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	322	<< " <Devices>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	323	<< " <Device>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	324	<< " <Type ProductCode=\"#x"
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	325	<< hex << setfill('0') << setw(8) << slave.product_code
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	326	<< "\" RevisionNo=\"#x"
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	327	<< hex << setfill('0') << setw(8) << slave.revision_number
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	328	<< "\"/>" << endl;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	329
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	330	for (i = 0; i < slave.sync_count; i++) {
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	331	getSync(&sync, slavePosition, i);
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	332
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	333	for (j = 0; j < sync.pdo_count; j++) {
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	334	getPdo(&pdo, slavePosition, i, j);
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	335
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	336	cout
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	337	<< " <" << (pdo.dir ? "T" : "R") << "xPdo>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	338	<< " <Index>#x"
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	339	<< hex << setfill('0') << setw(4) << pdo.index
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	340	<< "</Index>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	341	<< " <Name>" << pdo.name << "</Name>" << endl;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	342
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	343	for (k = 0; k < pdo.entry_count; k++) {
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	344	getPdoEntry(&entry, slavePosition, i, j, k);
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	345
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	346	cout
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	347	<< " <Entry>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	348	<< " <Index>#x"
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	349	<< hex << setfill('0') << setw(4) << entry.index
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	350	<< "</Index>" << endl;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	351	if (entry.index)
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	352	cout
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	353	<< " <SubIndex>"
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	354	<< dec << (unsigned int) entry.subindex
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	355	<< "</SubIndex>" << endl;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	356
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	357	cout
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	358	<< " <BitLen>"
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	359	<< (unsigned int) entry.bit_length
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	360	<< "</BitLen>" << endl;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	361
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	362	if (entry.index) {
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	363	cout
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	364	<< " <Name>" << entry.name
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	365	<< "</Name>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	366	<< " <DataType>";
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	367
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	368	if (entry.bit_length == 1) {
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	369	cout << "BOOL";
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	370	} else if (!(entry.bit_length % 8)) {
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	371	if (entry.bit_length <= 64)
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	372	cout << "UINT" << (unsigned int) entry.bit_length;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	373	else
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	374	cout << "STRING("
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	375	<< (unsigned int) (entry.bit_length / 8)
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	376	<< ")";
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	377	} else {
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	378	cerr << "Invalid bit length "
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	379	<< (unsigned int) entry.bit_length << endl;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	380	}
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	381
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	382	cout << "</DataType>" << endl;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	383	}
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	384
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	385	cout << " </Entry>" << endl;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	386	}
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	387
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	388	cout
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	389	<< " </" << (pdo.dir ? "T" : "R") << "xPdo>" << endl;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	390	}
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	391	}
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	392
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	393	cout
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	394	<< " </Device>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	395	<< " </Devices>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	396	<< " </Descriptions>" << endl
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	397	<< "</EtherCATInfo>" << endl;
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	398	}
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	399
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	400	/****************************************************************************/
5b936e8e39fa Added 'xml' command to generate a slave description file from a real Florian Pose <fp@igh-essen.com> parents: 936 diff changeset	401
948 1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	402	unsigned int Master::domainCount()
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	403	{
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	404	int ret;
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	405
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	406	if ((ret = ioctl(fd, EC_IOCTL_DOMAIN_COUNT, 0)) < 0) {
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	407	stringstream err;
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	408	err << "Failed to get number of domains: " << strerror(errno);
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	409	throw MasterException(err.str());
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	410	}
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	411
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	412	return ret;
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	413	}
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	414
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	415	/****************************************************************************/
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	416
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	417	unsigned int Master::slaveCount()
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	418	{
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	419	int ret;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	420
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	421	if ((ret = ioctl(fd, EC_IOCTL_SLAVE_COUNT, 0)) < 0) {
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	422	stringstream err;
948 1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	423	err << "Failed to get number of slaves: " << strerror(errno);
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	424	throw MasterException(err.str());
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	425	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	426
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	427	return ret;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	428	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	429
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	430	/****************************************************************************/
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	431
948 1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	432	void Master::getDomain(ec_ioctl_domain_t *data, unsigned int index)
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	433	{
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	434	data->index = index;
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	435
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	436	if (ioctl(fd, EC_IOCTL_DOMAIN, data)) {
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	437	stringstream err;
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	438	err << "Failed to get domain: ";
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	439	if (errno == EINVAL)
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	440	err << "Domain " << index << " does not exist!";
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	441	else
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	442	err << strerror(errno);
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	443	throw MasterException(err.str());
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	444	}
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	445	}
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	446
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	447	/****************************************************************************/
1cfab7161491 Implemented domain command. Florian Pose <fp@igh-essen.com> parents: 938 diff changeset	448
950 8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	449	void Master::getData(ec_ioctl_data_t *data, unsigned int domainIndex,
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	450	unsigned int dataSize, unsigned char *mem)
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	451	{
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	452	data->domain_index = domainIndex;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	453	data->data_size = dataSize;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	454	data->target = mem;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	455
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	456	if (ioctl(fd, EC_IOCTL_DATA, data) < 0) {
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	457	stringstream err;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	458	err << "Failed to get domain data: " << strerror(errno);
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	459	throw MasterException(err.str());
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	460	}
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	461	}
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	462
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	463	/****************************************************************************/
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	464
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	465	void Master::getSlave(ec_ioctl_slave_t *slave, uint16_t slaveIndex)
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	466	{
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	467	slave->position = slaveIndex;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	468
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	469	if (ioctl(fd, EC_IOCTL_SLAVE, slave)) {
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	470	stringstream err;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	471	err << "Failed to get slave: ";
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	472	if (errno == EINVAL)
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	473	err << "Slave " << slaveIndex << " does not exist!";
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	474	else
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	475	err << strerror(errno);
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	476	throw MasterException(err.str());
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	477	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	478	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	479
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	480	/****************************************************************************/
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	481
950 8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	482	void Master::getFmmu(
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	483	ec_ioctl_domain_fmmu_t *fmmu,
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	484	unsigned int domainIndex,
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	485	unsigned int fmmuIndex
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	486	)
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	487	{
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	488	fmmu->domain_index = domainIndex;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	489	fmmu->fmmu_index = fmmuIndex;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	490
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	491	if (ioctl(fd, EC_IOCTL_DOMAIN_FMMU, fmmu)) {
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	492	stringstream err;
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	493	err << "Failed to get domain FMMU: ";
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	494	if (errno == EINVAL)
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	495	err << "Either domain " << domainIndex << " does not exist, "
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	496	<< "or it contains less than " << (unsigned int) fmmuIndex + 1
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	497	<< " FMMus!";
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	498	else
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	499	err << strerror(errno);
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	500	throw MasterException(err.str());
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	501	}
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	502	}
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	503
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	504	/****************************************************************************/
8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	505
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	506	void Master::getSync(
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	507	ec_ioctl_sync_t *sync,
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	508	uint16_t slaveIndex,
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	509	uint8_t syncIndex
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	510	)
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	511	{
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	512	sync->slave_position = slaveIndex;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	513	sync->sync_index = syncIndex;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	514
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	515	if (ioctl(fd, EC_IOCTL_SYNC, sync)) {
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	516	stringstream err;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	517	err << "Failed to get sync manager: ";
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	518	if (errno == EINVAL)
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	519	err << "Either slave " << slaveIndex << " does not exist, "
950 8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	520	<< "or it contains less than " << (unsigned int) syncIndex + 1
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	521	<< " sync managers!";
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	522	else
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	523	err << strerror(errno);
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	524	throw MasterException(err.str());
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	525	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	526	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	527
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	528	/****************************************************************************/
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	529
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	530	void Master::getPdo(
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	531	ec_ioctl_pdo_t *pdo,
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	532	uint16_t slaveIndex,
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	533	uint8_t syncIndex,
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	534	uint8_t pdoPos
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	535	)
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	536	{
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	537	pdo->slave_position = slaveIndex;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	538	pdo->sync_index = syncIndex;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	539	pdo->pdo_pos = pdoPos;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	540
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	541	if (ioctl(fd, EC_IOCTL_PDO, pdo)) {
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	542	stringstream err;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	543	err << "Failed to get Pdo: ";
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	544	if (errno == EINVAL)
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	545	err << "Either slave " << slaveIndex << " does not exist, "
950 8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	546	<< "or it contains less than " << (unsigned int) syncIndex + 1
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	547	<< " sync managers, or sync manager "
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	548	<< (unsigned int) syncIndex << " contains less than "
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	549	<< pdoPos + 1 << " Pdos!" << endl;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	550	else
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	551	err << strerror(errno);
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	552	throw MasterException(err.str());
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	553	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	554	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	555
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	556	/****************************************************************************/
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	557
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	558	void Master::getPdoEntry(
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	559	ec_ioctl_pdo_entry_t *entry,
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	560	uint16_t slaveIndex,
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	561	uint8_t syncIndex,
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	562	uint8_t pdoPos,
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	563	uint8_t entryPos
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	564	)
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	565	{
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	566	entry->slave_position = slaveIndex;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	567	entry->sync_index = syncIndex;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	568	entry->pdo_pos = pdoPos;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	569	entry->entry_pos = entryPos;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	570
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	571	if (ioctl(fd, EC_IOCTL_PDO_ENTRY, entry)) {
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	572	stringstream err;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	573	err << "Failed to get Pdo entry: ";
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	574	if (errno == EINVAL)
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	575	err << "Either slave " << slaveIndex << " does not exist, "
950 8b00e63fff90 'ethercat domain' shows domain contents and process data. Florian Pose <fp@igh-essen.com> parents: 949 diff changeset	576	<< "or it contains less than " << (unsigned int) syncIndex + 1
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	577	<< " sync managers, or sync manager "
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	578	<< (unsigned int) syncIndex << " contains less than "
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	579	<< pdoPos + 1 << " Pdos, or the Pdo at position " << pdoPos
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	580	<< " contains less than " << (unsigned int) entryPos + 1
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	581	<< " entries!" << endl;
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	582	else
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	583	err << strerror(errno);
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	584	throw MasterException(err.str());
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	585	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	586	}
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	587
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	588	/****************************************************************************/
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	589
b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	590	string Master::slaveState(uint8_t state)
922 fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	591	{
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	592	switch (state) {
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	593	case 1: return "INIT";
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	594	case 2: return "PREOP";
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	595	case 4: return "SAFEOP";
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	596	case 8: return "OP";
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	597	default: return "???";
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	598	}
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	599	}
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	600
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	601	/****************************************************************************/

author	Florian Pose <fp@igh-essen.com>
	Wed, 04 Jun 2008 13:17:15 +0000
changeset 950	8b00e63fff90
parent 949	e424c0074c67
child 951	dc84a0af63da
permissions	-rw-r--r--