Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Programming

The source code is mixed C and C++.

This application is to be used with `Espressif IoT Development Framework`_ (ESP-IDF). It is tested with a version after v5.1 (rev b4268c874a4cf8fcf7c0c4153cffb76ad2ddda4e)
This application is to be used with `Espressif IoT Development Framework`_ (ESP-IDF). It is tested with a version v5.5.2.

Please check ESP-IDF docs for getting started instructions.

Expand Down
2 changes: 1 addition & 1 deletion ci/build_for_pc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ ninja
cd ..
mkdir build_clang
cd build_clang
CC=clang-15 CXX=clang++-15 cmake ../native -G Ninja -D CMAKE_CXX_FLAGS=-DASIO_STANDALONE
CC=clang-20 CXX=clang++-20 cmake ../native -G Ninja -D CMAKE_CXX_FLAGS=-DASIO_STANDALONE
ninja
cd ..
2 changes: 1 addition & 1 deletion ci/check_codestyle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

set -eo pipefail

ci/run-clang-format.py --clang-format-executable clang-format-15 -r main/ components/ native/
ci/run-clang-format.py --clang-format-executable clang-format-20 -r main/ components/ native/
4 changes: 2 additions & 2 deletions ci/static_code_analysis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ set -eo pipefail

mkdir build_clang
cd build_clang
CC=clang-15 CXX=clang++-15 cmake ../native -G Ninja -D CMAKE_CXX_FLAGS=-DASIO_STANDALONE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
CC=clang-20 CXX=clang++-20 cmake ../native -G Ninja -D CMAKE_CXX_FLAGS=-DASIO_STANDALONE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON

run-clang-tidy-15.py -clang-tidy-binary clang-tidy-15
run-clang-tidy-20.py -clang-tidy-binary clang-tidy-20
7 changes: 5 additions & 2 deletions components/sip_client/idf_component.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
## IDF Component Manager Manifest File
dependencies:
espressif/asio:
version: "^1.28.0"
version: "^1.32.0"
public: true
espressif/sock_utils:
version: "^0.1"
public: true
## Required IDF version
idf:
version: ">=5.1.0"
version: ">=5.5.2"
# # Put list of dependencies here
# # For components maintained by Espressif:
# component: "~1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion components/web_server/include/web_server/web_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class WebServer

public:
explicit WebServer(SipClientT& client)
: client { client } {};
: client { client } { };

WebServer(const WebServer&) = delete;
WebServer(WebServer&&) = delete;
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM espressif/idf:release-v5.1
FROM espressif/idf:release-v5.5

ARG DEBIAN_FRONTEND=noninteractive

Expand Down
12 changes: 6 additions & 6 deletions docker/run-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ apt-get update \

wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -

echo deb http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-15 main > /etc/apt/sources.list.d/llvm.list
echo deb http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-20 main > /etc/apt/sources.list.d/llvm.list

wget https://github.com/chriskohlhoff/asio/archive/asio-1-28-0.tar.gz -O /tmp/asio-1-28-0.tar.gz
wget https://github.com/chriskohlhoff/asio/archive/asio-1-32-0.tar.gz -O /tmp/asio-1-32-0.tar.gz

tar -C /usr/include --strip-components=3 -x -f /tmp/asio-1-28-0.tar.gz asio-asio-1-28-0/asio/include/
tar -C /usr/include --strip-components=3 -x -f /tmp/asio-1-32-0.tar.gz asio-asio-1-32-0/asio/include/

apt-get update \
&& apt-get install -y clang-15 \
clang-format-15 \
clang-tidy-15 \
&& apt-get install -y clang-20 \
clang-format-20 \
clang-tidy-20 \
&& rm -rf /var/lib/apt/lists/*
2 changes: 1 addition & 1 deletion main/Kconfig.projbuild
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ config CALL_TARGET_USER

config CALLER_DISPLAY_MESSAGE
string "Caller Display Message"
default "Türklingel"
default "Tuerklingel"
help
This message is shown on the called device.

Expand Down
4 changes: 2 additions & 2 deletions main/idf_component.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
## IDF Component Manager Manifest File
dependencies:
espressif/mdns: "^1.2.2"
espressif/mdns: "^1.9.1"
## Required IDF version
idf:
version: ">=5.1.0"
version: ">=5.5.2"
# # Put list of dependencies here
# # For components maintained by Espressif:
# component: "~1.0.0"
Expand Down