Restore mistakenly removed ability to configure AP channel (fixes #160).

field/arena.go

@@ -162,6 +162,15 @@ func (arena *Arena) LoadSettings() error {
 	arena.Plc.SetAddress(settings.PlcAddress)
 	arena.TbaClient = partner.NewTbaClient(settings.TbaEventCode, settings.TbaSecretId, settings.TbaSecret)
 
+	if arena.EventSettings.NetworkSecurityEnabled && arena.MatchState == PreMatch {
+		if err = arena.accessPoint.ConfigureAdminSettings(); err != nil {
+			log.Printf("Failed to configure access point admin settings: %s", err.Error())
+		}
+		if err = arena.accessPoint2.ConfigureAdminSettings(); err != nil {
+			log.Printf("Failed to configure second access point admin settings: %s", err.Error())
+		}
+	}
+
 	game.MatchTiming.WarmupDurationSec = settings.WarmupDurationSec
 	game.MatchTiming.AutoDurationSec = settings.AutoDurationSec
 	game.MatchTiming.PauseDurationSec = settings.PauseDurationSec

network/access_point.go

@@ -81,6 +81,21 @@ func (ap *AccessPoint) Run() {
 	}
 }
 
+// Calls the access point to configure the non-team-related settings.
+func (ap *AccessPoint) ConfigureAdminSettings() error {
+	if !ap.networkSecurityEnabled {
+		return nil
+	}
+
+	commands := []string{
+		fmt.Sprintf("set wireless.radio0.channel='%d'", ap.teamChannel),
+		"commit wireless",
+	}
+	command := fmt.Sprintf("uci batch <<ENDCONFIG && wifi radio0\n%s\nENDCONFIG\n", strings.Join(commands, "\n"))
+	_, err := ap.runCommand(command)
+	return err
+}
+
 // Adds a request to set up wireless networks for the given set of teams to the asynchronous queue.
 func (ap *AccessPoint) ConfigureTeamWifi(teams [6]*model.Team) error {
 	// Use a channel to serialize configuration requests; the monitoring goroutine will service them.