Skip to content

Commit 8152d91

Browse files
SuGliderSuGlider
authored
Merge branch 'master' into rgbWrite_change
2 parents 835a3f9 + 0539ebf commit 8152d91

File tree

12 files changed

+1304
-2
lines changed

12 files changed

+1304
-2
lines changed

‎boards.txt

+882
Large diffs are not rendered by default.

‎cores/esp32/Esp.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -262,13 +262,13 @@ const char *EspClass::getChipModel(void) {
262262
uint32_t pkg_ver = chip_ver & 0x7;
263263
switch (pkg_ver) {
264264
case EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ6:
265-
if (getChipRevision() == 3) {
265+
if ((getChipRevision() / 100) == 3) {
266266
return "ESP32-D0WDQ6-V3";
267267
} else {
268268
return "ESP32-D0WDQ6";
269269
}
270270
case EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ5:
271-
if (getChipRevision() == 3) {
271+
if ((getChipRevision() / 100) == 3) {
272272
return "ESP32-D0WD-V3";
273273
} else {
274274
return "ESP32-D0WD";

‎tools/partitions/max_app_4MB.csv

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Name, Type, SubType, Offset, Size, Flags
2+
nvs, data, nvs, 0x9000, 0x5000,
3+
otadata, data, ota, 0xe000, 0x2000,
4+
app0, app, factory, 0x10000, 0x3E0000,
5+
coredump, data, coredump,0x3F0000,0x10000,

‎tools/partitions/ota_nofs_4MB.csv

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Name, Type, SubType, Offset, Size, Flags
2+
nvs, data, nvs, 0x9000, 0x5000,
3+
otadata, data, ota, 0xE000, 0x2000,
4+
app0, app, ota_0, 0x10000, 0x1F0000,
5+
app1, app, ota_1, 0x200000, 0x1F0000,
6+
coredump, data, coredump, 0x3F0000, 0x10000,

‎variants/heltec_vision_master_e290/pins_arduino.h

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define Vision_Master_E290 true
7+
#define DISPLAY_HEIGHT 128
8+
#define DISPLAY_WIDTH 296
9+
10+
#define USB_VID 0x303a
11+
#define USB_PID 0x1001
12+
13+
static const uint8_t TX = 43;
14+
static const uint8_t RX = 44;
15+
16+
static const uint8_t SDA = 39;
17+
static const uint8_t SCL = 38;
18+
19+
static const uint8_t SS = 8;
20+
static const uint8_t MOSI = 10;
21+
static const uint8_t MISO = 11;
22+
static const uint8_t SCK = 9;
23+
24+
static const uint8_t A0 = 1;
25+
static const uint8_t A1 = 2;
26+
static const uint8_t A2 = 3;
27+
static const uint8_t A3 = 4;
28+
static const uint8_t A4 = 5;
29+
static const uint8_t A5 = 6;
30+
static const uint8_t A6 = 7;
31+
static const uint8_t A7 = 8;
32+
static const uint8_t A8 = 9;
33+
static const uint8_t A9 = 10;
34+
static const uint8_t A10 = 11;
35+
static const uint8_t A11 = 12;
36+
static const uint8_t A12 = 13;
37+
static const uint8_t A13 = 14;
38+
static const uint8_t A14 = 15;
39+
static const uint8_t A15 = 16;
40+
static const uint8_t A16 = 17;
41+
static const uint8_t A17 = 18;
42+
static const uint8_t A18 = 19;
43+
static const uint8_t A19 = 20;
44+
45+
static const uint8_t T1 = 1;
46+
static const uint8_t T2 = 2;
47+
static const uint8_t T3 = 3;
48+
static const uint8_t T4 = 4;
49+
static const uint8_t T5 = 5;
50+
static const uint8_t T6 = 6;
51+
static const uint8_t T7 = 7;
52+
static const uint8_t T8 = 8;
53+
static const uint8_t T9 = 9;
54+
static const uint8_t T10 = 10;
55+
static const uint8_t T11 = 11;
56+
static const uint8_t T12 = 12;
57+
static const uint8_t T13 = 13;
58+
static const uint8_t T14 = 14;
59+
60+
static const uint8_t Vext = 18;
61+
static const uint8_t Eink_SDI = 1;
62+
static const uint8_t Eink_CLK = 2;
63+
static const uint8_t Eink_CS = 3;
64+
static const uint8_t Eink_DC = 4;
65+
static const uint8_t Eink_RST = 5;
66+
static const uint8_t Eink_BUSY = 6;
67+
68+
static const uint8_t RST_LoRa = 12;
69+
static const uint8_t BUSY_LoRa = 13;
70+
static const uint8_t DIO0 = 14;
71+
72+
#endif /* Pins_Arduino_h */

‎variants/heltec_vision_master_e_213/pins_arduino.h

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define Vision_Master_E213 true
7+
#define DISPLAY_HEIGHT 122
8+
#define DISPLAY_WIDTH 250
9+
10+
#define USB_VID 0x303a
11+
#define USB_PID 0x1001
12+
13+
static const uint8_t TX = 43;
14+
static const uint8_t RX = 44;
15+
16+
static const uint8_t SDA = 39;
17+
static const uint8_t SCL = 38;
18+
19+
static const uint8_t SS = 8;
20+
static const uint8_t MOSI = 10;
21+
static const uint8_t MISO = 11;
22+
static const uint8_t SCK = 9;
23+
24+
static const uint8_t A0 = 1;
25+
static const uint8_t A1 = 2;
26+
static const uint8_t A2 = 3;
27+
static const uint8_t A3 = 4;
28+
static const uint8_t A4 = 5;
29+
static const uint8_t A5 = 6;
30+
static const uint8_t A6 = 7;
31+
static const uint8_t A7 = 8;
32+
static const uint8_t A8 = 9;
33+
static const uint8_t A9 = 10;
34+
static const uint8_t A10 = 11;
35+
static const uint8_t A11 = 12;
36+
static const uint8_t A12 = 13;
37+
static const uint8_t A13 = 14;
38+
static const uint8_t A14 = 15;
39+
static const uint8_t A15 = 16;
40+
static const uint8_t A16 = 17;
41+
static const uint8_t A17 = 18;
42+
static const uint8_t A18 = 19;
43+
static const uint8_t A19 = 20;
44+
45+
static const uint8_t T1 = 1;
46+
static const uint8_t T2 = 2;
47+
static const uint8_t T3 = 3;
48+
static const uint8_t T4 = 4;
49+
static const uint8_t T5 = 5;
50+
static const uint8_t T6 = 6;
51+
static const uint8_t T7 = 7;
52+
static const uint8_t T8 = 8;
53+
static const uint8_t T9 = 9;
54+
static const uint8_t T10 = 10;
55+
static const uint8_t T11 = 11;
56+
static const uint8_t T12 = 12;
57+
static const uint8_t T13 = 13;
58+
static const uint8_t T14 = 14;
59+
60+
static const uint8_t Vext = 18;
61+
static const uint8_t Eink_BUSY = 1;
62+
static const uint8_t Eink_DC = 2;
63+
static const uint8_t Eink_RST = 3;
64+
static const uint8_t Eink_CLK = 4;
65+
static const uint8_t Eink_CS = 5;
66+
static const uint8_t Eink_SDI = 6;
67+
68+
static const uint8_t RST_LoRa = 12;
69+
static const uint8_t BUSY_LoRa = 13;
70+
static const uint8_t DIO0 = 14;
71+
72+
#endif /* Pins_Arduino_h */

‎variants/heltec_vision_master_t190/pins_arduino.h

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define Vision_Master_T190 true
7+
#define DISPLAY_HEIGHT 170
8+
#define DISPLAY_WIDTH 320
9+
10+
#define USB_VID 0x303a
11+
#define USB_PID 0x1001
12+
13+
static const uint8_t TX = 43;
14+
static const uint8_t RX = 44;
15+
16+
static const uint8_t SDA = 2;
17+
static const uint8_t SCL = 1;
18+
19+
static const uint8_t SS = 8;
20+
static const uint8_t MOSI = 10;
21+
static const uint8_t MISO = 11;
22+
static const uint8_t SCK = 9;
23+
24+
static const uint8_t A0 = 1;
25+
static const uint8_t A1 = 2;
26+
static const uint8_t A2 = 3;
27+
static const uint8_t A3 = 4;
28+
static const uint8_t A4 = 5;
29+
static const uint8_t A5 = 6;
30+
static const uint8_t A6 = 7;
31+
static const uint8_t A7 = 8;
32+
static const uint8_t A8 = 9;
33+
static const uint8_t A9 = 10;
34+
static const uint8_t A10 = 11;
35+
static const uint8_t A11 = 12;
36+
static const uint8_t A12 = 13;
37+
static const uint8_t A13 = 14;
38+
static const uint8_t A14 = 15;
39+
static const uint8_t A15 = 16;
40+
static const uint8_t A16 = 17;
41+
static const uint8_t A17 = 18;
42+
static const uint8_t A18 = 19;
43+
static const uint8_t A19 = 20;
44+
45+
static const uint8_t T1 = 1;
46+
static const uint8_t T2 = 2;
47+
static const uint8_t T3 = 3;
48+
static const uint8_t T4 = 4;
49+
static const uint8_t T5 = 5;
50+
static const uint8_t T6 = 6;
51+
static const uint8_t T7 = 7;
52+
static const uint8_t T8 = 8;
53+
static const uint8_t T9 = 9;
54+
static const uint8_t T10 = 10;
55+
static const uint8_t T11 = 11;
56+
static const uint8_t T12 = 12;
57+
static const uint8_t T13 = 13;
58+
static const uint8_t T14 = 14;
59+
60+
static const uint8_t Vext = 5;
61+
static const uint8_t TFT_SCL = 38;
62+
static const uint8_t TFT_CS = 39;
63+
static const uint8_t TFT_RST = 40;
64+
static const uint8_t TFT_RS = 47;
65+
static const uint8_t TFT_SDA = 48;
66+
67+
static const uint8_t RST_LoRa = 12;
68+
static const uint8_t BUSY_LoRa = 13;
69+
static const uint8_t DIO0 = 14;
70+
71+
#endif /* Pins_Arduino_h */

‎variants/jczn_2432s028r/partitions_all_app_4MB.csv

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Name, Type, SubType, Offset, Size, Flags
2+
nvs, data, nvs, 0x9000, 0x5000,
3+
factory, app, factory, 0x10000, 0x3F0000,

‎variants/jczn_2432s028r/partitions_otanofs_4MB.csv

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Name, Type, SubType, Offset, Size, Flags
2+
nvs, data, nvs, 0x9000, 0x5000,
3+
otadata, data, ota, 0xE000, 0x2000,
4+
app0, app, ota_0, 0x10000, 0x1F0000,
5+
app1, app, ota_1, 0x200000, 0x1F0000,
6+
coredump, data, coredump, 0x3F0000, 0x10000,

‎variants/jczn_2432s028r/pins_arduino.h

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
2+
#ifndef Pins_Arduino_h
3+
#define Pins_Arduino_h
4+
5+
#include <stdint.h>
6+
#include "soc/soc_caps.h"
7+
8+
static const uint8_t TX = 1;
9+
static const uint8_t RX = 3;
10+
11+
static const uint8_t D35 = 35;
12+
static const uint8_t D22 = 22;
13+
static const uint8_t D27 = 27;
14+
static const uint8_t D21 = 21;
15+
16+
static const uint8_t A6 = 34;
17+
static const uint8_t A17 = 27;
18+
19+
static const uint8_t T7 = 27;
20+
21+
static const uint8_t SDA = 21;
22+
static const uint8_t SCL = 22;
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+
#define CYD_TP_IRQ 36
30+
#define CYD_TP_MOSI 32
31+
#define CYD_TP_MISO 39
32+
#define CYD_TP_CLK 25
33+
#define CYD_TP_CS 33
34+
#define CYD_TP_DIN CYD_TP_MOSI
35+
#define CYD_TP_OUT CYD_TP_MOSI
36+
#define CYD_TP_SPI_BUS VSPI
37+
38+
#define CYD_TFT_DC 2
39+
#define CYD_TFT_MISO 12
40+
#define CYD_TFT_MOSI 13
41+
#define CYD_TFT_SCK 14
42+
#define CYD_TFT_CS 15
43+
#define CYD_TFT_RS CYD_TFT_DC
44+
#define CYD_TFT_SDO CYD_TFT_MISO
45+
#define CYD_TFT_SDI CYD_TFT_MOSI
46+
#define CYD_TFT_SPI_BUS HSPI
47+
48+
#define CYD_TFT_WIDTH 320
49+
#define CYD_TFT_HEIGHT 240
50+
#define CYD_SCREEN_WIDTH CYD_TFT_WIDTH
51+
#define CYD_SCREEN_HEIGHT CYD_TFT_HEIGHT
52+
53+
#define CYD_TFT_BL 21
54+
#define CYD_TFT_BL_ENABLE() ((pinMode(CYD_TFT_BL, OUTPUT)))
55+
#define CYD_TFT_BL_OFF() (digitalWrite(CYD_TFT_BL, 0))
56+
#define CYD_TFT_BL_ON() (digitalWrite(CYD_TFT_BL, 1))
57+
58+
#define CYD_LED_RED 4
59+
#define CYD_LED_GREEN 16
60+
#define CYD_LED_BLUE 17
61+
62+
#define CYD_AUDIO_OUT 26
63+
64+
#define CYD_USER_BUTTON 0
65+
66+
#define CYD_SD_SS 5
67+
#define CYD_SD_MOSI 23
68+
#define CYD_SD_MISO 19
69+
#define CYD_SD_SCK 18
70+
#define CYD_SD_SPI_BUS VSPI
71+
72+
#define CYD_LDR 34
73+
74+
#define CYD_LED_RED_OFF() (digitalWrite(CYD_LED_RED, 1))
75+
#define CYD_LED_RED_ON() (digitalWrite(CYD_LED_RED, 0))
76+
#define CYD_LED_GREEN_OFF() (digitalWrite(CYD_LED_GREEN, 1))
77+
#define CYD_LED_GREEN_ON() (digitalWrite(CYD_LED_GREEN, 0))
78+
#define CYD_LED_BLUE_OFF() (digitalWrite(CYD_LED_BLUE, 1))
79+
#define CYD_LED_BLUE_ON() (digitalWrite(CYD_LED_BLUE, 0))
80+
#define CYD_LED_RGB_OFF() \
81+
CYD_LED_RED_OFF(); \
82+
CYD_LED_GREEN_OFF(); \
83+
CYD_LED_BLUE_OFF()
84+
#define CYD_LED_RGB_ON() \
85+
CYD_LED_RED_ON(); \
86+
CYD_LED_GREEN_ON(); \
87+
CYD_LED_BLUE_ON()
88+
#define CYD_LED_WHITE_OFF() CYD_LED_RGB_OFF()
89+
#define CYD_LED_WHITE_ON() CYD_LED_RGB_ON()
90+
91+
#endif /* Pins_Arduino_h */

‎variants/jczn_2432s028r/variant.cpp

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
#include "esp32-hal-gpio.h"
3+
#include "pins_arduino.h"
4+
5+
extern "C" {
6+
// Initialize variant/board, called before setup()
7+
void initVariant(void) {
8+
pinMode(CYD_LED_RED, OUTPUT);
9+
pinMode(CYD_LED_GREEN, OUTPUT);
10+
pinMode(CYD_LED_BLUE, OUTPUT);
11+
CYD_LED_RGB_OFF();
12+
}
13+
}

0 commit comments

Comments
 (0)