Update custom ER-Force RobotSpecs (remove dribbler_height)

Author: g3force

config/robot-specs.yaml

@@ -15,7 +15,6 @@ robot-specs:
       vel_angular_max: 20
     custom_erforce:
       shoot_radius: 0.067
-      dribbler_height: 0.04
       dribbler_width: 0.07
   "ER-Force":
     radius: 0.09
@@ -33,5 +32,4 @@ robot-specs:
       vel_angular_max: 20
     custom_erforce:
       shoot_radius: 0.067
-      dribbler_height: 0.04
       dribbler_width: 0.07

generateProto.sh

@@ -5,27 +5,8 @@ set -e
 # Print commands
 set -x
 
-# common GC
-protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/ssl_gc_common.proto
-protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/ssl_gc_geometry.proto
+# Update to latest protobuf compiler
+go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
 
-# vision
-protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/ssl_vision_detection.proto
-protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/ssl_vision_geometry.proto
-protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/ssl_vision_wrapper.proto
-
-# tracked vision
-protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/ssl_vision_detection_tracked.proto
-protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/ssl_vision_wrapper_tracked.proto
-
-# game events
-protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/ssl_gc_game_event.proto
-
-# referee message
-protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/ssl_gc_referee_message.proto
-
-# simulation control
-protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/ssl_simulation_custom_erforce_robot_spec.proto
-protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/ssl_simulation_error.proto
-protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/ssl_simulation_config.proto
-protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/ssl_simulation_control.proto
+# Generate all protobuf code
+protoc -I"./proto" -I"$GOPATH/src" --go_out="$GOPATH/src" proto/*.proto

internal/geom/ssl_gc_geometry.pb.go

@@ -34,9 +34,8 @@ type Limits struct {
 }
 
 type CustomRobotSpecErForce struct {
-	ShootRadius    float32 `yaml:"shoot_radius"`
-	DribblerHeight float32 `yaml:"dribbler_height"`
-	DribblerWidth  float32 `yaml:"dribbler_width"`
+	ShootRadius   float32 `yaml:"shoot_radius"`
+	DribblerWidth float32 `yaml:"dribbler_width"`
 }
 
 type RobotSpecHandler struct {
@@ -128,9 +127,8 @@ func mapRobotSpec(spec RobotSpec) (protoSpec *RobotSpecs) {
 	protoSpec.Limits = mapRobotLimits(spec.Limits)
 
 	customErForce := RobotSpecErForce{
-		ShootRadius:    &spec.CustomErforce.ShootRadius,
-		DribblerHeight: &spec.CustomErforce.DribblerHeight,
-		DribblerWidth:  &spec.CustomErforce.DribblerWidth,
+		ShootRadius:   &spec.CustomErforce.ShootRadius,
+		DribblerWidth: &spec.CustomErforce.DribblerWidth,
 	}
 	customErForceSerialized, err := proto.Marshal(&customErForce)
 	if err != nil {