etherlabmaster: comparison tool/CommandConfig.cpp

equal deleted inserted replaced

-:65781b048a47
+:ec6223c3b7ec
 #include <iomanip>
 #include <sstream>
 using namespace std;
 #include "CommandConfig.h"
+#include "MasterDevice.h"
 /*****************************************************************************/
 CommandConfig::CommandConfig():
 Command("config", "Show slave configurations.")
 /*****************************************************************************/
 /** Lists the bus configuration.
 */
-void CommandConfig::execute(MasterDevice &m, const StringVector &args)
+void CommandConfig::execute(const StringVector &args)
 {
 ConfigList configs;
+bool doIndent;
 if (args.size()) {
 stringstream err;
 err << "'" << getName() << "' takes no arguments!";
 throwInvalidUsageException(err);
 }
-m.open(MasterDevice::Read);
+doIndent = getMasterIndices().size() > 1;
-configs = selectedConfigs(m);
+MasterIndexList::const_iterator mi;
+for (mi = getMasterIndices().begin();
-if (getVerbosity() == Verbose) {
+mi != getMasterIndices().end(); mi++) {
-showDetailedConfigs(m, configs);
+MasterDevice m(*mi);
-} else {
+m.open(MasterDevice::Read);
-listConfigs(m, configs);
+configs = selectedConfigs(m);
+if (doIndent) {
+cout << "Master" << dec << *mi << endl;
+}
+if (getVerbosity() == Verbose) {
+showDetailedConfigs(m, configs, doIndent);
+} else {
+listConfigs(m, configs, doIndent);
+}
 }
 }
 /*****************************************************************************/
 /** Lists the complete bus configuration.
 */
 void CommandConfig::showDetailedConfigs(
 MasterDevice &m,
-const ConfigList &configList
+const ConfigList &configList,
+bool doIndent
 )
 {
 ConfigList::const_iterator configIter;
 unsigned int i, j, k, l;
 ec_ioctl_slave_t slave;
 ec_ioctl_config_pdo_t pdo;
 ec_ioctl_config_pdo_entry_t entry;
 ec_ioctl_config_sdo_t sdo;
+string indent(doIndent ? "  " : "");
 for (configIter = configList.begin();
 configIter != configList.end();
 configIter++) {
-cout << "Alias: "
+cout << indent
-<< dec << configIter->alias << endl
+<< "Alias: "
-<< "Position: " << configIter->position << endl
+<< dec << configIter->alias << endl << indent
+<< "Position: " << configIter->position << endl << indent
 << "Vendor Id: 0x"
 << hex << setfill('0')
-<< setw(8) << configIter->vendor_id << endl
+<< setw(8) << configIter->vendor_id << endl << indent
 << "Product code: 0x"
-<< setw(8) << configIter->product_code << endl
+<< setw(8) << configIter->product_code << endl << indent
 << "Attached slave: ";
 if (configIter->slave_position != -1) {
 m.getSlave(&slave, configIter->slave_position);
 cout << dec << configIter->slave_position
 << " (" << alStateString(slave.al_state) << ")" << endl;
 } else {
 cout << "none" << endl;
 }
-cout << "Watchdog divider: ";
+cout << indent << "Watchdog divider: ";
 if (configIter->watchdog_divider) {
 cout << dec << configIter->watchdog_divider;
 } else {
 cout << "(Default)";
 }
-cout << endl
+cout << endl << indent
 << "Watchdog intervals: ";
 if (configIter->watchdog_intervals) {
 cout << dec << configIter->watchdog_intervals;
 } else {
 cout << "(Default)";
 }
 cout << endl;
 for (j = 0; j < EC_MAX_SYNC_MANAGERS; j++) {
 if (configIter->syncs[j].pdo_count) {
-cout << "SM" << dec << j << ", Dir: "
+cout << indent << "SM" << dec << j << ", Dir: "
 << (configIter->syncs[j].dir == EC_DIR_INPUT
 ? "Input" : "Output") << ", Watchdog: ";
 switch (configIter->syncs[j].watchdog_mode) {
 case EC_WD_DEFAULT: cout << "Default"; break;
 case EC_WD_ENABLE: cout << "Enable"; break;
 cout << endl;
 for (k = 0; k < configIter->syncs[j].pdo_count; k++) {
 m.getConfigPdo(&pdo, configIter->config_index, j, k);
-cout << "  PDO 0x" << hex << setfill('0')
+cout << indent << "  PDO 0x" << hex << setfill('0')
 << setw(4) << pdo.index << endl;
 for (l = 0; l < pdo.entry_count; l++) {
 m.getConfigPdoEntry(&entry,
 configIter->config_index, j, k, l);
-cout << "    PDO entry 0x" << hex << setfill('0')
+cout << indent << "    PDO entry 0x"
+<< hex << setfill('0')
 << setw(4) << entry.index << ":"
 << setw(2) << (unsigned int) entry.subindex
 << ", " << dec << setfill(' ')
 << setw(2) << (unsigned int) entry.bit_length
 << " bit" << endl;
 }
 }
 }
 }
-cout << "SDO configuration:" << endl;
+cout << indent << "SDO configuration:" << endl;
 if (configIter->sdo_count) {
 for (j = 0; j < configIter->sdo_count; j++) {
 m.getConfigSdo(&sdo, configIter->config_index, j);
-cout << "  0x"
+cout << indent << "  0x"
 << hex << setfill('0')
 << setw(4) << sdo.index << ":"
 << setw(2) << (unsigned int) sdo.subindex
 << ", " << dec << sdo.size << " byte" << endl;
-cout << "    " << hex;
+cout << indent << "    " << hex;
 for (i = 0; i < min((uint32_t) sdo.size,
 (uint32_t) EC_MAX_SDO_DATA_SIZE); i++) {
 cout << setw(2) << (unsigned int) sdo.data[i];
 if ((i + 1) % 16 == 0 && i < sdo.size - 1) {
-cout << endl << "    ";
+cout << endl << indent << "    ";
 } else {
 cout << " ";
 }
 }
 cout << endl;
 if (sdo.size > EC_MAX_SDO_DATA_SIZE) {
-cout << "    ..." << endl;
+cout << indent << "    ..." << endl;
 }
 }
 } else {
-cout << "  None." << endl;
+cout << indent << "  None." << endl;
 }
 if (configIter->dc_assign_activate) {
 int i;
-cout << "DC configuration:" << endl
+cout << indent << "DC configuration:" << endl
-<< "  AssignActivate: 0x" << hex << setfill('0')
+<< indent << "  AssignActivate: 0x" << hex << setfill('0')
 << setw(4) << configIter->dc_assign_activate << endl;
-cout << "         Cycle [ns]   Shift [ns]" << endl;
+cout << indent << "         Cycle [ns]   Shift [ns]" << endl;
 for (i = 0; i < EC_SYNC_SIGNAL_COUNT; i++) {
-cout << "  SYNC" << dec << i << "  "
+cout << indent << "  SYNC" << dec << i << "  "
 << setfill(' ') << right
 << setw(11) << configIter->dc_sync[i].cycle_time
 << "  "
 << setw(11) << configIter->dc_sync[i].shift_time
 << endl;
 /** Lists the bus configuration.
 */
 void CommandConfig::listConfigs(
 MasterDevice &m,
-const ConfigList &configList
+const ConfigList &configList,
+bool doIndent
 )
 {
 ConfigList::const_iterator configIter;
 stringstream str;
 Info info;
 InfoList list;
 InfoList::const_iterator iter;
 unsigned int maxAliasWidth = 0, maxPosWidth = 0,
 maxSlavePosWidth = 0, maxStateWidth = 0;
 ec_ioctl_slave_t slave;
+string indent(doIndent ? "  " : "");
 for (configIter = configList.begin();
 configIter != configList.end();
 configIter++) {
 if (info.state.length() > maxStateWidth)
 maxStateWidth = info.state.length();
 }
 for (iter = list.begin(); iter != list.end(); iter++) {
-cout << setfill(' ') << right
+cout << indent << setfill(' ') << right
 << setw(maxAliasWidth) << iter->alias
 << ":" << left
 << setw(maxPosWidth) << iter->pos
 << "  "
 << iter->ident

changeset 1826	ec6223c3b7ec
parent 1804	742607c464c4
child 1827	489be2180f71