mirror of
https://github.com/EyeTrackVR/OpenIris.git
synced 2025-11-04 15:39:42 +08:00
update
- add dynamic support for ADHOC wifi creds
This commit is contained in:
parent
4d3a67baa3
commit
015af93efe
@ -203,9 +203,9 @@ void ProjectConfig::load()
|
||||
}
|
||||
|
||||
/* AP Config */
|
||||
this->config.ap_network.ssid = getString("apSSID", "openiris").c_str();
|
||||
this->config.ap_network.password = getString("apPass", "12345678").c_str();
|
||||
this->config.ap_network.channel = getUInt("apChannel", 1);
|
||||
this->config.ap_network.ssid = getString("apSSID").c_str();
|
||||
this->config.ap_network.password = getString("apPass").c_str();
|
||||
this->config.ap_network.channel = getUInt("apChannel");
|
||||
|
||||
/* Camera Config */
|
||||
this->config.camera.vflip = getInt("vflip", 0);
|
||||
|
||||
@ -103,7 +103,7 @@ void WiFiHandler::setUpADHOC()
|
||||
size_t passwordLen = configManager->getAPWifiConfig()->password.length();
|
||||
if (ssidLen <= 0)
|
||||
{
|
||||
this->adhoc(WIFI_AP_SSID, 1, WIFI_AP_PASSWORD);
|
||||
this->adhoc(WIFI_AP_SSID, WIFI_AP_CHANNEL, WIFI_AP_PASSWORD);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
# Name, Type, SubType, Offset, Size, Flags
|
||||
# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
|
||||
nvs, data, nvs, 0x9000, 0x6000,
|
||||
phy_init, data, phy, 0xf000, 0x1000,
|
||||
otadata, data, ota, , 0x2000
|
||||
ota_0, app, ota_0, , 1M,
|
||||
ota_1, app, ota_1, , 1M
|
||||
storage, data, spiffs, , 0xF0000,
|
||||
|
@ -232,10 +232,11 @@ build_flags =
|
||||
-DWIFI_CHANNEL=${wifi.channel}
|
||||
-DDEBUG_ESP_PORT=Serial ; set the debug port
|
||||
'-DMDNS_HOSTNAME=${wifi.mDNSName}' ; Set the OTA password
|
||||
'-DWIFI_SSID=${wifi.ssid}' ; Set the users wifi network name
|
||||
'-DWIFI_PASSWORD=${wifi.password}' ; Set the users wifi network password
|
||||
'-DWIFI_AP_SSID=${wifi.ap_ssid}' ; Set the users wifi network name
|
||||
'-DWIFI_AP_PASSWORD=${wifi.ap_password}' ; Set the users wifi network password
|
||||
'-DWIFI_SSID=${wifi.ssid}'
|
||||
'-DWIFI_PASSWORD=${wifi.password}'
|
||||
'-DWIFI_AP_SSID=${wifi.ap_ssid}'
|
||||
'-DWIFI_AP_PASSWORD=${wifi.ap_password}'
|
||||
'-DWIFI_AP_CHANNEL=${wifi.adhocchannel}'
|
||||
|
||||
-DENABLE_OTA=${ota.enableota}
|
||||
-DOTA_SERVER_PORT=${ota.otaserverport}
|
||||
|
||||
@ -1 +1 @@
|
||||
v5.0.10
|
||||
v6.5.10
|
||||
Loading…
Reference in New Issue
Block a user