Merge branch 'master' into dev-v1.1.0

This commit is contained in:
Gunnar Skjold 2020-02-16 15:28:47 +01:00
commit ccd818e1ab
2 changed files with 2 additions and 2 deletions

View File

@ -29,7 +29,7 @@ You can also use a ESP based development board and combine this with a M-Bus mod
- Dallas temp sensor connected to GPIO14
[Adafruit HUZZAH32](https://www.adafruit.com/product/3405)
- M-Bus connected to RX
- M-Bus connected to GPIO16
Combine one of above board with an M-Bus module. Connect 3.3v and GND together between the boards and connect the TX pin from the M-Bus board to the dedicated M-Bus pin on the ESP board.

View File

@ -52,7 +52,7 @@ SoftwareSerial *hanSerial = new SoftwareSerial(D1);
#define LED_ACTIVE_HIGH 1
#define AP_BUTTON_PIN INVALID_BUTTON_PIN
HardwareSerial *hanSerial = &Serial;
HardwareSerial *hanSerial = &Serial2;
// Default build settings
#else