From dd8cba118190ed3a1652d51b53f6f81f6b9306fc Mon Sep 17 00:00:00 2001 From: kenneth ou Date: Sun, 16 Feb 2025 14:56:27 -0500 Subject: [PATCH] Made changes backwards-compatible --- science.proto | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/science.proto b/science.proto index cc82f2d..6f33ec0 100644 --- a/science.proto +++ b/science.proto @@ -1,4 +1,4 @@ -// Version 2.0 +// Version 1.1 syntax = "proto3"; @@ -41,19 +41,23 @@ enum CarouselCommand { message ScienceCommand { // Individual control over each motor. Indicates steps to move float carousel_motor = 1; + float unused_2 = 2; + float unused_3 = 3; + // Control over other hardware - PumpState pumps = 2; - ServoState subsurface = 3; - CarouselCommand carousel = 4; + PumpState pumps = 4; + ServoState unused_5 = 5; + ServoState subsurface = 6; + CarouselCommand carousel = 7; // High level commands - bool calibrate = 5; - bool stop = 6; - int32 sample = 7; - ScienceState state = 8; + bool calibrate = 8; + bool stop = 9; + int32 sample = 10; + ScienceState state = 11; - Version version = 9; + Version version = 12; } /// Data coming from the science subsystem. @@ -66,8 +70,8 @@ message ScienceData { float co2 = 3; float humidity = 4; float temperature = 5; - - ServoState subsurface = 6; - Version version = 7; + Version version = 6; + + ServoState subsurface = 7; }