Skip to content

Support for static IP and BSSID/MAC, Channel of AP #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 19, 2017
Merged

Support for static IP and BSSID/MAC, Channel of AP #327

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd40128
Support for static IP and BSSID/MAC, Channel of AP
Apr 5, 2017
8156c1f
Addjustments for travis
Apr 5, 2017
5bcfe43
Another addjustments for travis
Apr 5, 2017
240d893
Fix problem with prepareToSleep
Apr 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix problem with prepareToSleep
  • Loading branch information
Piotr Antczak committed Apr 5, 2017
commit 240d893347ddef2adf0bcf915d4900ffc9075beb
68 changes: 35 additions & 33 deletions src/Homie/Boot/BootNormal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,42 +102,45 @@ void BootNormal::_endOtaUpdate(bool success, uint8_t update_error) {
}

void BootNormal::_wifiConnect() {
if (Interface::get().led.enabled) Interface::get().getBlinker().start(LED_WIFI_DELAY);
Interface::get().getLogger() << F("↕ Attempting to connect to Wi-Fi...") << endl;

if (WiFi.getMode() != WIFI_STA) WiFi.mode(WIFI_STA);

WiFi.hostname(Interface::get().getConfig().get().deviceId);
if (strcmp_P(Interface::get().getConfig().get().wifi.ip, PSTR("")) != 0) { // on _validateConfigWifi there is a requirement for mask and gateway
byte convertedBytes[4];
Helpers::stringToBytes(Interface::get().getConfig().get().wifi.ip, '.', convertedBytes, 4, 10);
IPAddress convertedIp(convertedBytes[0], convertedBytes[1], convertedBytes[2], convertedBytes[3]);
Helpers::stringToBytes(Interface::get().getConfig().get().wifi.mask, '.', convertedBytes, 4, 10);
IPAddress convertedMask(convertedBytes[0], convertedBytes[1], convertedBytes[2], convertedBytes[3]);
Helpers::stringToBytes(Interface::get().getConfig().get().wifi.gw, '.', convertedBytes, 4, 10);
IPAddress convertedGateway(convertedBytes[0], convertedBytes[1], convertedBytes[2], convertedBytes[3]);
if (strcmp_P(Interface::get().getConfig().get().wifi.dns1, PSTR("")) != 0) {
Helpers::stringToBytes(Interface::get().getConfig().get().wifi.dns2, '.', convertedBytes, 4, 10);
IPAddress convertedDns1(convertedBytes[0], convertedBytes[1], convertedBytes[2], convertedBytes[3]);
if ((strcmp_P(Interface::get().getConfig().get().wifi.dns2, PSTR("")) != 0)) { // on _validateConfigWifi there is requirement that we need dns1 if we want to define dns2
Helpers::stringToBytes(Interface::get().getConfig().get().wifi.dns2, '.', convertedBytes, 4, 10);
IPAddress convertedDns2(convertedBytes[0], convertedBytes[1], convertedBytes[2], convertedBytes[3]);
WiFi.config(convertedIp, convertedGateway, convertedMask, convertedDns1, convertedDns2);
if (!Interface::get().flaggedForSleep) {
if (Interface::get().led.enabled) Interface::get().getBlinker().start(LED_WIFI_DELAY);
Interface::get().getLogger() << F("↕ Attempting to connect to Wi-Fi...") << endl;

if (WiFi.getMode() != WIFI_STA) WiFi.mode(WIFI_STA);

WiFi.hostname(Interface::get().getConfig().get().deviceId);
if (strcmp_P(Interface::get().getConfig().get().wifi.ip, PSTR("")) != 0) { // on _validateConfigWifi there is a requirement for mask and gateway
byte convertedBytes[4];
Helpers::stringToBytes(Interface::get().getConfig().get().wifi.ip, '.', convertedBytes, 4, 10);
IPAddress convertedIp(convertedBytes[0], convertedBytes[1], convertedBytes[2], convertedBytes[3]);
Helpers::stringToBytes(Interface::get().getConfig().get().wifi.mask, '.', convertedBytes, 4, 10);
IPAddress convertedMask(convertedBytes[0], convertedBytes[1], convertedBytes[2], convertedBytes[3]);
Helpers::stringToBytes(Interface::get().getConfig().get().wifi.gw, '.', convertedBytes, 4, 10);
IPAddress convertedGateway(convertedBytes[0], convertedBytes[1], convertedBytes[2], convertedBytes[3]);

if (strcmp_P(Interface::get().getConfig().get().wifi.dns1, PSTR("")) != 0) {
Helpers::stringToBytes(Interface::get().getConfig().get().wifi.dns1, '.', convertedBytes, 4, 10);
IPAddress convertedDns1(convertedBytes[0], convertedBytes[1], convertedBytes[2], convertedBytes[3]);
if ((strcmp_P(Interface::get().getConfig().get().wifi.dns2, PSTR("")) != 0)) { // on _validateConfigWifi there is requirement that we need dns1 if we want to define dns2
Helpers::stringToBytes(Interface::get().getConfig().get().wifi.dns2, '.', convertedBytes, 4, 10);
IPAddress convertedDns2(convertedBytes[0], convertedBytes[1], convertedBytes[2], convertedBytes[3]);
WiFi.config(convertedIp, convertedGateway, convertedMask, convertedDns1, convertedDns2);
} else {
WiFi.config(convertedIp, convertedGateway, convertedMask, convertedDns1);
}
} else {
WiFi.config(convertedIp, convertedGateway, convertedMask, convertedDns1);
WiFi.config(convertedIp, convertedGateway, convertedMask);
}
}

if (strcmp_P(Interface::get().getConfig().get().wifi.bssid, PSTR("")) != 0) {
byte bssidBytes[6];
Helpers::stringToBytes(Interface::get().getConfig().get().wifi.bssid, ':', bssidBytes, 6, 16);
WiFi.begin(Interface::get().getConfig().get().wifi.ssid, Interface::get().getConfig().get().wifi.password, Interface::get().getConfig().get().wifi.channel, bssidBytes);
} else {
WiFi.config(convertedIp, convertedGateway, convertedMask);
WiFi.begin(Interface::get().getConfig().get().wifi.ssid, Interface::get().getConfig().get().wifi.password);
}
}
if (strcmp_P(Interface::get().getConfig().get().wifi.bssid, PSTR("")) != 0) {
byte bssidBytes[6];
Helpers::stringToBytes(Interface::get().getConfig().get().wifi.bssid, ':', bssidBytes, 6, 16);
WiFi.begin(Interface::get().getConfig().get().wifi.ssid, Interface::get().getConfig().get().wifi.password, Interface::get().getConfig().get().wifi.channel, bssidBytes);
} else {
WiFi.begin(Interface::get().getConfig().get().wifi.ssid, Interface::get().getConfig().get().wifi.password);
}
if (WiFi.SSID() != Interface::get().getConfig().get().wifi.ssid || WiFi.psk() != Interface::get().getConfig().get().wifi.password) {

WiFi.setAutoConnect(true);
WiFi.setAutoReconnect(true);
}
Expand Down Expand Up @@ -283,7 +286,6 @@ void BootNormal::_onMqttDisconnected(AsyncMqttClientDisconnectReason reason) {

if (_mqttOfflineMessageId != 0) {
_mqttOfflineMessageId = 0;
Interface::get().flaggedForSleep = false;
Interface::get().getLogger() << F("Triggering READY_TO_SLEEP event...") << endl;
Interface::get().event.type = HomieEventType::READY_TO_SLEEP;
Interface::get().eventHandler(Interface::get().event);
Expand Down