Skip to content

Commit

Permalink
Merge branch 'release/v0.7.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed May 19, 2017
2 parents 2649ba8 + 485f8b7 commit 572bd48
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
25 changes: 25 additions & 0 deletions builder/frameworks/espidf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@
https://github.com/espressif/esp-idf
"""

from glob import glob
from os import listdir, walk
from os.path import basename, isdir, isfile, join

from shutil import copy
import sys
from SCons.Script import DefaultEnvironment


Expand Down Expand Up @@ -267,6 +270,28 @@ def build_espidf_bootloader():
]
)


#
# Handle missing sdkconfig.h
#

if not isfile(join(env.subst("$PROJECTSRC_DIR"), "sdkconfig.h")):
search_path = join(
env.subst("$PIOHOME_DIR"), "platforms",
env.subst("$PIOPLATFORM"), "examples", "*", "src", "sdkconfig.h"
)

files = glob(search_path)
if not files:
sys.stderr.write(
"Error: \"sdkconfig.h\" file is required for esp-idf framework!\n")
env.Exit(1)

print("Warning! Cannot find \"sdk_config.h\" file. "
"Default \"sdk_config.h\" will be added to your project!")
copy(files[0], join(env.subst("$PROJECTSRC_DIR"), "sdkconfig.h"))


#
# Generate partition table
#
Expand Down
2 changes: 1 addition & 1 deletion platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-espressif32.git"
},
"version": "0.7.3",
"version": "0.7.4",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
Expand Down

0 comments on commit 572bd48

Please sign in to comment.