Skip to content

Commit 681d5b5

Browse files
committed
Fix issue with Doxyfile causing newer Doxygen versions to fail
Exclude venv from commits Remove some scripts now implemented by esp-docs Improve kconfig.in generation, show Doxygen version Fix 'Expected identifier in nested name. Sphinx warning' Remove redundant scripts
1 parent 583205a commit 681d5b5

File tree

22 files changed

+158
-875
lines changed

22 files changed

+158
-875
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,6 @@ coverage_report/
5757

5858
.vscode
5959

60-
**/.cache/
60+
**/.cache/
61+
62+
docs/venv/

.gitlab/ci/docs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
script:
6666
- pip install -r docs/requirements.txt
6767
- cd $DOCS_DIR
68-
- mkdir -p $ADF_PATH/docs/_build/${DOCLANG}/generic/inc
6968
- build-docs -bs $DOC_BUILDERS -l $DOCLANG build
7069
- ./check_lang_folder_sync.sh
7170
- echo "ESP-ADF Guide preview available at $CI_JOB_URL/artifacts/file/docs/_build/$DOCLANG/generic/html/index.html"

components/audio_recorder/include/audio_recorder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ typedef struct {
4949
/**
5050
* @brief Audio recorder event type
5151
*/
52-
enum {
52+
enum audio_recorder_event_type_t {
5353
AUDIO_REC_WAKEUP_START = -100, /*!< Wakeup start */
5454
AUDIO_REC_WAKEUP_END, /*!< Wakeup stop */
5555
AUDIO_REC_VAD_START, /*!< Vad start */

docs/Doxyfile

Lines changed: 129 additions & 132 deletions
Large diffs are not rendered by default.

docs/check_doc_warnings.sh

Lines changed: 0 additions & 39 deletions
This file was deleted.

docs/conf_common.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,17 @@
88
# documentation root, use os.path.abspath to make it absolute, like shown here.
99
sys.path.insert(0, os.path.abspath('..'))
1010

11+
doxygen_version = run_cmd_get_output('doxygen --version')
12+
print(f"Doxygen version: {doxygen_version}")
13+
1114
builddir = '_build'
1215
if 'BUILDDIR' in os.environ:
1316
builddir = os.environ['BUILDDIR']
1417

1518
# Generate 'kconfig.inc' file from components' Kconfig files
16-
kconfig_inc_path = '{}/inc/kconfig.inc'.format(builddir)
19+
kconfig_inc_folder = f'{builddir}/inc/'
20+
os.makedirs(kconfig_inc_folder, exist_ok=True)
21+
kconfig_inc_path = kconfig_inc_folder + 'kconfig.inc'
1722
os.system('python ../gen-kconfig-doc.py > ' + kconfig_inc_path + '.in')
1823
copy_if_modified(kconfig_inc_path + '.in', kconfig_inc_path)
1924

@@ -22,8 +27,7 @@
2227
# Add any Sphinx extension module names here, as strings. They can be
2328
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
2429
# ones.
25-
extensions += ['link-roles',
26-
'sphinx_copybutton',
30+
extensions += ['sphinx_copybutton',
2731
'sphinxcontrib.wavedrom',
2832
'esp_docs.esp_extensions.dummy_build_system',
2933
'esp_docs.esp_extensions.run_doxygen',

docs/docs_common.mk

Lines changed: 0 additions & 216 deletions
This file was deleted.

docs/en/api-reference/abstraction/ringbuf.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Ringbuffer is designed in addition to use as a data buffer, also used to connect
2727
Application Example
2828
-------------------
2929

30-
In most of ESP-ADF :adf:`examples` connecting of Elements with Ringbuffers is done "behind the scenes" by a function :cpp:func:`audio_pipeline_link`. To see this operation exposed check :example:`player/pipeline_sdcard_mp3_control` example.
30+
In most of ESP-ADF :project:`examples` connecting of Elements with Ringbuffers is done "behind the scenes" by a function :cpp:func:`audio_pipeline_link`. To see this operation exposed check :example:`player/pipeline_sdcard_mp3_control` example.
3131

3232

3333
API Reference

docs/en/api-reference/speech-recognition/esp_wn_iface.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Setting up the speech recognition application to detect a wakeup word may be don
2929
}
3030

3131

32-
Configuration and use of particular elements is demonstrated in several :adf:`examples <examples>` linked to elsewhere in this documentation. What may need clarification is use of the **Filter** and the **RAW stream**. The filter is used to adjust the sample rate of the I2S stream to match the sample rate of the speech recognition model. The RAW stream is the way to feed the audio input to the model.
32+
Configuration and use of particular elements is demonstrated in several :project:`examples <examples>` linked to elsewhere in this documentation. What may need clarification is use of the **Filter** and the **RAW stream**. The filter is used to adjust the sample rate of the I2S stream to match the sample rate of the speech recognition model. The RAW stream is the way to feed the audio input to the model.
3333

3434
The above introduction is the primary guidance. ESP-ADF offers users a more flexible and convenient module, namely the :doc:`audio recorder <audio_recorder>`, which is strongly recommended for use.
3535

docs/en/api-reference/streams/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Application Example
162162
Tone Stream
163163
-----------
164164

165-
The tone stream reads the data generated by :adf_file:`tools/audio_tone/mk_audio_tone.py`. It only supports the ``AUDIO_STREAM_READER`` type.
165+
The tone stream reads the data generated by :project_file:`tools/audio_tone/mk_audio_tone.py`. It only supports the ``AUDIO_STREAM_READER`` type.
166166

167167

168168
Application Example
@@ -179,7 +179,7 @@ Application Example
179179
Flash-Embedding Stream
180180
----------------------
181181

182-
The flash-embedding stream reads the data generated by :adf_file:`tools/audio_tone/mk_embed_flash.py`. It only supports the ``AUDIO_STREAM_READER`` type.
182+
The flash-embedding stream reads the data generated by :project_file:`tools/audio_tone/mk_embed_flash.py`. It only supports the ``AUDIO_STREAM_READER`` type.
183183

184184

185185
Application Example

0 commit comments

Comments
 (0)