Skip to content

Commit dd6f943

Browse files
wamisnetwamisnet
authored
Merge pull request #29 from Nefry-Community/develop
0.7.1
2 parents 7780b57 + c2ac722 commit dd6f943

File tree

6 files changed

+128
-55
lines changed

6 files changed

+128
-55
lines changed

‎boards.txt

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,49 @@ menu.DebugLevel=Core Debug Level
44

55
##############################################################
66

7+
nefrybt.name=Nefry BT
8+
9+
nefrybt.upload.tool=esptool
10+
nefrybt.upload.maximum_size=1044464
11+
nefrybt.upload.maximum_data_size=294912
12+
nefrybt.upload.wait_for_upload_port=true
13+
14+
nefrybt.serial.disableDTR=true
15+
nefrybt.serial.disableRTS=true
16+
17+
nefrybt.build.mcu=esp32
18+
nefrybt.build.core=esp32
19+
nefrybt.build.variant=esp32
20+
nefrybt.build.board=Nefry_Icing
21+
22+
nefrybt.build.f_cpu=240000000L
23+
nefrybt.build.flash_mode=dio
24+
nefrybt.build.flash_size=4MB
25+
26+
nefrybt.build.flash_freq=80m
27+
28+
nefrybt.menu.UploadSpeed.512000.windows=512000
29+
nefrybt.menu.UploadSpeed.512000.upload.speed=512000
30+
nefrybt.menu.UploadSpeed.115200=115200
31+
nefrybt.menu.UploadSpeed.115200.upload.speed=115200
32+
nefrybt.menu.UploadSpeed.921600=921600
33+
nefrybt.menu.UploadSpeed.921600.upload.speed=921600
34+
35+
nefrybt.menu.DebugLevel.none=None
36+
nefrybt.menu.DebugLevel.none.build.code_debug=0
37+
nefrybt.menu.DebugLevel.error=Error
38+
nefrybt.menu.DebugLevel.error.build.code_debug=1
39+
nefrybt.menu.DebugLevel.warn=Warn
40+
nefrybt.menu.DebugLevel.warn.build.code_debug=2
41+
nefrybt.menu.DebugLevel.info=Info
42+
nefrybt.menu.DebugLevel.info.build.code_debug=3
43+
nefrybt.menu.DebugLevel.debug=Debug
44+
nefrybt.menu.DebugLevel.debug.build.code_debug=4
45+
nefrybt.menu.DebugLevel.verbose=Verbose
46+
nefrybt.menu.DebugLevel.verbose.build.code_debug=5
47+
48+
##############################################################
49+
750
esp32.name=ESP32 Dev Module
851

952
esp32.upload.tool=esptool
@@ -56,45 +99,4 @@ esp32.menu.DebugLevel.debug.build.code_debug=4
5699
esp32.menu.DebugLevel.verbose=Verbose
57100
esp32.menu.DebugLevel.verbose.build.code_debug=5
58101

59-
##############################################################
60-
61-
nefrybt.name=Nefry BT
62-
63-
nefrybt.upload.tool=esptool
64-
nefrybt.upload.maximum_size=1044464
65-
nefrybt.upload.maximum_data_size=294912
66-
nefrybt.upload.wait_for_upload_port=true
67-
68-
nefrybt.serial.disableDTR=true
69-
nefrybt.serial.disableRTS=true
70-
71-
nefrybt.build.mcu=esp32
72-
nefrybt.build.core=esp32
73-
nefrybt.build.variant=esp32
74-
nefrybt.build.board=Nefry_Icing
75-
76-
nefrybt.build.f_cpu=240000000L
77-
nefrybt.build.flash_mode=dio
78-
nefrybt.build.flash_size=4MB
79-
80-
nefrybt.build.flash_freq=80m
81102

82-
nefrybt.menu.UploadSpeed.512000.windows=512000
83-
nefrybt.menu.UploadSpeed.512000.upload.speed=512000
84-
nefrybt.menu.UploadSpeed.115200=115200
85-
nefrybt.menu.UploadSpeed.115200.upload.speed=115200
86-
nefrybt.menu.UploadSpeed.921600=921600
87-
nefrybt.menu.UploadSpeed.921600.upload.speed=921600
88-
89-
nefrybt.menu.DebugLevel.none=None
90-
nefrybt.menu.DebugLevel.none.build.code_debug=0
91-
nefrybt.menu.DebugLevel.error=Error
92-
nefrybt.menu.DebugLevel.error.build.code_debug=1
93-
nefrybt.menu.DebugLevel.warn=Warn
94-
nefrybt.menu.DebugLevel.warn.build.code_debug=2
95-
nefrybt.menu.DebugLevel.info=Info
96-
nefrybt.menu.DebugLevel.info.build.code_debug=3
97-
nefrybt.menu.DebugLevel.debug=Debug
98-
nefrybt.menu.DebugLevel.debug.build.code_debug=4
99-
nefrybt.menu.DebugLevel.verbose=Verbose
100-
nefrybt.menu.DebugLevel.verbose.build.code_debug=5

‎cores/esp32/nefry/Nefry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ BootMode
2424
1 : WriteMode切替をする
2525
*/
2626

27-
#define LIBVERSION ("0.7.0")
27+
#define LIBVERSION ("0.7.1")
2828
#include "Nefry.h"
2929

