Merge pull request #7 from strahlex/includefix

Fixes to includes and more
machinekit · Nov 17, 2014 · db74406 · db74406
2 parents 0b94620 + ee81808
commit db74406
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -34,6 +34,9 @@ CXXGEN   := generated
 # generated Python files
 PYGEN    := python
 
+# disable protobuf.js per default
+PROTOBUFJS := 0
+
 # directory for ProtoBuf.js generated files
 PROTOBUFJS_GEN := js
 

diff --git a/proto/canon.proto b/proto/canon.proto
@@ -2,7 +2,6 @@ import "nanopb.proto";
 import "types.proto";
 import "emcclass.proto";
 import "motcmds.proto";
-import "status.proto";
 
 package pb;
 

diff --git a/proto/log.proto b/proto/log.proto
@@ -2,7 +2,6 @@ package pb;
 
 import "nanopb.proto";
 import "types.proto";
-import "value.proto";
 
 message LogMessage {
     required MsgOrigin origin  = 10;

diff --git a/proto/message.proto b/proto/message.proto
@@ -9,7 +9,7 @@ import "types.proto";
 import "object.proto";
 import "log.proto";
 import "motcmds.proto";
-import "test.proto";
+//import "test.proto";
 import "task.proto";
 import "canon.proto";
 import "value.proto";

diff --git a/proto/motcmds.proto b/proto/motcmds.proto
@@ -1,8 +1,7 @@
+package pb;
 
 import "emcclass.proto";
 
-package pb;
-
 // an uncleaned first transliteration
 
 // add _ to avoid collision with macros in emc/nml_intf/motion_typesh
@@ -157,4 +156,4 @@ message MotionStatus {
     required fixed32        commandNumEcho = 20;	/* increment this for new command */
     required cmd_status_t commandStatus = 30;	/* result of most recent command */
     optional EmcPose         carte_pos_fb = 40;	/* actual Cartesian position */
-};
+};
diff --git a/proto/object.proto b/proto/object.proto
@@ -3,7 +3,6 @@
 
 import "nanopb.proto";
 import "types.proto";
-import "value.proto";
 
 package pb;
 

diff --git a/proto/preview.proto b/proto/preview.proto
@@ -1,5 +1,3 @@
-//import "nanopb.proto";
-
 package pb;
 
 // experimental axis/joint representation

diff --git a/proto/rtapi_message.proto b/proto/rtapi_message.proto
@@ -1,5 +1,4 @@
 import "nanopb.proto";
-import "types.proto";
 import "value.proto";
 
 package pb;

diff --git a/proto/rtapicommand.proto b/proto/rtapicommand.proto
@@ -1,6 +1,4 @@
 import "nanopb.proto";
-import "types.proto";
-import "value.proto";
 
 package pb;
 

diff --git a/proto/test.proto b/proto/test.proto
@@ -1,6 +1,5 @@
 // use any of the below for testing and experimentation.
 
-import "types.proto";
 import "emcclass.proto";
 
 package pb;

diff --git a/proto/types.proto b/proto/types.proto
@@ -66,7 +66,7 @@ enum ObjectType {
     ORIGINATOR        = 22;
     NAMED_VALUE       = 25;
 
-    ERROR             = 30;
+    OT_ERROR          = 30;
 }
 
 enum RCS_STATUS {