Skip to content

Commit 9e6e324

Browse files
committed
update windows toolchain and platform.txt
1 parent be78716 commit 9e6e324

File tree

4 files changed

+12
-60
lines changed

4 files changed

+12
-60
lines changed

cores/esp32/main.cpp

-37
Original file line numberDiff line numberDiff line change
@@ -19,40 +19,3 @@ extern "C" void app_main()
1919
}
2020

2121
#endif
22-
23-
/*
24-
** Block below to be removed with next toolchain
25-
*/
26-
void *operator new(size_t size)
27-
{
28-
return malloc(size);
29-
}
30-
31-
void *operator new[](size_t size)
32-
{
33-
return malloc(size);
34-
}
35-
36-
void operator delete(void * ptr)
37-
{
38-
free(ptr);
39-
}
40-
41-
void operator delete[](void * ptr)
42-
{
43-
free(ptr);
44-
}
45-
46-
extern "C" void __cxa_pure_virtual(void) __attribute__ ((__noreturn__));
47-
extern "C" void __cxa_deleted_virtual(void) __attribute__ ((__noreturn__));
48-
49-
void __cxa_pure_virtual(void)
50-
{
51-
abort();
52-
}
53-
54-
void __cxa_deleted_virtual(void)
55-
{
56-
abort();
57-
}
58-

libraries/WiFi/examples/WiFiIPv6/WiFiIPv6.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "WiFi.h"
22

3-
#define STA_SSID "nbis-test"
4-
#define STA_PASS "1234567890"
5-
#define AP_SSID "esp32"
3+
#define STA_SSID "**********"
4+
#define STA_PASS "**********"
5+
#define AP_SSID "esp32-v6"
66

77
static volatile bool wifi_connected = false;
88

package/package_esp32_index.template.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
"systems": [
4646
{
4747
"host": "i686-mingw32",
48-
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-59.zip",
49-
"archiveFileName": "xtensa-esp32-elf-win32-1.22.0-59.zip",
50-
"checksum": "SHA-256:10476b9c11a7a90f40883413ddfb409f505b20692e316c4e597c4c175b4be09c",
51-
"size": "153527527"
48+
"url": "https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-61-gab8375a-5.2.0-2.zip",
49+
"archiveFileName": "xtensa-esp32-elf-win32-1.22.0-61-gab8375a-5.2.0-2.zip",
50+
"checksum": "SHA-256:c00dbdab8e8acc273d4aa319a74f7bb1d9496c843159823201d685359174168f",
51+
"size": "76346909"
5252
},
5353
{
5454
"host": "x86_64-apple-darwin",

platform.txt

+5-16
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
21
name=ESP32 Arduino
32
version=0.0.1
43

54
runtime.tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32-elf
6-
runtime.tools.esptool.path={runtime.platform.path}/tools/esptool.py
5+
6+
tools.esptool.cmd=python "{runtime.platform.path}/tools/esptool.py"
7+
tools.esptool.cmd.windows=python.exe "{runtime.platform.path}/tools/esptool.py"
78

89
compiler.warning_flags=-w
910
compiler.warning_flags.none=-w
@@ -33,14 +34,8 @@ compiler.as.cmd=xtensa-esp32-elf-as
3334
compiler.ar.cmd=xtensa-esp32-elf-ar
3435
compiler.ar.flags=cru
3536

36-
compiler.elf2hex.cmd=esptool.py
37-
compiler.elf2hex.flags=
38-
3937
compiler.size.cmd=xtensa-esp32-elf-size
4038

41-
compiler.python.cmd=python
42-
compiler.python.cmd.windows=python.exe
43-
4439
# This can be overriden in boards.txt
4540
build.extra_flags=-DESP32
4641

@@ -72,7 +67,7 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.f
7267
recipe.objcopy.eep.pattern=
7368

7469
## Create hex
75-
recipe.objcopy.hex.pattern="{compiler.python.cmd}" "{runtime.platform.path}/tools/esptool.py" --chip esp32 elf2image --flash_mode "{build.flash_mode}" --flash_freq "{build.flash_freq}" --flash_size "{build.flash_size}" -o "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.elf"
70+
recipe.objcopy.hex.pattern={tools.esptool.cmd} --chip esp32 elf2image --flash_mode "{build.flash_mode}" --flash_freq "{build.flash_freq}" --flash_size "{build.flash_size}" -o "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.elf"
7671

7772
## Save hex
7873
recipe.output.tmp_file={build.project_name}.bin
@@ -85,13 +80,7 @@ recipe.size.regex.data=^(?:\.dram0\.data|\.dram0\.bss)\s+([0-9]+).*
8580

8681
# ------------------------------
8782

88-
tools.esptool.cmd=python
89-
tools.esptool.cmd.windows=python.exe
90-
tools.esptool.path={runtime.platform.path}/tools/esptool.py
91-
tools.esptool.network_cmd=python
92-
tools.esptool.network_cmd.windows=python.exe
93-
9483
tools.esptool.upload.protocol=esp32
9584
tools.esptool.upload.params.verbose=
9685
tools.esptool.upload.params.quiet=
97-
tools.esptool.upload.pattern="{cmd}" "{path}" --chip esp32 --port "{serial.port}" --baud {upload.speed} write_flash -z --flash_freq {build.flash_freq} --flash_mode {build.flash_mode} --flash_size {build.flash_size} 0x1000 "{runtime.platform.path}/tools/sdk/bin/bootloader.bin" 0x8000 "{runtime.platform.path}/tools/sdk/bin/partitions_singleapp.bin" 0x10000 "{build.path}/{build.project_name}.bin"
86+
tools.esptool.upload.pattern={cmd} --chip esp32 --port "{serial.port}" --baud {upload.speed} write_flash -z --flash_freq {build.flash_freq} --flash_mode {build.flash_mode} --flash_size {build.flash_size} 0x1000 "{runtime.platform.path}/tools/sdk/bin/bootloader.bin" 0x8000 "{runtime.platform.path}/tools/sdk/bin/partitions_singleapp.bin" 0x10000 "{build.path}/{build.project_name}.bin"

0 commit comments

Comments
 (0)