fix: wifi连接
This commit is contained in:
+11
-11
@@ -624,16 +624,16 @@ class NetworkManager:
|
||||
password = inner_data.get("password")
|
||||
ota_res_url = inner_data.get("url")
|
||||
try:
|
||||
w = network.wifi.Wifi()
|
||||
e = w.connect(ssid, password, wait=True, timeout=15)
|
||||
err.check_raise(e, "connect wifi failed")
|
||||
ip, err = self.connect_wifi(ssid, password, persist=False, timeout_s=15, verify_host=None, verify_port=None)
|
||||
if err:
|
||||
raise RuntimeError(err)
|
||||
if self.logger:
|
||||
self.logger.info(f"[ota] Connect success, got ip{w.get_ip()}")
|
||||
self.logger.info(f"[ota] Connect success, got ip{ip}")
|
||||
self.safe_enqueue(
|
||||
{
|
||||
"cmd": 300,
|
||||
"result": "ota start...",
|
||||
"wifi": w.get_ip(),
|
||||
"wifi": ip,
|
||||
},
|
||||
2,
|
||||
)
|
||||
@@ -643,7 +643,7 @@ class NetworkManager:
|
||||
{
|
||||
"cmd": 300,
|
||||
"result": "success",
|
||||
"wifi": w.get_ip(),
|
||||
"wifi": ip,
|
||||
},
|
||||
2,
|
||||
)
|
||||
@@ -665,16 +665,16 @@ class NetworkManager:
|
||||
ssid = inner_data.get("ssid")
|
||||
password = inner_data.get("password")
|
||||
try:
|
||||
w = network.wifi.Wifi()
|
||||
e = w.connect(ssid, password, wait=True, timeout=15)
|
||||
err.check_raise(e, "connect wifi failed")
|
||||
ip, err = self.connect_wifi(ssid, password, persist=False, timeout_s=15, verify_host=None, verify_port=None)
|
||||
if err:
|
||||
raise RuntimeError(err)
|
||||
if self.logger:
|
||||
self.logger.info(f"[ota] Connect success, got ip{w.get_ip()}")
|
||||
self.logger.info(f"[conn wifi] Connect success, got ip{ip}")
|
||||
self.safe_enqueue(
|
||||
{
|
||||
"cmd": 600,
|
||||
"result": "success",
|
||||
"wifi": w.get_ip(),
|
||||
"wifi": ip,
|
||||
},
|
||||
2,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user