AmpSpeaker.UpdateState isPlayoff

cpapplefamily · Nov 30, 2024 · dc0701d · dc0701d
1 parent 765b769
commit dc0701d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/field/arena.go b/field/arena.go
@@ -1010,10 +1010,10 @@ func (arena *Arena) handlePlcInputOutput() {
 		redAmpSpeaker := &arena.RedRealtimeScore.CurrentScore.AmpSpeaker
 		blueAmpSpeaker := &arena.BlueRealtimeScore.CurrentScore.AmpSpeaker
 		redAmpSpeaker.UpdateState(
-			redAmpNoteCount, redSpeakerNoteCount, redAmplifyButton, redCoopButton, matchStartTime, currentTime,
+			redAmpNoteCount, redSpeakerNoteCount, redAmplifyButton, redCoopButton, matchStartTime, currentTime, arena.CurrentMatch.Type == model.Playoff,
 		)
 		blueAmpSpeaker.UpdateState(
-			blueAmpNoteCount, blueSpeakerNoteCount, blueAmplifyButton, blueCoopButton, matchStartTime, currentTime,
+			blueAmpNoteCount, blueSpeakerNoteCount, blueAmplifyButton, blueCoopButton, matchStartTime, currentTime,arena.CurrentMatch.Type == model.Playoff,
 		)
 		if !oldRedScore.Equals(redScore) || !oldBlueScore.Equals(blueScore) ||
 			oldRedAmplifiedTimeRemainingSec != arena.RedRealtimeScore.AmplifiedTimeRemainingSec ||
@@ -1167,10 +1167,10 @@ func (arena *Arena) handlePlcInputOutput() {
 		redAmpSpeaker := &arena.RedRealtimeScore.CurrentScore.AmpSpeaker
 		blueAmpSpeaker := &arena.BlueRealtimeScore.CurrentScore.AmpSpeaker
 		redAmpSpeaker.UpdateState(
-			redAmpNoteCount, redSpeakerNoteCount, redAmplifyButton, redCoopButton, matchStartTime, currentTime,
+			redAmpNoteCount, redSpeakerNoteCount, redAmplifyButton, redCoopButton, matchStartTime, currentTime,arena.CurrentMatch.Type == model.Playoff,
 		)
 		blueAmpSpeaker.UpdateState(
-			blueAmpNoteCount, blueSpeakerNoteCount, blueAmplifyButton, blueCoopButton, matchStartTime, currentTime,
+			blueAmpNoteCount, blueSpeakerNoteCount, blueAmplifyButton, blueCoopButton, matchStartTime, currentTime,arena.CurrentMatch.Type == model.Playoff,
 		)
 		if !oldRedScore.Equals(redScore) || !oldBlueScore.Equals(blueScore) ||
 			oldRedAmplifiedTimeRemainingSec != arena.RedRealtimeScore.AmplifiedTimeRemainingSec ||

diff --git a/web/scoring_panel.go b/web/scoring_panel.go
@@ -167,7 +167,8 @@ func (web *Web) scoringPanelWebsocketHandler(w http.ResponseWriter, r *http.Requ
 
 													_matchStartTime,
 
-													_currentTime)
+													_currentTime,
+													web.arena.CurrentMatch.Type == model.Playoff)
 						log.Printf("Speaker Pressed")
 						scoreChanged = true
 				case "O":
@@ -216,7 +217,8 @@ func (web *Web) scoringPanelWebsocketHandler(w http.ResponseWriter, r *http.Requ
 
 													_matchStartTime,
 
-													_currentTime)
+													_currentTime,
+													web.arena.CurrentMatch.Type == model.Playoff)
 					log.Printf("Amp Pressed")
 					scoreChanged = true
 				case "U":
@@ -273,7 +275,8 @@ func (web *Web) scoringPanelWebsocketHandler(w http.ResponseWriter, r *http.Requ
 
 													_matchStartTime,
 
-													_currentTime)
+													_currentTime,
+													web.arena.CurrentMatch.Type == model.Playoff)
 					log.Printf("amplifyButton Pressed")
 					scoreChanged = true
 				case "coopButton":
@@ -292,7 +295,8 @@ func (web *Web) scoringPanelWebsocketHandler(w http.ResponseWriter, r *http.Requ
 
 													_matchStartTime,
 
-													_currentTime)
+													_currentTime,
+													web.arena.CurrentMatch.Type == model.Playoff)
 					log.Printf("coopButton Pressed")
 					scoreChanged = true
 			}