Skip to content

Docker: Update library versions caused by dependencies #794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: release_candidate
Choose a base branch
from
Open

Docker: Update library versions caused by dependencies #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Firmware/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ RUN arduino-cli lib update-index
RUN arduino-cli core install "esp32:esp32@${CORE_VERSION}"

# Get Known Libraries
RUN arduino-cli lib install ArduinoJson@7.0.4
RUN arduino-cli lib install ArduinoJson@7.4.2
RUN arduino-cli lib install [email protected]
RUN arduino-cli lib install [email protected]
RUN arduino-cli lib install "ESP32-OTA-Pull"@1.0.0
Expand All @@ -85,7 +85,7 @@ RUN arduino-cli lib install "SparkFun LG290P Quadband RTK GNSS Arduino Library"@
RUN arduino-cli lib install "SparkFun I2C Expander Arduino Library"@1.0.1
RUN arduino-cli lib install "SparkFun Apple Accessory Arduino Library"@3.0.9
RUN arduino-cli lib install "SparkFun Authentication Coprocessor Arduino Library"@1.0.0
RUN arduino-cli lib install "SparkFun Toolkit"@1.0.6
RUN arduino-cli lib install "SparkFun Toolkit"@1.2.0

# Copy RTK_Everywhere and build deployment image
FROM upstream AS deployment
Expand Down
47 changes: 30 additions & 17 deletions Firmware/RTK_Everywhere/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
##########

SKETCH=RTK_Everywhere.ino
ESP_CORE_VERSION=3.0.7
ESP_IDF_VERSION=idf-release_v5.1-632e0c2a

# Uncomment all five lines for a complete update
#EXECUTABLES = arduino-config lib-update
Expand Down Expand Up @@ -125,31 +127,37 @@ core-update:

.PHONY: lib-update

ESP_CORE_VERSION=3.0.7
ESP_IDF_VERSION=idf-release_v5.1-632e0c2a

lib-update: core-update
arduino-cli lib install \
[email protected] \
"ArduinoMqttClient"@0.1.8 \
[email protected] \
"ESP32-OTA-Pull"@1.0.0 \
[email protected] \
[email protected] \
[email protected] \
"ESP32-OTA-Pull"@1.0.0 \
[email protected] \
[email protected] \
"SdFat"@2.1.1 \
"SparkFun BQ40Z50 Battery Manager Arduino Library"@1.0.0 \
"SparkFun Extensible Message Parser"@1.0.2 \
"SparkFun I2C Expander Arduino Library"@1.0.1 \
"SparkFun IM19 IMU Arduino Library"@1.0.1 \
"SparkFun LG290P Quadband RTK GNSS Arduino Library"@1.0.5
"SparkFun LIS2DH12 Arduino Library"@1.0.3 \
"SparkFun MAX1704x Fuel Gauge Arduino Library"@1.0.4 \
"SparkFun u-blox GNSS v3"@3.1.10 \
"SparkFun Qwiic OLED Arduino Library"@1.0.13 \
"SparkFun u-blox GNSS v3"@3.1.8 \
"SparkFun u-blox PointPerfect Library"@1.11.4 \
"SparkFun UM980 Triband RTK GNSS Arduino Library"@1.0.4 \
[email protected]
"SparkFun Extensible Message Parser"@1.0.6 \
"SparkFun BQ40Z50 Battery Manager Arduino Library"@1.0.0 \
"ArduinoMqttClient"@0.1.8 \
"SparkFun u-blox PointPerfect Library"@1.11.4 \
"SparkFun IM19 IMU Arduino Library"@1.0.1 \
"SparkFun UM980 Triband RTK GNSS Arduino Library"@1.0.9 \
"SparkFun LG290P Quadband RTK GNSS Arduino Library"@1.0.8
"SparkFun I2C Expander Arduino Library"@1.0.1 \
"SparkFun Apple Accessory Arduino Library"@3.0.9 \
"SparkFun Authentication Coprocessor Arduino Library"@1.0.0 \
"SparkFun Toolkit"@1.2.0 \

.PHONY: get-idf-version

get-idf-version:
ESP_IDF_VERSION=$(ls ~/.arduino15/packages/esp32/tools/esp32-arduino-libs | grep idf-release)
echo "ESP IDF Version: ${ESP_IDF_VERSION}"

$(PARTITION_DST_PATH): $(PARTITION_SRC_PATH)
$(COPY) $(PARTITION_SRC_PATH) $(PARTITION_DST_PATH)
Expand All @@ -160,7 +168,7 @@ partition: $(PARTITION_DST_PATH)

$(MBED_LIB_DEST_PATH)libmbedtls.a: $(PATCH_SRC_PATH)libmbedtls.a $(ESP_IDF_PATH)
$(DIR_LISTING) $(ESP_IDF_PATH)
echo ESP_
echo "ESP IDF Version: $(ESP_IDF_VERSION)"
$(COPY) $< $@

$(MBED_LIB_DEST_PATH)libmbedtls_2.a: $(PATCH_SRC_PATH)libmbedtls_2.a
Expand All @@ -178,11 +186,16 @@ $(BT_LIB_DEST_PATH)libbt.a: $(PATCH_SRC_PATH)libbt.a
.PHONY: patch

patch:
touch $(PATCH_SRC_PATH)libbt.a
touch $(PATCH_SRC_PATH)libmbedtls.a
touch $(PATCH_SRC_PATH)libmbedtls_2.a
touch $(PATCH_SRC_PATH)libmbedcrypto.a
touch $(PATCH_SRC_PATH)libmbedx509.a
touch $(PATCH_SRC_PATH)libbt.a
make $(MBED_LIB_DEST_PATH)libmbedtls.a
make $(MBED_LIB_DEST_PATH)libmbedtls_2.a
make $(MBED_LIB_DEST_PATH)libmbedcrypto.a
make $(MBED_LIB_DEST_PATH)libmbedx509.a
make $(BT_LIB_DEST_PATH)libbt.a

DEBUG_LEVEL=none
#DEBUG_LEVEL=error
Expand Down