pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-29 02:51:17 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lewishe 2022-09-07 09:48:39 +08:00
commit b8f862ac46
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesh/NodeDB.h
View File

@ -13,7 +13,7 @@ DeviceState versions used to be defined in the .proto file but really only this
#define here. #define here.
*/ */
#define DEVICESTATE_CUR_VER 15 #define DEVICESTATE_CUR_VER 16
#define DEVICESTATE_MIN_VER DEVICESTATE_CUR_VER #define DEVICESTATE_MIN_VER DEVICESTATE_CUR_VER
extern DeviceState devicestate; extern DeviceState devicestate;

4
src/mesh/http/WiFiAPClient.cpp
View File

@ -62,7 +62,7 @@ static int32_t reconnectWiFi()
const char *wifiName = config.wifi.ssid; const char *wifiName = config.wifi.ssid;
const char *wifiPsw = config.wifi.psk; const char *wifiPsw = config.wifi.psk;
if (needReconnect && !WiFi.isConnected()) { if (config.wifi.enabled && needReconnect && !WiFi.isConnected()) {
// if (radioConfig.has_preferences && needReconnect && !WiFi.isConnected()) { // if (radioConfig.has_preferences && needReconnect && !WiFi.isConnected()) {
if (!*wifiPsw) // Treat empty password as no password if (!*wifiPsw) // Treat empty password as no password
@ -184,7 +184,7 @@ bool initWifi(bool forceSoftAP)
{ {
forcedSoftAP = forceSoftAP; forcedSoftAP = forceSoftAP;
if ((config.wifi.ssid[0]) || forceSoftAP) { if (config.wifi.enabled && ((config.wifi.ssid[0]) || forceSoftAP)) {
// if ((radioConfig.has_preferences && config.wifi.ssid[0]) || forceSoftAP) { // if ((radioConfig.has_preferences && config.wifi.ssid[0]) || forceSoftAP) {
const char *wifiName = config.wifi.ssid; const char *wifiName = config.wifi.ssid;
const char *wifiPsw = config.wifi.psk; const char *wifiPsw = config.wifi.psk;

1
src/modules/AdminModule.cpp
View File

@ -191,6 +191,7 @@ void AdminModule::handleSetConfig(const Config &c)
DEBUG_MSG("Setting config: WiFi\n"); DEBUG_MSG("Setting config: WiFi\n");
config.has_wifi = true; config.has_wifi = true;
config.wifi = c.payloadVariant.wifi; config.wifi = c.payloadVariant.wifi;
requiresReboot = true;
break; break;
case Config_display_tag: case Config_display_tag:
DEBUG_MSG("Setting config: Display\n"); DEBUG_MSG("Setting config: Display\n");