Skip to content

Commit 5334075

Browse files
authored
Merge branch 'espressif:master' into master
2 parents f3600ac + 3780b5c commit 5334075

File tree

4 files changed

+56
-6
lines changed

4 files changed

+56
-6
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
----------------------------------------------------------------------------------------------------------------------------------------------------
2+
This entire section can be deleted if all items are checked.
3+
4+
*By completing this PR sufficiently, you help us to improve the quality of Release Notes*
5+
6+
### Checklist
7+
8+
1. [ ] Please provide specific title of the PR describing the change, including the component name (eg."Update of Documentation link on Readme.md")
9+
2. [ ] Please provide related links (eg. Issue, other Project, submodule PR..)
10+
----------------------------------------------------------------------------------------------------------------------------------------------------
11+
12+
## Summary
13+
Please describe your proposed PR and what it contains.
14+
15+
## Impact
16+
Please describe impact of your PR and it's function.

.github/workflows/docs.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: ReadTheDocs CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- release/*
8+
paths:
9+
- 'docs/**'
10+
- '.github/workflows/docs.yml'
11+
pull_request:
12+
paths:
13+
- 'docs/**'
14+
- '.github/workflows/docs.yml'
15+
16+
jobs:
17+
18+
build-docs:
19+
name: Build ReadTheDocs
20+
runs-on: ubuntu-latest
21+
defaults:
22+
run:
23+
shell: bash
24+
steps:
25+
- uses: actions/checkout@v2
26+
with:
27+
submodules: true
28+
- uses: actions/setup-python@v2
29+
with:
30+
python-version: '3.x'
31+
- name: Build
32+
run: |
33+
sudo apt update
34+
sudo apt install python3-pip python3-setuptools
35+
# GitHub CI installs pip3 and setuptools outside the path.
36+
# Update the path to include them and run.
37+
PATH=/home/runner/.local/bin:$PATH pip3 install --user -r ./docs/requirements.txt
38+
cd ./docs && PATH=/home/runner/.local/bin:$PATH SPHINXOPTS="-W" make html

cores/esp32/stdlib_noniso.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
#include "stdlib_noniso.h"
3131
#include "esp_system.h"
3232

33-
#if !CONFIG_DSP_ANSI && !CONFIG_DSP_OPTIMIZED
34-
void reverse(char* begin, char* end) {
33+
static void reverse(char* begin, char* end) {
3534
char *is = begin;
3635
char *ie = end - 1;
3736
while(is < ie) {
@@ -42,9 +41,6 @@ void reverse(char* begin, char* end) {
4241
--ie;
4342
}
4443
}
45-
#else
46-
void reverse(char* begin, char* end);
47-
#endif
4844

4945
char* ltoa(long value, char* result, int base) {
5046
if(base < 2 || base > 16) {

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
# a list of builtin themes.
5757
#
5858
html_theme = 'default'
59-
html_logo = 'logo_espressif.png'
59+
html_logo = '_static/logo_espressif.png'
6060

6161
# Add any paths that contain custom static files (such as style sheets) here,
6262
# relative to this directory. They are copied after the builtin static files,

0 commit comments

Comments
 (0)