post champs 1.1.2 changes

patfair · Apr 27, 2024 · 1321fd8 · 1321fd8
1 parent ed3e4e6
commit 1321fd8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 34 deletions.
diff --git a/radio/radio_robot.go b/radio/radio_robot.go
@@ -140,6 +140,8 @@ func (radio *Radio) configure(request ConfigurationRequest) error {
 			// Handle IP address when in STA mode.
 			uciTree.SetType("network", "lan", "ipaddr", uci.TypeOption, fmt.Sprintf("10.%s.1", teamPartialIp))
 			uciTree.SetType("network", "lan", "gateway", uci.TypeOption, fmt.Sprintf("10.%s.4", teamPartialIp))
+			uciTree.SetType("dhcp", "lan", "start", uci.TypeOption, "200")
+			uciTree.SetType("dhcp", "lan", "limit", uci.TypeOption, "20")
 		} else {
 			uciTree.SetType("wireless", wifiInterface6, "mode", uci.TypeOption, "ap")
 
@@ -155,6 +157,8 @@ func (radio *Radio) configure(request ConfigurationRequest) error {
 			// Handle IP address when in AP mode.
 			uciTree.SetType("network", "lan", "ipaddr", uci.TypeOption, fmt.Sprintf("10.%s.4", teamPartialIp))
 			uciTree.SetType("network", "lan", "gateway", uci.TypeOption, fmt.Sprintf("10.%s.4", teamPartialIp))
+			uciTree.SetType("dhcp", "lan", "start", uci.TypeOption, "20")
+			uciTree.SetType("dhcp", "lan", "limit", uci.TypeOption, "180")
 		}
 
 		// Handle DHCP.
@@ -172,7 +176,6 @@ func (radio *Radio) configure(request ConfigurationRequest) error {
 		}
 		time.Sleep(wifiReloadBackoffDuration)
 
-		var err error
 		radio.Ssid, err = getSsid(radioInterface6)
 		if err != nil {
 			return err

diff --git a/web/configuration_page.html b/web/configuration_page.html
@@ -100,69 +100,39 @@
 			</div>
 
 			<div class="ap-only">
-				<label for="channel" class="form-label">Wi-Fi Channel</label>
+				<label for="channel" class="form-label">Wi-Fi Channel (101 and up prohibited in EU)</label>
 				<select class="form-select" name="channel" id="channel" aria-describedby="channelHelp">
-					<option>1</option>
 					<option>5</option>
-					<option>9</option>
 					<option>13</option>
-					<option>17</option>
 					<option>21</option>
-					<option>25</option>
 					<option>29</option>
-					<option>33</option>
 					<option>37</option>
-					<option>41</option>
 					<option>45</option>
-					<option>49</option>
 					<option>53</option>
-					<option>57</option>
 					<option>61</option>
-					<option>65</option>
 					<option>69</option>
-					<option>73</option>
 					<option>77</option>
-					<option>81</option>
 					<option>85</option>
-					<option>89</option>
 					<option>93</option>
-					<option>97</option>
 					<option>101</option>
-					<option>105</option>
 					<option>109</option>
-					<option>113</option>
 					<option>117</option>
-					<option>121</option>
 					<option>125</option>
-					<option>129</option>
 					<option>133</option>
-					<option>137</option>
 					<option>141</option>
-					<option>145</option>
 					<option>149</option>
-					<option>153</option>
 					<option>157</option>
-					<option>161</option>
 					<option>165</option>
-					<option>169</option>
 					<option>173</option>
-					<option>177</option>
 					<option>181</option>
-					<option>185</option>
 					<option>189</option>
-					<option>193</option>
 					<option>197</option>
-					<option>201</option>
 					<option>205</option>
-					<option>209</option>
 					<option>213</option>
-					<option>217</option>
 					<option>221</option>
-					<option>225</option>
 					<option>229</option>
-					<option>233</option>
 				</select>
-				<div id="channelHelp" class="form-text">Wi-Fi 6E 20 MHz channel</div>
+				<div id="channelHelp" class="form-text">Wi-Fi 6E Channel</div>
 			</div>
 
 			<button id="configSubmit" type="sumbit" class="btn btn-primary">Configure</button>
@@ -356,4 +326,4 @@ <h1>Firmware Upload</h1>
 	</script>
 </body>
 
-</html>
+</html>