Skip to content

Commit

Permalink
Squashed '3rdparty/machinetalk-protobuf/' changes from 152d2a2..4e534c6
Browse files Browse the repository at this point in the history
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: 4e534c6
  • Loading branch information
machinekoder committed Jul 22, 2015
1 parent 3c0052a commit f669e23
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions proto/status.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}

0 comments on commit f669e23

Please sign in to comment.