Skip to content

Commit 0e300d0

Browse files
committed
Move amplified time remaining assignment above score change check for notifiction.
1 parent 0c845c6 commit 0e300d0

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

field/arena.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -981,17 +981,17 @@ func (arena *Arena) handlePlcInputOutput() {
981981
blueAmpSpeaker.UpdateState(
982982
blueAmpNoteCount, blueSpeakerNoteCount, blueAmplifyButton, blueCoopButton, matchStartTime, currentTime,
983983
)
984+
redAmplifiedTimeRemaining := redAmpSpeaker.AmplifiedTimeRemaining(currentTime)
985+
arena.RedRealtimeScore.AmplifiedTimeRemainingSec = int(math.Ceil(redAmplifiedTimeRemaining))
986+
blueAmplifiedTimeRemaining := blueAmpSpeaker.AmplifiedTimeRemaining(currentTime)
987+
arena.BlueRealtimeScore.AmplifiedTimeRemainingSec = int(math.Ceil(blueAmplifiedTimeRemaining))
984988
if !oldRedScore.Equals(redScore) || !oldBlueScore.Equals(blueScore) ||
985989
oldRedAmplifiedTimeRemainingSec != arena.RedRealtimeScore.AmplifiedTimeRemainingSec ||
986990
oldBlueAmplifiedTimeRemainingSec != arena.BlueRealtimeScore.AmplifiedTimeRemainingSec {
987991
arena.RealtimeScoreNotifier.Notify()
988992
}
989993

990994
// Handle the amp outputs.
991-
redAmplifiedTimeRemaining := redAmpSpeaker.AmplifiedTimeRemaining(currentTime)
992-
arena.RedRealtimeScore.AmplifiedTimeRemainingSec = int(math.Ceil(redAmplifiedTimeRemaining))
993-
blueAmplifiedTimeRemaining := blueAmpSpeaker.AmplifiedTimeRemaining(currentTime)
994-
arena.BlueRealtimeScore.AmplifiedTimeRemainingSec = int(math.Ceil(blueAmplifiedTimeRemaining))
995995
if arena.MatchState == AutoPeriod || arena.MatchState == PausePeriod || arena.MatchState == TeleopPeriod {
996996
redLowAmpLight := redAmpSpeaker.BankedAmpNotes >= 1
997997
redHighAmpLight := redAmpSpeaker.BankedAmpNotes >= 2

0 commit comments

Comments
 (0)