mirror of
https://github.com/lumapu/ahoy.git
synced 2025-05-30 01:06:11 +02:00
Merge branch 'development03' of https://github.com/geronet1/ahoy into geronet1-development03
This commit is contained in:
commit
c9803159e5
1 changed files with 2 additions and 4 deletions
|
@ -378,18 +378,16 @@ class settings {
|
|||
mCfg.sys.darkMode = false;
|
||||
mCfg.sys.schedReboot = false;
|
||||
// restore temp settings
|
||||
#if defined(ETHERNET)
|
||||
memcpy(&mCfg.sys, &tmp, sizeof(cfgSys_t));
|
||||
#else /* defined(ETHERNET) */
|
||||
if(keepWifi)
|
||||
memcpy(&mCfg.sys, &tmp, sizeof(cfgSys_t));
|
||||
#if !defined(ETHERNET)
|
||||
else {
|
||||
snprintf(mCfg.sys.stationSsid, SSID_LEN, FB_WIFI_SSID);
|
||||
snprintf(mCfg.sys.stationPwd, PWD_LEN, FB_WIFI_PWD);
|
||||
snprintf(mCfg.sys.apPwd, PWD_LEN, WIFI_AP_PWD);
|
||||
mCfg.sys.isHidden = false;
|
||||
}
|
||||
#endif /* defined(ETHERNET) */
|
||||
#endif /* !defined(ETHERNET) */
|
||||
|
||||
snprintf(mCfg.sys.deviceName, DEVNAME_LEN, DEF_DEVICE_NAME);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue