Merge pull request #787 from stockklauser/master
Fix a code Issue for non DMX usage and Adaopt Project structure to Visual Studio
This commit is contained in:
commit
2856e02eac
@ -17,8 +17,10 @@
|
|||||||
#define __ESP32_ESP32__
|
#define __ESP32_ESP32__
|
||||||
#define ESP_PLATFORM
|
#define ESP_PLATFORM
|
||||||
#define HAVE_CONFIG_H
|
#define HAVE_CONFIG_H
|
||||||
|
#define GCC_NOT_5_2_0 0
|
||||||
|
#define WITH_POSIX
|
||||||
#define F_CPU 240000000L
|
#define F_CPU 240000000L
|
||||||
#define ARDUINO 10809
|
#define ARDUINO 108011
|
||||||
#define ARDUINO_ESP32_DEV
|
#define ARDUINO_ESP32_DEV
|
||||||
#define ARDUINO_ARCH_ESP32
|
#define ARDUINO_ARCH_ESP32
|
||||||
#define ESP32
|
#define ESP32
|
||||||
@ -92,18 +94,11 @@ typedef long pthread_cond_t;
|
|||||||
#include "arduino.h"
|
#include "arduino.h"
|
||||||
#include <pins_arduino.h>
|
#include <pins_arduino.h>
|
||||||
|
|
||||||
//#include "..\generic\Common.h"
|
|
||||||
//#include "..\generic\pins_arduino.h"
|
|
||||||
|
|
||||||
//#undef F
|
|
||||||
//#define F(string_literal) ((const PROGMEM char *)(string_literal))
|
|
||||||
//#undef PSTR
|
|
||||||
//#define PSTR(string_literal) ((const PROGMEM char *)(string_literal))
|
|
||||||
//current vc++ does not understand this syntax so use older arduino example for intellisense
|
|
||||||
//todo:move to the new clang/gcc project types.
|
|
||||||
#define interrupts() sei()
|
#define interrupts() sei()
|
||||||
#define noInterrupts() cli()
|
#define noInterrupts() cli()
|
||||||
|
|
||||||
|
#define ESP_LOGI(tag, ...)
|
||||||
|
|
||||||
#include "wled00.ino"
|
#include "wled00.ino"
|
||||||
#include "wled01_eeprom.ino"
|
#include "wled01_eeprom.ino"
|
||||||
#include "wled02_xml.ino"
|
#include "wled02_xml.ino"
|
||||||
|
File diff suppressed because one or more lines are too long
@ -552,7 +552,9 @@ void loop() {
|
|||||||
handleSerial();
|
handleSerial();
|
||||||
handleNotifications();
|
handleNotifications();
|
||||||
handleTransitions();
|
handleTransitions();
|
||||||
|
#ifdef WLED_ENABLE_DMX
|
||||||
handleDMX();
|
handleDMX();
|
||||||
|
#endif
|
||||||
userLoop();
|
userLoop();
|
||||||
|
|
||||||
yield();
|
yield();
|
||||||
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user