feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added new parameter and fixed ifdef

Browse Source
This commit is contained in:
CommanderRedYT
2021-12-08 22:50:30 +01:00
parent b899b0a503
commit cc0a23802f
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/presets.cpp
View File

@ -50,8 +50,15 @@ StringSettings makeDefaultStringSettings()
},
.otaServerUrl = {},
#endif
#ifdef AP_PASSWORD
.ap_password = STRING(AP_PASSWORD),
.otaServerBranch = {}
#else
.ap_password = "Bobbycar_123",
#endif
#ifdef FEATURE_OTA
.otaServerBranch = {},
#endif
.webserver_password = STRING(AP_PASSWORD),
};
}
} // namespace presets

6
main/stringsettings.h
View File

@ -49,7 +49,10 @@ struct StringSettings
std::string dns_key;
#endif
std::string ap_password;
#ifdef FEATURE_OTA
std::string otaServerBranch;
#endif
std::string webserver_password;
};
template<typename T>
@ -114,12 +117,13 @@ void StringSettings::executeForEveryCommonSetting(T &&callable)
// callable("otaUrl9", otaServers[9].url);
callable("otaserver", otaServerUrl);
callable("otaBranch", otaServerBranch);
#endif
#ifdef FEATURE_DNS_NS
callable("dnskey", dns_key);
#endif
callable("ap_pw", ap_password);
callable("otaBranch", otaServerBranch);
callable("webpw", webserver_password);
}
template<typename T>