diff -r ef907b0b5125 -r 4d179b06dd3c tool/CommandDownload.cpp --- a/tool/CommandDownload.cpp Mon Jan 26 11:16:10 2009 +0000 +++ b/tool/CommandDownload.cpp Mon Jan 26 11:45:30 2009 +0000 @@ -13,7 +13,7 @@ /*****************************************************************************/ CommandDownload::CommandDownload(): - SdoCommand("download", "Write an Sdo entry to a slave.") + SdoCommand("download", "Write an SDO entry to a slave.") { } @@ -29,28 +29,28 @@ << endl << "This command requires a single slave to be selected." << endl << endl - << "The data type of the Sdo entry is taken from the Sdo" << endl + << "The data type of the SDO entry is taken from the SDO" << endl << "dictionary by default. It can be overridden with the" << endl - << "--type option. If the slave does not support the Sdo" << endl - << "information service or the Sdo is not in the dictionary," << endl + << "--type option. If the slave does not support the SDO" << endl + << "information service or the SDO is not in the dictionary," << endl << "the --type option is mandatory." << endl << endl - << "These are the valid Sdo entry data types:" << endl + << "These are the valid SDO entry data types:" << endl << " int8, int16, int32, uint8, uint16, uint32, string." << endl << endl << "Arguments:" << endl - << " INDEX is the Sdo index and must be an unsigned" << endl + << " INDEX is the SDO index and must be an unsigned" << endl << " 16 bit number." << endl - << " SUBINDEX is the Sdo entry subindex and must be an" << endl + << " SUBINDEX is the SDO entry subindex and must be an" << endl << " unsigned 8 bit number." << endl << " VALUE is the value to download and must correspond" << endl - << " to the Sdo entry datatype (see above)." << endl + << " to the SDO entry datatype (see above)." << endl << endl << "Command-specific options:" << endl << " --alias -a " << endl << " --position -p Slave selection. See the help of" << endl << " the 'slaves' command." << endl - << " --type -t Sdo entry data type (see above)." << endl + << " --type -t SDO entry data type (see above)." << endl << endl << numericInfo(); @@ -77,7 +77,7 @@ >> resetiosflags(ios::basefield) // guess base from prefix >> data.sdo_index; if (strIndex.fail()) { - err << "Invalid Sdo index '" << args[0] << "'!"; + err << "Invalid SDO index '" << args[0] << "'!"; throwInvalidUsageException(err); } @@ -86,7 +86,7 @@ >> resetiosflags(ios::basefield) // guess base from prefix >> number; if (strSubIndex.fail() || number > 0xff) { - err << "Invalid Sdo subindex '" << args[1] << "'!"; + err << "Invalid SDO subindex '" << args[1] << "'!"; throwInvalidUsageException(err); } data.sdo_entry_subindex = number; @@ -110,12 +110,12 @@ m.getSdoEntry(&entry, data.slave_position, data.sdo_index, data.sdo_entry_subindex); } catch (MasterDeviceException &e) { - err << "Failed to determine Sdo entry data type. " + err << "Failed to determine SDO entry data type. " << "Please specify --type."; throwCommandException(err); } if (!(dataType = findDataType(entry.data_type))) { - err << "Pdo entry has unknown data type 0x" + err << "PDO entry has unknown data type 0x" << hex << setfill('0') << setw(4) << entry.data_type << "!" << " Please specify --type."; throwCommandException(err); @@ -207,7 +207,7 @@ m.sdoDownload(&data); } catch (MasterDeviceSdoAbortException &e) { delete [] data.data; - err << "Sdo transfer aborted with code 0x" + err << "SDO transfer aborted with code 0x" << setfill('0') << hex << setw(8) << e.abortCode << ": " << abortText(e.abortCode); throwCommandException(err);