equal
deleted
inserted
replaced
98 if (slaves.size() != 1) { |
98 if (slaves.size() != 1) { |
99 throwSingleSlaveRequired(slaves.size()); |
99 throwSingleSlaveRequired(slaves.size()); |
100 } |
100 } |
101 data.slave_position = slaves.front().position; |
101 data.slave_position = slaves.front().position; |
102 |
102 |
103 if (dataTypeStr != "") { // data type specified |
103 if (!getDataType().empty()) { // data type specified |
104 if (!(dataType = findDataType(dataTypeStr))) { |
104 if (!(dataType = findDataType(getDataType()))) { |
105 err << "Invalid data type '" << dataTypeStr << "'!"; |
105 err << "Invalid data type '" << getDataType() << "'!"; |
106 throwInvalidUsageException(err); |
106 throwInvalidUsageException(err); |
107 } |
107 } |
108 } else { // no data type specified: fetch from dictionary |
108 } else { // no data type specified: fetch from dictionary |
109 ec_ioctl_slave_sdo_entry_t entry; |
109 ec_ioctl_slave_sdo_entry_t entry; |
110 |
110 |