Skip to content

Commit 6b88ede

Browse files
me-no-devme-no-dev
authored
Merge branch 'master' into esp_insights
2 parents 5605430 + 165d624 commit 6b88ede

File tree

8 files changed

+57
-98
lines changed

8 files changed

+57
-98
lines changed

‎.github/scripts/install-platformio-esp32.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export PLATFORMIO_ESP32_PATH="$HOME/.platformio/packages/framework-arduinoespres
44
PLATFORMIO_ESP32_URL="https://github.com/platformio/platform-espressif32.git"
55

66
TOOLCHAIN_VERSION="8.4.0+2021r2-patch3"
7-
ESPTOOLPY_VERSION="~1.30100.0"
7+
ESPTOOLPY_VERSION="~1.40201.0"
88
ESPRESSIF_ORGANIZATION_NAME="espressif"
99

1010
echo "Installing Python Wheel ..."

‎.github/scripts/on-push.sh

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -93,26 +93,11 @@ else
9393
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \
9494
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
9595

96-
# PlatformIO ESP32 Test
97-
# OPTIONS="board_build.mcu = esp32s2"
98-
# build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
99-
# build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
100-
101-
python -m platformio ci --board "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.mcu = esp32s2" --project-option="board_build.partitions = huge_app.csv"
102-
python -m platformio ci --board "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.mcu = esp32c3" --project-option="board_build.partitions = huge_app.csv"
103-
104-
echo "Hacking in S3 support ..."
105-
replace_script="import json; import os;"
106-
replace_script+="fp=open(os.path.expanduser('~/.platformio/platforms/espressif32/platform.json'), 'r+');"
107-
replace_script+="data=json.load(fp);"
108-
replace_script+="data['packages']['toolchain-xtensa-esp32']['optional']=True;"
109-
replace_script+="data['packages']['toolchain-xtensa-esp32s3']['optional']=False;"
110-
replace_script+="data['packages']['tool-esptoolpy']['owner']='tasmota';"
111-
replace_script+="data['packages']['tool-esptoolpy']['version']='https://github.com/tasmota/esptool/releases/download/v4.2.1/esptool-4.2.1.zip';"
112-
replace_script+="fp.seek(0);fp.truncate();json.dump(data, fp, indent=2);fp.close()"
113-
python -c "$replace_script"
114-
115-
python -m platformio ci --board "$BOARD" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.mcu = esp32s3" --project-option="board_build.partitions = huge_app.csv"
96+
# Basic sanity testing for other series
97+
for board in "esp32-c3-devkitm-1" "esp32-s2-saola-1" "esp32-s3-devkitc-1"
98+
do
99+
python -m platformio ci --board "$board" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient" --project-option="board_build.partitions = huge_app.csv"
100+
done
116101

117102
#build_pio_sketches "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries"
118103
fi

‎cores/esp32/esp32-hal-uart.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -496,21 +496,18 @@ int uartGetDebug()
496496
return s_uart_debug_nr;
497497
}
498498

499-
int log_printf(const char *format, ...)
499+
int log_printfv(const char *format, va_list arg)
500500
{
501501
static char loc_buf[64];
502502
char * temp = loc_buf;
503503
int len;
504-
va_list arg;
505504
va_list copy;
506-
va_start(arg, format);
507505
va_copy(copy, arg);
508506
len = vsnprintf(NULL, 0, format, copy);
509507
va_end(copy);
510508
if(len >= sizeof(loc_buf)){
511509
temp = (char*)malloc(len+1);
512510
if(temp == NULL) {
513-
va_end(arg);
514511
return 0;
515512
}
516513
}
@@ -528,13 +525,22 @@ int log_printf(const char *format, ...)
528525
xSemaphoreGive(_uart_bus_array[s_uart_debug_nr].lock);
529526
}
530527
#endif
531-
va_end(arg);
532528
if(len >= sizeof(loc_buf)){
533529
free(temp);
534530
}
535531
return len;
536532
}
537533

534+
int log_printf(const char *format, ...)
535+
{
536+
int len;
537+
va_list arg;
538+
va_start(arg, format);
539+
len = log_printfv(format, arg);
540+
va_end(arg);
541+
return len;
542+
}
543+
538544

