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

Fix compilation errors and project dependencies for Arduino Mega

Browse Source
This commit is contained in:
Mykhailo Khulap
2018-10-17 12:13:07 +03:00
parent d89dfd2364
commit 766cd060b8
3 changed files with 237 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lighthub/inputs.cpp
View File

@@ -20,6 +20,7 @@ e-mail anklimov@gmail.com
#include "inputs.h" #include "inputs.h"
#include "item.h" #include "item.h"
#include "utils.h"
#include <PubSubClient.h> #include <PubSubClient.h>
#ifndef DHT_DISABLE #ifndef DHT_DISABLE

10
lighthub/main.cpp
View File

@@ -477,8 +477,8 @@ void onInitialStateInitLAN() {
#if defined(__AVR__) || defined(__SAM3X8E__)||defined(ARDUINO_ARCH_STM32F1) #if defined(__AVR__) || defined(__SAM3X8E__)||defined(ARDUINO_ARCH_STM32F1)
#ifdef W5500_CS_PIN #ifdef W5500_CS_PIN
Ethernet.w5500_cspin = W5500_CS_PIN; Ethernet.w5500_cspin = W5500_CS_PIN;
debugSerial<<F("Use W5500 pin: ")); debugSerial<<"Use W5500 pin: ";
debugSerial<<Ethernet.w5500_cspin); debugSerial<<(Ethernet.w5500_cspin);
#endif #endif
IPAddress ip, dns, gw, mask; IPAddress ip, dns, gw, mask;
int res = 1; int res = 1;
@@ -553,8 +553,8 @@ void softRebootFunc(){
void resetHard() { void resetHard() {
#ifdef RESET_PIN #ifdef RESET_PIN
debugSerial<<F("Reset Arduino with digital pin ")); debugSerial<<"Reset Arduino with digital pin ";
debugSerial<<QUOTE(RESET_PIN)); debugSerial<<QUOTE(RESET_PIN);
delay(500); delay(500);
pinMode(RESET_PIN, OUTPUT); pinMode(RESET_PIN, OUTPUT);
digitalWrite(RESET_PIN,LOW); digitalWrite(RESET_PIN,LOW);
@@ -1182,7 +1182,7 @@ void printFirmwareVersionAndBuildOptions() {
#endif #endif
#ifdef RESET_PIN #ifdef RESET_PIN
debugSerial<<F("\n(+)HARDRESET on pin=")<<F(QUOTE(RESET_PIN); debugSerial<<"\n(+)HARDRESET on pin="<<QUOTE(RESET_PIN);
#else #else
debugSerial<<F("\n(-)HARDRESET, using soft"); debugSerial<<F("\n(-)HARDRESET, using soft");
#endif #endif

7
platformio.ini
View File

@@ -10,8 +10,8 @@
[platformio] [platformio]
src_dir = lighthub src_dir = lighthub
env_default = env_default =
; megaatmega2560 megaatmega2560
megaatmega2560-net ; megaatmega2560-net
; due ; due
; esp8266 ; esp8266
; esp32 ; esp32
@@ -112,7 +112,7 @@ lib_deps =
https://github.com/anklimov/CmdArduino https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial https://github.com/anklimov/DMXSerial
https://github.com/anklimov/Ethernet https://github.com/anklimov/Ethernet2
https://github.com/PaulStoffregen/SPI.git https://github.com/PaulStoffregen/SPI.git
https://github.com/knolleary/pubsubclient.git https://github.com/knolleary/pubsubclient.git
https://github.com/anklimov/Artnet.git https://github.com/anklimov/Artnet.git
@@ -122,6 +122,7 @@ lib_deps =
DHT sensor library DHT sensor library
https://github.com/arcao/Syslog.git https://github.com/arcao/Syslog.git
Streaming Streaming
https://github.com/Chris--A/PrintEx.git
[env:esp8266] [env:esp8266]
platform = espressif8266 platform = espressif8266