Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ESP32: regenerate sdkconfig after sdkconfig.defaults change

Browse Source 
Ensures the sdkconfig does not get out of date as updates are made to
the defaults. The sdkconfig can still be manually changed for testing.
This commit is contained in:
Thomas Watson 2024-12-07 20:36:32 -06:00 committed by Andrew Tridgell
parent 535f6875a8
commit a14fb9ab28
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Tools/ardupilotwaf/esp32.py
View File

@ -57,6 +57,24 @@ def configure(cfg):
#env.append_value('GIT_SUBMODULES', 'esp_idf') #env.append_value('GIT_SUBMODULES', 'esp_idf')
# delete the output sdkconfig file when the input defaults changes. we take the
# stamp as the output so we can compute the path to the sdkconfig, yet it
# doesn't have to exist when we're done.
class clean_sdkconfig(Task.Task):
def keyword(self):
return "delete sdkconfig generated from"
def run(self):
prefix = ".clean-stamp-"
for out in self.outputs:
if not out.name.startswith(prefix):
raise ValueError("not a stamp file: "+out)
dest = out.parent.abspath()+"/"+out.name[len(prefix):]
if os.path.exists(dest):
os.unlink(dest)
# waf needs the output to exist after the task, so touch it
open(out.abspath(), "w").close()
def pre_build(self): def pre_build(self):
"""Configure esp-idf as lib target""" """Configure esp-idf as lib target"""
@ -74,8 +92,21 @@ def pre_build(self):
) )
esp_idf_showinc = esp_idf.build('showinc', target='esp-idf_build/includes.list') esp_idf_showinc = esp_idf.build('showinc', target='esp-idf_build/includes.list')
# task to delete the sdkconfig (thereby causing it to be regenerated) when
# the .defaults changes. it uses a stamp to find the sdkconfig. changing
# the sdkconfig WILL NOT cause it to be deleted as it's not an input. this
# is by design so the user can tweak it for testing purposes.
clean_sdkconfig_task = esp_idf_showinc.create_task("clean_sdkconfig",
src=self.srcnode.find_or_declare(self.env.AP_HAL_ESP32+"/sdkconfig.defaults"),
tgt=self.bldnode.find_or_declare("esp-idf_build/.clean-stamp-sdkconfig"))
esp_idf_showinc.post() esp_idf_showinc.post()
# ensure the sdkconfig will be deleted before the cmake configure occurs
# that regenerates it
esp_idf_showinc.cmake_config_task.set_run_after(clean_sdkconfig_task)
from waflib import Task from waflib import Task
class load_generated_includes(Task.Task): class load_generated_includes(Task.Task):
"""After includes.list generated include it in env""" """After includes.list generated include it in env"""

6
libraries/AP_HAL_ESP32/README.md
View File

@ -68,11 +68,11 @@ https://docs.espressif.com/projects/esp-idf/en/latest/get-started/ -
in expansion of macro 'configSUPPORT_STATIC_ALLOCATION' in expansion of macro 'configSUPPORT_STATIC_ALLOCATION'
warning: "CONFIG_SUPPORT_STATIC_ALLOCATION" is not defined warning: "CONFIG_SUPPORT_STATIC_ALLOCATION" is not defined
this means your 'sdkconfig' file that the IDF relies on is perhaps a bit out of date or out of sync with your IDF. this means your 'sdkconfig' file that the IDF relies on is perhaps a bit out of date or out of sync with your IDF. This should not happen, please file a bug if it does!
You can simply remove sdkconfig file and idf build system will recreate it using sdkconfig.defaults, which should fix the problem. Changing the sdkconfig.defaults file will cause the sdkconfig to be deleted and regenerated. The sdkconfig will also be regenerated if it is manually deleted.
If you need to change sdkconfig, you can edit sdkconfig manually or to use ninja menuconfig: If you need to change sdkconfig (which will not cause it to be deleted), you can edit sdkconfig manually or to use ninja menuconfig:
So double check you are using the correct IDF version: So double check you are using the correct IDF version:
``` ```