etherlabmaster: comparison tools/Master.cpp

equal deleted inserted replaced

-:82122748f4e0
+:94a5f043dee5
 err << "'alias' takes exactly one argument!";
 throw MasterException(err.str());
 }
 strAlias << commandArgs[0];
-strAlias >> number;
+strAlias
+>> resetiosflags(ios::basefield) // guess base from prefix
+>> number;
 if (strAlias.fail() || number < 0x0000 || number > 0xffff) {
 err << "Invalid alias '" << commandArgs[0] << "'!";
 throw MasterException(err.str());
 }
 alias = number;
 err << "'debug' takes exactly one argument!";
 throw MasterException(err.str());
 }
 str << commandArgs[0];
-str >> debugLevel;
+str >> resetiosflags(ios::basefield) // guess base from prefix
+>> debugLevel;
 if (str.fail()) {
 stringstream err;
 err << "Invalid debug level '" << commandArgs[0] << "'!";
 throw MasterException(err.str());
 const string &dataTypeStr,
 const vector<string> &commandArgs
 )
 {
 stringstream strIndex, strSubIndex, strValue, err;
-int number, sval;
 ec_ioctl_sdo_download_t data;
-unsigned int i, uval;
+unsigned int i, number;
 const CoEDataType *dataType = NULL;
 if (slavePosition < 0) {
 err << "'sdo_download' requires a slave! Please specify --slave.";
 throw MasterException(err.str());
 err << "'sdo_download' takes 3 arguments!";
 throw MasterException(err.str());
 }
 strIndex << commandArgs[0];
-strIndex >> hex >> number;
+strIndex
-if (strIndex.fail() || number < 0x0000 || number > 0xffff) {
+>> resetiosflags(ios::basefield) // guess base from prefix
+>> data.sdo_index;
+if (strIndex.fail()) {
 err << "Invalid Sdo index '" << commandArgs[0] << "'!";
 throw MasterException(err.str());
 }
-data.sdo_index = number;
 strSubIndex << commandArgs[1];
-strSubIndex >> hex >> number;
+strSubIndex
-if (strSubIndex.fail() || number < 0x00 || number > 0xff) {
+>> resetiosflags(ios::basefield) // guess base from prefix
+>> number;
+if (strSubIndex.fail() || number > 0xff) {
 err << "Invalid Sdo subindex '" << commandArgs[1] << "'!";
 throw MasterException(err.str());
 }
 data.sdo_entry_subindex = number;
 }
 data.data = new uint8_t[data.data_size + 1];
 strValue << commandArgs[2];
+strValue >> resetiosflags(ios::basefield); // guess base from prefix
-switch (dataType->coeCode) {
+strValue.exceptions(ios::failbit);
-case 0x0002: // int8
-strValue >> sval;
+try {
-if ((uint32_t) sval > 0xff) {
+switch (dataType->coeCode) {
+case 0x0002: // int8
+{
+int16_t val; // uint8_t is interpreted as char
+strValue >> val;
+if (val > 127 || val < -128)
+throw ios::failure("Value out of range");
+*data.data = val;
+break;
+}
+case 0x0003: // int16
+{
+int16_t val;
+strValue >> val;
+*(int16_t *) data.data = cputole16(val);
+break;
+}
+case 0x0004: // int32
+{
+int32_t val;
+strValue >> val;
+*(int32_t *) data.data = cputole32(val);
+break;
+}
+case 0x0005: // uint8
+{
+uint16_t val; // uint8_t is interpreted as char
+strValue >> val;
+if (val > 0xff)
+throw ios::failure("Value out of range");
+*data.data = val;
+break;
+}
+case 0x0006: // uint16
+{
+uint16_t val;
+strValue >> val;
+*(uint16_t *) data.data = cputole16(val);
+break;
+}
+case 0x0007: // uint32
+{
+uint32_t val;
+strValue >> val;
+*(uint32_t *) data.data = cputole32(val);
+break;
+}
+case 0x0009: // string
+if (strValue.str().size() >= data.data_size) {
+err << "String too large";
+throw MasterException(err.str());
+}
+data.data_size = strValue.str().size();
+strValue >> (char *) data.data;
+break;
+default:
 delete [] data.data;
-err << "Invalid value for type '"
+err << "Unknown data type 0x" << hex << dataType->coeCode;
-<< dataType->name << "'!";
 throw MasterException(err.str());
 }
-*data.data = (int8_t) sval;
+} catch (ios::failure &e) {
-break;
+delete [] data.data;
-case 0x0003: // int16
+err << "Invalid value argument '" << commandArgs[2]
-strValue >> sval;
+<< "' for type '" << dataType->name << "'!";
-if ((uint32_t) sval > 0xffff) {
-delete [] data.data;
-err << "Invalid value for type '"
-<< dataType->name << "'!";
-throw MasterException(err.str());
-}
-*(int16_t *) data.data = cputole16(sval);
-break;
-case 0x0004: // int32
-strValue >> sval;
-*(int32_t *) data.data = cputole32(sval);
-break;
-case 0x0005: // uint8
-strValue >> uval;
-if ((uint32_t) uval > 0xff) {
-delete [] data.data;
-err << "Invalid value for type '"
-<< dataType->name << "'!";
-throw MasterException(err.str());
-}
-*data.data = (uint8_t) uval;
-break;
-case 0x0006: // uint16
-strValue >> uval;
-if ((uint32_t) uval > 0xffff) {
-delete [] data.data;
-err << "Invalid value for type '"
-<< dataType->name << "'!";
-throw MasterException(err.str());
-}
-*(uint16_t *) data.data = cputole16(uval);
-break;
-case 0x0007: // uint32
-strValue >> uval;
-*(uint32_t *) data.data = cputole32(uval);
-break;
-case 0x0009: // string
-if (strValue.str().size() >= data.data_size) {
-err << "String too big";
-throw MasterException(err.str());
-}
-data.data_size = strValue.str().size();
-strValue >> (char *) data.data;
-break;
-default:
-break;
-}
-if (strValue.fail()) {
-err << "Invalid value argument '" << commandArgs[2] << "'!";
 throw MasterException(err.str());
 }
 open(ReadWrite);
 if (ioctl(fd, EC_IOCTL_SDO_DOWNLOAD, &data) < 0) {
 stringstream err;
 err << "Failed to download Sdo: ";
 if (errno == EIO && data.abort_code) {
-err << "Abort code 0x" << hex << setfill('0') << setw(8)
+err << "Abort code 0x" << hex << setfill('0')
-<< data.abort_code;
+<< setw(8) << data.abort_code;
 } else {
 err << strerror(errno);
 }
 delete [] data.data;
 throw MasterException(err.str());
 const string &dataTypeStr,
 const vector<string> &commandArgs
 )
 {
 stringstream strIndex, strSubIndex;
-int number, sval;
+int sval;
 ec_ioctl_sdo_upload_t data;
 unsigned int i, uval;
 const CoEDataType *dataType = NULL;
 if (slavePosition < 0) {
 err << "'sdo_upload' takes two arguments!";
 throw MasterException(err.str());
 }
 strIndex << commandArgs[0];
-strIndex >> hex >> number;
+strIndex
-if (strIndex.fail() || number < 0x0000 || number > 0xffff) {
+>> resetiosflags(ios::basefield) // guess base from prefix
+>> data.sdo_index;
+if (strIndex.fail()) {
 stringstream err;
 err << "Invalid Sdo index '" << commandArgs[0] << "'!";
 throw MasterException(err.str());
 }
-data.sdo_index = number;
 strSubIndex << commandArgs[1];
-strSubIndex >> hex >> number;
+strSubIndex
-if (strSubIndex.fail() || number < 0x00 || number > 0xff) {
+>> resetiosflags(ios::basefield) // guess base from prefix
+>> uval;
+if (strSubIndex.fail() || uval > 0xff) {
 stringstream err;
 err << "Invalid Sdo subindex '" << commandArgs[1] << "'!";
 throw MasterException(err.str());
 }
-data.sdo_entry_subindex = number;
+data.sdo_entry_subindex = uval;
 if (dataTypeStr != "") { // data type specified
 if (!(dataType = findDataType(dataTypeStr))) {
 stringstream err;
 err << "Invalid data type '" << dataTypeStr << "'!";
 if (ioctl(fd, EC_IOCTL_SDO_UPLOAD, &data) < 0) {
 stringstream err;
 err << "Failed to upload Sdo: ";
 if (errno == EIO && data.abort_code) {
-err << "Abort code 0x" << hex << setfill('0') << setw(8)
+err << "Abort code 0x" << hex << setfill('0')
-<< data.abort_code;
+<< setw(8) << data.abort_code;
 } else {
 err << strerror(errno);
 }
 delete [] data.target;
 close();
 cout << "Alias: "
 << dec << config.alias << endl
 << "Position: " << config.position << endl
 << "Vendor Id: 0x"
-<< hex << setfill('0') << setw(8) << config.vendor_id << endl
+<< hex << setfill('0')
+<< setw(8) << config.vendor_id << endl
 << "Product code: 0x"
-<< hex << setw(8) << config.product_code << endl
+<< setw(8) << config.product_code << endl
 << "Attached: " << (config.attached ? "yes" : "no") << endl
 << "Operational: " << (config.operational ? "yes" : "no") << endl;
 for (j = 0; j < 16; j++) {
 if (config.syncs[j].pdo_count) {
 << (config.syncs[j].dir == EC_DIR_INPUT
 ? "Input" : "Output") << ")" << endl;
 for (k = 0; k < config.syncs[j].pdo_count; k++) {
 getConfigPdo(&pdo, i, j, k);
-cout << "  Pdo 0x"
+cout << "  Pdo 0x" << hex
-<< hex << setfill('0') << setw(4) << pdo.index
+<< setw(4) << pdo.index
 << " \"" << pdo.name << "\"" << endl;
 for (l = 0; l < pdo.entry_count; l++) {
 getConfigPdoEntry(&entry, i, j, k, l);
-cout << "    Pdo entry 0x"
+cout << "    Pdo entry 0x" << hex
-<< hex << setfill('0') << setw(4) << entry.index
+<< setw(4) << entry.index << ":"
-<< ":" << setw(2) << (unsigned int) entry.subindex
+<< setw(2) << (unsigned int) entry.subindex
 << ", " << dec << (unsigned int) entry.bit_length
 << " bit, \"" << entry.name << "\"" << endl;
 }
 }
 }
 cout << "Sdo configuration:" << endl;
 for (j = 0; j < config.sdo_count; j++) {
 getConfigSdo(&sdo, i, j);
 cout << "  0x"
-<< hex << setfill('0') << setw(4) << sdo.index
+<< hex << setfill('0')
-<< ":" << setw(2) << (unsigned int) sdo.subindex
+<< setw(4) << sdo.index << ":"
-<< ", " << sdo.size << " byte: " << hex;
+<< setw(2) << (unsigned int) sdo.subindex
+<< ", " << dec << sdo.size << " byte: " << hex;
 switch (sdo.size) {
 case 1:
 cout << "0x" << setw(2)
 << (unsigned int) *(uint8_t *) &sdo.data;
 str << dec << config.alias;
 info.alias = str.str();
 str.clear();
 str.str("");
-str << dec << config.position;
+str << config.position;
 info.pos = str.str();
 str.clear();
 str.str("");
-str << "0x"
+str << hex << setfill('0')
-<< hex << setfill('0') << setw(8) << config.vendor_id
+<< "0x" << setw(8) << config.vendor_id
-<< "/0x"
+<< "/0x" << setw(8) << config.product_code;
-<< hex << setw(8) << config.product_code;
 info.ident = str.str();
 str.clear();
 str.str("");
 str << (config.attached ? "attached" : "-");
 ec_ioctl_domain_fmmu_t fmmu;
 unsigned int dataOffset;
 getDomain(&domain, domainIndex);
-	cout << "Domain" << domainIndex << ":"
+	cout << "Domain" << dec << domainIndex << ":"
 		<< " LogBaseAddr 0x"
-		<< hex << setfill('0') << setw(8) << domain.logical_base_address
+		<< hex << setfill('0')
-		<< ", Size " << dec << setfill(' ') << setw(3) << domain.data_size
+<< setw(8) << domain.logical_base_address
+		<< ", Size " << dec << setfill(' ')
+<< setw(3) << domain.data_size
 		<< ", WorkingCounter "
-		<< dec << domain.working_counter << "/"
+		<< domain.working_counter << "/"
 << domain.expected_working_counter << endl;
 if (!domain.data_size)
 return;
 for (i = 0; i < domain.fmmu_count; i++) {
 getFmmu(&fmmu, domainIndex, i);
 cout << "  SlaveConfig "
-<< fmmu.slave_config_alias << ":" << fmmu.slave_config_position
+<< dec << fmmu.slave_config_alias
-<< ", SM" << dec << (unsigned int) fmmu.sync_index << " ("
+<< ":" << fmmu.slave_config_position
-<< setfill(' ') << setw(3)
+<< ", SM" << (unsigned int) fmmu.sync_index << " ("
+<< setfill(' ') << setw(6)
 << (fmmu.dir == EC_DIR_INPUT ? "Input" : "Output")
 << "), LogAddr 0x"
-<< hex << setfill('0') << setw(8) << fmmu.logical_address
+<< hex << setfill('0')
+<< setw(8) << fmmu.logical_address
 << ", Size " << dec << fmmu.data_size << endl;
 dataOffset = fmmu.logical_address - domain.logical_base_address;
 if (dataOffset + fmmu.data_size > domain.data_size) {
 stringstream err;
 for (i = 0; i < slave.sync_count; i++) {
 getSync(&sync, slavePosition, i);
 cout << "SM" << i << ":"
 << " PhysAddr 0x"
-<< hex << setfill('0') << setw(4) << sync.physical_start_address
+<< hex << setfill('0')
+<< setw(4) << sync.physical_start_address
 << ", DefaultSize "
 << dec << setfill(' ') << setw(4) << sync.default_size
 << ", ControlRegister 0x"
 << hex << setfill('0') << setw(2)
 << (unsigned int) sync.control_register
 for (j = 0; j < sync.pdo_count; j++) {
 getPdo(&pdo, slavePosition, i, j);
 cout << "  " << (sync.control_register & 0x04 ? "R" : "T")
 << "xPdo 0x"
-<< hex << setfill('0') << setw(4) << pdo.index
+<< hex << setfill('0')
+<< setw(4) << pdo.index
 << " \"" << pdo.name << "\"" << endl;
 if (quiet)
 continue;
 for (k = 0; k < pdo.entry_count; k++) {
 getPdoEntry(&entry, slavePosition, i, j, k);
 cout << "    Pdo entry 0x"
-<< hex << setfill('0') << setw(4) << entry.index
+<< hex << setfill('0')
+<< setw(4) << entry.index
 << ":" << setw(2) << (unsigned int) entry.subindex
 << ", " << dec << (unsigned int) entry.bit_length
 << " bit, \"" << entry.name << "\"" << endl;
 }
 }
 for (i = 0; i < slave.sdo_count; i++) {
 getSdo(&sdo, slavePosition, i);
 cout << "Sdo 0x"
-<< hex << setfill('0') << setw(4) << sdo.sdo_index
+<< hex << setfill('0')
+<< setw(4) << sdo.sdo_index
 << ", \"" << sdo.name << "\"" << endl;
 if (quiet)
 continue;
 for (j = 0; j <= sdo.max_subindex; j++) {
 getSdoEntry(&entry, slavePosition, -i, j);
 cout << "  0x" << hex << setfill('0')
 << setw(4) << sdo.sdo_index << ":"
 << setw(2) << (unsigned int) entry.sdo_entry_subindex
 << ", ";
 if ((d = findDataType(entry.data_type))) {
 cout << d->name;
 cout
 << "State: " << slaveState(slave.state) << endl
 << "Flag: " << (slave.error_flag ? 'E' : '+') << endl
 << "Identity:" << endl
-<< "  Vendor Id: 0x"
+<< "  Vendor Id:       0x"
-<< hex << setfill('0') << setw(8) << slave.vendor_id << endl
+<< hex << setfill('0')
-<< "  Product code: 0x"
+<< setw(8) << slave.vendor_id << endl
+<< "  Product code:    0x"
 << setw(8) << slave.product_code << endl
 << "  Revision number: 0x"
 << setw(8) << slave.revision_number << endl
-<< "  Serial number: 0x"
+<< "  Serial number:   0x"
 << setw(8) << slave.serial_number << endl;
 if (slave.mailbox_protocols) {
 cout << "Mailboxes:" << endl
 << "  RX: 0x"

changeset 1072	94a5f043dee5
parent 1071	82122748f4e0
child 1073	f3c50aa42b6c