Skip to content

Commit e205509

Browse files
lorowlorow
committed
Add PoC support for BSSID
1 parent c6584af commit e205509

13 files changed

Lines changed: 133 additions & 203 deletions

File tree

‎boards/sdkconfig.base_defaults‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,7 @@ CONFIG_CAMERA_WIFI_XCLK_FREQ=16500000
588588
#
589589
CONFIG_WIFI_MDNS_HOSTNAME="openiristracker"
590590
CONFIG_WIFI_SSID=""
591+
CONFIG_WIFI_BSSID=""
591592
CONFIG_WIFI_PASSWORD=""
592593
CONFIG_WIFI_AP_SSID="EyeTrackVR"
593594
CONFIG_WIFI_AP_PASSWORD="12345678"

‎components/CommandManager/CommandManager/CommandSchema.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ void from_json(const nlohmann::json& j, UpdateWifiPayload& payload)
1313
payload.ssid = j.at("ssid").get<std::string>();
1414
}
1515

16+
if (j.contains("bssid"))
17+
{
18+
payload.ssid = j.at("bssid").get<std::string>();
19+
}
20+
1621
if (j.contains("password"))
1722
{
1823
payload.password = j.at("password").get<std::string>();

‎components/CommandManager/CommandManager/CommandSchema.hpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,19 @@ struct WifiPayload : BasePayload
1010
{
1111
std::string name;
1212
std::string ssid;
13+
std::string bssid;
1314
std::string password;
1415
uint8_t channel;
1516
uint8_t power;
1617
};
1718

18-
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WifiPayload, name, ssid, password, channel, power)
19+
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(WifiPayload, name, ssid, bssid, password, channel, power)
1920

2021
struct UpdateWifiPayload : BasePayload
2122
{
2223
std::string name;
2324
std::optional<std::string> ssid;
25+
std::optional<std::string> bssid;
2426
std::optional<std::string> password;
2527
std::optional<uint8_t> channel;
2628
std::optional<uint8_t> power;

‎components/CommandManager/CommandManager/commands/wifi_commands.cpp‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,14 @@ CommandResult setWiFiCommand(std::shared_ptr<DependencyRegistry> registry, const
1919
return CommandResult::getErrorResult("Invalid payload: missing SSID");
2020
}
2121

22+
auto bssid_len = payload.bssid.length();
23+
if (bssid_len > 0 && bssid_len != 11)
24+
{
25+
return CommandResult::getErrorResult("BSSID is malformed");
26+
}
27+
2228
std::shared_ptr<ProjectConfig> projectConfig = registry->resolve<ProjectConfig>(DependencyType::project_config);
23-
projectConfig->setWifiConfig(payload.name, payload.ssid, payload.password, payload.channel, payload.power);
29+
projectConfig->setWifiConfig(payload.name, payload.ssid, payload.bssid, payload.password, payload.channel, payload.power);
2430

2531
return CommandResult::getSuccessResult("Config updated");
2632
}
@@ -53,12 +59,22 @@ CommandResult updateWiFiCommand(std::shared_ptr<DependencyRegistry> registry, co
5359
return CommandResult::getErrorResult("Invalid payload - missing network name");
5460
}
5561

62+
if (payload.bssid.has_value())
63+
{
64+
auto bssid_len = payload.bssid.value().length();
65+
if (bssid_len > 0 && bssid_len != 11)
66+
{
67+
return CommandResult::getErrorResult("BSSID is malformed");
68+
}
69+
}
70+
5671
auto projectConfig = registry->resolve<ProjectConfig>(DependencyType::project_config);
5772
auto storedNetworks = projectConfig->getWifiConfigs();
5873
if (const auto networkToUpdate = std::ranges::find_if(storedNetworks, [&](auto& network) { return network.name == payload.name; });
5974
networkToUpdate != storedNetworks.end())
6075
{
6176
projectConfig->setWifiConfig(payload.name, payload.ssid.has_value() ? payload.ssid.value() : networkToUpdate->ssid,
77+
payload.bssid.has_value() ? payload.bssid.value() : networkToUpdate->bssid,
6278
payload.password.has_value() ? payload.password.value() : networkToUpdate->password,
6379
payload.channel.has_value() ? payload.channel.value() : networkToUpdate->channel,
6480
payload.power.has_value() ? payload.power.value() : networkToUpdate->power);

‎components/ProjectConfig/ProjectConfig/Models.hpp‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,23 @@ struct WiFiConfig_t : BaseConfigModel
170170
// default constructor used for loading
171171
WiFiConfig_t(Preferences* pref) : BaseConfigModel(pref) {}
172172

173-
WiFiConfig_t(Preferences* pref, const uint8_t index, std::string name, std::string ssid, std::string password, const uint8_t channel, const uint8_t power)
174-
: BaseConfigModel(pref), index(index), name(std::move(name)), ssid(std::move(ssid)), password(std::move(password)), channel(channel), power(power)
173+
WiFiConfig_t(Preferences* pref, const uint8_t index, std::string name, std::string ssid, std::string bssid, std::string password, const uint8_t channel,
174+
const uint8_t power)
175+
: BaseConfigModel(pref),
176+
index(index),
177+
name(std::move(name)),
178+
ssid(std::move(ssid)),
179+
bssid(std::move(bssid)),
180+
password(std::move(password)),
181+
channel(channel),
182+
power(power)
175183
{
176184
}
177185

178186
uint8_t index;
179187
std::string name;
180188
std::string ssid;
189+
std::string bssid;
181190
std::string password;
182191
uint8_t channel;
183192
uint8_t power;
@@ -190,6 +199,7 @@ struct WiFiConfig_t : BaseConfigModel
190199
auto const iter_str = std::string(Helpers::itoa(index, buffer, 10));
191200
this->name = this->pref->getString(("name" + iter_str).c_str(), "");
192201
this->ssid = this->pref->getString(("ssid" + iter_str).c_str(), "");
202+
this->bssid = this->pref->getString(("bssid" + iter_str).c_str(), "");
193203
this->password = this->pref->getString(("password" + iter_str).c_str(), "");
194204
this->channel = this->pref->getUInt(("channel" + iter_str).c_str());
195205
this->power = this->pref->getUInt(("power" + iter_str).c_str());
@@ -204,6 +214,7 @@ struct WiFiConfig_t : BaseConfigModel
204214

205215
this->pref->putString(("name" + iter_str).c_str(), this->name.c_str());
206216
this->pref->putString(("ssid" + iter_str).c_str(), this->ssid.c_str());
217+
this->pref->putString(("bssid" + iter_str).c_str(), this->bssid.c_str());
207218
this->pref->putString(("password" + iter_str).c_str(), this->password.c_str());
208219
this->pref->putUInt(("channel" + iter_str).c_str(), this->channel);
209220
this->pref->putUInt(("power" + iter_str).c_str(), this->power);
@@ -213,8 +224,8 @@ struct WiFiConfig_t : BaseConfigModel
213224

214225
std::string toRepresentation()
215226
{
216-
return Helpers::format_string("{\"name\": \"%s\", \"ssid\": \"%s\", \"password\": \"%s\", \"channel\": %u, \"power\": %u}", this->name.c_str(),
217-
this->ssid.c_str(), this->password.c_str(), this->channel, this->power);
227+
return Helpers::format_string("{\"name\": \"%s\", \"ssid\": \"%s\", \"bssid\": \"%s\", \"password\": \"%s\", \"channel\": %u, \"power\": %u}",
228+
this->name.c_str(), this->ssid.c_str(), this->bssid.c_str(), this->password.c_str(), this->channel, this->power);
218229
};
219230
};
220231

