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

Add typing to all enums.

Browse Source
This commit is contained in:
Patrick Fairbank
2018-04-15 18:33:04 -07:00
parent af224250ee
commit d85d1bb8bd
19 changed files with 219 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web/alliance_station_display.go
View File

@@ -96,7 +96,7 @@ func (web *Web) allianceStationDisplayWebsocketHandler(w http.ResponseWriter, r
log.Printf("Websocket error: %s", err)
return
}
err = websocket.Write("matchTime", MatchTimeMessage{web.arena.MatchState, int(web.arena.LastMatchTimeSec)})
err = websocket.Write("matchTime", MatchTimeMessage{int(web.arena.MatchState), int(web.arena.LastMatchTimeSec)})
if err != nil {
log.Printf("Websocket error: %s", err)
return
@@ -134,7 +134,8 @@ func (web *Web) allianceStationDisplayWebsocketHandler(w http.ResponseWriter, r
if !ok {
return
}
websocket.Write("matchTime", MatchTimeMessage{web.arena.MatchState, int(web.arena.LastMatchTimeSec)})
websocket.Write("matchTime",
MatchTimeMessage{int(web.arena.MatchState), int(web.arena.LastMatchTimeSec)})
messageType = "setAllianceStationDisplay"
message = web.arena.AllianceStationDisplayScreen
case _, ok := <-matchLoadTeamsListener:
@@ -170,7 +171,7 @@ func (web *Web) allianceStationDisplayWebsocketHandler(w http.ResponseWriter, r
return
}
messageType = "matchTime"
message = MatchTimeMessage{web.arena.MatchState, matchTimeSec.(int)}
message = MatchTimeMessage{int(web.arena.MatchState), matchTimeSec.(int)}
case _, ok := <-realtimeScoreListener:
if !ok {
return

4
web/announcer_display.go
View File

@@ -86,7 +86,7 @@ func (web *Web) announcerDisplayWebsocketHandler(w http.ResponseWriter, r *http.
log.Printf("Websocket error: %s", err)
return
}
err = websocket.Write("matchTime", MatchTimeMessage{web.arena.MatchState, int(web.arena.LastMatchTimeSec)})
err = websocket.Write("matchTime", MatchTimeMessage{int(web.arena.MatchState), int(web.arena.LastMatchTimeSec)})
if err != nil {
log.Printf("Websocket error: %s", err)
return
@@ -130,7 +130,7 @@ func (web *Web) announcerDisplayWebsocketHandler(w http.ResponseWriter, r *http.
return
}
messageType = "matchTime"
message = MatchTimeMessage{web.arena.MatchState, matchTimeSec.(int)}
message = MatchTimeMessage{int(web.arena.MatchState), matchTimeSec.(int)}
case _, ok := <-realtimeScoreListener:
if !ok {
return

4
web/audience_display.go
View File

@@ -74,7 +74,7 @@ func (web *Web) audienceDisplayWebsocketHandler(w http.ResponseWriter, r *http.R
log.Printf("Websocket error: %s", err)
return
}
err = websocket.Write("matchTime", MatchTimeMessage{web.arena.MatchState, int(web.arena.LastMatchTimeSec)})
err = websocket.Write("matchTime", MatchTimeMessage{int(web.arena.MatchState), int(web.arena.LastMatchTimeSec)})
if err != nil {
log.Printf("Websocket error: %s", err)
return
@@ -149,7 +149,7 @@ func (web *Web) audienceDisplayWebsocketHandler(w http.ResponseWriter, r *http.R
return
}
messageType = "matchTime"
message = MatchTimeMessage{web.arena.MatchState, matchTimeSec.(int)}
message = MatchTimeMessage{int(web.arena.MatchState), matchTimeSec.(int)}
case _, ok := <-realtimeScoreListener:
if !ok {
return

4
web/match_play.go
View File

@@ -196,7 +196,7 @@ func (web *Web) matchPlayWebsocketHandler(w http.ResponseWriter, r *http.Request
log.Printf("Websocket error: %s", err)
return
}
data = MatchTimeMessage{web.arena.MatchState, int(web.arena.LastMatchTimeSec)}
data = MatchTimeMessage{int(web.arena.MatchState), int(web.arena.LastMatchTimeSec)}
err = websocket.Write("matchTime", data)
if err != nil {
log.Printf("Websocket error: %s", err)
@@ -244,7 +244,7 @@ func (web *Web) matchPlayWebsocketHandler(w http.ResponseWriter, r *http.Request
return
}
messageType = "matchTime"
message = MatchTimeMessage{web.arena.MatchState, matchTimeSec.(int)}
message = MatchTimeMessage{int(web.arena.MatchState), matchTimeSec.(int)}
case _, ok := <-realtimeScoreListener:
if !ok {
return

4
web/scoring_display.go
View File

@@ -93,7 +93,7 @@ func (web *Web) scoringDisplayWebsocketHandler(w http.ResponseWriter, r *http.Re
log.Printf("Websocket error: %s", err)
return
}
err = websocket.Write("matchTime", MatchTimeMessage{web.arena.MatchState, int(web.arena.LastMatchTimeSec)})
err = websocket.Write("matchTime", MatchTimeMessage{int(web.arena.MatchState), int(web.arena.LastMatchTimeSec)})
if err != nil {
log.Printf("Websocket error: %s", err)
return
@@ -116,7 +116,7 @@ func (web *Web) scoringDisplayWebsocketHandler(w http.ResponseWriter, r *http.Re
return
}
messageType = "matchTime"
message = MatchTimeMessage{web.arena.MatchState, matchTimeSec.(int)}
message = MatchTimeMessage{int(web.arena.MatchState), matchTimeSec.(int)}
case _, ok := <-reloadDisplaysListener:
if !ok {
return

17
web/setup_field.go
View File

@@ -7,6 +7,7 @@ package web
import (
"github.com/Team254/cheesy-arena/field"
"github.com/Team254/cheesy-arena/led"
"github.com/Team254/cheesy-arena/model"
"net/http"
"strconv"
@@ -23,15 +24,21 @@ func (web *Web) fieldGetHandler(w http.ResponseWriter, r *http.Request) {
handleWebErr(w, err)
return
}
plc := web.arena.Plc
data := struct {
*model.EventSettings
AllianceStationDisplays map[string]string
Inputs []bool
Counters []uint16
InputNames []string
Registers []uint16
RegisterNames []string
Coils []bool
LedMode int
}{web.arena.EventSettings, web.arena.AllianceStationDisplays, web.arena.Plc.Inputs[:],
web.arena.Plc.Registers[:], web.arena.Plc.Coils[:], web.arena.RedSwitchLedStrip.Mode}
CoilNames []string
CurrentLedMode led.Mode
LedModeNames map[led.Mode]string
}{web.arena.EventSettings, web.arena.AllianceStationDisplays, plc.Inputs[:], plc.GetInputNames(), plc.Registers[:],
plc.GetRegisterNames(), plc.Coils[:], plc.GetCoilNames(), web.arena.RedSwitchLedStrip.CurrentMode,
led.ModeNames}
err = template.ExecuteTemplate(w, "base", data)
if err != nil {
handleWebErr(w, err)
@@ -74,7 +81,7 @@ func (web *Web) fieldTestPostHandler(w http.ResponseWriter, r *http.Request) {
}
mode, _ := strconv.Atoi(r.PostFormValue("mode"))
web.arena.RedSwitchLedStrip.SetMode(mode)
web.arena.RedSwitchLedStrip.SetMode(led.Mode(mode))
http.Redirect(w, r, "/setup/field", 303)
}

2
web/setup_field_test.go
View File

@@ -25,5 +25,5 @@ func TestSetupField(t *testing.T) {
recorder = web.postHttpResponse("/setup/field/test", "mode=1")
assert.Equal(t, 303, recorder.Code)
assert.Equal(t, 1, web.arena.RedSwitchLedStrip.Mode)
assert.Equal(t, 1, int(web.arena.RedSwitchLedStrip.CurrentMode))
}