Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-09-11 17:14:27 +00:00
Code Issues Releases Activity

[ESP32 OTA] Exclude ESP32HTTPUpdateServer lib for ESP82xx builds

Browse Source
This commit is contained in:
Gijs Noorlander
2020-04-13 10:23:54 +02:00
parent a92e9d4f37
commit 1bfb6cd56f
3 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platformio_core_defs.ini
+15 -4
View File
@@ -38,6 +38,7 @@ build_flags = -D BUILD_GIT='"${sysenv.TRAVIS_TAG}"'
-DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-DVTABLES_IN_FLASH
-DPUYA_SUPPORT=1
lib_ignore = ESP32_ping, ESP32WebServer, ESP32HTTPUpdateServer
[esp82xx_2_5_x]
build_flags = -D BUILD_GIT='"${sysenv.TRAVIS_TAG}"'
@@ -49,12 +50,14 @@ build_flags = -D BUILD_GIT='"${sysenv.TRAVIS_TAG}"'
-DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
-DPUYA_SUPPORT=1
-DCORE_POST_2_5_0
lib_ignore = ${esp82xx_defaults.lib_ignore}
[esp82xx_2_6_x]
build_flags = ${esp82xx_2_5_x.build_flags}
-O2
-DBEARSSL_SSL_BASIC
-DCORE_POST_2_6_0
lib_ignore = ${esp82xx_defaults.lib_ignore}
;[core_2_3_0]
@@ -66,23 +69,23 @@ build_flags = ${esp82xx_2_5_x.build_flags}
; -DPUYA_SUPPORT=1
; -DARDUINO_ESP8266_RELEASE_2_3_0
; -DFORCE_PRE_2_5_0
;lib_ignore = ESP32_ping, ESP32WebServer, IRremoteESP8266, HeatpumpIR
;lib_ignore = ${esp82xx_defaults.lib_ignore}, IRremoteESP8266, HeatpumpIR
;[core_2_4_0]
;platform = https://github.com/TD-er/platform-espressif8266.git#patch/v1.6.0_Puya
;build_flags = ${esp82xx_defaults.build_flags} -DARDUINO_ESP8266_RELEASE_2_4_0 -DFORCE_PRE_2_5_0
;lib_ignore = ESP32_ping, ESP32WebServer, IRremoteESP8266, HeatpumpIR
;lib_ignore = ${esp82xx_defaults.lib_ignore}, IRremoteESP8266, HeatpumpIR
;[core_2_4_1]
;platform = https://github.com/TD-er/platform-espressif8266.git#patch/v1.7.3_Puya
;build_flags = ${esp82xx_defaults.build_flags} -DARDUINO_ESP8266_RELEASE_2_4_1 -DFORCE_PRE_2_5_0
;lib_ignore = ESP32_ping, ESP32WebServer, IRremoteESP8266, HeatpumpIR
;lib_ignore = ${esp82xx_defaults.lib_ignore}, IRremoteESP8266, HeatpumpIR
[core_2_4_2]
platform = https://github.com/TD-er/platform-espressif8266.git#patch/v1.8.0_Puya
build_flags = ${esp82xx_defaults.build_flags} -DARDUINO_ESP8266_RELEASE_2_4_2 -DFORCE_PRE_2_5_0
lib_ignore = ESP32_ping, ESP32WebServer, IRremoteESP8266, HeatpumpIR
lib_ignore = ${esp82xx_defaults.lib_ignore}, IRremoteESP8266, HeatpumpIR
;[core_2_5_0]
;platform = espressif8266@2.0.4
@@ -111,6 +114,7 @@ lib_ignore = ESP32_ping, ESP32WebServer, IRremoteESP8266, Heatpum
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3
[core_2_6_2]
extends = esp82xx_2_6_x
platform = espressif8266@2.3.1
platform_packages =
framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.6.2
@@ -118,20 +122,25 @@ build_flags = ${esp82xx_2_6_x.build_flags}
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
[core_2_6_2_sdk3]
extends = esp82xx_2_6_x
platform = espressif8266@2.3.1
platform_packages =
framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.6.2
build_flags = ${esp82xx_2_6_x.build_flags}
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3
[core_2_6_3]
extends = esp82xx_2_6_x
platform = espressif8266@2.4.0
platform_packages =
framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.6.3
build_flags = ${esp82xx_2_6_x.build_flags}
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
[core_2_6_3_sdk3]
extends = esp82xx_2_6_x
platform = espressif8266@2.4.0
platform_packages =
framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.6.3
@@ -139,12 +148,14 @@ build_flags = ${esp82xx_2_6_x.build_flags}
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3
[core_stage]
extends = esp82xx_2_6_x
platform = https://github.com/platformio/platform-espressif8266.git
build_flags = ${esp82xx_2_6_x.build_flags}
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105
platform_packages =
framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
[core_esp32_1_11_2]
platform = espressif32@1.11.2
platformio_esp82xx_base.ini
+13 -3
View File
@@ -9,6 +9,7 @@ build_unflags =
build_flags = ${core_2_6_3.build_flags}
platform = ${core_2_6_3.platform}
platform_packages = ${core_2_6_3.platform_packages}
lib_ignore = ${core_2_6_3.lib_ignore}
[core262_sdk3_platform]
@@ -16,13 +17,15 @@ build_unflags =
build_flags = ${core_2_6_3_sdk3.build_flags}
platform = ${core_2_6_3_sdk3.platform}
platform_packages = ${core_2_6_3_sdk3.platform_packages}
lib_ignore = ${core_2_6_3_sdk3.lib_ignore}
[beta_platform]
build_unflags =
build_flags = ${core_stage.build_flags}
platform = ${core_stage.platform}
platform_packages = ${core_stage.platform_packages}
lib_ignore = ${core_stage.lib_ignore}
[esp82xx_common]
@@ -31,7 +34,7 @@ board_build.f_cpu = 80000000L
build_flags = ${debug_flags.build_flags} ${mqtt_flags.build_flags} -DHTTPCLIENT_1_1_COMPATIBLE=0
build_unflags = -DDEBUG_ESP_PORT
lib_deps = https://github.com/TD-er/ESPEasySerial.git#v2.0.0, Adafruit ILI9341, Adafruit GFX Library
lib_ignore = ESP32_ping, ESP32WebServer, IRremoteESP8266, HeatpumpIR, SD(esp8266), SDFS
lib_ignore = ${esp82xx_defaults.lib_ignore}, IRremoteESP8266, HeatpumpIR, SD(esp8266), SDFS
board = esp12e
@@ -44,12 +47,14 @@ board = esp12e
platform = ${regular_platform.platform}
platform_packages = ${regular_platform.platform_packages}
build_flags = ${regular_platform.build_flags}
lib_ignore = ${regular_platform.lib_ignore}
[normal_beta]
platform = ${beta_platform.platform}
platform_packages = ${beta_platform.platform_packages}
build_flags = ${beta_platform.build_flags}
lib_ignore = ${beta_platform.lib_ignore}
;;; TEST *************************************************************
@@ -61,11 +66,14 @@ build_flags = ${beta_platform.build_flags}
platform = ${regular_platform.platform}
platform_packages = ${regular_platform.platform_packages}
build_flags = ${regular_platform.build_flags} -DPLUGIN_BUILD_TESTING
lib_ignore = ${regular_platform.lib_ignore}
[testing_beta]
platform = ${beta_platform.platform}
platform_packages = ${beta_platform.platform_packages}
build_flags = ${beta_platform.build_flags} -DPLUGIN_BUILD_TESTING
lib_ignore = ${beta_platform.lib_ignore}
;;; DEV **************************************************************
@@ -77,6 +85,8 @@ build_flags = ${beta_platform.build_flags} -DPLUGIN_BUILD_TESTING
platform = ${regular_platform.platform}
platform_packages = ${regular_platform.platform_packages}
build_flags = ${regular_platform.build_flags} -DPLUGIN_BUILD_DEV
lib_ignore = ${regular_platform.lib_ignore}
;;; IR ***********************************************************
@@ -87,7 +97,7 @@ build_flags = ${regular_platform.build_flags} -DPLUGIN_BUILD_DEV
platform = ${regular_platform.platform}
platform_packages = ${regular_platform.platform_packages}
build_flags = ${regular_platform.build_flags}
lib_ignore = ESP32_ping, ESP32WebServer, SD(esp8266), SDFS
lib_ignore = ${esp82xx_defaults.lib_ignore}, SD(esp8266), SDFS
[minimal_ir]
extends = ir
platformio_esp82xx_envs.ini
+6 -6
View File
@@ -20,7 +20,7 @@ platform_packages = ${regular_platform.platform_packages}
build_flags = ${regular_platform.build_flags}
${esp8266_4M1M.build_flags}
-DPLUGIN_BUILD_CUSTOM
lib_ignore = ESP32_ping, ESP32WebServer
lib_ignore = ${regular_platform.lib_ignore}
extra_scripts = pre:pre_custom_esp82xx.py
@@ -31,7 +31,7 @@ platform_packages = ${core_2_6_3_sdk3.platform_packages}
build_flags = ${core_2_6_3_sdk3.build_flags}
${esp8266_4M1M.build_flags}
-DPLUGIN_BUILD_CUSTOM
lib_ignore = ESP32_ping, ESP32WebServer
lib_ignore = ${core_2_6_3_sdk3.lib_ignore}
extra_scripts = pre:pre_custom_esp82xx.py
@@ -42,7 +42,7 @@ platform_packages = ${beta_platform.platform_packages}
build_flags = ${beta_platform.build_flags}
${esp8266_4M1M.build_flags}
-DPLUGIN_BUILD_CUSTOM
lib_ignore = ESP32_ping, ESP32WebServer
lib_ignore = ${beta_platform.lib_ignore}
extra_scripts = pre:pre_custom_esp82xx.py
@@ -54,7 +54,7 @@ platform_packages = ${regular_platform.platform_packages}
build_flags = ${regular_platform.build_flags}
${esp8266_4M1M.build_flags}
-DPLUGIN_BUILD_CUSTOM
lib_ignore = ESP32_ping, ESP32WebServer
lib_ignore = ${regular_platform.lib_ignore}
extra_scripts = pre:pre_custom_esp82xx.py
; Custom: 1M version --------------------------
@@ -65,7 +65,7 @@ platform_packages = ${regular_platform.platform_packages}
build_flags = ${regular_platform.build_flags}
${esp8266_1M.build_flags}
-DPLUGIN_BUILD_CUSTOM
lib_ignore = ESP32_ping, ESP32WebServer, ESP8266WiFiMesh
lib_ignore = ${regular_platform.lib_ignore}
extra_scripts = pre:pre_custom_esp82xx.py
@@ -314,7 +314,7 @@ build_flags = ${testing.build_flags}
-DFEATURE_ADC_VCC=true
-DFEATURE_MDNS
-DFEATURE_SD
lib_ignore = ESP32_ping, ESP32WebServer, IRremoteESP8266, HeatpumpIR
lib_ignore = ESP32_ping, ESP32WebServer, ESP32HTTPUpdateServer, , IRremoteESP8266, HeatpumpIR
[env:test_beta_ESP8266_4M1M]