diff --git a/user_setups/esp32/d1-mini-esp32_ili9341.ini b/user_setups/esp32/d1-mini-esp32_ili9341.ini index 68ed7003..a3a04a8a 100644 --- a/user_setups/esp32/d1-mini-esp32_ili9341.ini +++ b/user_setups/esp32/d1-mini-esp32_ili9341.ini @@ -6,14 +6,8 @@ ;***************************************************; [env:d1-mini-esp32_ili9341] -platform = espressif32 -platform_packages = framework-arduinoespressif32 -framework = arduino +extends = esp32 board = wemos_d1_mini32 -;upload_port = COM5 ; To change the port, use platform_override.ini -;monitor_port = COM5 ; To change the port, use platform_override.ini -monitor_filters = esp32_exception_decoder -board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv build_flags = ${env.build_flags} diff --git a/user_setups/esp32/d132-unoshield_ili9486_parallel.ini b/user_setups/esp32/d132-unoshield_ili9486_parallel.ini index 8c188f00..b1c84d76 100644 --- a/user_setups/esp32/d132-unoshield_ili9486_parallel.ini +++ b/user_setups/esp32/d132-unoshield_ili9486_parallel.ini @@ -5,12 +5,8 @@ ;***************************************************; [env:d132-unoshield] -platform = espressif32 +extends = esp32 board = esp32dev -upload_port = COM4 ; To change the port, use platform_override.ini -monitor_port = COM4 ; To change the port, use platform_override.ini -monitor_filters = esp32_exception_decoder -board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv build_flags = ${env.build_flags} diff --git a/user_setups/esp32/esp32-dev_ili9488.ini b/user_setups/esp32/esp32-dev_ili9488.ini index 2b529cc8..5747e110 100644 --- a/user_setups/esp32/esp32-dev_ili9488.ini +++ b/user_setups/esp32/esp32-dev_ili9488.ini @@ -5,19 +5,8 @@ ;***************************************************; [env:esp32dev-ili9488] -platform = espressif32 @ ^2.0.0 +extends = esp32 board = esp32dev -upload_port = COM2 ; To change the port, use platform_override.ini -monitor_port = COM2 ; To change the port, use platform_override.ini -; upload_protocol = espota ; Use ArduinoOTA after flashing over serial -; upload_port = 10.4.0.171 ; IP of the ESP -; upload_flags = -; --port=3232 -monitor_filters = esp32_exception_decoder -board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv - -debug_tool = esp-prog -debug_init_break = tbreak setup build_flags = ${env.build_flags} diff --git a/user_setups/esp32/esp32-dev_ili9488_parallel.ini b/user_setups/esp32/esp32-dev_ili9488_parallel.ini index d6f73632..995ba4a5 100644 --- a/user_setups/esp32/esp32-dev_ili9488_parallel.ini +++ b/user_setups/esp32/esp32-dev_ili9488_parallel.ini @@ -6,16 +6,8 @@ ;***************************************************; [env:esp32dev-mrb3511] -platform = espressif32 @ ^2.0.0 +extends = esp32 board = esp32dev -upload_port = COM1 ; To change the port, use platform_override.ini -monitor_port = COM1 ; To change the port, use platform_override.ini -monitor_filters = esp32_exception_decoder -board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv -check_tool = cppcheck -check_flags = --enable=all -debug_tool = esp-prog -debug_init_break = tbreak setup build_flags = ${env.build_flags} diff --git a/user_setups/esp32/esp32cam_st7796.ini b/user_setups/esp32/esp32cam_st7796.ini index 88d4e79d..fd51c356 100644 --- a/user_setups/esp32/esp32cam_st7796.ini +++ b/user_setups/esp32/esp32cam_st7796.ini @@ -6,20 +6,8 @@ ;***************************************************; [env:esp32cam-st7796] -platform = espressif32 @ ^2.0.0 +extends = esp32 board = esp32cam -; upload_port = COM18 ; To change the port, use platform_override.ini -; monitor_port = COM18 ; To change the port, use platform_override.ini -; upload_protocol = espota ; Use ArduinoOTA after flashing over serial -; upload_port = x.x.x.x; IP of the ESP -; upload_flags = -; --port=3232 - -debug_tool = esp-prog -debug_init_break = tbreak setup -;board_build.partitions = min_spiffs.csv -monitor_filters = esp32_exception_decoder -board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv ;ESP32 CAM PINS build_flags = diff --git a/user_setups/esp32/lanbon_l8.ini b/user_setups/esp32/lanbon_l8.ini index 2843205e..4328cc6e 100644 --- a/user_setups/esp32/lanbon_l8.ini +++ b/user_setups/esp32/lanbon_l8.ini @@ -6,14 +6,8 @@ ;***************************************************; [env:lanbon_l8] -platform = espressif32 -platform_packages = framework-arduinoespressif32 -framework = arduino +extends = esp32 board = esp32dev -;upload_port = COM5 ; To change the port, use platform_override.ini -;monitor_port = COM5 ; To change the port, use platform_override.ini -monitor_filters = esp32_exception_decoder -board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv build_flags = ${env.build_flags} diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini index dae78b4a..47a82dc2 100644 --- a/user_setups/esp32/lolin-d32-pro_ili9341.ini +++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini @@ -9,6 +9,7 @@ [env:lolind32pro-lolintft24] extends = esp32 +board = lolin_d32_pro build_flags = ${env.build_flags} diff --git a/user_setups/esp32/m5stack_core2.ini b/user_setups/esp32/m5stack_core2.ini index 6ea889e0..bd2dbb04 100644 --- a/user_setups/esp32/m5stack_core2.ini +++ b/user_setups/esp32/m5stack_core2.ini @@ -6,14 +6,8 @@ ;***************************************************; [env:m5stack-core2] -platform = espressif32 -platform_packages = framework-arduinoespressif32 -framework = arduino +extends = esp32 board = esp32dev -;upload_port = COM5 ; To change the port, use platform_override.ini -;monitor_port = COM5 ; To change the port, use platform_override.ini -monitor_filters = esp32_exception_decoder -board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv build_flags = ${env.build_flags} diff --git a/user_setups/esp32/nodemcu-32s_st7796.ini b/user_setups/esp32/nodemcu-32s_st7796.ini index 919b9ee4..5fd72ab2 100644 --- a/user_setups/esp32/nodemcu-32s_st7796.ini +++ b/user_setups/esp32/nodemcu-32s_st7796.ini @@ -6,14 +6,8 @@ ;***************************************************; [env:nodemcu32s-raspi] -platform = espressif32 @ ^2.0.0 +extends = esp32 board = nodemcu-32s -;upload_port = COM9 ; To change the port, use platform_override.ini -;monitor_port = COM9 ; To change the port, use platform_override.ini -monitor_filters = esp32_exception_decoder -board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv -debug_tool = esp-prog -debug_init_break = tbreak setup build_flags = ${env.build_flags} diff --git a/user_setups/esp32/ttgo-esp32-lilygo-pi.ini b/user_setups/esp32/ttgo-esp32-lilygo-pi.ini index 215a51ee..2d687549 100644 --- a/user_setups/esp32/ttgo-esp32-lilygo-pi.ini +++ b/user_setups/esp32/ttgo-esp32-lilygo-pi.ini @@ -6,17 +6,8 @@ ;***************************************************; [env:ttgo-esp32-lilygo-pi] -platform = espressif32 +extends = esp32 board = esp32dev -;upload_protocol = espota ; Use ArduinoOTA after flashing over serial -;upload_port = 10.4.70.37 ; 10.4.0.198 ; IP of the ESP -;upload_flags = -; --port=3232 - -;upload_port = COM9 ; To change the port, use platform_override.ini -;monitor_port = COM9 ; To change the port, use platform_override.ini -monitor_filters = esp32_exception_decoder -board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv build_flags = ${env.build_flags} diff --git a/user_setups/esp32/ttgo-esp32-poe_ili9341.ini b/user_setups/esp32/ttgo-esp32-poe_ili9341.ini index cab11a22..0031aae4 100644 --- a/user_setups/esp32/ttgo-esp32-poe_ili9341.ini +++ b/user_setups/esp32/ttgo-esp32-poe_ili9341.ini @@ -7,17 +7,8 @@ ;***************************************************; [env:ttgo_esp32_poe-lolintft24] -platform = espressif32 @ ^2.0.0 +extends = esp32 board = esp32dev -;upload_protocol = espota ; Use ArduinoOTA after flashing over serial -;upload_port = 10.4.70.37 ; 10.4.0.198 ; IP of the ESP -;upload_flags = -; --port=3232 - -;upload_port = COM9 ; To change the port, use platform_override.ini -;monitor_port = COM9 ; To change the port, use platform_override.ini -monitor_filters = esp32_exception_decoder -board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv build_flags = ${env.build_flags} diff --git a/user_setups/esp32/wt32-sc01.ini b/user_setups/esp32/wt32-sc01.ini index 5076645f..e63852ff 100644 --- a/user_setups/esp32/wt32-sc01.ini +++ b/user_setups/esp32/wt32-sc01.ini @@ -6,14 +6,8 @@ ;***************************************************; [env:wt32-sc01] -platform = espressif32 -platform_packages = framework-arduinoespressif32 -framework = arduino +extends = esp32 board = esp32dev -;upload_port = COM5 ; To change the port, use platform_override.ini -;monitor_port = COM5 ; To change the port, use platform_override.ini -monitor_filters = esp32_exception_decoder -board_build.partitions = user_setups/esp32_partition_app1300k_spiffs1216k.csv build_flags = ${env.build_flags} diff --git a/user_setups/esp8266/d1-mini-esp8266_ili9341.ini b/user_setups/esp8266/d1-mini-esp8266_ili9341.ini index c9998782..6eb7ac8a 100644 --- a/user_setups/esp8266/d1-mini-esp8266_ili9341.ini +++ b/user_setups/esp8266/d1-mini-esp8266_ili9341.ini @@ -6,15 +6,9 @@ ;***************************************************; [env:d1-mini-esp8266_ili9341] -platform = espressif8266@^2.6.2 +extends = esp8266 board = d1_mini -;upload_port = COM7 ; To change the port, use platform_override.ini -;monitor_port = COM7 ; To change the port, use platform_override.ini -monitor_filters = esp8266_exception_decoder -board_build.f_flash = 40000000L -board_build.flash_mode = dout -board_build.ldscript = eagle.flash.4m2m.ld ; 2Mb Spiffs -board_build.f_cpu = 160000000L ; set frequency to 160MHz + build_flags = ${env.build_flags} ${esp8266.build_flags} diff --git a/user_setups/esp8266/esp8266_st7735.ini b/user_setups/esp8266/esp8266_st7735.ini index d1637bcc..374292b6 100644 --- a/user_setups/esp8266/esp8266_st7735.ini +++ b/user_setups/esp8266/esp8266_st7735.ini @@ -5,14 +5,9 @@ ;***************************************************; [env:esp12e-st7735] -platform = espressif8266@^2.6.2 +extends = esp8266 board = esp12e -upload_port = COM8 ; To change the port, use platform_override.ini -monitor_port = COM8 ; To change the port, use platform_override.ini -board_build.f_flash = 40000000L -board_build.flash_mode = dout -board_build.ldscript = eagle.flash.4m2m.ld ; 2Mb Spiffs -board_build.f_cpu = 160000000L ; set frequency to 160MHz + build_flags = ${env.build_flags} ${esp8266.build_flags} diff --git a/user_setups/win32/emulator_64bits.ini b/user_setups/win32/emulator_64bits.ini index 9742840d..43480cbd 100644 --- a/user_setups/win32/emulator_64bits.ini +++ b/user_setups/win32/emulator_64bits.ini @@ -11,7 +11,7 @@ build_flags = ;-D LV_DRV_NO_CONF -D LV_MEM_SIZE=262144U ; 256kB lvgl memory -D USE_MONITOR - -D MONITOR_ZOOM=1 ; 2 + -D MONITOR_ZOOM=1 ; can be fractional like 1.5 or 2 -D USE_MOUSE -D USE_MOUSEWHEEL -D USE_KEYBOARD @@ -71,7 +71,7 @@ build_flags = lib_deps = ${env.lib_deps} - lv_drivers@~7.9.0 + ;lv_drivers@~7.9.0 ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip https://github.com/eclipse/paho.mqtt.c.git bblanchon/ArduinoJson@^6.17.2 ; Json(l) parser