resolve conflicts

This commit is contained in:
1technophile committed 2017-09-23 16:31:21 +02:00
commit 9ebbe99412
10 files changed
+48 -96

No files matched your search

+4 -3
View File
@@ -119,10 +119,9 @@ void callback(char* topic, byte* payload, unsigned int length) {
void setup()
{
//Launch serial for debugging purposes
Serial.begin(SERIAL_BAUD);
#ifdef ESP8266
//Launch serial for debugging purposes
Serial.begin(SERIAL_BAUD, SERIAL_8N1, SERIAL_TX_ONLY);
//Begining wifi connection in case of ESP8266
setup_wifi();
// Port defaults to 8266
@@ -153,6 +152,8 @@ void setup()
});
ArduinoOTA.begin();
#else
//Launch serial for debugging purposes
Serial.begin(SERIAL_BAUD);
//Begining ethernet connection in case of Arduino + W5100
setup_ethernet();
#endif