Update match timings for 2024 and remove timeout sounds.

Author: patfair

field/arena.go

@@ -986,7 +986,7 @@ func (arena *Arena) handleEstop(station string, state bool) {
 }
 
 func (arena *Arena) handleSounds(matchTimeSec float64) {
-	if arena.MatchState == PreMatch {
+	if arena.MatchState == PreMatch || arena.MatchState == TimeoutActive || arena.MatchState == PostTimeout {
 		// Only apply this logic during a match.
 		return
 	}
@@ -996,11 +996,6 @@ func (arena *Arena) handleSounds(matchTimeSec float64) {
 			// Skip sounds with negative timestamps; they are meant to only be triggered explicitly.
 			continue
 		}
-		if sound.Timeout && !(arena.MatchState == TimeoutActive || arena.MatchState == PostTimeout) ||
-			!sound.Timeout && (arena.MatchState == TimeoutActive || arena.MatchState == PostTimeout) {
-			// Skip timeout sounds if this is a regular match, and vice versa.
-			continue
-		}
 		if _, ok := arena.soundsPlayed[sound]; !ok {
 			if matchTimeSec > sound.MatchTimeSec && matchTimeSec-sound.MatchTimeSec < 1 {
 				arena.playSound(sound.Name)

game/match_sounds.go

@@ -9,7 +9,6 @@ type MatchSound struct {
 	Name          string
 	FileExtension string
 	MatchTimeSec  float64
-	Timeout       bool
 }
 
 // List of sounds and how many seconds into the match they are played. A negative time indicates that the sound can only
@@ -22,19 +21,16 @@ func UpdateMatchSounds() {
 			"start",
 			"wav",
 			0,
-			false,
 		},
 		{
 			"end",
 			"wav",
 			float64(MatchTiming.AutoDurationSec),
-			false,
 		},
 		{
 			"resume",
 			"wav",
 			float64(MatchTiming.AutoDurationSec + MatchTiming.PauseDurationSec),
-			false,
 		},
 		{
 			"warning",
@@ -43,37 +39,21 @@ func UpdateMatchSounds() {
 				MatchTiming.AutoDurationSec + MatchTiming.PauseDurationSec + MatchTiming.TeleopDurationSec -
 					MatchTiming.WarningRemainingDurationSec,
 			),
-			false,
 		},
 		{
 			"end",
 			"wav",
 			float64(MatchTiming.AutoDurationSec + MatchTiming.PauseDurationSec + MatchTiming.TeleopDurationSec),
-			false,
-		},
-		{
-			"timeout_warning",
-			"wav",
-			float64(MatchTiming.TimeoutDurationSec - MatchTiming.TimeoutWarningRemainingDurationSec),
-			true,
-		},
-		{
-			"end",
-			"wav",
-			float64(MatchTiming.TimeoutDurationSec),
-			true,
 		},
 		{
 			"abort",
 			"wav",
 			-1,
-			false,
 		},
 		{
 			"match_result",
 			"wav",
 			-1,
-			false,
 		},
 	}
 }

game/match_timing.go

@@ -10,14 +10,13 @@ import "time"
 var ChargeStationTeleopGracePeriod = 3 * time.Second
 
 var MatchTiming = struct {
-	WarmupDurationSec                  int
-	AutoDurationSec                    int
-	PauseDurationSec                   int
-	TeleopDurationSec                  int
-	WarningRemainingDurationSec        int
-	TimeoutDurationSec                 int
-	TimeoutWarningRemainingDurationSec int
-}{0, 15, 3, 135, 30, 0, 60}
+	WarmupDurationSec           int
+	AutoDurationSec             int
+	PauseDurationSec            int
+	TeleopDurationSec           int
+	WarningRemainingDurationSec int
+	TimeoutDurationSec          int
+}{0, 15, 3, 135, 20, 0}
 
 func GetDurationToAutoEnd() time.Duration {
 	return time.Duration(MatchTiming.WarmupDurationSec+MatchTiming.AutoDurationSec) * time.Second

model/event_settings_test.go

@@ -29,7 +29,7 @@ func TestEventSettingsReadWrite(t *testing.T) {
 			AutoDurationSec:             15,
 			PauseDurationSec:            3,
 			TeleopDurationSec:           135,
-			WarningRemainingDurationSec: 30,
+			WarningRemainingDurationSec: 20,
 			SustainabilityBonusLinkThresholdWithoutCoop: 6,
 			SustainabilityBonusLinkThresholdWithCoop:    5,
 			ActivationBonusPointThreshold:               26,