From e960bb64f08fbad86d23dd14def75431ea2dc1cc Mon Sep 17 00:00:00 2001 From: "Limor \"Ladyada\" Fried" Date: Mon, 8 May 2017 16:06:30 -0400 Subject: [PATCH 1/5] feather variant (#364) --- boards.txt | 43 ++++++++++++++++++ variants/feather_esp32/pins_arduino.h | 63 +++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 variants/feather_esp32/pins_arduino.h diff --git a/boards.txt b/boards.txt index e36294eaf0b..622ecf8f140 100644 --- a/boards.txt +++ b/boards.txt @@ -545,3 +545,46 @@ onehorse32dev.menu.UploadSpeed.460800.macosx=460800 onehorse32dev.menu.UploadSpeed.460800.upload.speed=460800 onehorse32dev.menu.UploadSpeed.512000.windows=512000 onehorse32dev.menu.UploadSpeed.512000.upload.speed=512000 + +############################################################## + +featheresp32.name=Adafruit ESP32 Feather + +featheresp32.upload.tool=esptool +featheresp32.upload.maximum_size=1044464 +featheresp32.upload.maximum_data_size=294912 +featheresp32.upload.wait_for_upload_port=true + +featheresp32.serial.disableDTR=true +featheresp32.serial.disableRTS=true + +featheresp32.build.mcu=esp32 +featheresp32.build.core=esp32 +featheresp32.build.variant=feather_esp32 +featheresp32.build.board=FEATHER_ESP32 + +featheresp32.build.f_cpu=240000000L +featheresp32.build.flash_mode=dio +featheresp32.build.flash_size=4MB + +featheresp32.menu.FlashFreq.80=80MHz +featheresp32.menu.FlashFreq.80.build.flash_freq=80m +featheresp32.menu.FlashFreq.40=40MHz +featheresp32.menu.FlashFreq.40.build.flash_freq=40m + +featheresp32.menu.UploadSpeed.921600=921600 +featheresp32.menu.UploadSpeed.921600.upload.speed=921600 +featheresp32.menu.UploadSpeed.115200=115200 +featheresp32.menu.UploadSpeed.115200.upload.speed=115200 +featheresp32.menu.UploadSpeed.256000.windows=256000 +featheresp32.menu.UploadSpeed.256000.upload.speed=256000 +featheresp32.menu.UploadSpeed.230400.windows.upload.speed=256000 +featheresp32.menu.UploadSpeed.230400=230400 +featheresp32.menu.UploadSpeed.230400.upload.speed=230400 +featheresp32.menu.UploadSpeed.460800.linux=460800 +featheresp32.menu.UploadSpeed.460800.macosx=460800 +featheresp32.menu.UploadSpeed.460800.upload.speed=460800 +featheresp32.menu.UploadSpeed.512000.windows=512000 +featheresp32.menu.UploadSpeed.512000.upload.speed=512000 + +############################################################## \ No newline at end of file diff --git a/variants/feather_esp32/pins_arduino.h b/variants/feather_esp32/pins_arduino.h new file mode 100644 index 00000000000..f952a83ef07 --- /dev/null +++ b/variants/feather_esp32/pins_arduino.h @@ -0,0 +1,63 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define EXTERNAL_NUM_INTERRUPTS 16 +#define NUM_DIGITAL_PINS 40 +#define NUM_ANALOG_INPUTS 16 + +#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1) +#define digitalPinToInterrupt(p) (((p)<40)?(p):-1) +#define digitalPinHasPWM(p) (p < 34) + +static const uint8_t LED_BUILTIN = 13; +#define BUILTIN_LED LED_BUILTIN // backward compatibility + +static const uint8_t TX = 17; +static const uint8_t RX = 16; + +static const uint8_t SDA = 23; +static const uint8_t SCL = 22; + +static const uint8_t SS = 2; +static const uint8_t MOSI = 18; +static const uint8_t MISO = 19; +static const uint8_t SCK = 5; + +// mapping to match other feathers and also in order +static const uint8_t A0 = 26; +static const uint8_t A1 = 25; +static const uint8_t A2 = 34; +static const uint8_t A3 = 39; +static const uint8_t A4 = 36; +static const uint8_t A5 = 4; +static const uint8_t A6 = 14; +static const uint8_t A7 = 32; +static const uint8_t A8 = 15; +static const uint8_t A9 = 33; +static const uint8_t A10 = 27; +static const uint8_t A11 = 12; +static const uint8_t A12 = 13; + +// vbat measure +static const uint8_t A13 = 35; +//static const uint8_t Ax = 0; // not used/available +//static const uint8_t Ax = 2; // not used/available + + +static const uint8_t T0 = 4; +static const uint8_t T1 = 0; +static const uint8_t T2 = 2; +static const uint8_t T3 = 15; +static const uint8_t T4 = 13; +static const uint8_t T5 = 12; +static const uint8_t T6 = 14; +static const uint8_t T7 = 27; +static const uint8_t T8 = 33; +static const uint8_t T9 = 32; + +static const uint8_t DAC1 = 25; +static const uint8_t DAC2 = 26; + +#endif /* Pins_Arduino_h */ From 8065e5d1615528315ff157b1fda5dac326ee06a9 Mon Sep 17 00:00:00 2001 From: wami Date: Tue, 9 May 2017 22:20:02 +0900 Subject: [PATCH 2/5] =?UTF-8?q?platform=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/platform.txt b/platform.txt index ff9a6d9234b..1f482933170 100644 --- a/platform.txt +++ b/platform.txt @@ -1,14 +1,14 @@ name=Nefry(ESP32)Module -version=0.5.3 +version=0.7.1 runtime.tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32-elf -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.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.network_cmd=python "{runtime.platform.path}/tools/espota.py" -tools.esptool.network_cmd.windows="{runtime.platform.path}/tools/espota.exe" +tools.esptool32.network_cmd=python "{runtime.platform.path}/tools/espota.py" +tools.esptool32.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.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" +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" ## 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.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" +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" From 040ebea69435c78bea17af16b556e36735e0d947 Mon Sep 17 00:00:00 2001 From: wami Date: Tue, 9 May 2017 22:28:51 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E3=83=9C=E3=83=BC=E3=83=89=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- boards.txt | 617 ++++------------------------------------------------- 1 file changed, 43 insertions(+), 574 deletions(-) diff --git a/boards.txt b/boards.txt index d7accc61d3d..4d440ac99a4 100644 --- a/boards.txt +++ b/boards.txt @@ -4,6 +4,49 @@ menu.DebugLevel=Core Debug Level ############################################################## +nefrybt.name=Nefry BT + +nefrybt.upload.tool=esptool +nefrybt.upload.maximum_size=1044464 +nefrybt.upload.maximum_data_size=294912 +nefrybt.upload.wait_for_upload_port=true + +nefrybt.serial.disableDTR=true +nefrybt.serial.disableRTS=true + +nefrybt.build.mcu=esp32 +nefrybt.build.core=esp32 +nefrybt.build.variant=esp32 +nefrybt.build.board=Nefry_Icing + +nefrybt.build.f_cpu=240000000L +nefrybt.build.flash_mode=dio +nefrybt.build.flash_size=4MB + +nefrybt.build.flash_freq=80m + +nefrybt.menu.UploadSpeed.512000.windows=512000 +nefrybt.menu.UploadSpeed.512000.upload.speed=512000 +nefrybt.menu.UploadSpeed.115200=115200 +nefrybt.menu.UploadSpeed.115200.upload.speed=115200 +nefrybt.menu.UploadSpeed.921600=921600 +nefrybt.menu.UploadSpeed.921600.upload.speed=921600 + +nefrybt.menu.DebugLevel.none=None +nefrybt.menu.DebugLevel.none.build.code_debug=0 +nefrybt.menu.DebugLevel.error=Error +nefrybt.menu.DebugLevel.error.build.code_debug=1 +nefrybt.menu.DebugLevel.warn=Warn +nefrybt.menu.DebugLevel.warn.build.code_debug=2 +nefrybt.menu.DebugLevel.info=Info +nefrybt.menu.DebugLevel.info.build.code_debug=3 +nefrybt.menu.DebugLevel.debug=Debug +nefrybt.menu.DebugLevel.debug.build.code_debug=4 +nefrybt.menu.DebugLevel.verbose=Verbose +nefrybt.menu.DebugLevel.verbose.build.code_debug=5 + +############################################################## + esp32.name=ESP32 Dev Module esp32.upload.tool=esptool @@ -56,578 +99,4 @@ esp32.menu.DebugLevel.debug.build.code_debug=4 esp32.menu.DebugLevel.verbose=Verbose esp32.menu.DebugLevel.verbose.build.code_debug=5 -############################################################## - -<<<<<<< HEAD -nefrybt.name=Nefry BT - -nefrybt.upload.tool=esptool -nefrybt.upload.maximum_size=1044464 -nefrybt.upload.maximum_data_size=294912 -nefrybt.upload.wait_for_upload_port=true - -nefrybt.serial.disableDTR=true -nefrybt.serial.disableRTS=true - -nefrybt.build.mcu=esp32 -nefrybt.build.core=esp32 -nefrybt.build.variant=esp32 -nefrybt.build.board=Nefry_Icing - -nefrybt.build.f_cpu=240000000L -nefrybt.build.flash_mode=dio -nefrybt.build.flash_size=4MB - -nefrybt.build.flash_freq=80m - -nefrybt.menu.UploadSpeed.512000.windows=512000 -nefrybt.menu.UploadSpeed.512000.upload.speed=512000 -nefrybt.menu.UploadSpeed.115200=115200 -nefrybt.menu.UploadSpeed.115200.upload.speed=115200 -nefrybt.menu.UploadSpeed.921600=921600 -nefrybt.menu.UploadSpeed.921600.upload.speed=921600 - -nefrybt.menu.DebugLevel.none=None -nefrybt.menu.DebugLevel.none.build.code_debug=0 -nefrybt.menu.DebugLevel.error=Error -nefrybt.menu.DebugLevel.error.build.code_debug=1 -nefrybt.menu.DebugLevel.warn=Warn -nefrybt.menu.DebugLevel.warn.build.code_debug=2 -nefrybt.menu.DebugLevel.info=Info -nefrybt.menu.DebugLevel.info.build.code_debug=3 -nefrybt.menu.DebugLevel.debug=Debug -nefrybt.menu.DebugLevel.debug.build.code_debug=4 -nefrybt.menu.DebugLevel.verbose=Verbose -nefrybt.menu.DebugLevel.verbose.build.code_debug=5 -======= -esp32thing.name=SparkFun ESP32 Thing - -esp32thing.upload.tool=esptool -esp32thing.upload.maximum_size=1044464 -esp32thing.upload.maximum_data_size=294912 -esp32thing.upload.wait_for_upload_port=true - -esp32thing.serial.disableDTR=true -esp32thing.serial.disableRTS=true - -esp32thing.build.mcu=esp32 -esp32thing.build.core=esp32 -esp32thing.build.variant=esp32thing -esp32thing.build.board=ESP32_THING - -esp32thing.build.f_cpu=240000000L -esp32thing.build.flash_mode=dio -esp32thing.build.flash_size=4MB - -esp32thing.menu.FlashFreq.80=80MHz -esp32thing.menu.FlashFreq.80.build.flash_freq=80m -esp32thing.menu.FlashFreq.40=40MHz -esp32thing.menu.FlashFreq.40.build.flash_freq=40m - -esp32thing.menu.UploadSpeed.921600=921600 -esp32thing.menu.UploadSpeed.921600.upload.speed=921600 -esp32thing.menu.UploadSpeed.115200=115200 -esp32thing.menu.UploadSpeed.115200.upload.speed=115200 -esp32thing.menu.UploadSpeed.256000.windows=256000 -esp32thing.menu.UploadSpeed.256000.upload.speed=256000 -esp32thing.menu.UploadSpeed.230400.windows.upload.speed=256000 -esp32thing.menu.UploadSpeed.230400=230400 -esp32thing.menu.UploadSpeed.230400.upload.speed=230400 -esp32thing.menu.UploadSpeed.460800.linux=460800 -esp32thing.menu.UploadSpeed.460800.macosx=460800 -esp32thing.menu.UploadSpeed.460800.upload.speed=460800 -esp32thing.menu.UploadSpeed.512000.windows=512000 -esp32thing.menu.UploadSpeed.512000.upload.speed=512000 - -############################################################## - -esp320.name=Electronic SweetPeas - ESP320 - -esp320.upload.tool=esptool -esp320.upload.maximum_size=1044464 -esp320.upload.maximum_data_size=294912 -esp320.upload.wait_for_upload_port=true - -esp320.serial.disableDTR=true -esp320.serial.disableRTS=true - -esp320.build.mcu=esp32 -esp320.build.core=esp32 -esp320.build.variant=esp320 -esp320.build.board=ESP320 - -esp320.build.f_cpu=240000000L -esp320.build.flash_mode=qio -esp320.build.flash_size=4MB - -esp320.menu.FlashFreq.80=80MHz -esp320.menu.FlashFreq.80.build.flash_freq=80m -esp320.menu.FlashFreq.40=40MHz -esp320.menu.FlashFreq.40.build.flash_freq=40m -esp320.menu.UploadSpeed.921600=921600 -esp320.menu.UploadSpeed.921600.upload.speed=921600 -esp320.menu.UploadSpeed.115200=115200 -esp320.menu.UploadSpeed.115200.upload.speed=115200 -esp320.menu.UploadSpeed.256000.windows=256000 -esp320.menu.UploadSpeed.256000.upload.speed=256000 -esp320.menu.UploadSpeed.230400.windows.upload.speed=256000 -esp320.menu.UploadSpeed.230400=230400 -esp320.menu.UploadSpeed.230400.upload.speed=230400 -esp320.menu.UploadSpeed.460800.linux=460800 -esp320.menu.UploadSpeed.460800.macosx=460800 -esp320.menu.UploadSpeed.460800.upload.speed=460800 -esp320.menu.UploadSpeed.512000.windows=512000 -esp320.menu.UploadSpeed.512000.upload.speed=512000 - -############################################################## - -nano32.name=Nano32 - -nano32.upload.tool=esptool -nano32.upload.maximum_size=1044464 -nano32.upload.maximum_data_size=294912 -nano32.upload.wait_for_upload_port=true - -nano32.serial.disableDTR=true -nano32.serial.disableRTS=true - -nano32.build.mcu=esp32 -nano32.build.core=esp32 -nano32.build.variant=nano32 -nano32.build.board=NANO32 - -nano32.build.f_cpu=240000000L -nano32.build.flash_mode=dio -nano32.build.flash_size=4MB - -nano32.menu.FlashFreq.80=80MHz -nano32.menu.FlashFreq.80.build.flash_freq=80m -nano32.menu.FlashFreq.40=40MHz -nano32.menu.FlashFreq.40.build.flash_freq=40m - -nano32.menu.UploadSpeed.921600=921600 -nano32.menu.UploadSpeed.921600.upload.speed=921600 -nano32.menu.UploadSpeed.115200=115200 -nano32.menu.UploadSpeed.115200.upload.speed=115200 -nano32.menu.UploadSpeed.256000.windows=256000 -nano32.menu.UploadSpeed.256000.upload.speed=256000 -nano32.menu.UploadSpeed.230400.windows.upload.speed=256000 -nano32.menu.UploadSpeed.230400=230400 -nano32.menu.UploadSpeed.230400.upload.speed=230400 -nano32.menu.UploadSpeed.460800.linux=460800 -nano32.menu.UploadSpeed.460800.macosx=460800 -nano32.menu.UploadSpeed.460800.upload.speed=460800 -nano32.menu.UploadSpeed.512000.windows=512000 -nano32.menu.UploadSpeed.512000.upload.speed=512000 - -############################################################## - -lolin32.name=WEMOS LOLIN32 - -lolin32.upload.tool=esptool -lolin32.upload.maximum_size=1044464 -lolin32.upload.maximum_data_size=294912 -lolin32.upload.wait_for_upload_port=true - -lolin32.serial.disableDTR=true -lolin32.serial.disableRTS=true - -lolin32.build.mcu=esp32 -lolin32.build.core=esp32 -lolin32.build.variant=lolin32 -lolin32.build.board=LOLIN32 - -lolin32.build.f_cpu=240000000L -lolin32.build.flash_mode=dio -lolin32.build.flash_size=4MB - -lolin32.menu.FlashFreq.80=80MHz -lolin32.menu.FlashFreq.80.build.flash_freq=80m -lolin32.menu.FlashFreq.40=40MHz -lolin32.menu.FlashFreq.40.build.flash_freq=40m - -lolin32.menu.UploadSpeed.921600=921600 -lolin32.menu.UploadSpeed.921600.upload.speed=921600 -lolin32.menu.UploadSpeed.115200=115200 -lolin32.menu.UploadSpeed.115200.upload.speed=115200 -lolin32.menu.UploadSpeed.256000.windows=256000 -lolin32.menu.UploadSpeed.256000.upload.speed=256000 -lolin32.menu.UploadSpeed.230400.windows.upload.speed=256000 -lolin32.menu.UploadSpeed.230400=230400 -lolin32.menu.UploadSpeed.230400.upload.speed=230400 -lolin32.menu.UploadSpeed.460800.linux=460800 -lolin32.menu.UploadSpeed.460800.macosx=460800 -lolin32.menu.UploadSpeed.460800.upload.speed=460800 -lolin32.menu.UploadSpeed.512000.windows=512000 -lolin32.menu.UploadSpeed.512000.upload.speed=512000 - -############################################################## - -espea32.name=ESPea32 - -espea32.upload.tool=esptool -espea32.upload.maximum_size=1044464 -espea32.upload.maximum_data_size=294912 -espea32.upload.wait_for_upload_port=true - -espea32.serial.disableDTR=true -espea32.serial.disableRTS=true - -espea32.build.mcu=esp32 -espea32.build.core=esp32 -espea32.build.variant=espea32 -espea32.build.board=ESPea32 - -espea32.build.f_cpu=240000000L -espea32.build.flash_mode=dio -espea32.build.flash_size=4MB - -espea32.menu.FlashFreq.80=80MHz -espea32.menu.FlashFreq.80.build.flash_freq=80m -espea32.menu.FlashFreq.40=40MHz -espea32.menu.FlashFreq.40.build.flash_freq=40m - -espea32.menu.UploadSpeed.921600=921600 -espea32.menu.UploadSpeed.921600.upload.speed=921600 -espea32.menu.UploadSpeed.115200=115200 -espea32.menu.UploadSpeed.115200.upload.speed=115200 -espea32.menu.UploadSpeed.256000.windows=256000 -espea32.menu.UploadSpeed.256000.upload.speed=256000 -espea32.menu.UploadSpeed.230400.windows.upload.speed=256000 -espea32.menu.UploadSpeed.230400=230400 -espea32.menu.UploadSpeed.230400.upload.speed=230400 -espea32.menu.UploadSpeed.460800.linux=460800 -espea32.menu.UploadSpeed.460800.macosx=460800 -espea32.menu.UploadSpeed.460800.upload.speed=460800 -espea32.menu.UploadSpeed.512000.windows=512000 -espea32.menu.UploadSpeed.512000.upload.speed=512000 - -############################################################## - -quantum.name=Noduino Quantum - -quantum.upload.tool=esptool -quantum.upload.maximum_size=1044464 -quantum.upload.maximum_data_size=294912 -quantum.upload.wait_for_upload_port=true - -quantum.serial.disableDTR=true -quantum.serial.disableRTS=true - -quantum.build.mcu=esp32 -quantum.build.core=esp32 -quantum.build.variant=quantum -quantum.build.board=QUANTUM - -quantum.build.f_cpu=240000000L -quantum.build.flash_mode=qio -quantum.build.flash_size=16MB - -quantum.menu.FlashFreq.80=80MHz -quantum.menu.FlashFreq.80.build.flash_freq=80m -quantum.menu.FlashFreq.40=40MHz -quantum.menu.FlashFreq.40.build.flash_freq=40m - -quantum.menu.UploadSpeed.921600=921600 -quantum.menu.UploadSpeed.921600.upload.speed=921600 -quantum.menu.UploadSpeed.115200=115200 -quantum.menu.UploadSpeed.115200.upload.speed=115200 -quantum.menu.UploadSpeed.256000.windows=256000 -quantum.menu.UploadSpeed.256000.upload.speed=256000 -quantum.menu.UploadSpeed.230400.windows.upload.speed=256000 -quantum.menu.UploadSpeed.230400=230400 -quantum.menu.UploadSpeed.230400.upload.speed=230400 -quantum.menu.UploadSpeed.460800.linux=460800 -quantum.menu.UploadSpeed.460800.macosx=460800 -quantum.menu.UploadSpeed.460800.upload.speed=460800 -quantum.menu.UploadSpeed.512000.windows=512000 -quantum.menu.UploadSpeed.512000.upload.speed=512000 - -############################################################## - -node32s.name=Node32s - -node32s.upload.tool=esptool -node32s.upload.maximum_size=1044464 -node32s.upload.maximum_data_size=294912 -node32s.upload.wait_for_upload_port=true - -node32s.serial.disableDTR=true -node32s.serial.disableRTS=true - -node32s.build.mcu=esp32 -node32s.build.core=esp32 -node32s.build.variant=node32s -node32s.build.board=Node32s - -node32s.build.f_cpu=240000000L -node32s.build.flash_mode=dio -node32s.build.flash_size=4MB - -node32s.menu.FlashFreq.80=80MHz -node32s.menu.FlashFreq.80.build.flash_freq=80m -node32s.menu.FlashFreq.40=40MHz -node32s.menu.FlashFreq.40.build.flash_freq=40m - -node32s.menu.UploadSpeed.921600=921600 -node32s.menu.UploadSpeed.921600.upload.speed=921600 -node32s.menu.UploadSpeed.115200=115200 -node32s.menu.UploadSpeed.115200.upload.speed=115200 -node32s.menu.UploadSpeed.256000.windows=256000 -node32s.menu.UploadSpeed.256000.upload.speed=256000 -node32s.menu.UploadSpeed.230400.windows.upload.speed=256000 -node32s.menu.UploadSpeed.230400=230400 -node32s.menu.UploadSpeed.230400.upload.speed=230400 -node32s.menu.UploadSpeed.460800.linux=460800 -node32s.menu.UploadSpeed.460800.macosx=460800 -node32s.menu.UploadSpeed.460800.upload.speed=460800 -node32s.menu.UploadSpeed.512000.windows=512000 -node32s.menu.UploadSpeed.512000.upload.speed=512000 - -############################################################## - -hornbill32dev.name=Hornbill ESP32 Dev - -hornbill32dev.upload.tool=esptool -hornbill32dev.upload.maximum_size=1044464 -hornbill32dev.upload.maximum_data_size=294912 -hornbill32dev.upload.wait_for_upload_port=true - -hornbill32dev.serial.disableDTR=true -hornbill32dev.serial.disableRTS=true - -hornbill32dev.build.mcu=esp32 -hornbill32dev.build.core=esp32 -hornbill32dev.build.variant=hornbill32dev -hornbill32dev.build.board=HORNBILL_ESP32_DEV -hornbill32dev.build.f_cpu=240000000L -hornbill32dev.build.flash_mode=dio -hornbill32dev.build.flash_size=4MB - -hornbill32dev.menu.FlashFreq.80=80MHz -hornbill32dev.menu.FlashFreq.80.build.flash_freq=80m -hornbill32dev.menu.FlashFreq.40=40MHz -hornbill32dev.menu.FlashFreq.40.build.flash_freq=40m - -hornbill32dev.menu.UploadSpeed.921600=921600 -hornbill32dev.menu.UploadSpeed.921600.upload.speed=921600 -hornbill32dev.menu.UploadSpeed.115200=115200 -hornbill32dev.menu.UploadSpeed.115200.upload.speed=115200 -hornbill32dev.menu.UploadSpeed.256000.windows=256000 -hornbill32dev.menu.UploadSpeed.256000.upload.speed=256000 -hornbill32dev.menu.UploadSpeed.230400.windows.upload.speed=256000 -hornbill32dev.menu.UploadSpeed.230400=230400 -hornbill32dev.menu.UploadSpeed.230400.upload.speed=230400 -hornbill32dev.menu.UploadSpeed.460800.linux=460800 -hornbill32dev.menu.UploadSpeed.460800.macosx=460800 -hornbill32dev.menu.UploadSpeed.460800.upload.speed=460800 -hornbill32dev.menu.UploadSpeed.512000.windows=512000 -hornbill32dev.menu.UploadSpeed.512000.upload.speed=512000 - -############################################################## - -hornbill32minima.name=Hornbill ESP32 Minima - -hornbill32minima.upload.tool=esptool -hornbill32minima.upload.maximum_size=1044464 -hornbill32minima.upload.maximum_data_size=294912 -hornbill32minima.upload.wait_for_upload_port=true - -hornbill32minima.serial.disableDTR=true -hornbill32minima.serial.disableRTS=true - -hornbill32minima.build.mcu=esp32 -hornbill32minima.build.core=esp32 -hornbill32minima.build.variant=hornbill32minima -hornbill32minima.build.board=HORNBILL_ESP32_MINIMA -hornbill32minima.build.f_cpu=240000000L -hornbill32minima.build.flash_mode=dio -hornbill32minima.build.flash_size=4MB - -hornbill32minima.menu.FlashFreq.80=80MHz -hornbill32minima.menu.FlashFreq.80.build.flash_freq=80m -hornbill32minima.menu.FlashFreq.40=40MHz -hornbill32minima.menu.FlashFreq.40.build.flash_freq=40m - -hornbill32minima.menu.UploadSpeed.921600=921600 -hornbill32minima.menu.UploadSpeed.921600.upload.speed=921600 -hornbill32minima.menu.UploadSpeed.115200=115200 -hornbill32minima.menu.UploadSpeed.115200.upload.speed=115200 -hornbill32minima.menu.UploadSpeed.256000.windows=256000 -hornbill32minima.menu.UploadSpeed.256000.upload.speed=256000 -hornbill32minima.menu.UploadSpeed.230400.windows.upload.speed=256000 -hornbill32minima.menu.UploadSpeed.230400=230400 -hornbill32minima.menu.UploadSpeed.230400.upload.speed=230400 -hornbill32minima.menu.UploadSpeed.460800.linux=460800 -hornbill32minima.menu.UploadSpeed.460800.macosx=460800 -hornbill32minima.menu.UploadSpeed.460800.upload.speed=460800 -hornbill32minima.menu.UploadSpeed.512000.windows=512000 -hornbill32minima.menu.UploadSpeed.512000.upload.speed=512000 - -############################################################## - -firebeetle32.name=FireBeetle-ESP32 - -firebeetle32.upload.tool=esptool -firebeetle32.upload.maximum_size=1044464 -firebeetle32.upload.maximum_data_size=294912 -firebeetle32.upload.wait_for_upload_port=true - -firebeetle32.serial.disableDTR=true -firebeetle32.serial.disableRTS=true - -firebeetle32.build.mcu=esp32 -firebeetle32.build.core=esp32 -firebeetle32.build.variant=firebeetle32 -firebeetle32.build.board=ESP32_DEV - -firebeetle32.build.f_cpu=240000000L -firebeetle32.build.flash_mode=dio -firebeetle32.build.flash_size=4MB - -firebeetle32.menu.FlashFreq.80=80MHz -firebeetle32.menu.FlashFreq.80.build.flash_freq=80m -firebeetle32.menu.FlashFreq.40=40MHz -firebeetle32.menu.FlashFreq.40.build.flash_freq=40m - -firebeetle32.menu.UploadSpeed.921600=921600 -firebeetle32.menu.UploadSpeed.921600.upload.speed=921600 -firebeetle32.menu.UploadSpeed.115200=115200 -firebeetle32.menu.UploadSpeed.115200.upload.speed=115200 -firebeetle32.menu.UploadSpeed.256000.windows=256000 -firebeetle32.menu.UploadSpeed.256000.upload.speed=256000 -firebeetle32.menu.UploadSpeed.230400.windows.upload.speed=256000 -firebeetle32.menu.UploadSpeed.230400=230400 -firebeetle32.menu.UploadSpeed.230400.upload.speed=230400 -firebeetle32.menu.UploadSpeed.460800.linux=460800 -firebeetle32.menu.UploadSpeed.460800.macosx=460800 -firebeetle32.menu.UploadSpeed.460800.upload.speed=460800 -firebeetle32.menu.UploadSpeed.512000.windows=512000 -firebeetle32.menu.UploadSpeed.512000.upload.speed=512000 - -############################################################## - -intorobot-fig.name=IntoRobot Fig - -intorobot-fig.upload.tool=esptool -intorobot-fig.upload.maximum_size=1044464 -intorobot-fig.upload.maximum_data_size=294912 -intorobot-fig.upload.wait_for_upload_port=true - -intorobot-fig.serial.disableDTR=true -intorobot-fig.serial.disableRTS=true - -intorobot-fig.build.mcu=esp32 -intorobot-fig.build.core=esp32 -intorobot-fig.build.variant=intorobot-fig -intorobot-fig.build.board=INTOROBOT_ESP32_DEV - -intorobot-fig.build.f_cpu=240000000L -intorobot-fig.build.flash_mode=dio -intorobot-fig.build.flash_size=4MB - -intorobot-fig.menu.FlashFreq.80=80MHz -intorobot-fig.menu.FlashFreq.80.build.flash_freq=80m -intorobot-fig.menu.FlashFreq.40=40MHz -intorobot-fig.menu.FlashFreq.40.build.flash_freq=40m - -intorobot-fig.menu.UploadSpeed.921600=921600 -intorobot-fig.menu.UploadSpeed.921600.upload.speed=921600 -intorobot-fig.menu.UploadSpeed.115200=115200 -intorobot-fig.menu.UploadSpeed.115200.upload.speed=115200 -intorobot-fig.menu.UploadSpeed.256000.windows=256000 -intorobot-fig.menu.UploadSpeed.256000.upload.speed=256000 -intorobot-fig.menu.UploadSpeed.230400.windows.upload.speed=256000 -intorobot-fig.menu.UploadSpeed.230400=230400 -intorobot-fig.menu.UploadSpeed.230400.upload.speed=230400 -intorobot-fig.menu.UploadSpeed.460800.linux=460800 -intorobot-fig.menu.UploadSpeed.460800.macosx=460800 -intorobot-fig.menu.UploadSpeed.460800.upload.speed=460800 -intorobot-fig.menu.UploadSpeed.512000.windows=512000 -intorobot-fig.menu.UploadSpeed.512000.upload.speed=512000 - -############################################################## - -onehorse32dev.name=Onehorse ESP32 Dev Module - -onehorse32dev.upload.tool=esptool -onehorse32dev.upload.maximum_size=1044464 -onehorse32dev.upload.maximum_data_size=294912 -onehorse32dev.upload.wait_for_upload_port=true - -onehorse32dev.serial.disableDTR=true -onehorse32dev.serial.disableRTS=true - -onehorse32dev.build.mcu=esp32 -onehorse32dev.build.core=esp32 -onehorse32dev.build.variant=onehorse32dev -onehorse32dev.build.board=ONEHORSE_ESP32_DEV - -onehorse32dev.build.f_cpu=240000000L -onehorse32dev.build.flash_mode=dout -onehorse32dev.build.flash_size=4MB - -onehorse32dev.menu.FlashFreq.80=80MHz -onehorse32dev.menu.FlashFreq.80.build.flash_freq=80m -onehorse32dev.menu.FlashFreq.40=40MHz -onehorse32dev.menu.FlashFreq.40.build.flash_freq=40m - -onehorse32dev.menu.UploadSpeed.921600=921600 -onehorse32dev.menu.UploadSpeed.921600.upload.speed=921600 -onehorse32dev.menu.UploadSpeed.115200=115200 -onehorse32dev.menu.UploadSpeed.115200.upload.speed=115200 -onehorse32dev.menu.UploadSpeed.256000.windows=256000 -onehorse32dev.menu.UploadSpeed.256000.upload.speed=256000 -onehorse32dev.menu.UploadSpeed.230400.windows.upload.speed=256000 -onehorse32dev.menu.UploadSpeed.230400=230400 -onehorse32dev.menu.UploadSpeed.230400.upload.speed=230400 -onehorse32dev.menu.UploadSpeed.460800.linux=460800 -onehorse32dev.menu.UploadSpeed.460800.macosx=460800 -onehorse32dev.menu.UploadSpeed.460800.upload.speed=460800 -onehorse32dev.menu.UploadSpeed.512000.windows=512000 -onehorse32dev.menu.UploadSpeed.512000.upload.speed=512000 - -############################################################## - -featheresp32.name=Adafruit ESP32 Feather - -featheresp32.upload.tool=esptool -featheresp32.upload.maximum_size=1044464 -featheresp32.upload.maximum_data_size=294912 -featheresp32.upload.wait_for_upload_port=true - -featheresp32.serial.disableDTR=true -featheresp32.serial.disableRTS=true - -featheresp32.build.mcu=esp32 -featheresp32.build.core=esp32 -featheresp32.build.variant=feather_esp32 -featheresp32.build.board=FEATHER_ESP32 - -featheresp32.build.f_cpu=240000000L -featheresp32.build.flash_mode=dio -featheresp32.build.flash_size=4MB - -featheresp32.menu.FlashFreq.80=80MHz -featheresp32.menu.FlashFreq.80.build.flash_freq=80m -featheresp32.menu.FlashFreq.40=40MHz -featheresp32.menu.FlashFreq.40.build.flash_freq=40m - -featheresp32.menu.UploadSpeed.921600=921600 -featheresp32.menu.UploadSpeed.921600.upload.speed=921600 -featheresp32.menu.UploadSpeed.115200=115200 -featheresp32.menu.UploadSpeed.115200.upload.speed=115200 -featheresp32.menu.UploadSpeed.256000.windows=256000 -featheresp32.menu.UploadSpeed.256000.upload.speed=256000 -featheresp32.menu.UploadSpeed.230400.windows.upload.speed=256000 -featheresp32.menu.UploadSpeed.230400=230400 -featheresp32.menu.UploadSpeed.230400.upload.speed=230400 -featheresp32.menu.UploadSpeed.460800.linux=460800 -featheresp32.menu.UploadSpeed.460800.macosx=460800 -featheresp32.menu.UploadSpeed.460800.upload.speed=460800 -featheresp32.menu.UploadSpeed.512000.windows=512000 -featheresp32.menu.UploadSpeed.512000.upload.speed=512000 - -############################################################## ->>>>>>> ESP32/master From abc7aaa43b63ecd39341234d92126141de9fe0ee Mon Sep 17 00:00:00 2001 From: wami Date: Tue, 9 May 2017 22:31:20 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9?= =?UTF-8?q?=E3=83=AA=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cores/esp32/nefry/Nefry.cpp | 2 +- libraries/Nefry/library.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/esp32/nefry/Nefry.cpp b/cores/esp32/nefry/Nefry.cpp index 6efa0ba7367..cfc40c69ca8 100644 --- a/cores/esp32/nefry/Nefry.cpp +++ b/cores/esp32/nefry/Nefry.cpp @@ -24,7 +24,7 @@ BootMode 1 : WriteMode切替をする */ -#define LIBVERSION ("0.7.0") +#define LIBVERSION ("0.7.1") #include "Nefry.h" Adafruit_NeoPixel _NefryLED[40]; diff --git a/libraries/Nefry/library.properties b/libraries/Nefry/library.properties index aea9a5ee7ac..74a0379b7da 100644 --- a/libraries/Nefry/library.properties +++ b/libraries/Nefry/library.properties @@ -1,5 +1,5 @@ name=Nefry -version=0.7.0 +version=0.7.1 author=Nefry community maintainer= sentence=nefry. From c2ac722fa811a0653d786799d8b7631024963cb2 Mon Sep 17 00:00:00 2001 From: wami Date: Tue, 9 May 2017 22:36:59 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=83=8E=E3=83=BC=E3=83=88=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- release note.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/release note.md b/release note.md index e346869fc84..ff18b84e31f 100644 --- a/release note.md +++ b/release note.md @@ -1,4 +1,12 @@ # このノートはNefry(ESP32版)のリリースノートになります。 +## 0.7.1 + +コンパイル環境のesptoolがうまく動作しなかったため修正 + +バグフィックス + +- コンパイラ環境の修正 + ## 0.7.0 NefryのModule設定機能の追加