Nefry-Community · wamisnet · May 9, 2017 · May 8, 2017 · May 9, 2017 · May 9, 2017
diff --git 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,45 +99,4 @@ esp32.menu.DebugLevel.debug.build.code_debug=4
 esp32.menu.DebugLevel.verbose=Verbose
 esp32.menu.DebugLevel.verbose.build.code_debug=5
 
-##############################################################
-
-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
diff --git 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
@@ -1,5 +1,5 @@
 name=Nefry
-version=0.7.0
+version=0.7.1
 author=Nefry community
 maintainer=
 sentence=nefry.

diff --git 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"
diff --git a/release note.md b/release note.md
@@ -1,4 +1,12 @@
 # このノートはNefry(ESP32版)のリリースノートになります。
+## 0.7.1
+
+コンパイル環境のesptoolがうまく動作しなかったため修正
+
+バグフィックス
+
+- コンパイラ環境の修正
+
 ## 0.7.0
 
 NefryのModule設定機能の追加

diff --git a/variants/feather_esp32/pins_arduino.h b/variants/feather_esp32/pins_arduino.h
@@ -0,0 +1,63 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#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 */