Merge pull request machinekit#1417 from machinekoder/mt-merge-back

Merge back Machinetalk with fixes
tadtruex · Nov 15, 2018 · 3cdd782 · 3cdd782
2 parents 9c3423c + fe28710
commit 3cdd782
Show file tree

Hide file tree

Showing 7 changed files with 11,936 additions and 9,517 deletions.
diff --git a/src/machinetalk/proto/dist/machinetalk-protobuf.js b/src/machinetalk/proto/dist/machinetalk-protobuf.js
diff --git a/src/machinetalk/proto/dist/machinetalk-protobuf.min.js b/src/machinetalk/proto/dist/machinetalk-protobuf.min.js
diff --git a/src/machinetalk/proto/dist/machinetalk-protobuf.min.js.gz b/src/machinetalk/proto/dist/machinetalk-protobuf.min.js.gz
diff --git a/src/machinetalk/proto/dist/machinetalk-protobuf.min.map.json b/src/machinetalk/proto/dist/machinetalk-protobuf.min.map.json
diff --git a/src/machinetalk/proto/package.json b/src/machinetalk/proto/package.json
@@ -1,11 +1,11 @@
 {
   "name": "machinetalk-protobuf",
-  "version": "1.0.1",
+  "version": "1.1.01",
   "description": "Protobuf definitions to communicate with Machinetalk",
   "main": "js/index.js",
   "scripts": {
-      "prepublish": "js/scripts/install.js",
-      "bundle": "js/scripts/bundle.js"
+    "prepublish": "js/scripts/install.js",
+    "bundle": "js/scripts/bundle.js"
   },
   "repository": {
     "type": "git",
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/machinekit/machinetalk-protobuf#readme",
   "dependencies": {
     "mkdirp": "0.5.1",
-    "protobufjs": "5.0.0"
+    "protobufjs": "5.0.3"
   },
   "devDependencies": {
     "browserify": "^13.0.0",

diff --git a/src/machinetalk/proto/setup.py b/src/machinetalk/proto/setup.py
@@ -71,6 +71,8 @@
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
 
     # What does your project relate to?

diff --git a/src/machinetalk/proto/src/machinetalk/protobuf/jplan.proto b/src/machinetalk/proto/src/machinetalk/protobuf/jplan.proto
@@ -19,5 +19,5 @@ message JplanJoint {
 message JplanCommand {
     option (nanopb_msgopt).msgid = 354;
 
-    repeated JplanJoint joint =  2  [(nanopb).max_count = 10];;
+    repeated JplanJoint joint =  2  [(nanopb).max_count = 10];
 };