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

Added remote reloading of all displays.

Browse Source
This commit is contained in:
Patrick Fairbank
2014-08-23 22:04:26 -07:00
parent 40ffe03158
commit f593e79b53
7 changed files with 108 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arena.go
View File

@@ -81,6 +81,7 @@ type Arena struct {
allianceSelectionNotifier *Notifier
lowerThirdNotifier *Notifier
hotGoalLightNotifier *Notifier
reloadDisplaysNotifier *Notifier
audienceDisplayScreen string
allianceStationDisplays map[string]string
allianceStationDisplayScreen string
@@ -128,6 +129,7 @@ func (arena *Arena) Setup() {
arena.allianceSelectionNotifier = NewNotifier()
arena.lowerThirdNotifier = NewNotifier()
arena.hotGoalLightNotifier = NewNotifier()
arena.reloadDisplaysNotifier = NewNotifier()
// Load empty match as current.
arena.MatchState = PRE_MATCH

87
displays.go
View File

@@ -64,6 +64,8 @@ func AudienceDisplayWebsocketHandler(w http.ResponseWriter, r *http.Request) {
defer close(allianceSelectionListener)
lowerThirdListener := mainArena.lowerThirdNotifier.Listen()
defer close(lowerThirdListener)
reloadDisplaysListener := mainArena.reloadDisplaysNotifier.Listen()
defer close(reloadDisplaysListener)
// Send the various notifications immediately upon connection.
var data interface{}
@@ -194,6 +196,12 @@ func AudienceDisplayWebsocketHandler(w http.ResponseWriter, r *http.Request) {
}
messageType = "lowerThird"
message = lowerThird
case _, ok := <-reloadDisplaysListener:
if !ok {
return
}
messageType = "reload"
message = nil
}
err = websocket.Write(messageType, message)
if err != nil {
@@ -234,6 +242,53 @@ func PitDisplayHandler(w http.ResponseWriter, r *http.Request) {
}
}
// The websocket endpoint for the pit display, used only to force reloads remotely.
func PitDisplayWebsocketHandler(w http.ResponseWriter, r *http.Request) {
websocket, err := NewWebsocket(w, r)
if err != nil {
handleWebErr(w, err)
return
}
defer websocket.Close()
reloadDisplaysListener := mainArena.reloadDisplaysNotifier.Listen()
defer close(reloadDisplaysListener)
// Spin off a goroutine to listen for notifications and pass them on through the websocket.
go func() {
for {
var messageType string
var message interface{}
select {
case _, ok := <-reloadDisplaysListener:
if !ok {
return
}
messageType = "reload"
message = nil
}
err = websocket.Write(messageType, message)
if err != nil {
// The client has probably closed the connection; nothing to do here.
return
}
}
}()
// Loop, waiting for commands and responding to them, until the client closes the connection.
for {
_, _, err := websocket.Read()
if err != nil {
if err == io.EOF {
// Client has closed the connection; nothing to do here.
return
}
log.Printf("Websocket error: %s", err)
return
}
}
}
// Renders the announcer display which shows team info and scores for the current match.
func AnnouncerDisplayHandler(w http.ResponseWriter, r *http.Request) {
template := template.New("").Funcs(templateHelpers)
@@ -271,6 +326,8 @@ func AnnouncerDisplayWebsocketHandler(w http.ResponseWriter, r *http.Request) {
defer close(scorePostedListener)
audienceDisplayListener := mainArena.audienceDisplayNotifier.Listen()
defer close(audienceDisplayListener)
reloadDisplaysListener := mainArena.reloadDisplaysNotifier.Listen()
defer close(reloadDisplaysListener)
// Send the various notifications immediately upon connection.
var data interface{}
@@ -374,6 +431,12 @@ func AnnouncerDisplayWebsocketHandler(w http.ResponseWriter, r *http.Request) {
}
messageType = "setAudienceDisplay"
message = mainArena.audienceDisplayScreen
case _, ok := <-reloadDisplaysListener:
if !ok {
return
}
messageType = "reload"
message = nil
}
err = websocket.Write(messageType, message)
if err != nil {
@@ -459,6 +522,8 @@ func ScoringDisplayWebsocketHandler(w http.ResponseWriter, r *http.Request) {
matchLoadTeamsListener := mainArena.matchLoadTeamsNotifier.Listen()
defer close(matchLoadTeamsListener)
reloadDisplaysListener := mainArena.reloadDisplaysNotifier.Listen()
defer close(reloadDisplaysListener)
// Send the various notifications immediately upon connection.
err = websocket.Write("score", *score)
@@ -479,6 +544,12 @@ func ScoringDisplayWebsocketHandler(w http.ResponseWriter, r *http.Request) {
}
messageType = "score"
message = *score
case _, ok := <-reloadDisplaysListener:
if !ok {
return
}
messageType = "reload"
message = nil
}
err = websocket.Write(messageType, message)
if err != nil {
@@ -710,6 +781,8 @@ func RefereeDisplayWebsocketHandler(w http.ResponseWriter, r *http.Request) {
matchLoadTeamsListener := mainArena.matchLoadTeamsNotifier.Listen()
defer close(matchLoadTeamsListener)
reloadDisplaysListener := mainArena.reloadDisplaysNotifier.Listen()
defer close(reloadDisplaysListener)
// Spin off a goroutine to listen for notifications and pass them on through the websocket.
go func() {
@@ -723,6 +796,12 @@ func RefereeDisplayWebsocketHandler(w http.ResponseWriter, r *http.Request) {
}
messageType = "reload"
message = nil
case _, ok := <-reloadDisplaysListener:
if !ok {
return
}
messageType = "reload"
message = nil
}
err = websocket.Write(messageType, message)
if err != nil {
@@ -892,6 +971,8 @@ func AllianceStationDisplayWebsocketHandler(w http.ResponseWriter, r *http.Reque
defer close(realtimeScoreListener)
hotGoalLightListener := mainArena.hotGoalLightNotifier.Listen()
defer close(hotGoalLightListener)
reloadDisplaysListener := mainArena.reloadDisplaysNotifier.Listen()
defer close(reloadDisplaysListener)
// Send the various notifications immediately upon connection.
var data interface{}
@@ -997,6 +1078,12 @@ func AllianceStationDisplayWebsocketHandler(w http.ResponseWriter, r *http.Reque
}
messageType = "hotGoalLight"
message = side
case _, ok := <-reloadDisplaysListener:
if !ok {
return
}
messageType = "reload"
message = nil
}
err = websocket.Write(messageType, message)
if err != nil {

6
setup_field.go
View File

@@ -36,3 +36,9 @@ func FieldPostHandler(w http.ResponseWriter, r *http.Request) {
mainArena.matchLoadTeamsNotifier.Notify(nil)
http.Redirect(w, r, "/setup/field", 302)
}
// Force-reloads all the websocket-connected displays.
func FieldReloadDisplaysHandler(w http.ResponseWriter, r *http.Request) {
mainArena.reloadDisplaysNotifier.Notify(nil)
http.Redirect(w, r, "/setup/field", 302)
}

4
static/js/pit_display.js
View File

@@ -4,6 +4,7 @@
//
// Client-side methods for the pit display.
var websocket;
var initial_dwell_ms = 3000;
var scroll_ms_per_row = 700; // How long in milliseconds it takes to scroll a height of one row.
var static_update_interval_ms = 10000; // How long between updates if not scrolling.
@@ -80,5 +81,8 @@ var setHighestPlayedMatch = function(highestPlayedMatch) {
};
$(function() {
// Set up the websocket back to the server. Used only for remote forcing of reloads.
websocket = new CheesyWebsocket("/displays/pit/websocket", {});
updateStaticRankings();
});

4
templates/field.html
View File

@@ -23,6 +23,10 @@
</div>
</form>
{{end}}
<legend>Reload All Displays</legend>
<div class="form-group">
<a href="/setup/field/reload_displays" class="btn btn-primary">Force Reload of All Displays</a>
</div>
</div>
</div>
</div>

3
templates/pit_display.html
View File

@@ -67,7 +67,10 @@
</script>
<script src="/static/js/lib/handlebars-1.3.0.js"></script>
<script src="/static/js/lib/jquery.min.js"></script>
<script src="/static/js/lib/jquery.json-2.4.min.js"></script>
<script src="/static/js/lib/jquery.websocket-0.0.1.js"></script>
<script src="/static/js/lib/jquery.transit.min.js"></script>
<script src="/static/js/cheesy-websocket.js"></script>
<script src="/static/js/pit_display.js"></script>
</body>
</html>

2
web.go
View File

@@ -123,6 +123,7 @@ func newHandler() http.Handler {
router.HandleFunc("/setup/alliance_selection/finalize", AllianceSelectionFinalizeHandler).Methods("POST")
router.HandleFunc("/setup/field", FieldGetHandler).Methods("GET")
router.HandleFunc("/setup/field", FieldPostHandler).Methods("POST")
router.HandleFunc("/setup/field/reload_displays", FieldReloadDisplaysHandler).Methods("GET")
router.HandleFunc("/setup/lower_thirds", LowerThirdsGetHandler).Methods("GET")
router.HandleFunc("/setup/lower_thirds", LowerThirdsPostHandler).Methods("POST")
router.HandleFunc("/match_play", MatchPlayHandler).Methods("GET")
@@ -142,6 +143,7 @@ func newHandler() http.Handler {
router.HandleFunc("/displays/audience", AudienceDisplayHandler).Methods("GET")
router.HandleFunc("/displays/audience/websocket", AudienceDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/displays/pit", PitDisplayHandler).Methods("GET")
router.HandleFunc("/displays/pit/websocket", PitDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/displays/announcer", AnnouncerDisplayHandler).Methods("GET")
router.HandleFunc("/displays/announcer/websocket", AnnouncerDisplayWebsocketHandler).Methods("GET")
router.HandleFunc("/displays/scoring/{alliance}", ScoringDisplayHandler).Methods("GET")