MrUnknownDE/OpenIris-ESPIDF
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/OpenIris-ESPIDF.git synced 2026-04-17 13:33:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into mutimodal

Browse Source 
# Conflicts:
#	components/CameraManager/CameraManager/CameraManager.cpp
#	dependencies.lock
#	main/openiris_main.cpp
#	sdkconfig
This commit is contained in:
Lorow
2025-08-13 23:46:13 +02:00
parent 6f1b5f68ee bcb3387e1c
commit ee5a73895c
18 changed files with 409 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/ProjectConfig/ProjectConfig/Models.hpp
View File

@@ -84,7 +84,7 @@ struct MDNSConfig_t : BaseConfigModel
{
// by default, this will be openiris
// but we can override it at compile time
std::string default_hostname = CONFIG_MDNS_HOSTNAME;
std::string default_hostname = CONFIG_WIFI_MDNS_HOSTNAME;
if (default_hostname.empty())
{
@@ -224,8 +224,8 @@ struct AP_WiFiConfig_t : BaseConfigModel
void load()
{
this->ssid = this->pref->getString("apSSID", CONFIG_AP_WIFI_SSID);
this->password = this->pref->getString("apPassword", CONFIG_AP_WIFI_PASSWORD);
this->ssid = this->pref->getString("apSSID", CONFIG_WIFI_AP_SSID);
this->password = this->pref->getString("apPassword", CONFIG_WIFI_AP_PASSWORD);
};
void save() const {