andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-08 12:49:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merging changes

Browse Source
This commit is contained in:
Andrey Klimov
2018-05-06 18:40:53 +03:00
parent 7c68fd1491
commit 0c3b4e6034
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lighthub/item.cpp
View File

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

3
lighthub/options.h
View File

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

4
platformio.ini
View File

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