etherlabmaster: tool/main.cpp@c5d6e28eec91 (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 <getopt.h>
1118 9487162e4d4d helpWanted; cmdName. Florian Pose <fp@igh-essen.com> parents: 1099 diff changeset	8	#include <libgen.h> // basename()
922 fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	9
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	10	#include <iostream>
1126 b09fd81894cb Moved every command into a separate file. Florian Pose <fp@igh-essen.com> parents: 1125 diff changeset	11	#include <iomanip>
922 fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	12	using namespace std;
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	13
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	14	#include "CommandAlias.h"
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	15	#include "CommandConfig.h"
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	16	#include "CommandData.h"
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	17	#include "CommandDebug.h"
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	18	#include "CommandDomains.h"
1165 c5d6e28eec91 Added 'ethercat version' command. Florian Pose <fp@igh-essen.com> parents: 1158 diff changeset	19	#include "CommandDownload.h"
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	20	#include "CommandMaster.h"
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	21	#include "CommandPdos.h"
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	22	#include "CommandSdos.h"
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	23	#include "CommandSiiRead.h"
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	24	#include "CommandSiiWrite.h"
1165 c5d6e28eec91 Added 'ethercat version' command. Florian Pose <fp@igh-essen.com> parents: 1158 diff changeset	25	#include "CommandSlaves.h"
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	26	#include "CommandStates.h"
1165 c5d6e28eec91 Added 'ethercat version' command. Florian Pose <fp@igh-essen.com> parents: 1158 diff changeset	27	#include "CommandUpload.h"
c5d6e28eec91 Added 'ethercat version' command. Florian Pose <fp@igh-essen.com> parents: 1158 diff changeset	28	#include "CommandVersion.h"
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	29	#include "CommandXml.h"
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	30
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	31	/*****************************************************************************/
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	32
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	33	typedef list<Command *> CommandList;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	34	CommandList commandList;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	35
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	36	MasterDevice masterDev;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	37
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	38	string binaryBaseName;
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	39	string commandName;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	40	Command::StringVector commandArgs;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	41
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	42	// option variables
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	43	unsigned int masterIndex = 0;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	44	int slavePosition = -1;
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	45	int slaveAlias = -1;
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	46	int domainIndex = -1;
968 b0e894257743 Implemented sdo_upload command. Florian Pose <fp@igh-essen.com> parents: 966 diff changeset	47	string dataTypeStr;
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	48	Command::Verbosity verbosity = Command::Normal;
980 c07dd38243ba Implemented SII writing (including alias writing) via ethercat command. Florian Pose <fp@igh-essen.com> parents: 978 diff changeset	49	bool force = false;
1121 52a005ffd011 helpRequested. Florian Pose <fp@igh-essen.com> parents: 1120 diff changeset	50	bool helpRequested = false;
922 fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	51
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	52	/*****************************************************************************/
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	53
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	54	string usage()
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	55	{
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	56	stringstream str;
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	57	CommandList::const_iterator ci;
1126 b09fd81894cb Moved every command into a separate file. Florian Pose <fp@igh-essen.com> parents: 1125 diff changeset	58	size_t maxWidth = 0;
b09fd81894cb Moved every command into a separate file. Florian Pose <fp@igh-essen.com> parents: 1125 diff changeset	59
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	60	for (ci = commandList.begin(); ci != commandList.end(); ci++) {
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	61	if ((*ci)->getName().length() > maxWidth) {
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	62	maxWidth = (*ci)->getName().length();
1126 b09fd81894cb Moved every command into a separate file. Florian Pose <fp@igh-essen.com> parents: 1125 diff changeset	63	}
b09fd81894cb Moved every command into a separate file. Florian Pose <fp@igh-essen.com> parents: 1125 diff changeset	64	}
b09fd81894cb Moved every command into a separate file. Florian Pose <fp@igh-essen.com> parents: 1125 diff changeset	65
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	66	str << "Usage: " << binaryBaseName << " <COMMAND> [OPTIONS] [ARGUMENTS]"
1137 a73c0f54be42 Added command-line help for every ethercat command. Florian Pose <fp@igh-essen.com> parents: 1136 diff changeset	67	<< endl << endl
a73c0f54be42 Added command-line help for every ethercat command. Florian Pose <fp@igh-essen.com> parents: 1136 diff changeset	68	<< "Commands (can be abbreviated):" << endl;
1126 b09fd81894cb Moved every command into a separate file. Florian Pose <fp@igh-essen.com> parents: 1125 diff changeset	69
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	70	str << left;
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	71	for (ci = commandList.begin(); ci != commandList.end(); ci++) {
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	72	str << " " << setw(maxWidth) << (*ci)->getName()
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	73	<< " " << (*ci)->getBriefDescription() << endl;
1126 b09fd81894cb Moved every command into a separate file. Florian Pose <fp@igh-essen.com> parents: 1125 diff changeset	74	}
b09fd81894cb Moved every command into a separate file. Florian Pose <fp@igh-essen.com> parents: 1125 diff changeset	75
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	76	str << endl
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	77	<< "Global options:" << endl
1137 a73c0f54be42 Added command-line help for every ethercat command. Florian Pose <fp@igh-essen.com> parents: 1136 diff changeset	78	<< " --master -m <master> Index of the master to use. Default: 0."
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	79	<< endl
1137 a73c0f54be42 Added command-line help for every ethercat command. Florian Pose <fp@igh-essen.com> parents: 1136 diff changeset	80	<< " --force -f Force a command." << endl
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	81	<< " --quiet -q Output less information." << endl
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	82	<< " --verbose -v Output more information." << endl
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	83	<< " --help -h Show this help." << endl
1137 a73c0f54be42 Added command-line help for every ethercat command. Florian Pose <fp@igh-essen.com> parents: 1136 diff changeset	84	<< endl
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	85	<< Command::numericInfo()
1137 a73c0f54be42 Added command-line help for every ethercat command. Florian Pose <fp@igh-essen.com> parents: 1136 diff changeset	86	<< endl
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	87	<< "Call '" << binaryBaseName
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	88	<< " <COMMAND> --help' for command-specific help." << endl
1137 a73c0f54be42 Added command-line help for every ethercat command. Florian Pose <fp@igh-essen.com> parents: 1136 diff changeset	89	<< endl
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	90	<< "Send bug reports to " << PACKAGE_BUGREPORT << "." << endl;
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	91
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	92	return str.str();
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	93	}
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	94
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	95	/*****************************************************************************/
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	96
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	97	void getOptions(int argc, char **argv)
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	98	{
1158 f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	99	int c, argCount;
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	100	stringstream str;
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	101
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	102	static struct option longOptions[] = {
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	103	//name, has_arg, flag, val
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	104	{"master", required_argument, NULL, 'm'},
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	105	{"alias", required_argument, NULL, 'a'},
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	106	{"position", required_argument, NULL, 'p'},
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	107	{"domain", required_argument, NULL, 'd'},
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	108	{"type", required_argument, NULL, 't'},
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	109	{"force", no_argument, NULL, 'f'},
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	110	{"quiet", no_argument, NULL, 'q'},
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	111	{"verbose", no_argument, NULL, 'v'},
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	112	{"help", no_argument, NULL, 'h'},
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	113	{}
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	114	};
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	115
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	116	do {
1158 f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	117	c = getopt_long(argc, argv, "m:a:p:d:t:fqvh", longOptions, NULL);
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	118
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	119	switch (c) {
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	120	case 'm':
1158 f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	121	str.clear();
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	122	str.str("");
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	123	str << optarg;
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	124	str >> resetiosflags(ios::basefield) // guess base from prefix
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	125	>> masterIndex;
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	126	if (str.fail() \|\| masterIndex < 0) {
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	127	cerr << "Invalid master number " << optarg << "!" << endl
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	128	<< endl << usage();
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	129	exit(1);
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	130	}
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	131	break;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	132
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	133	case 'a':
1158 f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	134	str.clear();
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	135	str.str("");
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	136	str << optarg;
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	137	str >> resetiosflags(ios::basefield) // guess base from prefix
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	138	>> slaveAlias;
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	139	if (str.fail() \|\| slaveAlias < 0 \|\| slaveAlias > 0xFFFF) {
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	140	cerr << "Invalid slave alias " << optarg << "!" << endl
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	141	<< endl << usage();
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	142	exit(1);
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	143	}
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	144	break;
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	145
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	146	case 'p':
1158 f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	147	str.clear();
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	148	str.str("");
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	149	str << optarg;
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	150	str >> resetiosflags(ios::basefield) // guess base from prefix
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	151	>> slavePosition;
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	152	if (str.fail()
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	153	\|\| slavePosition < 0 \|\| slavePosition > 0xFFFF) {
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	154	cerr << "Invalid slave position " << optarg << "!" << endl
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	155	<< endl << usage();
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	156	exit(1);
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	157	}
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	158	break;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	159
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	160	case 'd':
1158 f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	161	str.clear();
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	162	str.str("");
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	163	str << optarg;
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	164	str >> resetiosflags(ios::basefield) // guess base from prefix
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	165	>> domainIndex;
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	166	if (str.fail() \|\| domainIndex < 0) {
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	167	cerr << "Invalid domain index " << optarg << "!" << endl
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	168	<< endl << usage();
f65164fa4a58 Removed parameter values 'all'. Florian Pose <fp@igh-essen.com> parents: 1151 diff changeset	169	exit(1);
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	170	}
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	171	break;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	172
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	173	case 't':
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	174	dataTypeStr = optarg;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	175	break;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	176
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	177	case 'f':
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	178	force = true;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	179	break;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	180
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	181	case 'q':
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	182	verbosity = Command::Quiet;
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	183	break;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	184
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	185	case 'v':
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	186	verbosity = Command::Verbose;
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	187	break;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	188
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	189	case 'h':
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	190	helpRequested = true;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	191	break;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	192
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	193	case '?':
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	194	cerr << endl << usage();
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	195	exit(1);
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	196
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	197	default:
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	198	break;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	199	}
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	200	}
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	201	while (c != -1);
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	202
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	203	argCount = argc - optind;
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	204
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	205	if (!argCount) {
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	206	if (helpRequested) {
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	207	cout << usage();
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	208	exit(0);
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	209	} else {
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	210	cerr << "Please specify a command!" << endl
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	211	<< endl << usage();
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	212	exit(1);
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	213	}
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	214	}
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	215
1125 9976f7b9fe66 Command abbreviation. Florian Pose <fp@igh-essen.com> parents: 1122 diff changeset	216	commandName = argv[optind];
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	217	while (++optind < argc)
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	218	commandArgs.push_back(string(argv[optind]));
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	219	}
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	220
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	221	/****************************************************************************/
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	222
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	223	list<Command *> getMatchingCommands(const string &cmdStr)
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	224	{
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	225	CommandList::iterator ci;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	226	list<Command *> res;
1125 9976f7b9fe66 Command abbreviation. Florian Pose <fp@igh-essen.com> parents: 1122 diff changeset	227
1127 bd7aef6c310c Improved abbreviation. Florian Pose <fp@igh-essen.com> parents: 1126 diff changeset	228	// find matching commands from beginning of the string
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	229	for (ci = commandList.begin(); ci != commandList.end(); ci++) {
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	230	if ((*ci)->matchesSubstr(cmdStr)) {
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	231	res.push_back(*ci);
1125 9976f7b9fe66 Command abbreviation. Florian Pose <fp@igh-essen.com> parents: 1122 diff changeset	232	}
9976f7b9fe66 Command abbreviation. Florian Pose <fp@igh-essen.com> parents: 1122 diff changeset	233	}
9976f7b9fe66 Command abbreviation. Florian Pose <fp@igh-essen.com> parents: 1122 diff changeset	234
1127 bd7aef6c310c Improved abbreviation. Florian Pose <fp@igh-essen.com> parents: 1126 diff changeset	235	if (!res.size()) { // nothing found
bd7aef6c310c Improved abbreviation. Florian Pose <fp@igh-essen.com> parents: 1126 diff changeset	236	// find /any/ matching commands
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	237	for (ci = commandList.begin(); ci != commandList.end(); ci++) {
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	238	if ((*ci)->matchesAbbrev(cmdStr)) {
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	239	res.push_back(*ci);
1127 bd7aef6c310c Improved abbreviation. Florian Pose <fp@igh-essen.com> parents: 1126 diff changeset	240	}
bd7aef6c310c Improved abbreviation. Florian Pose <fp@igh-essen.com> parents: 1126 diff changeset	241	}
bd7aef6c310c Improved abbreviation. Florian Pose <fp@igh-essen.com> parents: 1126 diff changeset	242	}
bd7aef6c310c Improved abbreviation. Florian Pose <fp@igh-essen.com> parents: 1126 diff changeset	243
1125 9976f7b9fe66 Command abbreviation. Florian Pose <fp@igh-essen.com> parents: 1122 diff changeset	244	return res;
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	245	}
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	246
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	247	/****************************************************************************/
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	248
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	249	int main(int argc, char **argv)
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	250	{
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	251	int retval = 0;
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	252	list<Command *> matchingCommands;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	253	list<Command *>::const_iterator ci;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	254	Command *cmd;
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	255
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	256	binaryBaseName = basename(argv[0]);
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	257
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	258	commandList.push_back(new CommandAlias());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	259	commandList.push_back(new CommandConfig());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	260	commandList.push_back(new CommandData());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	261	commandList.push_back(new CommandDebug());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	262	commandList.push_back(new CommandDomains());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	263	commandList.push_back(new CommandDownload());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	264	commandList.push_back(new CommandMaster());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	265	commandList.push_back(new CommandPdos());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	266	commandList.push_back(new CommandSdos());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	267	commandList.push_back(new CommandSiiRead());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	268	commandList.push_back(new CommandSiiWrite());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	269	commandList.push_back(new CommandSlaves());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	270	commandList.push_back(new CommandStates());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	271	commandList.push_back(new CommandUpload());
1165 c5d6e28eec91 Added 'ethercat version' command. Florian Pose <fp@igh-essen.com> parents: 1158 diff changeset	272	commandList.push_back(new CommandVersion());
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	273	commandList.push_back(new CommandXml());
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	274
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	275	getOptions(argc, argv);
ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	276
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	277	matchingCommands = getMatchingCommands(commandName);
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	278	masterDev.setIndex(masterIndex);
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	279
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	280	if (matchingCommands.size()) {
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	281	if (matchingCommands.size() == 1) {
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	282	cmd = matchingCommands.front();
1125 9976f7b9fe66 Command abbreviation. Florian Pose <fp@igh-essen.com> parents: 1122 diff changeset	283	if (!helpRequested) {
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	284	try {
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	285	cmd->setVerbosity(verbosity);
1151 1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	286	cmd->setAlias(slaveAlias);
1fc1535dec29 Alias/Position selection. Florian Pose <fp@igh-essen.com> parents: 1144 diff changeset	287	cmd->setPosition(slavePosition);
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	288	cmd->execute(masterDev, commandArgs);
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	289	} catch (InvalidUsageException &e) {
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	290	cerr << e.what() << endl << endl;
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	291	cerr << binaryBaseName << " " << cmd->helpString();
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	292	retval = 1;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	293	} catch (CommandException &e) {
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	294	cerr << e.what() << endl;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	295	retval = 1;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	296	} catch (MasterDeviceException &e) {
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	297	cerr << e.what() << endl;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	298	retval = 1;
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	299	}
1125 9976f7b9fe66 Command abbreviation. Florian Pose <fp@igh-essen.com> parents: 1122 diff changeset	300	} else {
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	301	cout << binaryBaseName << " " << cmd->helpString();
1125 9976f7b9fe66 Command abbreviation. Florian Pose <fp@igh-essen.com> parents: 1122 diff changeset	302	}
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	303	} else {
1128 b69b2c850160 Fixed typos. Florian Pose <fp@igh-essen.com> parents: 1127 diff changeset	304	cerr << "Ambiguous command abbreviation! Matching:" << endl;
1142 59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	305	for (ci = matchingCommands.begin();
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	306	ci != matchingCommands.end();
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	307	ci++) {
59be91dfcbe1 Redesigned command interface. Florian Pose <fp@igh-essen.com> parents: 1139 diff changeset	308	cerr << (*ci)->getName() << endl;
1125 9976f7b9fe66 Command abbreviation. Florian Pose <fp@igh-essen.com> parents: 1122 diff changeset	309	}
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	310	cerr << endl << usage();
1125 9976f7b9fe66 Command abbreviation. Florian Pose <fp@igh-essen.com> parents: 1122 diff changeset	311	retval = 1;
935 b954e9d91ea5 Added 'pdos' command to ethercat tool. Florian Pose <fp@igh-essen.com> parents: 922 diff changeset	312	}
1125 9976f7b9fe66 Command abbreviation. Florian Pose <fp@igh-essen.com> parents: 1122 diff changeset	313	} else {
1144 7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	314	cerr << "Unknown command " << commandName << "!" << endl
7dbfdd61812c Bugfixes and improvements. Florian Pose <fp@igh-essen.com> parents: 1142 diff changeset	315	<< endl << usage();
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	316	retval = 1;
922 fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	317	}
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	318
1122 ee305a780a02 First step of moving to command list. Florian Pose <fp@igh-essen.com> parents: 1121 diff changeset	319	return retval;
922 fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	320	}
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	321
fede1d8f5b71 Added the new ethercat comman-line tool with lsec functionality. Florian Pose <fp@igh-essen.com> parents: diff changeset	322	/****************************************************************************/

author	Florian Pose <fp@igh-essen.com>
	Mon, 28 Jul 2008 14:06:03 +0000
changeset 1165	c5d6e28eec91
parent 1158	f65164fa4a58
child 1166	006244d53f68
permissions	-rw-r--r--