Enable configuring VH-109 channels from settings.

Team254 · Oct 11, 2023 · ff0ea56 · ff0ea56
1 parent eb7ed00
commit ff0ea56
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 10 deletions.
diff --git a/field/arena.go b/field/arena.go
@@ -168,8 +168,10 @@ func (arena *Arena) LoadSettings() error {
 		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())
+		if arena.EventSettings.Ap2TeamChannel != 0 {
+			if err = arena.accessPoint2.ConfigureAdminSettings(); err != nil {
+				log.Printf("Failed to configure second access point admin settings: %s", err.Error())
+			}
 		}
 	}
 

diff --git a/network/access_point.go b/network/access_point.go
@@ -92,11 +92,13 @@ func (ap *AccessPoint) ConfigureAdminSettings() error {
 		return nil
 	}
 
-	commands := []string{
-		fmt.Sprintf("set wireless.radio0.channel='%d'", ap.teamChannel),
-		"commit wireless",
+	var device string
+	if ap.isVividType {
+		device = "wifi1"
+	} else {
+		device = "radio0"
 	}
-	command := fmt.Sprintf("uci batch <<ENDCONFIG && wifi radio0\n%s\nENDCONFIG\n", strings.Join(commands, "\n"))
+	command := fmt.Sprintf("uci set wireless.%s.channel=%d && uci commit wireless", device, ap.teamChannel)
 	_, err := ap.runCommand(command)
 	return err
 }

diff --git a/templates/setup_settings.html b/templates/setup_settings.html
@@ -160,14 +160,14 @@
             <div class="col-lg-7">
               <div class="radio">
                 <label>
-                  <input type="radio" name="apType" value="linksys"
+                  <input type="radio" name="apType" value="linksys" onclick="updateAccessPointType(false);"
                     {{if eq .ApType "linksys"}}checked{{end}}>
                   Linksys WRT1900ACS
                 </label>
               </div>
               <div class="radio">
                 <label>
-                  <input type="radio" name="apType" value="vivid"
+                  <input type="radio" name="apType" value="vivid" onclick="updateAccessPointType(true);"
                     {{if eq .ApType "vivid"}}checked{{end}}>
                   Vivid-Hosting VH109
                 </label>
@@ -195,7 +195,8 @@
           <div class="form-group">
             <label class="col-lg-5 control-label">AP Team Channel (5GHz)</label>
             <div class="col-lg-7">
-              <select class="form-control" name="apTeamChannel" value="{{.ApTeamChannel}}">
+              <select class="form-control" name="apTeamChannel5" value="{{.ApTeamChannel}}"
+                {{if eq .ApType "vivid"}}disabled{{end}}>
                 <option{{if eq .ApTeamChannel 36}} selected{{end}}>36</option>
                 <option{{if eq .ApTeamChannel 40}} selected{{end}}>40</option>
                 <option{{if eq .ApTeamChannel 44}} selected{{end}}>44</option>
@@ -207,6 +208,19 @@
               </select>
             </div>
           </div>
+          <div class="form-group">
+            <label class="col-lg-5 control-label">AP Team Channel (6GHz)</label>
+            <div class="col-lg-7">
+              <select class="form-control" name="apTeamChannel6" value="{{.ApTeamChannel}}"
+                {{if ne .ApType "vivid"}}disabled{{end}}>
+                {{range $i, $j := seq 29}}
+                  <option{{if eq $.ApTeamChannel (add 5 (multiply $i 8))}} selected{{end}}>
+                    {{(add 5 (multiply $i 8))}}
+                  </option>
+                {{end}}
+              </select>
+            </div>
+          </div>
           <div class="form-group">
             <label class="col-lg-5 control-label">Switch Address</label>
             <div class="col-lg-7">
@@ -416,5 +430,16 @@ <h4 class="modal-title">Confirm</h4>
       numPlayoffAlliances.val(8);
     }
   };
+  updateAccessPointType = function(isVividType) {
+    const apTeamChannel5 = $("select[name=apTeamChannel5]");
+    const apTeamChannel6 = $("select[name=apTeamChannel6]");
+    if (isVividType) {
+      apTeamChannel5.prop("disabled", true);
+      apTeamChannel6.prop("disabled", false);
+    } else {
+      apTeamChannel5.prop("disabled", false);
+      apTeamChannel6.prop("disabled", true);
+    }
+  };
 </script>
 {{end}}
diff --git a/web/setup_settings.go b/web/setup_settings.go
@@ -81,7 +81,11 @@ func (web *Web) settingsPostHandler(w http.ResponseWriter, r *http.Request) {
 	eventSettings.ApAddress = r.PostFormValue("apAddress")
 	eventSettings.ApUsername = r.PostFormValue("apUsername")
 	eventSettings.ApPassword = r.PostFormValue("apPassword")
-	eventSettings.ApTeamChannel, _ = strconv.Atoi(r.PostFormValue("apTeamChannel"))
+	if eventSettings.ApType == "vivid" {
+		eventSettings.ApTeamChannel, _ = strconv.Atoi(r.PostFormValue("apTeamChannel6"))
+	} else {
+		eventSettings.ApTeamChannel, _ = strconv.Atoi(r.PostFormValue("apTeamChannel5"))
+	}
 	eventSettings.Ap2Address = r.PostFormValue("ap2Address")
 	eventSettings.Ap2Username = r.PostFormValue("ap2Username")
 	eventSettings.Ap2Password = r.PostFormValue("ap2Password")