Merge branch 'science-sar' into auger-proto

BinghamtonRover · Feb 13, 2025 · b103906 · b103906
2 parents e648f2c + 5cf6026
commit b103906
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/science.proto b/science.proto
@@ -42,11 +42,11 @@ enum CarouselCommand {
 message ScienceCommand {
 	// Individual control over each motor. Indicates steps to move
 	float carousel_motor = 1;
-	float subsurface_motor = 2;
+	float subsurface_motor = 2; // Obsolete; leaving for legacy
 
 	// Control over other hardware
 	PumpState pumps = 4;
-	ServoState funnel = 5;
+	ServoState subsurface = 5;
 	CarouselCommand carousel = 6;	
 
 	// High level commands
@@ -68,6 +68,8 @@ message ScienceData {
 	float co2 = 3;
 	float humidity = 4;
 	float temperature = 5;
+
+	ServoState subsurface = 6;
 
-	Version version = 6;
+	Version version = 7;
 }