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

Environment nrf52840_dk [SUCCESS]

Browse Source 
Environment esp32               [SUCCESS]
Environment due                 [SUCCESS]
Environment megaatmega2560      [SUCCESS]
Environment esp8266             [SUCCESS]
Environment megaatmega2560-net  [SUCCESS]
Environment due-5500            [SUCCESS]
Environment controllino         [SUCCESS]
Environment stm32               [SUCCESS]
This commit is contained in:
Andrey Klimov
2019-03-23 15:58:52 +03:00
parent 696254a932
commit 2947a1e53c
7 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lighthub/inputs.cpp
View File

@@ -26,7 +26,6 @@ e-mail anklimov@gmail.com
#ifndef DHT_DISABLE
#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
#include <DHTesp.h>
#else
#include "DHT.h"
#endif

6
lighthub/main.cpp
View File

@@ -86,13 +86,13 @@ WiFiClient ethClient;
NRFFlashStorage EEPROM;
#endif
#ifdef ARDUINO_ARCH_STM32F1
#ifdef ARDUINO_ARCH_STM32
#include "HttpClient.h"
//#include <EthernetClient.h>
//#include "UIPEthernet.h"
#include "UIPEthernet.h"
//#include "UIPUdp.h"
//#include <SPI.h>
#include <Ethernet_STM.h>
//#include <Ethernet_STM.h>
#include "Dns.h"
//#include "utility/logging.h"

6
lighthub/main.h
View File

@@ -79,6 +79,12 @@
#define wdt_dis()
#endif
#if defined(ARDUINO_ARCH_STM32)
#define wdt_res()
#define wdt_en()
#define wdt_dis()
#endif
//#if defined(ESP8266)
//#define wdt_res()
//#define wdt_en()

7
lighthub/options.h
View File

@@ -138,6 +138,13 @@
#define dmxin DmxDue1
#endif
#if defined(NRF5)
//#define modbusSerial Serial1
#undef _dmxin
#undef _dmxout
#undef _modbus
#endif
#if defined(ARDUINO_ARCH_ESP8266)
#undef _dmxin
#undef _modbus

4
lighthub/utils.cpp
View File

@@ -22,7 +22,7 @@ e-mail anklimov@gmail.com
#include "options.h"
#include "stdarg.h"
#if defined(__SAM3X8E__) || defined(ARDUINO_ARCH_STM32F1)
#if defined(__SAM3X8E__) || defined(ARDUINO_ARCH_STM32)
#include <malloc.h>
#endif
@@ -103,7 +103,7 @@ unsigned long freeRam ()
}
#endif
#if defined(ARDUINO_ARCH_STM32F1)
#if defined(ARDUINO_ARCH_STM32)
extern char _end;
extern "C" char *sbrk(int i);