Merging changes

This commit is contained in:
2018-05-06 18:40:53 +03:00
parent 7c68fd1491
commit 0c3b4e6034
3 changed files with 15 additions and 14 deletions

View File

@@ -32,8 +32,6 @@ e-mail anklimov@gmail.com
#include <ModbusMaster.h>
#include <PubSubClient.h>
#define dimPar SERIAL_8E1
#define fmPar SERIAL_8N1
short modbusBusy = 0;
extern aJsonObject *pollingItem;

View File

@@ -32,7 +32,10 @@
#define MODBUS_SERIAL_BAUD 9600
#endif
#ifndef SERIAL_BAUD
#define dimPar SERIAL_8E1
#define fmPar SERIAL_8N1
#ifndef SERIAL_BAUD
#define SERIAL_BAUD 115200
#endif

View File

@@ -9,11 +9,11 @@
; http://docs.platformio.org/page/projectconf.html
[platformio]
src_dir = lighthub
env_default =
env_default = due-5500
; megaatmega2560
; megaatmega2560-5500
; due
due-5500
; esp8266
[env:due]