bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed tabs.

This commit is contained in:
Florian Pose 2010-03-19 12:41:32 +01:00
parent 4eaebb3cd5
commit d079fb789b
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tool/Command.cpp
View File

@ -25,6 +25,8 @@
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
*
* vim: expandtab
*
****************************************************************************/
#include "Command.h"
@ -189,35 +191,35 @@ void Command::throwSingleSlaveRequired(unsigned int size) const
Command::MasterIndexList Command::getMasterIndices() const
{
MasterIndexList indices;
MasterIndexList indices;
try {
MasterIndexParser p;
indices = p.parse(masters.c_str());
} catch (MasterDeviceException &e) {
stringstream err;
err << "Failed to obtain number of masters: " << e.what();
throwCommandException(err);
stringstream err;
err << "Failed to obtain number of masters: " << e.what();
throwCommandException(err);
} catch (runtime_error &e) {
stringstream err;
stringstream err;
err << "Invalid master argument '" << masters << "': " << e.what();
throwInvalidUsageException(err);
throwInvalidUsageException(err);
}
return indices;
return indices;
}
/*****************************************************************************/
unsigned int Command::getSingleMasterIndex() const
{
MasterIndexList masterIndices = getMasterIndices();
MasterIndexList masterIndices = getMasterIndices();
if (masterIndices.size() != 1) {
stringstream err;
stringstream err;
err << getName() << " requires to select a single master!";
throwInvalidUsageException(err);
}
return masterIndices.front();
return masterIndices.front();
}
/*****************************************************************************/

6
tool/CommandConfig.cpp
View File

@ -25,6 +25,8 @@
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
*
* vim: expandtab
*
****************************************************************************/
#include <list>
@ -104,7 +106,7 @@ string CommandConfig::helpString() const
*/
void CommandConfig::execute(const StringVector &args)
{
MasterIndexList masterIndices;
MasterIndexList masterIndices;
bool doIndent;
ConfigList configs;
@ -114,7 +116,7 @@ void CommandConfig::execute(const StringVector &args)
throwInvalidUsageException(err);
}
masterIndices = getMasterIndices();
masterIndices = getMasterIndices();
doIndent = masterIndices.size() > 1;
MasterIndexList::const_iterator mi;
for (mi = masterIndices.begin();

6
tool/CommandData.cpp
View File

@ -25,6 +25,8 @@
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
*
* vim: expandtab
*
****************************************************************************/
#include <iostream>
@ -66,7 +68,7 @@ string CommandData::helpString() const
void CommandData::execute(const StringVector &args)
{
MasterIndexList masterIndices;
MasterIndexList masterIndices;
DomainList domains;
DomainList::const_iterator di;
@ -76,7 +78,7 @@ void CommandData::execute(const StringVector &args)
throwInvalidUsageException(err);
}
masterIndices = getMasterIndices();
masterIndices = getMasterIndices();
MasterIndexList::const_iterator mi;
for (mi = masterIndices.begin();
mi != masterIndices.end(); mi++) {

2
tool/CommandDebug.cpp
View File

@ -25,6 +25,8 @@
* EtherCAT technology and brand is only permitted in compliance with the
* industrial property and similar rights of Beckhoff Automation GmbH.
*
* vim: expandtab
*
****************************************************************************/
#include <sstream>