diff --git a/arm.proto b/arm.proto index 4bd3168..6d4ef90 100644 --- a/arm.proto +++ b/arm.proto @@ -1,4 +1,4 @@ -// Version: 1.2 +// Version: 1.3 syntax = "proto3"; import "version.proto"; @@ -42,6 +42,11 @@ message ArmCommand { Version version = 11; } +message AugerData { + int32 speedActual = 1; + BoolState augerOn = 2; +} + message GripperData { MotorData lift = 1; MotorData rotate = 2; @@ -50,6 +55,17 @@ message GripperData { Version version = 4; int32 servoAngle = 5; BoolState laserState = 6; + + AugerData augerData = 7; +} + +message AugerCommand { + float augerSpeed = 1; + + // Indicates that [augerSpeed] = 0 is valid, even though 0 usually means no value. + bool speedSet = 2; + + BoolState augerOn = 3; } message GripperCommand { @@ -70,4 +86,6 @@ message GripperCommand { Version version = 9; int32 servoAngle = 10; BoolState laserState = 11; + + AugerCommand auger = 12; } diff --git a/science.proto b/science.proto index 087c4d4..6f33ec0 100644 --- a/science.proto +++ b/science.proto @@ -1,4 +1,4 @@ -// Version 1.0 +// Version 1.1 syntax = "proto3"; @@ -41,13 +41,14 @@ enum CarouselCommand { message ScienceCommand { // Individual control over each motor. Indicates steps to move float carousel_motor = 1; - float scoop_motor = 2; - float subsurface_motor = 3; + float unused_2 = 2; + float unused_3 = 3; + // Control over other hardware PumpState pumps = 4; - ServoState funnel = 5; - ServoState scoop = 6; + ServoState unused_5 = 5; + ServoState subsurface = 6; CarouselCommand carousel = 7; // High level commands @@ -71,4 +72,6 @@ message ScienceData { float temperature = 5; Version version = 6; + + ServoState subsurface = 7; }