diff --git a/README.rst b/README.rst index c7cb44f..85fd5e4 100644 --- a/README.rst +++ b/README.rst @@ -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. diff --git a/ci/build_for_pc.sh b/ci/build_for_pc.sh index fdda2d8..7c11987 100755 --- a/ci/build_for_pc.sh +++ b/ci/build_for_pc.sh @@ -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 .. diff --git a/ci/check_codestyle.sh b/ci/check_codestyle.sh index de4e869..9c0038e 100755 --- a/ci/check_codestyle.sh +++ b/ci/check_codestyle.sh @@ -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/ diff --git a/ci/static_code_analysis.sh b/ci/static_code_analysis.sh index ceaaa1a..42a26f6 100755 --- a/ci/static_code_analysis.sh +++ b/ci/static_code_analysis.sh @@ -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 diff --git a/components/sip_client/idf_component.yml b/components/sip_client/idf_component.yml index a6a9ead..0f7297f 100644 --- a/components/sip_client/idf_component.yml +++ b/components/sip_client/idf_component.yml @@ -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" diff --git a/components/web_server/include/web_server/web_server.h b/components/web_server/include/web_server/web_server.h index 4a79261..3b3f22b 100644 --- a/components/web_server/include/web_server/web_server.h +++ b/components/web_server/include/web_server/web_server.h @@ -49,7 +49,7 @@ class WebServer public: explicit WebServer(SipClientT& client) - : client { client } {}; + : client { client } { }; WebServer(const WebServer&) = delete; WebServer(WebServer&&) = delete; diff --git a/docker/Dockerfile b/docker/Dockerfile index 693fe78..14cf155 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM espressif/idf:release-v5.1 +FROM espressif/idf:release-v5.5 ARG DEBIAN_FRONTEND=noninteractive diff --git a/docker/run-docker.sh b/docker/run-docker.sh index 5d8e36f..b842d1f 100755 --- a/docker/run-docker.sh +++ b/docker/run-docker.sh @@ -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/* diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index fab4610..53b6ca8 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -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. diff --git a/main/idf_component.yml b/main/idf_component.yml index aecce6e..8645619 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -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"