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

Some tweeks

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

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

@ -24,7 +24,10 @@ void setup() {
delay(10); delay(10);
Serial.println('\n'); Serial.println('\n');
Serial.println("HW: " + String(hwId)); Serial.println("HW: " + String(hwId));
Serial.print("IP address:\t");
Serial.println(WiFi.localIP());
Serial.print("MAC address:\t");
Serial.println(WiFi.macAdress());
pinMode(LIGHTPIN, INPUT); pinMode(LIGHTPIN, INPUT);
} }
@ -85,19 +88,13 @@ void loop() {
} }
//Set static ip //Set static ip
<<<<<<< HEAD:_FIRMWARE/firmwares/NodeMCU Sensor/ESP_OS_NODE_V3.ino
IPAddress addr;
if (addr.fromString(ipAddress)) {
IPAddress ip(addr);
=======
IPAddress staticIpAddress; IPAddress staticIpAddress;
IPAddress subnetIpAddress(192,168,0,1); IPAddress subnetIpAddress(192,168,0,1);
IPAddress gatewayIpAddress(255, 255, 255, 0); IPAddress gatewayIpAddress(255, 255, 255, 0);
if (staticIpAddress.fromString(ipAddress)) { if (staticIpAddress.fromString(ipAddress)) {
WiFi.config(staticIpAddress, subnetIpAddress, gatewayIpAddress); WiFi.config(staticIpAddress, subnetIpAddress, gatewayIpAddress);
>>>>>>> d67bac14e9b4cd8a60a50b3d65b6f09d40bc944e:_FIRMWARE/firmwares/NodeMCU Sensor/ESP_OS_NODE_V3.ino/ESP_OS_NODE_V3.ino.ino Serial.print("STATIC IP address:\t");
Serial.print("IP address:\t");
Serial.println(WiFi.localIP()); Serial.println(WiFi.localIP());
} }