Skip to content

Commit c068886

Browse files
ed7coyneed7coyne
authored
Merge pull request #1 from espressif/master
Merge to current master
2 parents d1b94df + f6c9faf commit c068886

File tree

6,623 files changed

+1318558
-161339
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,623 files changed

+1318558
-161339
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
name: Bug report
3+
about: Please fill in the bug report carefully
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
Make your question, not a Statement, inclusive. Include all pertinent information:
11+
12+
What you are trying to do?
13+
Describe your system( Hardware, computer, O/S, core version, environment).
14+
Describe what is failing.
15+
Show the shortest possible code that will duplicate the error.
16+
Show the EXACT error message(it doesn't work is not enough).
17+
All of this work on your part shows us that you have worked to solve YOUR problem. The more complete your issue posting is, the more likely someone will volunteer their time to help you.
18+
19+
If you have a Guru Meditation Error or Backtrace, ***please decode it***:
20+
https://github.com/me-no-dev/EspExceptionDecoder
21+
22+
----------------------------- Remove above -----------------------------
23+
24+
25+
### Hardware:
26+
Board: ?ESP32 Dev Module? ?node32? ?ttgo_lora?
27+
Core Installation version: ?1.0.0? ?1.0.1-rc4? ?1.0.1? ?1.0.1-git? ?1.0.2? ?1.0.3?
28+
IDE name: ?Arduino IDE? ?Platform.io? ?IDF component?
29+
Flash Frequency: ?40Mhz?
30+
PSRAM enabled: ?no? ?yes?
31+
Upload Speed: ?115200?
32+
Computer OS: ?Windows 10? ?Mac OSX? ?Ubuntu?
33+
34+
### Description:
35+
Describe your problem here
36+
37+
38+
### Sketch: (leave the backquotes for [code formatting](https://help.github.com/articles/creating-and-highlighting-code-blocks/))
39+
```cpp
40+
41+
//Change the code below by your sketch
42+
#include <Arduino.h>
43+
44+
void setup() {
45+
}
46+
47+
void loop() {
48+
}
49+
```
50+
51+
### Debug Messages:
52+
```
53+
Enable Core debug level: Debug on tools menu of Arduino IDE, then put the serial output here
54+
```

‎.github/scripts/check-cmakelists.sh

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/bash
2+
#
3+
# This script is for Travis. It checks all non-examples source files in libraries/ and cores/ are listed in
4+
# CMakeLists.txt for the cmake-based IDF component
5+
#
6+
# If you see an error running this script, edit CMakeLists.txt and add any new source files into your PR
7+
#
8+
9+
set -e
10+
11+
# pull all submodules
12+
git submodule update --init --recursive
13+
14+
# find all source files in repo
15+
REPO_SRCS=`find cores/esp32/ libraries/ -name 'examples' -prune -o -name '*.c' -print -o -name '*.cpp' -print | sort`
16+
17+
# find all source files named in CMakeLists.txt COMPONENT_SRCS
18+
CMAKE_SRCS=`cmake --trace-expand -C CMakeLists.txt 2>&1 | grep set\(srcs | cut -d'(' -f3 | sed 's/ )//' | sed 's/srcs //' | tr ' ;' '\n' | sort`
19+
20+
if ! diff -u0 --label "Repo Files" --label "srcs" <(echo "$REPO_SRCS") <(echo "$CMAKE_SRCS"); then
21+
echo "Source files in repo (-) and source files in CMakeLists.txt (+) don't match"
22+
echo "Edit CMakeLists.txt as appropriate to add/remove source files from COMPONENT_SRCS"
23+
exit 1
24+
fi
25+
26+
echo "CMakeLists.txt and repo source files match"
27+
exit 0

‎.github/scripts/install-arduino-core-esp32.sh

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/bin/bash
2+
3+
export ARDUINO_ESP32_PATH="$ARDUINO_USR_PATH/hardware/espressif/esp32"
4+
if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
5+
echo "Installing ESP32 Arduino Core ..."
6+
script_init_path="$PWD"
7+
mkdir -p "$ARDUINO_USR_PATH/hardware/espressif"
8+
cd "$ARDUINO_USR_PATH/hardware/espressif"
9+
10+
echo "Installing Python Serial ..."
11+
pip install pyserial > /dev/null
12+
13+
if [ "$OS_IS_WINDOWS" == "1" ]; then
14+
echo "Installing Python Requests ..."
15+
pip install requests > /dev/null
16+
fi
17+
18+
if [ "$GITHUB_REPOSITORY" == "espressif/arduino-esp32" ]; then
19+
echo "Linking Core..."
20+
ln -s $GITHUB_WORKSPACE esp32
21+
else
22+
echo "Cloning Core Repository..."
23+
git clone https://github.com/espressif/arduino-esp32.git esp32 > /dev/null 2>&1
24+
fi
25+
26+
#echo "Updating Submodules ..."
27+
cd esp32
28+
#git submodule update --init --recursive > /dev/null 2>&1
29+
30+
echo "Installing Platform Tools ..."
31+
cd tools && python get.py
32+
cd $script_init_path
33+
34+
echo "ESP32 Arduino has been installed in '$ARDUINO_ESP32_PATH'"
35+
echo ""
36+
fi

‎.github/scripts/install-arduino-ide.sh

Lines changed: 238 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,238 @@
1+
#!/bin/bash
2+
3+
#OSTYPE: 'linux-gnu', ARCH: 'x86_64' => linux64
4+
#OSTYPE: 'msys', ARCH: 'x86_64' => win32
5+
#OSTYPE: 'darwin18', ARCH: 'i386' => macos
6+
7+
OSBITS=`arch`
8+
if [[ "$OSTYPE" == "linux"* ]]; then
9+
export OS_IS_LINUX="1"
10+
ARCHIVE_FORMAT="tar.xz"
11+
if [[ "$OSBITS" == "i686" ]]; then
12+
OS_NAME="linux32"
13+
elif [[ "$OSBITS" == "x86_64" ]]; then
14+
OS_NAME="linux64"
15+
elif [[ "$OSBITS" == "armv7l" || "$OSBITS" == "aarch64" ]]; then
16+
OS_NAME="linuxarm"
17+
else
18+
OS_NAME="$OSTYPE-$OSBITS"
19+
echo "Unknown OS '$OS_NAME'"
20+
exit 1
21+
fi
22+
elif [[ "$OSTYPE" == "darwin"* ]]; then
23+
export OS_IS_MACOS="1"
24+
ARCHIVE_FORMAT="zip"
25+
OS_NAME="macosx"
26+
elif [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]]; then
27+
export OS_IS_WINDOWS="1"
28+
ARCHIVE_FORMAT="zip"
29+
OS_NAME="windows"
30+
else
31+
OS_NAME="$OSTYPE-$OSBITS"
32+
echo "Unknown OS '$OS_NAME'"
33+
exit 1
34+
fi
35+
export OS_NAME
36+
37+
ARDUINO_BUILD_DIR="$HOME/.arduino/build.tmp"
38+
ARDUINO_CACHE_DIR="$HOME/.arduino/cache.tmp"
39+
40+
if [ "$OS_IS_MACOS" == "1" ]; then
41+
export ARDUINO_IDE_PATH="/Applications/Arduino.app/Contents/Java"
42+
export ARDUINO_USR_PATH="$HOME/Documents/Arduino"
43+
elif [ "$OS_IS_WINDOWS" == "1" ]; then
44+
export ARDUINO_IDE_PATH="$HOME/arduino_ide"
45+
export ARDUINO_USR_PATH="$HOME/Documents/Arduino"
46+
else
47+
export ARDUINO_IDE_PATH="$HOME/arduino_ide"
48+
export ARDUINO_USR_PATH="$HOME/Arduino"
49+
fi
50+
51+
# Updated as of Nov 3rd 2020
52+
ARDUINO_IDE_URL="https://github.com/espressif/arduino-esp32/releases/download/1.0.4/arduino-nightly-"
53+
54+
# Currently not working
55+
#ARDUINO_IDE_URL="https://www.arduino.cc/download.php?f=/arduino-nightly-"
56+
57+
if [ ! -d "$ARDUINO_IDE_PATH" ]; then
58+
echo "Installing Arduino IDE on $OS_NAME ..."
59+
echo "Downloading '$ARDUINO_IDE_URL$OS_NAME.$ARCHIVE_FORMAT' to 'arduino.$ARCHIVE_FORMAT' ..."
60+
if [ "$OS_IS_LINUX" == "1" ]; then
61+
wget -O "arduino.$ARCHIVE_FORMAT" "$ARDUINO_IDE_URL$OS_NAME.$ARCHIVE_FORMAT" > /dev/null 2>&1
62+
echo "Extracting 'arduino.$ARCHIVE_FORMAT' ..."
63+
tar xf "arduino.$ARCHIVE_FORMAT" > /dev/null
64+
mv arduino-nightly "$ARDUINO_IDE_PATH"
65+
else
66+
curl -o "arduino.$ARCHIVE_FORMAT" -L "$ARDUINO_IDE_URL$OS_NAME.$ARCHIVE_FORMAT" > /dev/null 2>&1
67+
echo "Extracting 'arduino.$ARCHIVE_FORMAT' ..."
68+
unzip "arduino.$ARCHIVE_FORMAT" > /dev/null
69+
if [ "$OS_IS_MACOS" == "1" ]; then
70+
mv "Arduino.app" "/Applications/Arduino.app"
71+
else
72+
mv arduino-nightly "$ARDUINO_IDE_PATH"
73+
fi
74+
fi
75+
rm -rf "arduino.$ARCHIVE_FORMAT"
76+
77+
mkdir -p "$ARDUINO_USR_PATH/libraries"
78+
mkdir -p "$ARDUINO_USR_PATH/hardware"
79+
80+
echo "Arduino IDE Installed in '$ARDUINO_IDE_PATH'"
81+
echo ""
82+
fi
83+
84+
function build_sketch(){ # build_sketch <fqbn> <path-to-ino> [extra-options]
85+
if [ "$#" -lt 2 ]; then
86+
echo "ERROR: Illegal number of parameters"
87+
echo "USAGE: build_sketch <fqbn> <path-to-ino> [extra-options]"
88+
return 1
89+
fi
90+
91+
local fqbn="$1"
92+
local sketch="$2"
93+
local xtra_opts="$3"
94+
local win_opts=""
95+
if [ "$OS_IS_WINDOWS" == "1" ]; then
96+
local ctags_version=`ls "$ARDUINO_IDE_PATH/tools-builder/ctags/"`
97+
local preprocessor_version=`ls "$ARDUINO_IDE_PATH/tools-builder/arduino-preprocessor/"`
98+
win_opts="-prefs=runtime.tools.ctags.path=$ARDUINO_IDE_PATH/tools-builder/ctags/$ctags_version -prefs=runtime.tools.arduino-preprocessor.path=$ARDUINO_IDE_PATH/tools-builder/arduino-preprocessor/$preprocessor_version"
99+
fi
100+
101+
#echo ""
102+
#echo "Compiling '"$(basename "$sketch")"' ..."
103+
mkdir -p "$ARDUINO_BUILD_DIR"
104+
mkdir -p "$ARDUINO_CACHE_DIR"
105+
$ARDUINO_IDE_PATH/arduino-builder -compile -logger=human -core-api-version=10810 \
106+
-fqbn=$fqbn \
107+
-warnings="all" \
108+
-tools "$ARDUINO_IDE_PATH/tools-builder" \
109+
-tools "$ARDUINO_IDE_PATH/tools" \
110+
-built-in-libraries "$ARDUINO_IDE_PATH/libraries" \
111+
-hardware "$ARDUINO_IDE_PATH/hardware" \
112+
-hardware "$ARDUINO_USR_PATH/hardware" \
113+
-libraries "$ARDUINO_USR_PATH/libraries" \
114+
-build-cache "$ARDUINO_CACHE_DIR" \
115+
-build-path "$ARDUINO_BUILD_DIR" \
116+
$win_opts $xtra_opts "$sketch"
117+
}
118+
119+
function count_sketches() # count_sketches <examples-path> <target-mcu>
120+
{
121+
local examples="$1"
122+
local target="$2"
123+
rm -rf sketches.txt
124+
if [ ! -d "$examples" ]; then
125+
touch sketches.txt
126+
return 0
127+
fi
128+
local sketches=$(find $examples -name *.ino)
129+
local sketchnum=0
130+
for sketch in $sketches; do
131+
local sketchdir=$(dirname $sketch)
132+
local sketchdirname=$(basename $sketchdir)
133+
local sketchname=$(basename $sketch)
134+
if [[ "$sketchdirname.ino" != "$sketchname" ]]; then
135+
continue
136+
elif [[ -f "$sketchdir/.skip.$target" ]]; then
137+
continue
138+
else
139+
echo $sketch >> sketches.txt
140+
sketchnum=$(($sketchnum + 1))
141+
fi
142+
done
143+
return $sketchnum
144+
}
145+
146+
function build_sketches() # build_sketches <fqbn> <target-mcu> <examples-path> <chunk> <total-chunks> [extra-options]
147+
{
148+
local fqbn=$1
149+
local target="$2"
150+
local examples=$3
151+
local chunk_idex=$4
152+
local chunks_num=$5
153+
local xtra_opts=$6
154+
155+
if [ "$#" -lt 3 ]; then
156+
echo "ERROR: Illegal number of parameters"
157+
echo "USAGE: build_sketches <fqbn> <target-mcu <examples-path> [<chunk> <total-chunks>] [extra-options]"
158+
return 1
159+
fi
160+
161+
if [ "$#" -lt 5 ]; then
162+
chunk_idex="0"
163+
chunks_num="1"
164+
xtra_opts=$4
165+
fi
166+
167+
if [ "$chunks_num" -le 0 ]; then
168+
echo "ERROR: Chunks count must be positive number"
169+
return 1
170+
fi
171+
if [ "$chunk_idex" -ge "$chunks_num" ] && [ "$chunks_num" -ge 2 ]; then
172+
echo "ERROR: Chunk index must be less than chunks count"
173+
return 1
174+
fi
175+
176+
set +e
177+
count_sketches "$examples" "$target"
178+
local sketchcount=$?
179+
set -e
180+
local sketches=$(cat sketches.txt)
181+
rm -rf sketches.txt
182+
183+
local chunk_size=$(( $sketchcount / $chunks_num ))
184+
local all_chunks=$(( $chunks_num * $chunk_size ))
185+
if [ "$all_chunks" -lt "$sketchcount" ]; then
186+
chunk_size=$(( $chunk_size + 1 ))
187+
fi
188+
189+
local start_index=0
190+
local end_index=0
191+
if [ "$chunk_idex" -ge "$chunks_num" ]; then
192+
start_index=$chunk_idex
193+
end_index=$sketchcount
194+
else
195+
start_index=$(( $chunk_idex * $chunk_size ))
196+
if [ "$sketchcount" -le "$start_index" ]; then
197+
echo "Skipping job"
198+
return 0
199+
fi
200+
201+
end_index=$(( $(( $chunk_idex + 1 )) * $chunk_size ))
202+
if [ "$end_index" -gt "$sketchcount" ]; then
203+
end_index=$sketchcount
204+
fi
205+
fi
206+
207+
local start_num=$(( $start_index + 1 ))
208+
echo "Found $sketchcount Sketches for target '$target'";
209+
echo "Chunk Index : $chunk_idex"
210+
echo "Chunk Count : $chunks_num"
211+
echo "Chunk Size : $chunk_size"
212+
echo "Start Sketch: $start_num"
213+
echo "End Sketch : $end_index"
214+
215+
local sketchnum=0
216+
for sketch in $sketches; do
217+
local sketchdir=$(dirname $sketch)
218+
local sketchdirname=$(basename $sketchdir)
219+
local sketchname=$(basename $sketch)
220+
if [ "${sketchdirname}.ino" != "$sketchname" ] \
221+
|| [ -f "$sketchdir/.skip.$target" ]; then
222+
continue
223+
fi
224+
sketchnum=$(($sketchnum + 1))
225+
if [ "$sketchnum" -le "$start_index" ] \
226+
|| [ "$sketchnum" -gt "$end_index" ]; then
227+
continue
228+
fi
229+
echo ""
230+
echo "Building Sketch Index $(($sketchnum - 1)) - $sketchdirname"
231+
build_sketch "$fqbn" "$sketch" "$xtra_opts"
232+
local result=$?
233+
if [ $result -ne 0 ]; then
234+
return $result
235+
fi
236+
done
237+
return 0
238+
}

0 commit comments

Comments
 (0)