3030
Adafruit_NeoPixel _NefryLED[40];

‎libraries/Nefry/library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=Nefry
2-
version=0.7.0
2+
version=0.7.1
33
author=Nefry community
44
maintainer=
55
sentence=nefry.

‎platform.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name=Nefry(ESP32)Module
2-
version=0.5.3
2+
version=0.7.1
33

44
runtime.tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32-elf
55

6-
tools.esptool.cmd="{runtime.tools.esptool.path}/esptool"
7-
tools.esptool.cmd.linux="{runtime.tools.esptool.path}/esptool.py"
8-
tools.esptool.cmd.windows="{runtime.tools.esptool.path}/esptool.exe"
6+
tools.esptool32.cmd="{runtime.tools.esptool32.path}/esptool"
7+
tools.esptool32.cmd.linux="{runtime.tools.esptool32.path}/esptool.py"
8+
tools.esptool32.cmd.windows="{runtime.tools.esptool32.path}/esptool.exe"
99

10-
tools.esptool.network_cmd=python "{runtime.platform.path}/tools/espota.py"
11-
tools.esptool.network_cmd.windows="{runtime.platform.path}/tools/espota.exe"
10+
tools.esptool32.network_cmd=python "{runtime.platform.path}/tools/espota.py"
11+
tools.esptool32.network_cmd.windows="{runtime.platform.path}/tools/espota.exe"
1212

1313
tools.gen_esp32part.cmd=python "{runtime.platform.path}/tools/gen_esp32part.py"
1414
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
7575
recipe.objcopy.eep.pattern={tools.gen_esp32part.cmd} -q "{runtime.platform.path}/tools/partitions/default.csv" "{build.path}/{build.project_name}.partitions.bin"
7676

7777
## Create hex
78-
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"
78+
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"
7979

8080
## Save hex
8181
recipe.output.tmp_file={build.project_name}.bin
@@ -88,8 +88,8 @@ recipe.size.regex.data=^(?:\.dram0\.data|\.dram0\.bss)\s+([0-9]+).*
8888

8989
# ------------------------------
9090

91-
tools.esptool.upload.protocol=esp32
92-
tools.esptool.upload.params.verbose=
93-
tools.esptool.upload.params.quiet=
94-
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"
95-
tools.esptool.upload.network_pattern={network_cmd} -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"
91+
tools.esptool32.upload.protocol=esp32
92+
tools.esptool32.upload.params.verbose=
93+
tools.esptool32.upload.params.quiet=
94+
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"
95+
tools.esptool32.upload.network_pattern={network_cmd} -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"

‎release note.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
# このノートはNefry(ESP32版)のリリースノートになります。
2+
## 0.7.1
3+
4+
コンパイル環境のesptoolがうまく動作しなかったため修正
5+
6+
バグフィックス
7+
8+
- コンパイラ環境の修正
9+
210
## 0.7.0
311

412
NefryのModule設定機能の追加

‎variants/feather_esp32/pins_arduino.h

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define EXTERNAL_NUM_INTERRUPTS 16
7+
#define NUM_DIGITAL_PINS 40
8+
#define NUM_ANALOG_INPUTS 16
9+
10+
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
11+
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
12+
#define digitalPinHasPWM(p) (p < 34)
13+
14+
static const uint8_t LED_BUILTIN = 13;
15+
#define BUILTIN_LED LED_BUILTIN // backward compatibility
16+
17+
static const uint8_t TX = 17;
18+
static const uint8_t RX = 16;
19+
20+
static const uint8_t SDA = 23;
21+
static const uint8_t SCL = 22;
22+
23+
static const uint8_t SS = 2;
24+
static const uint8_t MOSI = 18;
25+
static const uint8_t MISO = 19;
26+
static const uint8_t SCK = 5;
27+
28+
// mapping to match other feathers and also in order
29+
static const uint8_t A0 = 26;
30+
static const uint8_t A1 = 25;
31+
static const uint8_t A2 = 34;
32+
static const uint8_t A3 = 39;
33+
static const uint8_t A4 = 36;
34+
static const uint8_t A5 = 4;
35+
static const uint8_t A6 = 14;
36+
static const uint8_t A7 = 32;
37+
static const uint8_t A8 = 15;
38+
static const uint8_t A9 = 33;
39+
static const uint8_t A10 = 27;
40+
static const uint8_t A11 = 12;
41+
static const uint8_t A12 = 13;
42+
43+
// vbat measure
44+
static const uint8_t A13 = 35;
45+
//static const uint8_t Ax = 0; // not used/available
46+
//static const uint8_t Ax = 2; // not used/available
47+
48+
49+
static const uint8_t T0 = 4;
50+
static const uint8_t T1 = 0;
51+
static const uint8_t T2 = 2;
52+
static const uint8_t T3 = 15;
53+
static const uint8_t T4 = 13;
54+
static const uint8_t T5 = 12;
55+
static const uint8_t T6 = 14;
56+
static const uint8_t T7 = 27;
57+
static const uint8_t T8 = 33;
58+
static const uint8_t T9 = 32;
59+
60+
static const uint8_t DAC1 = 25;
61+
static const uint8_t DAC2 = 26;
62+
63+
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)