Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-26 17:05:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Allow Arduino Core 2.5.0 for ESP8266 (#469)

Browse source
This commit is contained in:
Otto Winter 2019-03-05 13:25:59 +01:00 committed by GitHub
parent 60c9ffef30
commit 975b5127d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
esphome/core_config.py
View file

@ -113,7 +113,7 @@ def validate_platform(value):
PLATFORMIO_ESP8266_LUT = { PLATFORMIO_ESP8266_LUT = {
'2.5.0': 'espressif8266@2.0.0', '2.5.0': 'espressif8266@2.0.1',
'2.4.2': 'espressif8266@1.8.0', '2.4.2': 'espressif8266@1.8.0',
'2.4.1': 'espressif8266@1.7.3', '2.4.1': 'espressif8266@1.7.3',
'2.4.0': 'espressif8266@1.6.0', '2.4.0': 'espressif8266@1.6.0',

22
esphome/writer.py
View file

@ -342,14 +342,6 @@ def gather_build_flags():
'-DUSE_WIFI_SIGNAL_SENSOR', '-DUSE_WIFI_SIGNAL_SENSOR',
} }
# avoid changing build flags order
return list(sorted(list(build_flags)))
def get_ini_content():
lib_deps = gather_lib_deps()
build_flags = gather_build_flags()
if CORE.is_esp8266 and CORE.board in ESP8266_FLASH_SIZES: if CORE.is_esp8266 and CORE.board in ESP8266_FLASH_SIZES:
flash_size = ESP8266_FLASH_SIZES[CORE.board] flash_size = ESP8266_FLASH_SIZES[CORE.board]
ld_scripts = ESP8266_LD_SCRIPTS[flash_size] ld_scripts = ESP8266_LD_SCRIPTS[flash_size]
@ -362,7 +354,19 @@ def get_ini_content():
ld_script = ld_scripts[1] ld_script = ld_scripts[1]
if ld_script is not None: if ld_script is not None:
build_flags.append('-Wl,-T{}'.format(ld_script)) build_flags.add('-Wl,-T{}'.format(ld_script))
if CORE.is_esp8266 and CORE.arduino_version in (ARDUINO_VERSION_ESP8266_DEV,
ARDUINO_VERSION_ESP8266_2_5_0):
build_flags.add('-fno-exceptions')
# avoid changing build flags order
return list(sorted(list(build_flags)))
def get_ini_content():
lib_deps = gather_lib_deps()
build_flags = gather_build_flags()
data = { data = {
'platform': CORE.arduino_version, 'platform': CORE.arduino_version,