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

Fix wifi config representation ,fix ap_network representation

Browse Source
This commit is contained in:
Lorow
2025-05-11 21:12:45 +02:00
parent 3e6efe84cd
commit 698a775c88
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,9 +181,7 @@ struct WiFiConfig_t : BaseConfigModel
std::string toRepresentation() std::string toRepresentation()
{ {
return Helpers::format_string( return Helpers::format_string(
"{\"name\": \"%s\", \"ssid\": \"%s\", \"password\": \"%s\", " "{\"name\": \"%s\", \"ssid\": \"%s\", \"password\": \"%s\", \"channel\": %u, \"power\": %u}",
"\"channel\": "
"%u, \"power\": %u}",
this->name.c_str(), this->ssid.c_str(), this->password.c_str(), this->name.c_str(), this->ssid.c_str(), this->password.c_str(),
this->channel, this->power); this->channel, this->power);
}; };
@@ -268,18 +266,30 @@ public:
{ {
std::string WifiConfigRepresentation = ""; std::string WifiConfigRepresentation = "";
for (auto &network : this->networks) // we need a valid json representation, so we can't have a dangling comma at the end
if (this->networks.size() > 0)
{ {
WifiConfigRepresentation += Helpers::format_string(", %s", network.toRepresentation()); if (this->networks.size() > 1)
{
for (auto i = 0; i < this->networks.size() - 1; i++)
{
printf("we're at %d while networks size is %d ", i, this->networks.size() - 2);
WifiConfigRepresentation += Helpers::format_string("%s, ", this->networks[i].toRepresentation().c_str());
}
}
WifiConfigRepresentation += Helpers::format_string("%s", this->networks[networks.size() - 1].toRepresentation().c_str());
printf(WifiConfigRepresentation.c_str());
printf("\n");
} }
return Helpers::format_string( return Helpers::format_string(
"%s, %s, %s, %s, %s, %s", "%s, %s, %s, networks: [%s], %s, %s",
this->device.toRepresentation().c_str(), this->device.toRepresentation().c_str(),
this->mdns.toRepresentation().c_str(), this->mdns.toRepresentation().c_str(),
this->camera.toRepresentation().c_str(), this->camera.toRepresentation().c_str(),
WifiConfigRepresentation.c_str(), WifiConfigRepresentation.c_str(),
this->mdns.toRepresentation().c_str(), this->ap_network.toRepresentation().c_str(),
this->txpower.toRepresentation().c_str()); this->txpower.toRepresentation().c_str());
} }
}; };