Skip to content

Commit 6622ac8

Browse files
TD-erTD-er
authored
Merge pull request letscontrolit#3216 from TD-er/build/core_2_7_4
[Build] Change to esp8266/Arduino core 2.7.4
2 parents c625d91 + 321aef3 commit 6622ac8

File tree

4 files changed

+56
-56
lines changed

4 files changed

+56
-56
lines changed

‎.travis.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ env:
4646
- ENV=minimal_IRext_ESP8266_4M2M
4747
- ENV=minimal_core_242_ESP8266_1M_OTA
4848
- ENV=minimal_core_242_ESP8285_1M_OTA
49-
- ENV=minimal_core_273_ESP8266_1M_OTA_Domoticz
50-
- ENV=minimal_core_273_ESP8266_1M_OTA_FHEM_HA
51-
- ENV=minimal_core_273_ESP8285_1M_OTA_Domoticz
52-
- ENV=minimal_core_273_ESP8285_1M_OTA_FHEM_HA
53-
#- ENV=minimal_core_273_sdk3_ESP8266_1M_OTA_Domoticz
54-
#- ENV=minimal_core_273_sdk3_ESP8266_1M_OTA_FHEM_HA
55-
#- ENV=minimal_core_273_sdk3_ESP8285_1M_OTA_Domoticz
56-
#- ENV=minimal_core_273_sdk3_ESP8285_1M_OTA_FHEM_HA
49+
- ENV=minimal_core_274_ESP8266_1M_OTA_Domoticz
50+
- ENV=minimal_core_274_ESP8266_1M_OTA_FHEM_HA
51+
- ENV=minimal_core_274_ESP8285_1M_OTA_Domoticz
52+
- ENV=minimal_core_274_ESP8285_1M_OTA_FHEM_HA
53+
#- ENV=minimal_core_274_sdk3_ESP8266_1M_OTA_Domoticz
54+
#- ENV=minimal_core_274_sdk3_ESP8266_1M_OTA_FHEM_HA
55+
#- ENV=minimal_core_274_sdk3_ESP8285_1M_OTA_Domoticz
56+
#- ENV=minimal_core_274_sdk3_ESP8285_1M_OTA_FHEM_HA
5757
#- ENV=normal_ESP8266_16M_LittleFS
5858
- ENV=normal_ESP8266_1M
5959
- ENV=normal_ESP8266_1M_VCC

‎platformio_core_defs.ini‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,31 +98,31 @@ lib_ignore = ${esp82xx_defaults.lib_ignore}, IRremoteESP8266, Hea
9898

9999
; See for SDK flags: https://github.com/esp8266/Arduino/blob/master/tools/platformio-build.py
100100

101-
[core_2_7_3]
101+
[core_2_7_4]
102102
extends = esp82xx_2_6_x
103-
platform = [email protected].1
103+
platform = [email protected].2
104104
platform_packages =
105-
framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.7.3
105+
framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.7.4
106106
build_flags = ${esp82xx_2_6_x.build_flags}
107107
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
108108
-Wno-deprecated-declarations
109109

110110
; Core with alternative WiFi for nodes not running stable wifi or slow network response
111111
; e.g. Sonoff Basic R2.
112-
[core_2_7_3_alt_wifi]
112+
[core_2_7_4_alt_wifi]
113113
extends = esp82xx_2_6_x
114-
platform = [email protected].1
114+
platform = [email protected].2
115115
platform_packages =
116-
framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.7.3
116+
framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.7.4
117117
build_flags = ${esp82xx_2_6_x.build_flags}
118118
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191122
119119
-Wno-deprecated-declarations
120120

121-
[core_2_7_3_sdk3]
121+
[core_2_7_4_sdk3]
122122
extends = esp82xx_2_6_x
123-
platform = [email protected].1
123+
platform = [email protected].2
124124
platform_packages =
125-
framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.7.3
125+
framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.7.4
126126
build_flags = ${esp82xx_2_6_x.build_flags}
127127
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3
128128

‎platformio_esp82xx_base.ini‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@
66

77
[regular_platform]
88
build_unflags =
9-
build_flags = ${core_2_7_3.build_flags}
10-
platform = ${core_2_7_3.platform}
11-
platform_packages = ${core_2_7_3.platform_packages}
12-
lib_ignore = ${core_2_7_3.lib_ignore}
9+
build_flags = ${core_2_7_4.build_flags}
10+
platform = ${core_2_7_4.platform}
11+
platform_packages = ${core_2_7_4.platform_packages}
12+
lib_ignore = ${core_2_7_4.lib_ignore}
1313

