Skip to content

Commit 40428b1

Browse files
committed
makefile: Update to build EVK using core and correct libraries
1 parent 1dc3507 commit 40428b1

File tree

1 file changed

+33
-16
lines changed

1 file changed

+33
-16
lines changed

Firmware/RTK_Everywhere/makefile

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -109,38 +109,48 @@ all: $(EXECUTABLES)
109109
arduino-config:
110110
arduino-cli config init --overwrite --additional-urls "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json,https://espressif.github.io/arduino-esp32/package_esp32_dev_index.json"
111111

112-
.PHONY: lib-update
113-
114-
ESP_CORE_VERSION=3.0.1
115-
ESP_IDF_VERSION=idf-release_v5.1-442a798083
112+
.PHONY: core-update
116113

117-
lib-update:
114+
core-update:
115+
$(DELETE) $(HOME_BOARD_PATH)
118116
arduino-cli core update-index
119117
arduino-cli core install esp32:esp32@$(ESP_CORE_VERSION)
118+
119+
.PHONY: lib-update
120+
121+
ESP_CORE_VERSION=3.0.7
122+
ESP_IDF_VERSION=idf-release_v5.1-632e0c2a
123+
124+
lib-update: core-update
120125
arduino-cli lib install \
121-
ArduinoJson@6.19.4 \
126+
ArduinoJson@7.0.4 \
122127
"ArduinoMqttClient"@0.1.8 \
123-
124-
128+
125129
"ESP32-OTA-Pull"@1.0.0 \
130+
126131
127132
128133
"SdFat"@2.1.1 \
129134
"SparkFun BQ40Z50 Battery Manager Arduino Library"@1.0.0 \
130-
"SparkFun Extensible Message Parser"@1.0.1 \
135+
"SparkFun Extensible Message Parser"@1.0.2 \
136+
"SparkFun I2C Expander Arduino Library"@1.0.1 \
131137
"SparkFun IM19 IMU Arduino Library"@1.0.1 \
138+
"SparkFun LG290P Quadband RTK GNSS Arduino Library"@1.0.2
132139
"SparkFun LIS2DH12 Arduino Library"@1.0.3 \
133140
"SparkFun MAX1704x Fuel Gauge Arduino Library"@1.0.4 \
134141
"SparkFun Qwiic OLED Arduino Library"@1.0.13 \
135-
"SparkFun u-blox GNSS v3"@3.1.5 \
142+
"SparkFun u-blox GNSS v3"@3.1.8 \
136143
"SparkFun u-blox PointPerfect Library"@1.11.4 \
137144
"SparkFun UM980 Triband RTK GNSS Arduino Library"@1.0.4 \
138145
139146

140-
141147
$(PARTITION_DST_PATH): $(PARTITION_SRC_PATH)
142148
$(COPY) $(PARTITION_SRC_PATH) $(PARTITION_DST_PATH)
143149

150+
.PHONY: partition
151+
152+
partition: $(PARTITION_DST_PATH)
153+
144154
$(MBED_LIB_DEST_PATH)libmbedtls.a: $(PATCH_SRC_PATH)libmbedtls.a $(ESP_IDF_PATH)
145155
$(DIR_LISTING) $(ESP_IDF_PATH)
146156
echo ESP_
@@ -155,14 +165,21 @@ $(MBED_LIB_DEST_PATH)libmbedcrypto.a: $(PATCH_SRC_PATH)libmbedcrypto.a
155165
$(MBED_LIB_DEST_PATH)libmbedx509.a: $(PATCH_SRC_PATH)libmbedx509.a
156166
$(COPY) $< $@
157167

158-
$(NET_EVENT_PATCH_PATH)NetworkEvents.cpp: $(PATCH_SRC_PATH)NetworkEvents.cpp
159-
$(COPY) $< $@
168+
.PHONY: patch
160169

161-
$(NET_EVENT_PATCH_PATH)NetworkEvents.h: $(PATCH_SRC_PATH)NetworkEvents.h
162-
$(COPY) $< $@
170+
patch:
171+
touch $(PATCH_SRC_PATH)libmbedtls.a
172+
touch $(PATCH_SRC_PATH)libmbedtls_2.a
173+
touch $(PATCH_SRC_PATH)libmbedcrypto.a
174+
touch $(PATCH_SRC_PATH)libmbedx509.a
163175

164176
#DEBUG_LEVEL=none
177+
#DEBUG_LEVEL=error
178+
#DEBUG_LEVEL=warn
179+
#DEBUG_LEVEL=info
165180
DEBUG_LEVEL=debug
181+
#DEBUG_LEVEL=verbose
182+
166183
ENABLE_DEVELOPER=false
167184
FIRMWARE_VERSION_MAJOR=99
168185
FIRMWARE_VERSION_MINOR=99
@@ -172,7 +189,7 @@ form.h: AP-Config/* AP-Config/src/* AP-Config/src/fonts/*
172189
python ../Tools/index_html_zipper.py AP-Config/index.html form.h
173190
python ../Tools/main_js_zipper.py AP-Config/src/main.js form.h
174191

175-
$(RTK_BIN_PATH): RTK_Everywhere.ino *.ino *.h makefile $(PARTITION_DST_PATH) $(MBED_LIB_DEST_PATH)libmbedtls.a $(MBED_LIB_DEST_PATH)libmbedtls_2.a $(MBED_LIB_DEST_PATH)libmbedcrypto.a $(MBED_LIB_DEST_PATH)libmbedx509.a $(NET_EVENT_PATCH_PATH)NetworkEvents.cpp $(NET_EVENT_PATCH_PATH)NetworkEvents.h
192+
$(RTK_BIN_PATH): RTK_Everywhere.ino *.ino *.h makefile $(PARTITION_DST_PATH) $(MBED_LIB_DEST_PATH)libmbedtls.a $(MBED_LIB_DEST_PATH)libmbedtls_2.a $(MBED_LIB_DEST_PATH)libmbedcrypto.a $(MBED_LIB_DEST_PATH)libmbedx509.a
176193
$(CLEAR)
177194
arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=$(DEBUG_LEVEL),PSRAM=enabled RTK_Everywhere.ino \
178195
--warnings default \

0 commit comments

Comments
 (0)