SH/PHP_SMART_HOME_V3
SH/PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'dev' of https://git.steelants.cz/JonatanRek/PHP_SMART_HOME_V3 into dev

Browse Source
This commit is contained in:
JonatanRek 2019-11-27 19:13:15 +01:00
commit 5418452da2
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
_FIRMWARE/firmwares/NodeMCU Sensor/ESP_OS_NODE_V3.ino
View File

@ -85,9 +85,18 @@ void loop() {
} }
//Set static ip //Set static ip
<<<<<<< HEAD:_FIRMWARE/firmwares/NodeMCU Sensor/ESP_OS_NODE_V3.ino
IPAddress addr; IPAddress addr;
if (addr.fromString(ipAddress)) { if (addr.fromString(ipAddress)) {
IPAddress ip(addr); IPAddress ip(addr);
=======
IPAddress staticIpAddress;
IPAddress subnetIpAddress(192,168,0,1);
IPAddress gatewayIpAddress(255, 255, 255, 0);
if (staticIpAddress.fromString(ipAddress)) {
WiFi.config(staticIpAddress, subnetIpAddress, gatewayIpAddress);
>>>>>>> d67bac14e9b4cd8a60a50b3d65b6f09d40bc944e:_FIRMWARE/firmwares/NodeMCU Sensor/ESP_OS_NODE_V3.ino/ESP_OS_NODE_V3.ino.ino
Serial.print("IP address:\t"); Serial.print("IP address:\t");
Serial.println(WiFi.localIP()); Serial.println(WiFi.localIP());
} }