alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/doc_soc_caps_file_path' into 'master'

Browse Source 
doc: correct soc caps file path

See merge request espressif/esp-idf!8097
This commit is contained in:
Angus Gratton 2020-03-26 10:32:12 +08:00
commit 928fc0016c
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/soc/soc/esp32/include/soc/brownout_caps.h
View File

@ -20,7 +20,7 @@ extern "C" {
#include "sdkconfig.h" #include "sdkconfig.h"
#if (CONFIG_ESP32_REV_MIN >= 1) #if __DOXYGEN__ || (CONFIG_ESP32_REV_MIN >= 1)
#define SOC_BROWNOUT_RESET_SUPPORTED 1 #define SOC_BROWNOUT_RESET_SUPPORTED 1
#endif #endif

2
components/soc/soc/esp32/include/soc/can_caps.h
View File

@ -20,7 +20,7 @@ extern "C" {
#include "sdkconfig.h" #include "sdkconfig.h"
#if (CONFIG_ESP32_REV_MIN >= 2) #if __DOXYGEN__ || (CONFIG_ESP32_REV_MIN >= 2)
#define CAN_BRP_DIV_SUPPORTED 1 #define CAN_BRP_DIV_SUPPORTED 1
#define CAN_BRP_DIV_THRESH 128 #define CAN_BRP_DIV_THRESH 128
//Any even number from 2 to 128, or multiples of 4 from 132 to 256 //Any even number from 2 to 128, or multiples of 4 from 132 to 256

19
docs/idf_extensions/run_doxygen.py
View File

@ -28,13 +28,14 @@ def setup(app):
return {'parallel_read_safe': True, 'parallel_write_safe': True, 'version': '0.1'} return {'parallel_read_safe': True, 'parallel_write_safe': True, 'version': '0.1'}
def _parse_defines(header_path): def _parse_defines(header_path, sdk_config_path):
defines = {} defines = {}
# Note: we run C preprocessor here without any -I arguments, so assumption is # Note: we run C preprocessor here without any -I arguments (except "sdkconfig.h"), so assumption is
# that these headers are all self-contained and don't include any other headers # that these headers are all self-contained and don't include any other headers
# not in the same directory # not in the same directory
print("Reading macros from %s..." % (header_path)) print("Reading macros from %s..." % (header_path))
processed_output = subprocess.check_output(["xtensa-esp32-elf-gcc", "-dM", "-E", header_path]).decode() processed_output = subprocess.check_output(["xtensa-esp32-elf-gcc", "-I", sdk_config_path,
"-dM", "-E", header_path]).decode()
for line in processed_output.split("\n"): for line in processed_output.split("\n"):
line = line.strip() line = line.strip()
m = re.search("#define ([^ ]+) ?(.*)", line) m = re.search("#define ([^ ]+) ?(.*)", line)
@ -47,20 +48,24 @@ def _parse_defines(header_path):
def generate_doxygen(app, project_description): def generate_doxygen(app, project_description):
build_dir = os.path.dirname(app.doctreedir.rstrip(os.sep)) build_dir = os.path.dirname(app.doctreedir.rstrip(os.sep))
sdk_config_path = os.path.join(project_description["build_dir"], "config")
# Parse kconfig macros to pass into doxygen # Parse kconfig macros to pass into doxygen
# #
# TODO: this should use the set of "config which can't be changed" eventually, # TODO: this should use the set of "config which can't be changed" eventually,
# not the header # not the header
defines = _parse_defines(os.path.join(project_description["build_dir"], defines = _parse_defines(os.path.join(project_description["build_dir"],
"config", "sdkconfig.h")) "config", "sdkconfig.h"), sdk_config_path)
# Add all SOC _caps.h headers to the defines # Add all SOC _caps.h headers to the defines
# #
# kind of a hack, be nicer to add a component info dict in project_description.json # kind of a hack, be nicer to add a component info dict in project_description.json
soc_path = [p for p in project_description["build_component_paths"] if p.endswith("/soc")][0] soc_path = [p for p in project_description["build_component_paths"] if p.endswith("/soc")][0]
for soc_header in glob.glob(os.path.join(soc_path, project_description["target"], soc_headers = glob.glob(os.path.join(soc_path, "soc", project_description["target"],
"include", "soc", "*_caps.h")): "include", "soc", "*_caps.h"))
defines.update(_parse_defines(soc_header)) assert len(soc_headers) > 0
for soc_header in soc_headers:
defines.update(_parse_defines(soc_header, sdk_config_path))
# Call Doxygen to get XML files from the header files # Call Doxygen to get XML files from the header files
print("Calling Doxygen to generate latest XML files") print("Calling Doxygen to generate latest XML files")