From f669e2369487adf53a09a5c5a7f9ac9a8a5d1a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20R=C3=B6ssler?= <mail.aroessler@gmail.com>
Date: Wed, 22 Jul 2015 09:50:20 +0200
Subject: [PATCH] Squashed '3rdparty/machinetalk-protobuf/' changes from
 152d2a2..4e534c6

4e534c6 Merge pull request #19 from strahlex/user-commands
72c5fb5 machinetalk-protobuf: added user_command field to status message

git-subtree-dir: 3rdparty/machinetalk-protobuf
git-subtree-split: 4e534c63539648a528977d0e0e32d3ae93c3ebff
---
 proto/status.proto | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/proto/status.proto b/proto/status.proto
index c8ba11104..41bbf4b5a 100644
--- a/proto/status.proto
+++ b/proto/status.proto
@@ -248,6 +248,7 @@ message EmcStatusConfig {
     optional string                     remote_path              = 35;
     optional EmcTimeUnitsType           time_units               = 36;
     optional string                     name                     = 37;
+    repeated EmcStatusUserCommand       user_command             = 38;
 }
 
 message EmcStatusMotion {
@@ -367,3 +368,11 @@ message EmcCommandParameters {
     optional EmcPose                pose = 103;
     optional EmcToolData            tool_data = 104;
 }
+
+message EmcStatusUserCommand {
+
+    option (nanopb_msgopt).msgid = 1116;
+
+    required int32          index = 1;
+    optional string         command = 2;
+}