Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-09-26 12:03:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implemented drive_no for command-line tool; binary base name is now a

Browse Source 
parameter of the helpString method.
This commit is contained in:
Florian Pose
2010-10-25 10:12:26 +02:00
parent a7cdeeec13
commit 18f63a581d
55 changed files with 156 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool/CommandSoeRead.cpp
+33 -7
View File
@@ -28,6 +28,7 @@
****************************************************************************/
#include <iostream>
#include <iomanip>
using namespace std;
#include "CommandSoeRead.h"
@@ -42,17 +43,22 @@ CommandSoeRead::CommandSoeRead():
/*****************************************************************************/
string CommandSoeRead::helpString() const
string CommandSoeRead::helpString(const string &binaryBaseName) const
{
stringstream str;
str << getName() << " [OPTIONS] <IDN>" << endl
str << binaryBaseName << " " << getName()
<< " [OPTIONS] <IDN>" << endl
<< binaryBaseName << " " << getName()
<< " [OPTIONS] <DRIVE> <IDN>" << endl
<< endl
<< getBriefDescription() << endl
<< endl
<< "This command requires a single slave to be selected." << endl
<< endl
<< "Arguments:" << endl
<< " DRIVE is the drive number (0 - 7). If omitted, 0 is assumed."
<< endl
<< " IDN is the IDN and must be either an unsigned" << endl
<< " 16 bit number acc. to IEC 61800-7-204:" << endl
<< " Bit 15: (0) Standard data, (1) Product data" << endl
@@ -84,18 +90,38 @@ void CommandSoeRead::execute(const StringVector &args)
stringstream err;
const DataType *dataType = NULL;
ec_ioctl_slave_soe_read_t ioctl;
int driveArgIndex = -1, idnArgIndex = -1;
if (args.size() != 1) {
err << "'" << getName() << "' takes one argument!";
if (args.size() == 1) {
idnArgIndex = 0;
} else if (args.size() == 2) {
driveArgIndex = 0;
idnArgIndex = 1;
} else {
err << "'" << getName() << "' takes eiter 1 or 2 arguments!";
throwInvalidUsageException(err);
}
ioctl.drive_no = 0; // FIXME
if (driveArgIndex >= 0) {
stringstream str;
unsigned int number;
str << args[driveArgIndex];
str
>> resetiosflags(ios::basefield) // guess base from prefix
>> number;
if (str.fail() || number > 7) {
err << "Invalid drive number '" << args[driveArgIndex] << "'!";
throwInvalidUsageException(err);
}
ioctl.drive_no = number;
} else {
ioctl.drive_no = 0;
}
try {
ioctl.idn = parseIdn(args[0]);
ioctl.idn = parseIdn(args[idnArgIndex]);
} catch (runtime_error &e) {
err << "Invalid IDN '" << args[0] << "': " << e.what();
err << "Invalid IDN '" << args[idnArgIndex] << "': " << e.what();
throwInvalidUsageException(err);
}