Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-09-22 18:13:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge -c1617 branches/stable-1.4: Added octet_string as an SDO data type.

Browse Source
This commit is contained in:
Florian Pose
2009-01-26 11:59:32 +00:00
parent 7e69daf7dd
commit b3238a745f
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool/CommandDownload.cpp
+10 -1
View File
@@ -36,7 +36,8 @@ string CommandDownload::helpString() const
<< "the --type option is mandatory." << endl
<< endl
<< "These are the valid SDO entry data types:" << endl
<< " int8, int16, int32, uint8, uint16, uint32, string." << endl
<< " int8, int16, int32, uint8, uint16, uint32, string," << endl
<< " octet_string." << endl
<< endl
<< "Arguments:" << endl
<< " INDEX is the SDO index and must be an unsigned" << endl
@@ -190,6 +191,14 @@ void CommandDownload::execute(MasterDevice &m, const StringVector &args)
data.data_size = strValue.str().size();
strValue >> (char *) data.data;
break;
case 0x000a: // octet_string
if (strValue.str().size() >= data.data_size) {
err << "String too large";
throwCommandException(err);
}
data.data_size = strValue.str().size();
strValue >> (char *) data.data;
break;
default:
delete [] data.data;