diff --git a/db/migrations/20140524160241_CreateEventSettings.sql b/db/migrations/20140524160241_CreateEventSettings.sql
index 35e68f5..3ed57b5 100644
--- a/db/migrations/20140524160241_CreateEventSettings.sql
+++ b/db/migrations/20140524160241_CreateEventSettings.sql
@@ -30,8 +30,7 @@ CREATE TABLE event_settings (
autodurationsec int,
pausedurationsec int,
teleopdurationsec int,
- warning1remainingdurationsec int,
- warning2remainingdurationsec int,
+ warningremainingdurationsec int,
habdockingthreshold int
);
diff --git a/field/arena.go b/field/arena.go
index b06b7d5..91840d8 100644
--- a/field/arena.go
+++ b/field/arena.go
@@ -154,8 +154,7 @@ func (arena *Arena) LoadSettings() error {
game.MatchTiming.AutoDurationSec = settings.AutoDurationSec
game.MatchTiming.PauseDurationSec = settings.PauseDurationSec
game.MatchTiming.TeleopDurationSec = settings.TeleopDurationSec
- game.MatchTiming.Warning1RemainingDurationSec = settings.Warning1RemainingDurationSec
- game.MatchTiming.Warning2RemainingDurationSec = settings.Warning2RemainingDurationSec
+ game.MatchTiming.WarningRemainingDurationSec = settings.WarningRemainingDurationSec
game.UpdateMatchSounds()
arena.MatchTimingNotifier.Notify()
diff --git a/game/match_sounds.go b/game/match_sounds.go
index 4bb2dbb..31872d3 100644
--- a/game/match_sounds.go
+++ b/game/match_sounds.go
@@ -18,13 +18,14 @@ var MatchSounds []*MatchSound
func UpdateMatchSounds() {
MatchSounds = []*MatchSound{
{"start", "wav", 0},
+ {"end", "wav", float64(MatchTiming.AutoDurationSec)},
{"resume", "wav", float64(MatchTiming.AutoDurationSec + MatchTiming.PauseDurationSec)},
- {"warning1", "wav", float64(MatchTiming.AutoDurationSec + MatchTiming.PauseDurationSec +
- MatchTiming.TeleopDurationSec - MatchTiming.Warning1RemainingDurationSec)},
- {"warning2", "wav", float64(MatchTiming.AutoDurationSec + MatchTiming.PauseDurationSec +
- MatchTiming.TeleopDurationSec - MatchTiming.Warning2RemainingDurationSec)},
+ {"warning", "wav", float64(MatchTiming.AutoDurationSec + MatchTiming.PauseDurationSec +
+ MatchTiming.TeleopDurationSec - MatchTiming.WarningRemainingDurationSec)},
{"end", "wav", float64(MatchTiming.AutoDurationSec + MatchTiming.PauseDurationSec +
MatchTiming.TeleopDurationSec)},
- {"abort", "mp3", -1},
+ {"abort", "wav", -1},
+ {"rotation", "wav", -1},
+ {"position", "wav", -1},
}
}
diff --git a/game/match_timing.go b/game/match_timing.go
index b207c64..370adce 100644
--- a/game/match_timing.go
+++ b/game/match_timing.go
@@ -6,11 +6,10 @@
package game
var MatchTiming = struct {
- WarmupDurationSec int
- AutoDurationSec int
- PauseDurationSec int
- TeleopDurationSec int
- Warning1RemainingDurationSec int
- Warning2RemainingDurationSec int
- TimeoutDurationSec int
-}{0, 15, 0, 135, 30, 20, 0}
+ WarmupDurationSec int
+ AutoDurationSec int
+ PauseDurationSec int
+ TeleopDurationSec int
+ WarningRemainingDurationSec int
+ TimeoutDurationSec int
+}{0, 15, 2, 135, 30, 0}
diff --git a/model/event_settings.go b/model/event_settings.go
index 1c8bc27..016092a 100644
--- a/model/event_settings.go
+++ b/model/event_settings.go
@@ -8,38 +8,37 @@ package model
import "github.com/Team254/cheesy-arena/game"
type EventSettings struct {
- Id int
- Name string
- NumElimAlliances int
- SelectionRound2Order string
- SelectionRound3Order string
- TBADownloadEnabled bool
- TbaPublishingEnabled bool
- TbaEventCode string
- TbaSecretId string
- TbaSecret string
- NetworkSecurityEnabled bool
- ApAddress string
- ApUsername string
- ApPassword string
- ApTeamChannel int
- ApAdminChannel int
- ApAdminWpaKey string
- Ap2Address string
- Ap2Username string
- Ap2Password string
- Ap2TeamChannel int
- SwitchAddress string
- SwitchPassword string
- PlcAddress string
- AdminPassword string
- WarmupDurationSec int
- AutoDurationSec int
- PauseDurationSec int
- TeleopDurationSec int
- Warning1RemainingDurationSec int
- Warning2RemainingDurationSec int
- HabDockingThreshold int
+ Id int
+ Name string
+ NumElimAlliances int
+ SelectionRound2Order string
+ SelectionRound3Order string
+ TBADownloadEnabled bool
+ TbaPublishingEnabled bool
+ TbaEventCode string
+ TbaSecretId string
+ TbaSecret string
+ NetworkSecurityEnabled bool
+ ApAddress string
+ ApUsername string
+ ApPassword string
+ ApTeamChannel int
+ ApAdminChannel int
+ ApAdminWpaKey string
+ Ap2Address string
+ Ap2Username string
+ Ap2Password string
+ Ap2TeamChannel int
+ SwitchAddress string
+ SwitchPassword string
+ PlcAddress string
+ AdminPassword string
+ WarmupDurationSec int
+ AutoDurationSec int
+ PauseDurationSec int
+ TeleopDurationSec int
+ WarningRemainingDurationSec int
+ HabDockingThreshold int
}
const eventSettingsId = 0
@@ -62,8 +61,7 @@ func (database *Database) GetEventSettings() (*EventSettings, error) {
eventSettings.AutoDurationSec = game.MatchTiming.AutoDurationSec
eventSettings.PauseDurationSec = game.MatchTiming.PauseDurationSec
eventSettings.TeleopDurationSec = game.MatchTiming.TeleopDurationSec
- eventSettings.Warning1RemainingDurationSec = game.MatchTiming.Warning1RemainingDurationSec
- eventSettings.Warning2RemainingDurationSec = game.MatchTiming.Warning2RemainingDurationSec
+ eventSettings.WarningRemainingDurationSec = game.MatchTiming.WarningRemainingDurationSec
eventSettings.HabDockingThreshold = 15
err = database.eventSettingsMap.Insert(eventSettings)
diff --git a/model/event_settings_test.go b/model/event_settings_test.go
index db6d1d2..1491f1a 100644
--- a/model/event_settings_test.go
+++ b/model/event_settings_test.go
@@ -15,9 +15,8 @@ func TestEventSettingsReadWrite(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, EventSettings{Id: 0, Name: "Untitled Event", NumElimAlliances: 8, SelectionRound2Order: "L",
SelectionRound3Order: "", TBADownloadEnabled: true, ApTeamChannel: 157, ApAdminChannel: 0,
- ApAdminWpaKey: "1234Five", WarmupDurationSec: 0, AutoDurationSec: 15, PauseDurationSec: 0,
- TeleopDurationSec: 135, Warning1RemainingDurationSec: 30, Warning2RemainingDurationSec: 20,
- HabDockingThreshold: 15}, *eventSettings)
+ ApAdminWpaKey: "1234Five", WarmupDurationSec: 0, AutoDurationSec: 15, PauseDurationSec: 2,
+ TeleopDurationSec: 135, WarningRemainingDurationSec: 30, HabDockingThreshold: 15}, *eventSettings)
eventSettings.Name = "Chezy Champs"
eventSettings.NumElimAlliances = 6
diff --git a/static/audio/abort.mp3 b/static/audio/abort.mp3
deleted file mode 100644
index ca9be9f..0000000
Binary files a/static/audio/abort.mp3 and /dev/null differ
diff --git a/static/audio/abort.wav b/static/audio/abort.wav
new file mode 100644
index 0000000..774f216
Binary files /dev/null and b/static/audio/abort.wav differ
diff --git a/static/audio/end.wav b/static/audio/end.wav
index c8f37c9..374182e 100644
Binary files a/static/audio/end.wav and b/static/audio/end.wav differ
diff --git a/static/audio/position.wav b/static/audio/position.wav
new file mode 100644
index 0000000..6f51d12
Binary files /dev/null and b/static/audio/position.wav differ
diff --git a/static/audio/resume.wav b/static/audio/resume.wav
index cf5586d..5c307a4 100644
Binary files a/static/audio/resume.wav and b/static/audio/resume.wav differ
diff --git a/static/audio/rotation.wav b/static/audio/rotation.wav
new file mode 100644
index 0000000..fb40c19
Binary files /dev/null and b/static/audio/rotation.wav differ
diff --git a/static/audio/start.wav b/static/audio/start.wav
index 9b4f832..8260c37 100644
Binary files a/static/audio/start.wav and b/static/audio/start.wav differ
diff --git a/static/audio/warning.wav b/static/audio/warning.wav
new file mode 100644
index 0000000..978ba0d
Binary files /dev/null and b/static/audio/warning.wav differ
diff --git a/static/audio/warning1.wav b/static/audio/warning1.wav
deleted file mode 100644
index 667641f..0000000
Binary files a/static/audio/warning1.wav and /dev/null differ
diff --git a/static/audio/warning2.wav b/static/audio/warning2.wav
deleted file mode 100644
index 9741898..0000000
Binary files a/static/audio/warning2.wav and /dev/null differ
diff --git a/templates/setup_settings.html b/templates/setup_settings.html
index 8069054..3865a3b 100644
--- a/templates/setup_settings.html
+++ b/templates/setup_settings.html
@@ -268,17 +268,10 @@
-
diff --git a/web/setup_settings.go b/web/setup_settings.go
index 7f1acf3..cad4b45 100644
--- a/web/setup_settings.go
+++ b/web/setup_settings.go
@@ -74,8 +74,7 @@ func (web *Web) settingsPostHandler(w http.ResponseWriter, r *http.Request) {
eventSettings.AutoDurationSec, _ = strconv.Atoi(r.PostFormValue("autoDurationSec"))
eventSettings.PauseDurationSec, _ = strconv.Atoi(r.PostFormValue("pauseDurationSec"))
eventSettings.TeleopDurationSec, _ = strconv.Atoi(r.PostFormValue("teleopDurationSec"))
- eventSettings.Warning1RemainingDurationSec, _ = strconv.Atoi(r.PostFormValue("warning1RemainingDurationSec"))
- eventSettings.Warning2RemainingDurationSec, _ = strconv.Atoi(r.PostFormValue("warning2RemainingDurationSec"))
+ eventSettings.WarningRemainingDurationSec, _ = strconv.Atoi(r.PostFormValue("warningRemainingDurationSec"))
eventSettings.HabDockingThreshold, _ = strconv.Atoi(r.PostFormValue("habDockingThreshold"))
if eventSettings.Ap2TeamChannel != 0 && eventSettings.Ap2TeamChannel == eventSettings.ApTeamChannel {