From ea57b1496a2e87d3977a31a29a4cf7d63216f008 Mon Sep 17 00:00:00 2001 From: Jochen Groppe Date: Sun, 5 Nov 2017 17:12:04 +0100 Subject: [PATCH 1/3] fix NodeMCU-32S .build.board property The .build.board=xx proptery is used for generating a macro named "ARDUINO_xxx". C macro names should never have a "-" sign. * current: ARDUINO_NodeMCU-32S * should be: ARDUINO_=NodeMCU_32S --- boards.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards.txt b/boards.txt index b42d5e6046c..d461ad0ea05 100644 --- a/boards.txt +++ b/boards.txt @@ -830,7 +830,7 @@ nodemcu-32s.serial.disableRTS=true nodemcu-32s.build.mcu=esp32 nodemcu-32s.build.core=esp32 nodemcu-32s.build.variant=nodemcu-32s -nodemcu-32s.build.board=NodeMCU-32S +nodemcu-32s.build.board=NodeMCU_32S nodemcu-32s.build.f_cpu=240000000L nodemcu-32s.build.flash_mode=dio From 7131870e6d3120c137ce6065e3baf1bb983f96d8 Mon Sep 17 00:00:00 2001 From: Jochen Groppe Date: Sun, 5 Nov 2017 18:41:19 +0100 Subject: [PATCH 2/3] fix compiler flags to be compatible to ESP8622/Arduino see also "fix NodeMCU-32S .build.board property" #812 (https://github.com/espressif/arduino-esp32/pull/812#issuecomment-341990261) `-DARDUINO_BOARD={build.board}` **is missing** --- platform.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform.txt b/platform.txt index bf09e5067e4..ae0cbc25166 100644 --- a/platform.txt +++ b/platform.txt @@ -61,13 +61,13 @@ compiler.objcopy.eep.extra_flags= compiler.elf2hex.extra_flags= ## Compile c files -recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}" +recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}" ## Compile c++ files -recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}" +recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}" ## Compile S files -recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}" +recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.S.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}" ## Create archives recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/arduino.ar" "{object_file}" From 7495db0309ef63ad6f5e87adf52313917a6e273c Mon Sep 17 00:00:00 2001 From: Jochen Groppe Date: Sun, 5 Nov 2017 18:41:54 +0100 Subject: [PATCH 3/3] Revert "fix NodeMCU-32S .build.board property" This reverts commit ea57b1496a2e87d3977a31a29a4cf7d63216f008. --- boards.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards.txt b/boards.txt index d461ad0ea05..b42d5e6046c 100644 --- a/boards.txt +++ b/boards.txt @@ -830,7 +830,7 @@ nodemcu-32s.serial.disableRTS=true nodemcu-32s.build.mcu=esp32 nodemcu-32s.build.core=esp32 nodemcu-32s.build.variant=nodemcu-32s -nodemcu-32s.build.board=NodeMCU_32S +nodemcu-32s.build.board=NodeMCU-32S nodemcu-32s.build.f_cpu=240000000L nodemcu-32s.build.flash_mode=dio