Skip to content

Commit c152e4e

Browse files
author
wamisnet
committed
Merge remote-tracking branch 'ESP32/master' into develop
# Conflicts: # boards.txt
2 parents 0ccc527 + 0768590 commit c152e4e

File tree

2 files changed

+92
-6
lines changed

2 files changed

+92
-6
lines changed

‎platform.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ version=0.7.2
33

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

6-
tools.esptool.path={runtime.platform.path}/tools/esptool
7-
tools.esptool.cmd="{tools.esptool.path}"
8-
tools.esptool.cmd.linux=python "{tools.esptool.path}.py"
9-
tools.esptool.cmd.windows="{tools.esptool.path}.exe"
6+
tools.esptool.path={runtime.platform.path}/tools
7+
tools.esptool.cmd=esptool
8+
tools.esptool.cmd.linux=esptool.py
9+
tools.esptool.cmd.windows=esptool.exe
1010

1111
tools.esptool.network_cmd=python "{runtime.platform.path}/tools/espota.py"
1212
tools.esptool.network_cmd.windows="{runtime.platform.path}/tools/espota.exe"
@@ -79,7 +79,8 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.f
7979
recipe.objcopy.eep.pattern={tools.gen_esp32part.cmd} -q "{runtime.platform.path}/tools/partitions/{build.partitions}.csv" "{build.path}/{build.project_name}.partitions.bin"
8080

8181
## Create hex
82-
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"
82+
recipe.objcopy.hex.pattern="{tools.esptool.path}/{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"
83+
recipe.objcopy.hex.pattern.linux=python "{tools.esptool.path}/{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"
8384

8485
## Save hex
8586
recipe.output.tmp_file={build.project_name}.bin
@@ -95,5 +96,6 @@ recipe.size.regex.data=^(?:\.dram0\.data|\.dram0\.bss)\s+([0-9]+).*
9596
tools.esptool.upload.protocol=esp32
9697
tools.esptool.upload.params.verbose=
9798
tools.esptool.upload.params.quiet=
98-
tools.esptool.upload.pattern={cmd} --chip esp32 --port "{serial.port}" --baud {upload.speed} --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x1000 "{runtime.platform.path}/tools/sdk/bin/{build.boot}.bin" 0x10000 "{build.path}/{build.project_name}.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin"
99+
tools.esptool.upload.pattern="{path}/{cmd}" --chip esp32 --port "{serial.port}" --baud {upload.speed} --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x1000 "{runtime.platform.path}/tools/sdk/bin/{build.boot}.bin" 0x10000 "{build.path}/{build.project_name}.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin"
100+
tools.esptool.upload.pattern.linux=python "{path}/{cmd}" --chip esp32 --port "{serial.port}" --baud {upload.speed} --before default_reset --after hard_reset write_flash -z --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size detect 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x1000 "{runtime.platform.path}/tools/sdk/bin/{build.boot}.bin" 0x10000 "{build.path}/{build.project_name}.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin"
99101
tools.esptool.upload.network_pattern={network_cmd} -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"

‎variants/nina_w10/pins_arduino.h

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#define EXTERNAL_NUM_INTERRUPTS 16
5+
#define NUM_DIGITAL_PINS 40
6+
#define NUM_ANALOG_INPUTS 16
7+
8+
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
9+
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
10+
#define digitalPinHasPWM(p) (p < 34)
11+
12+
static const uint8_t LED_GREEN = 33;
13+
static const uint8_t LED_RED = 23;
14+
static const uint8_t LED_BLUE = 21;
15+
static const uint8_t SW1 = 33;
16+
static const uint8_t SW2 = 27;
17+
18+
static const uint8_t TX = 1;
19+
static const uint8_t RX = 3;
20+
21+
static const uint8_t SDA = 12;
22+
static const uint8_t SCL = 13;
23+
24+
static const uint8_t SS = 5;
25+
static const uint8_t MOSI = 23;
26+
static const uint8_t MISO = 19;
27+
static const uint8_t SCK = 18;
28+
29+
static const uint8_t A0 = 36;
30+
static const uint8_t A3 = 39;
31+
static const uint8_t A4 = 32;
32+
static const uint8_t A5 = 33;
33+
static const uint8_t A6 = 34;
34+
static const uint8_t A7 = 35;
35+
static const uint8_t A10 = 4;
36+
static const uint8_t A11 = 0;
37+
static const uint8_t A12 = 2;
38+
static const uint8_t A13 = 15;
39+
static const uint8_t A14 = 13;
40+
static const uint8_t A15 = 12;
41+
static const uint8_t A16 = 14;
42+
static const uint8_t A17 = 27;
43+
static const uint8_t A18 = 25;
44+
static const uint8_t A19 = 26;
45+
46+
static const uint8_t D0 = 3;
47+
static const uint8_t D1 = 1;
48+
static const uint8_t D2 = 26;
49+
static const uint8_t D3 = 25;
50+
static const uint8_t D4 = 35;
51+
static const uint8_t D5 = 27;
52+
static const uint8_t D6 = 22;
53+
static const uint8_t D7 = 0;
54+
static const uint8_t D8 = 15;
55+
static const uint8_t D9 = 14;
56+
static const uint8_t D10 = 5;
57+
static const uint8_t D11 = 19;
58+
static const uint8_t D12 = 23;
59+
static const uint8_t D13 = 18;
60+
static const uint8_t D14 = 13;
61+
static const uint8_t D15 = 12;
62+
63+
static const uint8_t D16 = 32;
64+
static const uint8_t D17 = 33;
65+
static const uint8_t D18 = 21;
66+
static const uint8_t D19 = 34;
67+
static const uint8_t D20 = 36;
68+
static const uint8_t D21 = 39;
69+
70+
static const uint8_t T0 = 4;
71+
static const uint8_t T1 = 0;
72+
static const uint8_t T2 = 2;
73+
static const uint8_t T3 = 15;
74+
static const uint8_t T4 = 13;
75+
static const uint8_t T5 = 12;
76+
static const uint8_t T6 = 14;
77+
static const uint8_t T7 = 27;
78+
static const uint8_t T8 = 33;
79+
static const uint8_t T9 = 32;
80+
81+
static const uint8_t DAC1 = 25;
82+
static const uint8_t DAC2 = 26;
83+
84+
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)