Skip to content

Develop #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 13, 2017
Merged

Develop #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d91b55
version情報更新
wamisnet May 13, 2017
2d0abf5
platform復元
wamisnet May 13, 2017
ee5fa11
リリースノート更新
wamisnet May 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cores/esp32/nefry/Nefry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ BootMode
1 : WriteMode切替をする
*/

#define LIBVERSION ("0.7.1")
#define LIBVERSION ("0.7.2")
#include "Nefry.h"

Adafruit_NeoPixel _NefryLED[40];
Expand Down
2 changes: 1 addition & 1 deletion libraries/Nefry/library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Nefry
version=0.7.1
version=0.7.2
author=Nefry community
maintainer=
sentence=nefry.
Expand Down
24 changes: 12 additions & 12 deletions platform.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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"
9 changes: 9 additions & 0 deletions release note.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
# このノートはNefry(ESP32版)のリリースノートになります。

## 0.7.2

0.7.1で修正した内容を破棄

バグフィックス

- コンパイラ環境の復元

## 0.7.1

コンパイル環境のesptoolがうまく動作しなかったため修正
Expand Down