diff --git a/cores/esp32/nefry/Nefry.cpp b/cores/esp32/nefry/Nefry.cpp index cfc40c69ca8..5a14bafa0ae 100644 --- a/cores/esp32/nefry/Nefry.cpp +++ b/cores/esp32/nefry/Nefry.cpp @@ -24,7 +24,7 @@ BootMode 1 : WriteMode切替をする */ -#define LIBVERSION ("0.7.1") +#define LIBVERSION ("0.7.2") #include "Nefry.h" Adafruit_NeoPixel _NefryLED[40]; diff --git a/libraries/Nefry/library.properties b/libraries/Nefry/library.properties index 74a0379b7da..42a9bbaa1d9 100644 --- a/libraries/Nefry/library.properties +++ b/libraries/Nefry/library.properties @@ -1,5 +1,5 @@ name=Nefry -version=0.7.1 +version=0.7.2 author=Nefry community maintainer= sentence=nefry. diff --git a/platform.txt b/platform.txt index 1f482933170..d72500588ef 100644 --- a/platform.txt +++ b/platform.txt @@ -1,14 +1,14 @@ name=Nefry(ESP32)Module -version=0.7.1 +version=0.7.2 runtime.tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32-elf -tools.esptool32.cmd="{runtime.tools.esptool32.path}/esptool" -tools.esptool32.cmd.linux="{runtime.tools.esptool32.path}/esptool.py" -tools.esptool32.cmd.windows="{runtime.tools.esptool32.path}/esptool.exe" +tools.esptool.cmd="{runtime.tools.esptool.path}/esptool" +tools.esptool.cmd.linux="{runtime.tools.esptool.path}/esptool.py" +tools.esptool.cmd.windows="{runtime.tools.esptool.path}/esptool.exe" -tools.esptool32.network_cmd=python "{runtime.platform.path}/tools/espota.py" -tools.esptool32.network_cmd.windows="{runtime.platform.path}/tools/espota.exe" +tools.esptool.network_cmd=python "{runtime.platform.path}/tools/espota.py" +tools.esptool.network_cmd.windows="{runtime.platform.path}/tools/espota.exe" tools.gen_esp32part.cmd=python "{runtime.platform.path}/tools/gen_esp32part.py" tools.gen_esp32part.cmd.windows="{runtime.platform.path}/tools/gen_esp32part.exe" @@ -75,7 +75,7 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.f recipe.objcopy.eep.pattern={tools.gen_esp32part.cmd} -q "{runtime.platform.path}/tools/partitions/default.csv" "{build.path}/{build.project_name}.partitions.bin" ## Create hex -recipe.objcopy.hex.pattern={tools.esptool32.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" +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" ## Save hex recipe.output.tmp_file={build.project_name}.bin @@ -88,8 +88,8 @@ recipe.size.regex.data=^(?:\.dram0\.data|\.dram0\.bss)\s+([0-9]+).* # ------------------------------ -tools.esptool32.upload.protocol=esp32 -tools.esptool32.upload.params.verbose= -tools.esptool32.upload.params.quiet= -tools.esptool32.upload.pattern={cmd} --chip esp32 --port "{serial.port}" --baud {upload.speed} --before default_reset --after hard_reset 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 "{build.path}/{build.project_name}.partitions.bin" 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x10000 "{build.path}/{build.project_name}.bin" -tools.esptool32.upload.network_pattern={network_cmd} -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin" +tools.esptool.upload.protocol=esp32 +tools.esptool.upload.params.verbose= +tools.esptool.upload.params.quiet= +tools.esptool.upload.pattern={cmd} --chip esp32 --port "{serial.port}" --baud {upload.speed} --before default_reset --after hard_reset 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 "{build.path}/{build.project_name}.partitions.bin" 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x10000 "{build.path}/{build.project_name}.bin" +tools.esptool.upload.network_pattern={network_cmd} -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin" diff --git a/release note.md b/release note.md index ff18b84e31f..a0e6dae0cb2 100644 --- a/release note.md +++ b/release note.md @@ -1,4 +1,13 @@ # このノートはNefry(ESP32版)のリリースノートになります。 + +## 0.7.2 + +0.7.1で修正した内容を破棄 + +バグフィックス + +- コンパイラ環境の復元 + ## 0.7.1 コンパイル環境のesptoolがうまく動作しなかったため修正