NCGEARS/cheesy-arena-lite
1
0
Fork 0
mirror of https://github.com/Team254/cheesy-arena-lite.git synced 2026-03-09 21:56:50 -04:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Made the in-match alliance display stick around for a few seconds post-match.

Browse Source
This commit is contained in:
Patrick Fairbank
2014-09-04 22:50:29 -07:00
parent 89a1b1c127
commit 6b25b55cb7
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arena.go
View File

@@ -142,7 +142,7 @@ func (arena *Arena) Setup() {
arena.savedMatch = &Match{}
arena.savedMatchResult = &MatchResult{}
arena.allianceStationDisplays = make(map[string]string)
arena.allianceStationDisplayScreen = "blank"
arena.allianceStationDisplayScreen = "match"
arena.lights.Setup()
}
@@ -230,6 +230,10 @@ func (arena *Arena) LoadMatch(match *Match) error {
arena.matchLoadTeamsNotifier.Notify(nil)
arena.realtimeScoreNotifier.Notify(nil)
arena.allianceStationDisplayScreen = "match"
arena.allianceStationDisplayNotifier.Notify(nil)
return nil
}
@@ -461,6 +465,8 @@ func (arena *Arena) Update() {
time.Sleep(time.Second * matchEndScoreDwellSec)
arena.audienceDisplayScreen = "blank"
arena.audienceDisplayNotifier.Notify(nil)
arena.allianceStationDisplayScreen = "logo"
arena.allianceStationDisplayNotifier.Notify(nil)
}()
arena.playSoundNotifier.Notify("match-end")
}

1
displays.go
View File

@@ -1028,6 +1028,7 @@ func AllianceStationDisplayWebsocketHandler(w http.ResponseWriter, r *http.Reque
if !ok {
return
}
websocket.Write("matchTime", MatchTimeMessage{mainArena.MatchState, int(mainArena.lastMatchTimeSec)})
messageType = "setAllianceStationDisplay"
message = mainArena.allianceStationDisplayScreen
case _, ok := <-matchLoadTeamsListener:

9
static/css/alliance_station_display.css
View File

@@ -60,17 +60,20 @@ body[data-mode=match] .mode#match {
width: 100%;
height: 100%;
}
#match[data-state=AUTO_PERIOD], #match[data-state=PAUSE_PERIOD], #match[data-state=TELEOP_PERIOD], #match[data-state=ENDGAME_PERIOD] {
#match[data-state=AUTO_PERIOD], #match[data-state=PAUSE_PERIOD], #match[data-state=TELEOP_PERIOD],
#match[data-state=ENDGAME_PERIOD], #match[data-state=POST_MATCH] {
background-color: #fff;
color: #000;
}
#preMatch, #inMatch {
display: none;
}
#match[data-state=PRE_MATCH] #preMatch, #match[data-state=POST_MATCH] #preMatch {
#match[data-state=PRE_MATCH] #preMatch {
display: block;
}
#match[data-state=AUTO_PERIOD] #inMatch, #match[data-state=PAUSE_PERIOD] #inMatch, #match[data-state=TELEOP_PERIOD] #inMatch, #match[data-state=ENDGAME_PERIOD] #inMatch {
#match[data-state=AUTO_PERIOD] #inMatch, #match[data-state=PAUSE_PERIOD] #inMatch,
#match[data-state=TELEOP_PERIOD] #inMatch, #match[data-state=ENDGAME_PERIOD] #inMatch,
#match[data-state=POST_MATCH] #inMatch {
display: block;
}

3
static/js/alliance_station_display.js
View File

@@ -97,7 +97,8 @@ var handleRealtimeScore = function(data) {
};
var handleHotGoalLight = function(side) {
if (allianceStation != "" && (side == "left" && allianceStation[1] == "3" || side == "right" && allianceStation[1] == "1")) {
if (allianceStation != "" && (side == "left" && allianceStation[1] == "3" ||
side == "right" && allianceStation[1] == "1")) {
$("#match").attr("data-hotgoal", "active");
} else {
$("#match").attr("data-hotgoal", "");