1. Fix an Issue withtin the DMX Compiler Flags if you dont use it in …

…wled00.ino 2. Fix the Build / working environment for Visual Studio and make a better Folder Structure within the Visual Studio Project
andyb2000 · Mar 22, 2020 · a4f0c91 · a4f0c91
1 parent f4f5d6e
commit a4f0c91
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/wled00/__vm/.wled00.vsarduino.h b/wled00/__vm/.wled00.vsarduino.h
@@ -17,8 +17,10 @@
 #define __ESP32_ESP32__
 #define ESP_PLATFORM
 #define HAVE_CONFIG_H
+#define GCC_NOT_5_2_0 0
+#define WITH_POSIX
 #define F_CPU 240000000L
-#define ARDUINO 10809
+#define ARDUINO 108011
 #define ARDUINO_ESP32_DEV
 #define ARDUINO_ARCH_ESP32
 #define ESP32
@@ -92,18 +94,11 @@ typedef long pthread_cond_t;
 #include "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 noInterrupts() cli()
 
+#define ESP_LOGI(tag, ...)
+
 #include "wled00.ino"
 #include "wled01_eeprom.ino"
 #include "wled02_xml.ino"

diff --git a/wled00/__vm/Compile.vmps.xml b/wled00/__vm/Compile.vmps.xml
diff --git a/wled00/wled00.ino b/wled00/wled00.ino
@@ -552,7 +552,9 @@ void loop() {
   handleSerial();
   handleNotifications();
   handleTransitions();
+#ifdef WLED_ENABLE_DMX
   handleDMX();
+#endif
   userLoop();
 
   yield();

diff --git a/wled00/wled00.vcxproj b/wled00/wled00.vcxproj
@@ -73,9 +73,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\wled00;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\libraries\WiFi\src;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\libraries\ESPmDNS\src;C:\Program Files (x86)\Arduino\libraries\AsyncTCP;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\libraries\SPIFFS\src;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\libraries\FS\src;C:\Program Files (x86)\Arduino\libraries\ESPAsyncWebServer\src;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\libraries\EEPROM\src;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\libraries\DNSServer\src;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\libraries\ArduinoOTA\src;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\libraries\Update\src;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\libraries\AsyncUDP\src;$(ProjectDir)..\..\..\User\Thomas\Documents\Arduino\libraries\NeoPixelBus_by_Makuna\src;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\libraries\SPI\src;$(ProjectDir)..\..\..\User\Thomas\Documents\Arduino\libraries\FastLED;C:\Program Files (x86)\Arduino\libraries;$(ProjectDir)..\..\..\User\Thomas\Documents\Arduino\libraries;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\libraries;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\cores\esp32;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\cores\esp32\apps;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\cores\esp32\libb64;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\variants\esp32;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\config;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\app_trace;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\app_update;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\asio;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\bootloader_support;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\bt;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\coap;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\console;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\driver;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\esp-tls;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\esp32;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\esp_adc_cal;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\esp_event;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\esp_http_client;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\esp_http_server;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\esp_https_ota;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\esp_ringbuf;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\ethernet;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\expat;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\fatfs;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\freemodbus;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\freertos;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\heap;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\idf_test;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\jsmn;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\json;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\libsodium;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\log;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\lwip;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\mbedtls;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\mdns;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\micro-ecc;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\mqtt;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\newlib;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\nghttp;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\nvs_flash;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\openssl;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\protobuf-c;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\protocomm;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\pthread;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\sdmmc;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\smartconfig_ack;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\soc;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\spi_flash;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\spiffs;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\tcp_transport;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\tcpip_adapter;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\ulp;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\vfs;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\wear_levelling;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\wifi_provisioning;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\wpa_supplicant;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\xtensa-debug-module;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\esp32-camera;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\esp-face;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\hardware\esp32\1.0.2\tools\sdk\include\fb_gfx;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0\lib\gcc\xtensa-esp32-elf\5.2.0\include;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0\xtensa-esp32-elf\include\c++\5.2.0\xtensa-esp32-elf;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0\xtensa-esp32-elf\include;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0\xtensa-esp32-elf\include\c++\5.2.0;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0\include\c++\5.2.0;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0\include;C:\Users\thoma\AppData\Local\arduino15\packages\esp32\tools\xtensa-esp32-elf-gcc\1.22.0-80-g6c4433a-5.2.0\include\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\wled00;C:\Program Files (x86)\Arduino\libraries\WiFi\src;C:\Program Files (x86)\Arduino\libraries\WiFi\src\utility;C:\Program Files (x86)\Arduino\hardware\arduino\avr\libraries\EEPROM\src;C:\Program Files (x86)\Arduino\hardware\arduino\avr\cores\arduino;C:\Program Files (x86)\Arduino\hardware\arduino\avr\variants\yun;C:\Program Files (x86)\Arduino\hardware\tools\avr\\lib\gcc\avr\7.3.0\include;C:\Program Files (x86)\Arduino\hardware\tools\avr\avr\include;C:\Program Files (x86)\Arduino\hardware\tools\avr\\lib\gcc\avr\7.3.0\include;C:\Program Files (x86)\Arduino\hardware\tools\avr\avr\include-fixed;C:\Program Files (x86)\Arduino\hardware\tools\avr\avr\include\avr;C:\Program Files (x86)\Arduino\hardware\tools\avr\lib\gcc\avr\4.9.2\include;C:\Program Files (x86)\Arduino\hardware\tools\avr\lib\gcc\avr\4.9.2\include;C:\Program Files (x86)\Arduino\hardware\tools\avr\lib\gcc\avr\4.9.3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(ProjectDir)__vm\.wled00.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <PreprocessorDefinitions>__ESP32_esp32__;__ESP32_ESP32__;ESP_PLATFORM;HAVE_CONFIG_H;F_CPU=240000000L;ARDUINO=10809;ARDUINO_ESP32_DEV;ARDUINO_ARCH_ESP32;ESP32;CORE_DEBUG_LEVEL=0;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__AVR_atmega32u4__;__AVR_ATmega32U4__;__AVR_ATmega32u4__;F_CPU=16000000L;ARDUINO=108011;ARDUINO_AVR_YUN;ARDUINO_ARCH_AVR;USB_VID=0x2341;USB_PID=0x8041;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>