Added getSingleMasterIndex() for command-line tool.

This commit is contained in:
Florian Pose
2010-03-11 15:17:25 +01:00
parent ddaee8a1fc
commit aa0b667b4f
15 changed files with 27 additions and 96 deletions
+1 -7
View File
@@ -82,7 +82,6 @@ string CommandUpload::helpString() const
void CommandUpload::execute(const StringVector &args)
{
MasterIndexList masterIndices;
SlaveList slaves;
stringstream err, strIndex, strSubIndex;
ec_ioctl_slave_sdo_upload_t data;
@@ -113,12 +112,7 @@ void CommandUpload::execute(const StringVector &args)
}
data.sdo_entry_subindex = uval;
masterIndices = getMasterIndices();
if (masterIndices.size() != 1) {
err << getName() << " requires to select a single master!";
throwInvalidUsageException(err);
}
MasterDevice m(masterIndices.front());
MasterDevice m(getSingleMasterIndex());
m.open(MasterDevice::Read);
slaves = selectedSlaves(m);
if (slaves.size() != 1) {