Skip to content

Commit

Permalink
Merge pull request #50 from strahlex/small-clean
Browse files Browse the repository at this point in the history 
Fixed case inconsistency and added generic update messagetypes
  • Loading branch information
@bobvanderlinden
bobvanderlinden committed Jan 13, 2016
2 parents 8ecfe22 + 3f5125c commit 5621140
Show file tree
Hide file tree
Showing 6 changed files with 104 additions and 20 deletions.
86 changes: 83 additions & 3 deletions dist/machinetalk-protobuf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2056,6 +2056,14 @@ module.exports = require("protobufjs").newBuilder({})['import']({
"name": "MT_ERROR",
"id": 360
},
{
"name": "MT_FULL_UPDATE",
"id": 370
},
{
"name": "MT_INCREMENTAL_UPDATE",
"id": 371
},
{
"name": "MT_TASK_REPLY",
"id": 400
Expand Down Expand Up @@ -5132,6 +5140,14 @@ module.exports = require("protobufjs").newBuilder({})['import']({
"name": "MT_ERROR",
"id": 360
},
{
"name": "MT_FULL_UPDATE",
"id": 370
},
{
"name": "MT_INCREMENTAL_UPDATE",
"id": 371
},
{
"name": "MT_TASK_REPLY",
"id": 400
Expand Down Expand Up @@ -9363,7 +9379,7 @@ module.exports = require("protobufjs").newBuilder({})['import']({
{
"rule": "optional",
"type": "EmcAxisType",
"name": "axisType",
"name": "axis_type",
"id": 2
},
{
Expand Down Expand Up @@ -11969,6 +11985,14 @@ module.exports = require("protobufjs").newBuilder({})['import']({
"name": "MT_ERROR",
"id": 360
},
{
"name": "MT_FULL_UPDATE",
"id": 370
},
{
"name": "MT_INCREMENTAL_UPDATE",
"id": 371
},
{
"name": "MT_TASK_REPLY",
"id": 400
Expand Down Expand Up @@ -17739,7 +17763,7 @@ module.exports = require("protobufjs").newBuilder({})['import']({
{
"rule": "optional",
"type": "EmcAxisType",
"name": "axisType",
"name": "axis_type",
"id": 2
},
{
Expand Down Expand Up @@ -20367,6 +20391,14 @@ module.exports = require("protobufjs").newBuilder({})['import']({
"name": "MT_ERROR",
"id": 360
},
{
"name": "MT_FULL_UPDATE",
"id": 370
},
{
"name": "MT_INCREMENTAL_UPDATE",
"id": 371
},
{
"name": "MT_TASK_REPLY",
"id": 400
Expand Down Expand Up @@ -24272,6 +24304,14 @@ module.exports = require("protobufjs").newBuilder({})['import']({
"name": "MT_ERROR",
"id": 360
},
{
"name": "MT_FULL_UPDATE",
"id": 370
},
{
"name": "MT_INCREMENTAL_UPDATE",
"id": 371
},
{
"name": "MT_TASK_REPLY",
"id": 400
Expand Down Expand Up @@ -27119,6 +27159,14 @@ module.exports = require("protobufjs").newBuilder({})['import']({
"name": "MT_ERROR",
"id": 360
},
{
"name": "MT_FULL_UPDATE",
"id": 370
},
{
"name": "MT_INCREMENTAL_UPDATE",
"id": 371
},
{
"name": "MT_TASK_REPLY",
"id": 400
Expand Down Expand Up @@ -29379,7 +29427,7 @@ module.exports = require("protobufjs").newBuilder({})['import']({
{
"rule": "optional",
"type": "EmcAxisType",
"name": "axisType",
"name": "axis_type",
"id": 2
},
{
Expand Down Expand Up @@ -31281,6 +31329,14 @@ module.exports = require("protobufjs").newBuilder({})['import']({
"name": "MT_ERROR",
"id": 360
},
{
"name": "MT_FULL_UPDATE",
"id": 370
},
{
"name": "MT_INCREMENTAL_UPDATE",
"id": 371
},
{
"name": "MT_TASK_REPLY",
"id": 400
Expand Down Expand Up @@ -34238,6 +34294,14 @@ module.exports = require("protobufjs").newBuilder({})['import']({
"name": "MT_ERROR",
"id": 360
},
{
"name": "MT_FULL_UPDATE",
"id": 370
},
{
"name": "MT_INCREMENTAL_UPDATE",
"id": 371
},
{
"name": "MT_TASK_REPLY",
"id": 400
Expand Down Expand Up @@ -36666,6 +36730,14 @@ module.exports = require("protobufjs").newBuilder({})['import']({
"name": "MT_ERROR",
"id": 360
},
{
"name": "MT_FULL_UPDATE",
"id": 370
},
{
"name": "MT_INCREMENTAL_UPDATE",
"id": 371
},
{
"name": "MT_TASK_REPLY",
"id": 400
Expand Down Expand Up @@ -38986,6 +39058,14 @@ module.exports = require("protobufjs").newBuilder({})['import']({
"name": "MT_ERROR",
"id": 360
},
{
"name": "MT_FULL_UPDATE",
"id": 370
},
{
"name": "MT_INCREMENTAL_UPDATE",
"id": 371
},
{
"name": "MT_TASK_REPLY",
"id": 400
Expand Down
30 changes: 15 additions & 15 deletions dist/machinetalk-protobuf.min.js
View file

Large diffs are not rendered by default.

Binary file modified dist/machinetalk-protobuf.min.js.gz
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/machinetalk-protobuf.min.map.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/machinetalk/protobuf/status.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ message EmcStatusConfigAxis {
option (nanopb_msgopt).msgid = 1102;

required int32 index = 1; /// Axis index.
optional EmcAxisType axisType = 2; /// Type of axis. Reflects [AXIS_N]TYPE
optional EmcAxisType axis_type = 2; /// Type of axis. Reflects [AXIS_N]TYPE
optional double backlash = 3; /// Axis backlash. Reflects [AXIS_N]BACKLASH
optional double max_ferror = 4; /// Maximum following error. Reflects [AXIS_N]FERROR
optional double max_position_limit = 5; /// Maximum position limit. Reflects [AXIS_N]MAX_LIMIT
Expand Down
4 changes: 4 additions & 0 deletions src/machinetalk/protobuf/types.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,10 @@ enum ContainerType {
// generic error reply. note field contains explanation.
MT_ERROR = 360;

// generic full update and incremental update
MT_FULL_UPDATE = 370;
MT_INCREMENTAL_UPDATE = 371;

// task/client comms
MT_TASK_REPLY = 400;
MT_TICKET_UPDATE = 401;
Expand Down

0 comments on commit 5621140

Please sign in to comment.