539545
static void log_print_buf_line(const uint8_t *b, size_t len, size_t total_len){
540546
for(size_t i = 0; i<len; i++){

‎libraries/WiFiClientSecure/src/WiFiClientSecure.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ void WiFiClientSecure::setCACert (const char *rootCA)
264264
{
265265
if (bundle != NULL)
266266
{
267-
esp_crt_bundle_set(bundle);
267+
arduino_esp_crt_bundle_set(bundle);
268268
_use_ca_bundle = true;
269269
} else {
270-
esp_crt_bundle_detach(NULL);
270+
arduino_esp_crt_bundle_detach(NULL);
271271
_use_ca_bundle = false;
272272
}
273273
}

‎libraries/WiFiClientSecure/src/esp_crt_bundle.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ static esp_err_t esp_crt_bundle_init(const uint8_t *x509_bundle)
176176
return ESP_OK;
177177
}
178178

179-
esp_err_t esp_crt_bundle_attach(void *conf)
179+
esp_err_t arduino_esp_crt_bundle_attach(void *conf)
180180
{
181181
esp_err_t ret = ESP_OK;
182182
// If no bundle has been set by the user then use the bundle embedded in the binary
@@ -199,7 +199,7 @@ esp_err_t esp_crt_bundle_attach(void *conf)
199199
return ret;
200200
}
201201

202-
void esp_crt_bundle_detach(mbedtls_ssl_config *conf)
202+
void arduino_esp_crt_bundle_detach(mbedtls_ssl_config *conf)
203203
{
204204
free(s_crt_bundle.crts);
205205
s_crt_bundle.crts = NULL;
@@ -208,7 +208,7 @@ void esp_crt_bundle_detach(mbedtls_ssl_config *conf)
208208
}
209209
}
210210

