diff --git a/platformio.ini b/platformio.ini index fdf2d7df..8a67f546 100644 --- a/platformio.ini +++ b/platformio.ini @@ -61,7 +61,7 @@ default_envs = esp32s2_tinyUF2_PSRAM_max esp8266pro_16MB_min esp01_1MB_min - + ; Go to MoonModules environments for environments src_dir = ./wled00 @@ -353,14 +353,15 @@ build_unflags = ${common.build_unflags} build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP02 -D WLED_DISABLE_BLYNK lib_deps = ${esp8266.lib_deps} -[env:esp01_1m_full] -board = esp01_1m -platform = ${common.platform_wled_default} -platform_packages = ${common.platform_packages} -board_build.ldscript = ${common.ldscript_1m128k} -build_unflags = ${common.build_unflags} -build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP01 -D WLED_DISABLE_OTA -D WLED_DISABLE_BLYNK -lib_deps = ${esp8266.lib_deps} +; WLEDMM see below +; [env:esp01_1m_full] +; board = esp01_1m +; platform = ${common.platform_wled_default} +; platform_packages = ${common.platform_packages} +; board_build.ldscript = ${common.ldscript_1m128k} +; build_unflags = ${common.build_unflags} +; build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP01 -D WLED_DISABLE_OTA -D WLED_DISABLE_BLYNK +; lib_deps = ${esp8266.lib_deps} [env:esp07] board = esp07 @@ -604,27 +605,28 @@ lib_deps = ${esp32s2.lib_deps} # custom board configurations # ------------------------------------------------------------------------------ -[env:wemos_shield_esp32_donotuse] -board = esp32dev -platform = espressif32@3.2 -upload_speed = 460800 -build_unflags = ${common.build_unflags} -build_flags = ${common.build_flags_esp32} - -D LEDPIN=16 - -D RLYPIN=19 - -D BTNPIN=17 - -D IRPIN=18 - -D UWLED_USE_MY_CONFIG - -D USERMOD_DALLASTEMPERATURE - -D USERMOD_FOUR_LINE_DISPLAY - -D TEMPERATURE_PIN=23 - -D USE_ALT_DISPlAY ; new versions of USERMOD_FOUR_LINE_DISPLAY and USERMOD_ROTARY_ENCODER_UI - -D USERMOD_AUDIOREACTIVE -lib_deps = ${esp32.lib_deps} - OneWire@~2.3.5 - olikraus/U8g2 @ ^2.28.8 - https://github.com/blazoncek/arduinoFFT.git -board_build.partitions = ${esp32.default_partitions} +; WLEDMM see below +; [env:wemos_shield_esp32] +; board = esp32dev +; platform = espressif32@3.2 +; upload_speed = 460800 +; build_unflags = ${common.build_unflags} +; build_flags = ${common.build_flags_esp32} +; -D LEDPIN=16 +; -D RLYPIN=19 +; -D BTNPIN=17 +; -D IRPIN=18 +; -D UWLED_USE_MY_CONFIG +; -D USERMOD_DALLASTEMPERATURE +; -D USERMOD_FOUR_LINE_DISPLAY +; -D TEMPERATURE_PIN=23 +; -D USE_ALT_DISPlAY ; new versions of USERMOD_FOUR_LINE_DISPLAY and USERMOD_ROTARY_ENCODER_UI +; -D USERMOD_AUDIOREACTIVE +; lib_deps = ${esp32.lib_deps} +; OneWire@~2.3.5 +; olikraus/U8g2 @ ^2.28.8 +; https://github.com/blazoncek/arduinoFFT.git +; board_build.partitions = ${esp32.default_partitions} [env:m5atom] board = esp32dev @@ -1354,8 +1356,8 @@ build_flags = ${wemos_shield_esp32_4MB_all_base.build_flags} ${Shield_ICS4343x.b -D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_ICS4343x_all board = ${Board_ESP32_16MB.board} board_build.partitions = ${Board_ESP32_16MB.board_build.partitions} -; RAM: [== ] 24.4% (used 79820 bytes from 327680 bytes) -; Flash: [========= ] 88.6% (used 1393421 bytes from 1572864 bytes) +; RAM: [== ] 24.4% (used 80044 bytes from 327680 bytes) +; Flash: [======= ] 67.9% (used 1424185 bytes from 2097152 bytes) monitor_filters = esp32_exception_decoder ; used to show crash details [env:wemos_shield_esp32_16MB_SPM1423_max] diff --git a/usermods/customeffects/arti_wled.h b/usermods/customeffects/arti_wled.h index 1b78af63..d9c8e363 100644 --- a/usermods/customeffects/arti_wled.h +++ b/usermods/customeffects/arti_wled.h @@ -189,10 +189,12 @@ float ARTI::arti_external_function(uint8_t function, float par1, float par2, flo SEGMENT.drawLine(par1, par2, par3, par4, par5); return floatNull; case F_drawArc: - if (par5 == floatNull) - SEGMENT.drawArc(par1, par2, par3, par4); - else - SEGMENT.drawArc(par1, par2, par3, par4, par5); //fillColor + #ifndef WLED_DISABLE_2D + if (par5 == floatNull) + SEGMENT.drawArc(par1, par2, par3, par4); + else + SEGMENT.drawArc(par1, par2, par3, par4, par5); //fillColor + #endif return floatNull; case F_constrain: return constrain(par1, par2, par3); diff --git a/wled00/wled.h b/wled00/wled.h index 84c245f0..9b3b591c 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2302140 +#define VERSION 2302150 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG