# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1232971172 0
# Node ID da3d22a275003286ed97101962d0a788384052e1
# Parent  7b9898062c8f3377bf2a9a5767b402195f301002
merge -c1617 branches/stable-1.4: Added octet_string as an SDO data type.

diff -r 7b9898062c8f -r da3d22a27500 tool/CommandDownload.cpp
--- a/tool/CommandDownload.cpp	Mon Jan 26 11:59:07 2009 +0000
+++ b/tool/CommandDownload.cpp	Mon Jan 26 11:59:32 2009 +0000
@@ -36,7 +36,8 @@
 		<< "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 @@
                 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;
diff -r 7b9898062c8f -r da3d22a27500 tool/CommandUpload.cpp
--- a/tool/CommandUpload.cpp	Mon Jan 26 11:59:07 2009 +0000
+++ b/tool/CommandUpload.cpp	Mon Jan 26 11:59:32 2009 +0000
@@ -36,7 +36,8 @@
         << "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
@@ -181,6 +182,10 @@
             cout << string((const char *) data.target, data.data_size)
                 << endl;
             break;
+        case 0x000a: // octet_string
+            cout << string((const char *) data.target, data.data_size)
+                << endl;
+            break;
         default:
             printRawData(data.target, data.data_size); // FIXME
             break;
diff -r 7b9898062c8f -r da3d22a27500 tool/SdoCommand.cpp
--- a/tool/SdoCommand.cpp	Mon Jan 26 11:59:07 2009 +0000
+++ b/tool/SdoCommand.cpp	Mon Jan 26 11:59:32 2009 +0000
@@ -57,14 +57,15 @@
 /****************************************************************************/
 
 const SdoCommand::DataType SdoCommand::dataTypes[] = {
-    {"int8",   0x0002, 1},
-    {"int16",  0x0003, 2},
-    {"int32",  0x0004, 4},
-    {"uint8",  0x0005, 1},
-    {"uint16", 0x0006, 2},
-    {"uint32", 0x0007, 4},
-    {"string", 0x0009, 0},
-    {"raw",    0xffff, 0},
+    {"int8",         0x0002, 1},
+    {"int16",        0x0003, 2},
+    {"int32",        0x0004, 4},
+    {"uint8",        0x0005, 1},
+    {"uint16",       0x0006, 2},
+    {"uint32",       0x0007, 4},
+    {"string",       0x0009, 0},
+    {"octet_string", 0x000a, 0},
+    {"raw",          0xffff, 0},
     {}
 };