211-
void esp_crt_bundle_set(const uint8_t *x509_bundle)
211+
void arduino_esp_crt_bundle_set(const uint8_t *x509_bundle)
212212
{
213213
// Free any previously used bundle
214214
free(s_crt_bundle.crts);

‎libraries/WiFiClientSecure/src/esp_crt_bundle.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extern "C" {
3636
* - ESP_OK if adding certificates was successful.
3737
* - Other if an error occured or an action must be taken by the calling process.
3838
*/
39-
esp_err_t esp_crt_bundle_attach(void *conf);
39+
esp_err_t arduino_esp_crt_bundle_attach(void *conf);
4040

4141

4242
/**
@@ -46,7 +46,7 @@ esp_err_t esp_crt_bundle_attach(void *conf);
4646
*
4747
* @param[in] conf The config struct for the SSL connection.
4848
*/
49-
void esp_crt_bundle_detach(mbedtls_ssl_config *conf);
49+
void arduino_esp_crt_bundle_detach(mbedtls_ssl_config *conf);
5050

5151

5252
/**
@@ -58,7 +58,7 @@ void esp_crt_bundle_detach(mbedtls_ssl_config *conf);
5858
*
5959
* @param[in] x509_bundle A pointer to the certificate bundle.
6060
*/
61-
void esp_crt_bundle_set(const uint8_t *x509_bundle);
61+
void arduino_esp_crt_bundle_set(const uint8_t *x509_bundle);
6262

6363

6464
#ifdef __cplusplus

‎libraries/WiFiClientSecure/src/ssl_client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ int start_ssl_client(sslclient_context *ssl_client, const char *host, uint32_t p
193193
}
194194
} else if (useRootCABundle) {
195195
log_v("Attaching root CA cert bundle");
196-
ret = esp_crt_bundle_attach(&ssl_client->ssl_conf);
196+
ret = arduino_esp_crt_bundle_attach(&ssl_client->ssl_conf);
197197

198198
if (ret < 0) {
199199
return handle_error(ret);

‎tools/platformio-build.py

Lines changed: 31 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -82,52 +82,41 @@ def get_bootloader_image(variants_dir):
8282
return (
8383
variant_bootloader
8484
if isfile(variant_bootloader)
85-
else join(
86-
FRAMEWORK_DIR,
87-
"tools",
88-
"sdk",
89-
build_mcu,
90-
"bin",
91-
"bootloader_${__get_board_boot_mode(__env__)}_${__get_board_f_flash(__env__)}.bin",
85+
else generate_bootloader_image(
86+
join(
87+
FRAMEWORK_DIR,
88+
"tools",
89+
"sdk",
90+
build_mcu,
91+
"bin",
92+
"bootloader_${__get_board_boot_mode(__env__)}_${__get_board_f_flash(__env__)}.elf",
93+
)
9294
)
9395
)
9496

9597

96-
def get_patched_bootloader_image(original_bootloader_image, bootloader_offset):
97-
patched_bootloader_image = join(env.subst("$BUILD_DIR"), "patched_bootloader.bin")
98+
def generate_bootloader_image(bootloader_elf):
9899
bootloader_cmd = env.Command(
99-
patched_bootloader_image,
100-
original_bootloader_image,
101-
env.VerboseAction(
102-
" ".join(
103-
[
104-
'"$PYTHONEXE"',
105-
join(
106-
platform.get_package_dir("tool-esptoolpy") or "", "esptool.py"
107-
),
108-
"--chip",
109-
build_mcu,
110-
"merge_bin",
111-
"-o",
112-
"$TARGET",
113-
"--flash_mode",
114-
"${__get_board_flash_mode(__env__)}",
115-
"--flash_freq",
116-
"${__get_board_f_flash(__env__)}",
117-
"--flash_size",
118-
board_config.get("upload.flash_size", "4MB"),
119-
"--target-offset",
120-
bootloader_offset,
121-
bootloader_offset,
122-
"$SOURCE",
123-
]
124-
),
125-
"Updating bootloader headers",
126-
),
100+
join("$BUILD_DIR", "bootloader.bin"),
101+
bootloader_elf,
102+
env.VerboseAction(" ".join([
103+
'"$PYTHONEXE" "$OBJCOPY"',
104+
"--chip", build_mcu, "elf2image",
105+
"--flash_mode", "${__get_board_flash_mode(__env__)}",
106+
"--flash_freq", "${__get_board_f_flash(__env__)}",
107+
"--flash_size", board_config.get("upload.flash_size", "4MB"),
108+
"-o", "$TARGET", "$SOURCES"
109+
]), "Building $TARGET"),
127110
)
111+
128112
env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", bootloader_cmd)
129113

130-
return patched_bootloader_image
114+
# Because the Command always returns a NodeList, we have to
115+
# access the first element in the list to get the Node object
116+
# that actually represents the bootloader image.
117+
# Also, this file is later used in generic Python code, so the
118+
# Node object in converted to a generic string
119+
return str(bootloader_cmd[0])
131120

132121

133122
def add_tinyuf2_extra_image():
@@ -210,34 +199,13 @@ def add_tinyuf2_extra_image():
210199
# Process framework extra images
211200
#
212201

213-
# Starting with v2.0.4 the Arduino core contains updated bootloader images that have
214-
# innacurate default headers. This results in bootloops if firmware is flashed via
215-
# OpenOCD (e.g. debugging or uploading via debug tools). For this reason, before
216-
# uploading or debugging we need to adjust the bootloader binary according to
217-
# the values of the --flash-size and --flash-mode arguments.
218-
# Note: This behavior doesn't occur if uploading is done via esptoolpy, as esptoolpy
219-
# overrides the binary image headers before flashing.
220-
221-
bootloader_patch_required = bool(
222-
env.get("PIOFRAMEWORK", []) == ["arduino"]
223-
and (
224-
"debug" in env.GetBuildType()
225-
or env.subst("$UPLOAD_PROTOCOL") in board_config.get("debug.tools", {})
226-
or env.IsIntegrationDump()
227-
)
228-
)
229-
230-
bootloader_image_path = get_bootloader_image(variants_dir)
231-
bootloader_offset = "0x1000" if build_mcu in ("esp32", "esp32s2") else "0x0000"
232-
if bootloader_patch_required:
233-
bootloader_image_path = get_patched_bootloader_image(
234-
bootloader_image_path, bootloader_offset
235-
)
236-
237202
env.Append(
238203
LIBSOURCE_DIRS=[join(FRAMEWORK_DIR, "libraries")],
239204
FLASH_EXTRA_IMAGES=[
240-
(bootloader_offset, bootloader_image_path),
205+
(
206+
"0x1000" if build_mcu in ("esp32", "esp32s2") else "0x0000",
207+
get_bootloader_image(variants_dir),
208+
),
241209
("0x8000", join(env.subst("$BUILD_DIR"), "partitions.bin")),
242210
("0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin")),
243211
]

0 commit comments

Comments
 (0)