Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arduino Core 3 (#407)

Browse Source 
* Add and remove libs and components for Arduino Core 3

* Arduino Core 3

* Add back Solo1

* Change ESP32-S3 to 4MB build

* Update README.md

* Fix retain and number of retries

* Fix rolling log

* Fix defaults

* Fix BleScanner on Solo1

* Export settings

* Import settings

* Fix HA Battery voltage

* Change submodule

* Update espMqttClient and AsyncTCP

* Webserial and MQTT/Network reconnecting

* Update nuki_ble

---------

Co-authored-by: iranl <iranl@github.com>
This commit is contained in:
iranl
2024-07-05 18:45:39 +02:00
committed by GitHub
parent 193ebb5f91
commit 6b0100fd61
236 changed files with 16390 additions and 9740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Docker/Dockerfile_cmake
View File

@@ -1,45 +0,0 @@
FROM eclipse-temurin:11-jdk-jammy AS builder
RUN set -ex && \
apt-get update && \
apt-get install -y git cmake xz-utils python3 python3-serial ninja-build
RUN curl -L "https://downloads.arduino.cc/arduino-1.8.19-linux64.tar.xz" -o /tmp/arduino-ide.tar.xz
RUN tar -xf /tmp/arduino-ide.tar.xz --directory ~/
RUN cd ~/arduino* && \
./install.sh && \
./arduino --pref "boardsmanager.additional.urls=https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json" --save-prefs && \
./arduino --install-boards esp32:esp32:2.0.17
RUN git clone --recurse-submodules https://github.com/technyon/Arduino-CMake-Toolchain.git ~/Arduino-CMake-Toolchain
COPY src /usr/src/nuki_hub/src
COPY lib /usr/src/nuki_hub/lib
COPY include /usr/src/nuki_hub/include
COPY CMakeLists.txt /usr/src/nuki_hub
RUN mkdir -p /usr/src/nuki_hub/build
RUN cd /usr/src/nuki_hub/build && \
echo "# Espressif ESP32 Partition Table" > partitions.csv && \
echo "# Name, Type, SubType, Offset, Size, Flags" >> partitions.csv && \
echo "nvs, data, nvs, 0x9000, 0x5000," >> partitions.csv && \
echo "otadata, data, ota, 0xe000, 0x2000," >> partitions.csv && \
echo "app0, app, ota_0, 0x10000, 0x1E0000," >> partitions.csv && \
echo "app1, app, ota_1, 0x1F0000,0x1E0000," >> partitions.csv && \
echo "spiffs, data, spiffs, 0x3D0000,0x30000," >> partitions.csv
RUN set -ex && \
cd /usr/src/nuki_hub/build && \
touch file_opts && \
cmake -G Ninja -D CMAKE_TOOLCHAIN_FILE=~/Arduino-CMake-Toolchain/Arduino-toolchain.cmake .. && \
ninja
FROM builder AS runtime
COPY --from=builder /usr/src/nuki_hub/build/nuki_hub.bin /usr/src/nuki_hub/build/release/nuki_hub.bin
COPY --from=builder /usr/src/nuki_hub/build/nuki_hub.partitions.bin /usr/src/nuki_hub/build/release/nuki_hub.partitions.bin
COPY --from=builder /root/.arduino15/packages/esp32/hardware/esp32/2.0.17/tools/partitions/boot_app0.bin /usr/src/nuki_hub/build/release/boot_app0.bin
CMD ["/bin/bash"]

11
Docker/README.md
View File

@@ -2,7 +2,7 @@
You can build this project using Docker. Just run the following commands in the console:
## Build with PlatformIO (will build for the ESP32, ESP32-S3, ESP32-C3 and ESP32-solo1)
## Build with PlatformIO (will build for the ESP32, ESP32-S3, ESP32-C3 and ESP32-C6)
```console
git clone https://github.com/technyon/nuki_hub --recursive
cd nuki_hub/Docker
@@ -10,12 +10,3 @@ cd nuki_hub/Docker
```
once the script is complete you will find the nuki_hub binaries in the `nuki_hub/release` folder.
## Build with CMake (will only build for the ESP32)
```console
git clone https://github.com/technyon/nuki_hub --recursive
cd nuki_hub/Docker
./build_with_docker_cmake.sh
```
once the script is complete you will find the nuki_hub binary in the `nuki_hub/build_cmake` folder.

6
Docker/build_with_docker_cmake.sh
View File

@@ -1,6 +0,0 @@
set -ex
docker build -f ./Dockerfile_cmake -t nuki_hub_cmake ..
docker create --name nuki_hub_cmake nuki_hub_cmake
rm -rf ../build_cmake
docker cp nuki_hub_cmake:/usr/src/nuki_hub/build/ ../build_cmake
docker rm -f nuki_hub_cmake