Skip to content

Commit a1c86ae

Browse files
GitshaoxiangGitshaoxiang
authored
update m5stack boards define (espressif#9086)
* update m5stack boards define * update pins define * add M5Dial Board * build.board modify uppercase
1 parent 9aae6f5 commit a1c86ae

File tree

23 files changed

+4641
-1349
lines changed

23 files changed

+4641
-1349
lines changed

‎boards.txt

Lines changed: 4115 additions & 1324 deletions
Large diffs are not rendered by default.

‎variants/m5stack_cores3/partitions_16MB_factory_4_apps.csv renamed to ‎tools/partitions/m5stack_partitions_16MB_factory_4_apps.csv

File renamed without changes.

‎variants/m5stack_cores3/partitions_16MB_factory_6_apps.csv renamed to ‎tools/partitions/m5stack_partitions_16MB_factory_6_apps.csv

File renamed without changes.

‎variants/m5stack_atom/pins_arduino.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
static const uint8_t TX = 1;
77
static const uint8_t RX = 3;
88

9-
static const uint8_t TXD2 = 32;
10-
static const uint8_t RXD2 = 26;
11-
129
static const uint8_t SDA = 26;
1310
static const uint8_t SCL = 32;
1411

12+
1513
static const uint8_t G12 = 12;
1614
static const uint8_t G19 = 19;
1715
static const uint8_t G21 = 21;

‎variants/m5stack_atoms3/pins_arduino.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
#define USB_VID 0x303a
88
#define USB_PID 0x1001
99

10-
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 35;
11-
#define BUILTIN_LED LED_BUILTIN // backward compatibility
12-
#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN
10+
// Some boards have too low voltage on this pin (board design bug)
11+
// Use different pin with 3V and connect with 48
12+
// and change this setup for the chosen pin (for example 38)
13+
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 48;
14+
#define BUILTIN_LED LED_BUILTIN // backward compatibility
15+
#define LED_BUILTIN LED_BUILTIN
1316
#define RGB_BUILTIN LED_BUILTIN
1417
#define RGB_BRIGHTNESS 64
1518

‎variants/m5stack_capsule/pins_arduino.h

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
#include "soc/soc_caps.h"
6+
7+
#define USB_VID 0x303a
8+
#define USB_PID 0x1001
9+
10+
static const uint8_t TX = 43;
11+
static const uint8_t RX = 44;
12+
13+
static const uint8_t TXD2 = 1;
14+
static const uint8_t RXD2 = 2;
15+
16+
static const uint8_t SDA = 13;
17+
static const uint8_t SCL = 15;
18+
19+
static const uint8_t SS = 11;
20+
static const uint8_t MOSI = 12;
21+
static const uint8_t MISO = 39;
22+
static const uint8_t SCK = 14;
23+
24+
static const uint8_t G0 = 0;
25+
static const uint8_t G1 = 1;
26+
static const uint8_t G2 = 2;
27+
static const uint8_t G3 = 3;
28+
static const uint8_t G4 = 4;
29+
static const uint8_t G5 = 5;
30+
static const uint8_t G6 = 6;
31+
static const uint8_t G7 = 7;
32+
static const uint8_t G8 = 8;
33+
static const uint8_t G9 = 9;
34+
static const uint8_t G10 = 10;
35+
static const uint8_t G11 = 11;
36+
static const uint8_t G12 = 12;
37+
static const uint8_t G13 = 13;
38+
static const uint8_t G14 = 14;
39+
static const uint8_t G15 = 15;
40+
static const uint8_t G39 = 39;
41+
static const uint8_t G40 = 40;
42+
static const uint8_t G41 = 41;
43+
static const uint8_t G42 = 42;
44+
static const uint8_t G43 = 43;
45+
static const uint8_t G44 = 44;
46+
static const uint8_t G46 = 46;
47+
48+
static const uint8_t ADC1 = 7;
49+
static const uint8_t ADC2 = 8;
50+
51+
#endif /* Pins_Arduino_h */

‎variants/m5stack_cardputer/pins_arduino.h

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
#include "soc/soc_caps.h"
6+
7+
#define USB_VID 0x303a
8+
#define USB_PID 0x1001
9+
10+
static const uint8_t TX = 43;
11+
static const uint8_t RX = 44;
12+
13+
static const uint8_t TXD2 = 1;
14+
static const uint8_t RXD2 = 2;
15+
16+
static const uint8_t SDA = 13;
17+
static const uint8_t SCL = 15;
18+
19+
static const uint8_t SS = 12;
20+
static const uint8_t MOSI = 14;
21+
static const uint8_t MISO = 39;
22+
static const uint8_t SCK = 40;
23+
24+
static const uint8_t G0 = 0;
25+
static const uint8_t G1 = 1;
26+
static const uint8_t G2 = 2;
27+
static const uint8_t G3 = 3;
28+
static const uint8_t G4 = 4;
29+
static const uint8_t G5 = 5;
30+
static const uint8_t G6 = 6;
31+
static const uint8_t G7 = 7;
32+
static const uint8_t G8 = 8;
33+
static const uint8_t G9 = 9;
34+
static const uint8_t G10 = 10;
35+
static const uint8_t G11 = 11;
36+
static const uint8_t G12 = 12;
37+
static const uint8_t G13 = 13;
38+
static const uint8_t G14 = 14;
39+
static const uint8_t G15 = 15;
40+
static const uint8_t G39 = 39;
41+
static const uint8_t G40 = 40;
42+
static const uint8_t G41 = 41;
43+
static const uint8_t G42 = 42;
44+
static const uint8_t G43 = 43;
45+
static const uint8_t G44 = 44;
46+
static const uint8_t G46 = 46;
47+
48+
static const uint8_t ADC1 = 7;
49+
static const uint8_t ADC2 = 8;
50+
51+
52+
53+
#endif /* Pins_Arduino_h */

‎variants/m5stack_core_esp32/pins_arduino.h renamed to ‎variants/m5stack_core/pins_arduino.h

File renamed without changes.

‎variants/m5stack_cores3/pins_arduino.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,19 @@
22
#define Pins_Arduino_h
33

44
#include <stdint.h>
5+
#include "soc/soc_caps.h"
56

67
#define USB_VID 0x303a
78
#define USB_PID 0x1001
89

9-
// CoreS3 has no builtin LED / NeoLED
10+
// Some boards have too low voltage on this pin (board design bug)
11+
// Use different pin with 3V and connect with 48
12+
// and change this setup for the chosen pin (for example 38)
13+
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + 48;
14+
#define BUILTIN_LED LED_BUILTIN // backward compatibility
15+
#define LED_BUILTIN LED_BUILTIN
16+
#define RGB_BUILTIN LED_BUILTIN
17+
#define RGB_BRIGHTNESS 64
1018

1119
static const uint8_t TX = 43;
1220
static const uint8_t RX = 44;

‎variants/m5stack_dial/pins_arduino.h

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
#include "soc/soc_caps.h"
6+
7+
#define USB_VID 0x303a
8+
#define USB_PID 0x1001
9+
10+
static const uint8_t TX = 43;
11+
static const uint8_t RX = 44;
12+
13+
static const uint8_t TXD2 = 1;
14+
static const uint8_t RXD2 = 2;
15+
16+
static const uint8_t SDA = 13;
17+
static const uint8_t SCL = 15;
18+
19+
static const uint8_t SS = 12;
20+
static const uint8_t MOSI = 14;
21+
static const uint8_t MISO = 39;
22+
static const uint8_t SCK = 40;
23+
24+
static const uint8_t G0 = 0;
25+
static const uint8_t G1 = 1;
26+
static const uint8_t G2 = 2;
27+
static const uint8_t G3 = 3;
28+
static const uint8_t G4 = 4;
29+
static const uint8_t G5 = 5;
30+
static const uint8_t G6 = 6;
31+
static const uint8_t G7 = 7;
32+
static const uint8_t G8 = 8;
33+
static const uint8_t G9 = 9;
34+
static const uint8_t G10 = 10;
35+
static const uint8_t G11 = 11;
36+
static const uint8_t G12 = 12;
37+
static const uint8_t G13 = 13;
38+
static const uint8_t G14 = 14;
39+
static const uint8_t G15 = 15;
40+
static const uint8_t G39 = 39;
41+
static const uint8_t G40 = 40;
42+
static const uint8_t G41 = 41;
43+
static const uint8_t G42 = 42;
44+
static const uint8_t G43 = 43;
45+
static const uint8_t G44 = 44;
46+
static const uint8_t G46 = 46;
47+
48+
static const uint8_t ADC1 = 7;
49+
static const uint8_t ADC2 = 8;
50+
51+
52+
53+
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)