1414
[regular_platform_alt_wifi]
1515
build_unflags =
16-
build_flags = ${core_2_7_3_alt_wifi.build_flags}
17-
platform = ${core_2_7_3_alt_wifi.platform}
18-
platform_packages = ${core_2_7_3_alt_wifi.platform_packages}
19-
lib_ignore = ${core_2_7_3_alt_wifi.lib_ignore}
16+
build_flags = ${core_2_7_4_alt_wifi.build_flags}
17+
platform = ${core_2_7_4_alt_wifi.platform}
18+
platform_packages = ${core_2_7_4_alt_wifi.platform_packages}
19+
lib_ignore = ${core_2_7_4_alt_wifi.lib_ignore}
2020

2121

2222
[core262_sdk3_platform]
2323
build_unflags =
24-
build_flags = ${core_2_7_3_sdk3.build_flags}
25-
platform = ${core_2_7_3_sdk3.platform}
26-
platform_packages = ${core_2_7_3_sdk3.platform_packages}
27-
lib_ignore = ${core_2_7_3_sdk3.lib_ignore}
24+
build_flags = ${core_2_7_4_sdk3.build_flags}
25+
platform = ${core_2_7_4_sdk3.platform}
26+
platform_packages = ${core_2_7_4_sdk3.platform_packages}
27+
lib_ignore = ${core_2_7_4_sdk3.lib_ignore}
2828

2929

3030
[beta_platform]

‎platformio_esp82xx_envs.ini‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ extra_scripts = ${esp8266_scripts_custom.extra_scripts}
4848

4949
[env:custom_sdk3_ESP8266_4M1M]
5050
extends = esp8266_4M1M
51-
platform = ${core_2_7_3_sdk3.platform}
52-
platform_packages = ${core_2_7_3_sdk3.platform_packages}
53-
build_flags = ${core_2_7_3_sdk3.build_flags}
51+
platform = ${core_2_7_4_sdk3.platform}
52+
platform_packages = ${core_2_7_4_sdk3.platform_packages}
53+
build_flags = ${core_2_7_4_sdk3.build_flags}
5454
${esp8266_4M1M.build_flags}
5555
-DPLUGIN_BUILD_CUSTOM
56-
lib_ignore = ${core_2_7_3_sdk3.lib_ignore}
56+
lib_ignore = ${core_2_7_4_sdk3.lib_ignore}
5757
extra_scripts = ${esp8266_scripts_custom.extra_scripts}
5858

5959

@@ -148,9 +148,9 @@ build_flags = ${regular_platform_alt_wifi.build_flags}
148148

149149
[env:normal_sdk3_ESP8266_1M]
150150
extends = esp8266_1M
151-
platform = ${core_2_7_3_sdk3.platform}
152-
platform_packages = ${core_2_7_3_sdk3.platform_packages}
153-
build_flags = ${core_2_7_3_sdk3.build_flags}
151+
platform = ${core_2_7_4_sdk3.platform}
152+
platform_packages = ${core_2_7_4_sdk3.platform_packages}
153+
build_flags = ${core_2_7_4_sdk3.build_flags}
154154
${esp8266_1M.build_flags}
155155

156156

@@ -255,68 +255,68 @@ platform = ${core_2_4_2.platform}
255255
build_flags = ${core_2_4_2.build_flags}
256256
${esp8285_1M_OTA.build_flags}
257257

258-
[env:minimal_core_273_ESP8266_1M_OTA_Domoticz]
258+
[env:minimal_core_274_ESP8266_1M_OTA_Domoticz]
259259
extends = esp8266_1M_OTA
260260
platform = ${regular_platform.platform}
261261
platform_packages = ${regular_platform.platform_packages}
262262
build_flags = ${regular_platform.build_flags}
263263
${esp8266_1M_OTA.build_flags}
264264
${minimal_OTA_domoticz.build_flags}
265265

266-
[env:minimal_core_273_ESP8285_1M_OTA_Domoticz]
266+
[env:minimal_core_274_ESP8285_1M_OTA_Domoticz]
267267
extends = esp8285_1M_OTA
268268
platform = ${regular_platform.platform}
269269
platform_packages = ${regular_platform.platform_packages}
270270
build_flags = ${regular_platform.build_flags}
271271
${esp8285_1M_OTA.build_flags}
272272
${minimal_OTA_domoticz.build_flags}
273273