‎components/ProjectConfig/ProjectConfig/ProjectConfig.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ void ProjectConfig::setCameraConfig(const uint8_t vflip, const uint8_t framesize
127127
ESP_LOGD(CONFIGURATION_TAG, "Updating Camera config");
128128
}
129129

130-
void ProjectConfig::setWifiConfig(const std::string& networkName, const std::string& ssid, const std::string& password, uint8_t channel, uint8_t power)
130+
void ProjectConfig::setWifiConfig(const std::string& networkName, const std::string& ssid, const std::string& bssid, const std::string& password,
131+
uint8_t channel, uint8_t power)
131132
{
132133
const auto size = this->config.networks.size();
133134

@@ -139,6 +140,7 @@ void ProjectConfig::setWifiConfig(const std::string& networkName, const std::str
139140

140141
it->name = networkName;
141142
it->ssid = ssid;
143+
it->bssid = bssid;
142144
it->password = password;
143145
it->channel = channel;
144146
it->power = power;
@@ -150,7 +152,7 @@ void ProjectConfig::setWifiConfig(const std::string& networkName, const std::str
150152
if (size == 0)
151153
{
152154
ESP_LOGI(CONFIGURATION_TAG, "No networks, We're adding a new network");
153-
this->config.networks.emplace_back(this->pref, static_cast<uint8_t>(0), networkName, ssid, password, channel, power);
155+
this->config.networks.emplace_back(this->pref, static_cast<uint8_t>(0), networkName, ssid, bssid, password, channel, power);
154156
// Save the new network immediately
155157
this->config.networks.back().save();
156158
saveNetworkCount(this->pref, 1);
@@ -162,10 +164,10 @@ void ProjectConfig::setWifiConfig(const std::string& networkName, const std::str
162164
{
163165
ESP_LOGI(CONFIGURATION_TAG, "We're adding a new network");
164166
// we don't have that network yet, we can add it as we still have some
165-
// space we're using emplace_back as push_back will create a copy of it,
167+
// space, we're using emplace_back as push_back will create a copy of it,
166168
// we want to avoid that
167169
uint8_t last_index = getNetworkCount(this->pref);
168-
this->config.networks.emplace_back(this->pref, last_index, networkName, ssid, password, channel, power);
170+
this->config.networks.emplace_back(this->pref, last_index, networkName, ssid, bssid, password, channel, power);
169171
// Save the new network immediately
170172
this->config.networks.back().save();
171173
saveNetworkCount(this->pref, static_cast<int>(this->config.networks.size()));

‎components/ProjectConfig/ProjectConfig/ProjectConfig.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ class ProjectConfig
3737
void setLEDDUtyCycleConfig(int led_external_pwm_duty_cycle);
3838
void setMDNSConfig(const std::string& hostname);
3939
void setCameraConfig(uint8_t vflip, uint8_t framesize, uint8_t href, uint8_t quality, uint8_t brightness);
40-
void setWifiConfig(const std::string& networkName, const std::string& ssid, const std::string& password, uint8_t channel, uint8_t power);
40+
void setWifiConfig(const std::string& networkName, const std::string& ssid, const std::string& bssid, const std::string& password, uint8_t channel,
41+
uint8_t power);
4142

4243
void deleteWifiConfig(const std::string& networkName);
4344

0 commit comments

Comments
 (0)