Squashed '3rdparty/machinetalk-protobuf/' changes from 9378252..46c9536

46c9536 Merge pull request #16 from strahlex/shutdown 6536eae Merge pull request #17 from strahlex/increments 3860b1b status: adding per axis increments value to config message cdedb9c enabled shutdown and confirm shutdown message types git-subtree-dir: 3rdparty/machinetalk-protobuf git-subtree-split: 46c95369ac51e5c48eb8ec5c1865977ebb5b9c02
machinekit · Jul 20, 2015 · ad87138 · ad87138
1 parent 2c63a81
commit ad87138
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/proto/status.proto b/proto/status.proto
@@ -148,6 +148,7 @@ message EmcStatusConfigAxis {
     optional int32          home_sequence       = 9;
     optional double         max_acceleration    = 10;
     optional double         max_velocity        = 11;
+    optional string         increments          = 12;
 }
 
 message EmcProgramExtension {

diff --git a/proto/types.proto b/proto/types.proto
@@ -216,8 +216,8 @@ enum ContainerType {
     // MT_OFFER          = 30;
     // MT_CONFIRM_OFFER  = 35;
     // MT_DISPLAY_MESSAGE = 40;
-    // MT_SHUTDOWN        = 45;
-    // MT_CONFIRM_SHUTDOWN = 50;
+    MT_SHUTDOWN         = 45;
+    MT_CONFIRM_SHUTDOWN = 50;
 
     // identification of individual RTMessage submessages
     // field Container.rtmessage