274-
[env:minimal_core_273_sdk3_ESP8266_1M_OTA_Domoticz]
274+
[env:minimal_core_274_sdk3_ESP8266_1M_OTA_Domoticz]
275275
extends = esp8266_1M_OTA
276-
platform = ${core_2_7_3_sdk3.platform}
277-
platform_packages = ${core_2_7_3_sdk3.platform_packages}
278-
build_flags = ${core_2_7_3_sdk3.build_flags}
276+
platform = ${core_2_7_4_sdk3.platform}
277+
platform_packages = ${core_2_7_4_sdk3.platform_packages}
278+
build_flags = ${core_2_7_4_sdk3.build_flags}
279279
${esp8266_1M_OTA.build_flags}
280280
${minimal_OTA_domoticz.build_flags}
281281

282-
[env:minimal_core_273_sdk3_ESP8285_1M_OTA_Domoticz]
282+
[env:minimal_core_274_sdk3_ESP8285_1M_OTA_Domoticz]
283283
extends = esp8285_1M_OTA
284-
platform = ${core_2_7_3_sdk3.platform}
285-
platform_packages = ${core_2_7_3_sdk3.platform_packages}
286-
build_flags = ${core_2_7_3_sdk3.build_flags}
284+
platform = ${core_2_7_4_sdk3.platform}
285+
platform_packages = ${core_2_7_4_sdk3.platform_packages}
286+
build_flags = ${core_2_7_4_sdk3.build_flags}
287287
${esp8285_1M_OTA.build_flags}
288288
${minimal_OTA_domoticz.build_flags}
289289

290290

291-
[env:minimal_core_273_ESP8266_1M_OTA_FHEM_HA]
291+
[env:minimal_core_274_ESP8266_1M_OTA_FHEM_HA]
292292
extends = esp8266_1M_OTA
293293
platform = ${regular_platform.platform}
294294
platform_packages = ${regular_platform.platform_packages}
295295
build_flags = ${regular_platform.build_flags}
296296
${esp8266_1M_OTA.build_flags}
297297
${minimal_OTA_FHEM_HA.build_flags}
298298

299-
[env:minimal_core_273_ESP8285_1M_OTA_FHEM_HA]
299+
[env:minimal_core_274_ESP8285_1M_OTA_FHEM_HA]
300300
extends = esp8285_1M_OTA
301301
platform = ${regular_platform.platform}
302302
platform_packages = ${regular_platform.platform_packages}
303303
build_flags = ${regular_platform.build_flags}
304304
${esp8285_1M_OTA.build_flags}
305305
${minimal_OTA_FHEM_HA.build_flags}
306306

307-
[env:minimal_core_273_sdk3_ESP8266_1M_OTA_FHEM_HA]
307+
[env:minimal_core_274_sdk3_ESP8266_1M_OTA_FHEM_HA]
308308
extends = esp8266_1M_OTA
309-
platform = ${core_2_7_3_sdk3.platform}
310-
platform_packages = ${core_2_7_3_sdk3.platform_packages}
311-
build_flags = ${core_2_7_3_sdk3.build_flags}
309+
platform = ${core_2_7_4_sdk3.platform}
310+
platform_packages = ${core_2_7_4_sdk3.platform_packages}
311+
build_flags = ${core_2_7_4_sdk3.build_flags}
312312
${esp8266_1M_OTA.build_flags}
313313
${minimal_OTA_FHEM_HA.build_flags}
314314

315-
[env:minimal_core_273_sdk3_ESP8285_1M_OTA_FHEM_HA]
315+
[env:minimal_core_274_sdk3_ESP8285_1M_OTA_FHEM_HA]
316316
extends = esp8285_1M_OTA
317-
platform = ${core_2_7_3_sdk3.platform}
318-
platform_packages = ${core_2_7_3_sdk3.platform_packages}
319-
build_flags = ${core_2_7_3_sdk3.build_flags}
317+
platform = ${core_2_7_4_sdk3.platform}
318+
platform_packages = ${core_2_7_4_sdk3.platform_packages}
319+
build_flags = ${core_2_7_4_sdk3.build_flags}
320320
${esp8285_1M_OTA.build_flags}
321321
${minimal_OTA_FHEM_HA.build_flags}
322322

0 commit comments

Comments
 (0)