Skip to content

Commit 59ca4e2

Browse files
me-no-devme-no-dev
authored
Merge branch 'master' into release/v3.1.x
2 parents edb4ee1 + 064d1c4 commit 59ca4e2

File tree

13 files changed

+2863
-9
lines changed

13 files changed

+2863
-9
lines changed

‎boards.txt‎

Lines changed: 1972 additions & 0 deletions
Large diffs are not rendered by default.

‎libraries/ESP32/examples/AnalogOut/LEDCFade/LEDCFade.ino‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#define LEDC_FADE_TIME (3000)
2222

2323
bool fade_ended = false; // status of LED fade
24-
bool fade_on = true;
24+
bool fade_in = true;
2525

2626
void ARDUINO_ISR_ATTR LED_FADE_ISR() {
2727
fade_ended = true;
@@ -55,15 +55,15 @@ void loop() {
5555
Serial.println("LED fade ended");
5656
fade_ended = false;
5757

58-
// Check if last fade was fade on
59-
if (fade_on) {
58+
// Check what fade should be started next
59+
if (fade_in) {
6060
ledcFadeWithInterrupt(LED_PIN, LEDC_START_DUTY, LEDC_TARGET_DUTY, LEDC_FADE_TIME, LED_FADE_ISR);
61-
Serial.println("LED Fade off started.");
62-
fade_on = false;
61+
Serial.println("LED Fade in started.");
62+
fade_in = false;
6363
} else {
6464
ledcFadeWithInterrupt(LED_PIN, LEDC_TARGET_DUTY, LEDC_START_DUTY, LEDC_FADE_TIME, LED_FADE_ISR);
65-
Serial.println("LED Fade on started.");
66-
fade_on = true;
65+
Serial.println("LED Fade out started.");
66+
fade_in = true;
6767
}
6868
}
6969
}

‎platform.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ recipe.hooks.core.prebuild.1.pattern.windows=cmd /c echo "-DARDUINO_CORE_BUILD"
142142
recipe.hooks.core.postbuild.1.pattern.windows=cmd /c type nul > "{file_opts.path}"
143143

144144
# Copy sdkconfig to build folder
145-
recipe.hooks.prebuild.8.pattern=/usr/bin/env bash -c "cp -f "{runtime.platform.path}"/tools/esp32-arduino-libs/{build.mcu}/sdkconfig "{build.path}"/sdkconfig"
146-
recipe.hooks.prebuild.8.pattern.windows=cmd /c COPY /y "{runtime.platform.path}\tools\esp32-arduino-libs\{build.mcu}\sdkconfig" "{build.path}\sdkconfig"
145+
recipe.hooks.prebuild.8.pattern=/usr/bin/env bash -c "cp -f "{compiler.sdk.path}"/sdkconfig "{build.path}"/sdkconfig"
146+
recipe.hooks.prebuild.8.pattern.windows=cmd /c COPY /y "{compiler.sdk.path}\sdkconfig" "{build.path}\sdkconfig"
147147

148148
## Compile c files
149149
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.extra_flags} {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" -DARDUINO_VARIANT="{build.variant}" -DARDUINO_PARTITION_{build.partitions} {build.extra_flags} {compiler.cpreprocessor.flags} {includes} "@{build.opt.path}" "@{file_opts.path}" "{source_file}" -o "{object_file}"

‎variants/atd35s3/pins_arduino.h‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define USB_VID 0x303a
7+
#define USB_PID 0x1001
8+
9+
static const uint8_t TX = 43;
10+
static const uint8_t RX = 44;
11+
12+
static const uint8_t SDA = 8;
13+
static const uint8_t SCL = 9;
14+
15+
static const uint8_t SS = 10;
16+
static const uint8_t MOSI = 11;
17+
static const uint8_t MISO = 13;
18+
static const uint8_t SCK = 12;
19+
20+
// LCD pin
21+
#define LCD_CS SS
22+
#define LCD_SCK SCK
23+
#define LCD_SDA MOSI
24+
static const uint8_t LCD_DC = 21;
25+
static const uint8_t LCD_RES = 14;
26+
static const uint8_t LCD_BL = 3;
27+
28+
// MicroSD Card pin
29+
static const uint8_t SD_CS = 18;
30+
static const uint8_t SD_CD = 17;
31+
32+
static const uint8_t BTN_A = 4;
33+
#define KEY_BUILTIN BTN_A
34+
35+
static const uint8_t LED_BUILTIN = 5;
36+
37+
// DAC pin
38+
static const uint8_t DAC_DIN = 47;
39+
static const uint8_t DAC_BCLK = 48;
40+
static const uint8_t DAC_WS = 45;
41+
42+
static const uint8_t A0 = 1;
43+
static const uint8_t A1 = 2;
44+
static const uint8_t A2 = 3;
45+
static const uint8_t A3 = 4;
46+
static const uint8_t A4 = 5;
47+
static const uint8_t A5 = 6;
48+
static const uint8_t A6 = 7;
49+
static const uint8_t A7 = 8;
50+
static const uint8_t A8 = 9;
51+
static const uint8_t A9 = 10;
52+
static const uint8_t A10 = 11;
53+
static const uint8_t A11 = 12;
54+
static const uint8_t A12 = 13;
55+
static const uint8_t A13 = 14;
56+
static const uint8_t A14 = 15;
57+
static const uint8_t A15 = 16;
58+
static const uint8_t A16 = 17;
59+
static const uint8_t A17 = 18;
60+
static const uint8_t A18 = 19;
61+
static const uint8_t A19 = 20;
62+
63+
static const uint8_t T1 = 1;
64+
static const uint8_t T2 = 2;
65+
static const uint8_t T3 = 3;
66+
static const uint8_t T4 = 4;
67+
static const uint8_t T5 = 5;
68+
static const uint8_t T6 = 6;
69+
static const uint8_t T7 = 7;
70+
static const uint8_t T8 = 8;
71+
static const uint8_t T9 = 9;
72+
static const uint8_t T10 = 10;
73+
static const uint8_t T11 = 11;
74+
static const uint8_t T12 = 12;
75+
static const uint8_t T13 = 13;
76+
static const uint8_t T14 = 14;
77+
78+
#endif /* Pins_Arduino_h */

‎variants/cezerio_dev_esp32c6/pins_arduino.h‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
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+
#define USB_MANUFACTURER "RFtek Electronics"
10+
#define USB_PRODUCT "cezerio dev ESP32C6"
11+
#define USB_SERIAL ""
12+
13+
#define PIN_RGB_LED 3
14+
// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
15+
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
16+
#define BUILTIN_LED LED_BUILTIN // backward compatibility
17+
#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN
18+
// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
19+
#define RGB_BUILTIN LED_BUILTIN
20+
#define RGBLED LED_BUILTIN
21+
#define RGB_BRIGHTNESS 64
22+
23+
static const uint8_t BUT_BUILTIN = 9;
24+
#define BUILTIN_BUT BUT_BUILTIN // backward compatibility
25+
#define BUT_BUILTIN BUT_BUILTIN // allow testing #ifdef BUT_BUILTIN
26+
#define BOOT BUT_BUILTIN
27+
28+
static const uint8_t TX = 16;
29+
static const uint8_t RX = 17;
30+
31+
static const uint8_t SDA = 8;
32+
static const uint8_t SCL = 7;
33+
34+
static const uint8_t SS = 14;
35+
static const uint8_t MOSI = 22;
36+
static const uint8_t MISO = 23;
37+
static const uint8_t SCK = 21;
38+
39+
static const uint8_t A0 = 0;
40+
static const uint8_t A1 = 1;
41+
static const uint8_t A2 = 2;
42+
static const uint8_t A3 = 3;
43+
static const uint8_t A4 = 4;
44+
static const uint8_t A5 = 5;
45+
static const uint8_t A6 = 6;
46+
47+
static const uint8_t MATRIX = 18;
48+
49+
static const uint8_t IMUSD = 8;
50+
static const uint8_t IMUSC = 7;
51+
52+
#endif /* Pins_Arduino_h */

‎variants/ioxesp32c6/pins_arduino.h‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
#include "soc/soc_caps.h"
6+
7+
#define PIN_RGB_LED 8
8+
// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
9+
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
10+
#define BUILTIN_LED LED_BUILTIN // backward compatibility
11+
#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN
12+
// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
13+
#define RGB_BUILTIN LED_BUILTIN
14+
#define RGB_BRIGHTNESS 64
15+
16+
static const uint8_t TX = 16;
17+
static const uint8_t RX = 17;
18+
19+
static const uint8_t SDA = 21;
20+
static const uint8_t SCL = 22;
21+
22+
static const uint8_t SS = 18;
23+
static const uint8_t MOSI = 23;
24+
static const uint8_t MISO = 20;
25+
static const uint8_t SCK = 19;
26+
27+
static const uint8_t A0 = 0;
28+
static const uint8_t A1 = 1;
29+
static const uint8_t A2 = 2;
30+
static const uint8_t A3 = 3;
31+
static const uint8_t A4 = 4;
32+
static const uint8_t A5 = 5;
33+
static const uint8_t A6 = 6;
34+
35+
#endif /* Pins_Arduino_h */

‎variants/waveshare_esp32_s3_touch_lcd_185/pins_arduino.h‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
#include "soc/soc_caps.h"
6+
7+
// BN: ESP32 Family Device
8+
#define USB_VID 0x303a
9+
#define USB_PID 0x8290
10+
11+
#define USB_MANUFACTURER "Waveshare"
12+
#define USB_PRODUCT "ESP32-S3-Touch-LCD-1.85"
13+
#define USB_SERIAL ""
14+
15+
// I2C pins
16+
static const uint8_t SCL = 10;
17+
static const uint8_t SDA = 11;
18+
19+
static const uint8_t TX = 43;
20+
static const uint8_t RX = 44;
21+
22+
// Mapping based on the ESP32S3 data sheet - alternate for SPI2
23+
static const uint8_t SS = 34; // FSPICS0
24+
static const uint8_t MOSI = 35; // FSPID
25+
static const uint8_t MISO = 37; // FSPIQ
26+
static const uint8_t SCK = 36; // FSPICLK
27+
28+
static const uint8_t A0 = 1;
29+
static const uint8_t A1 = 2;
30+
static const uint8_t A2 = 3;
31+
static const uint8_t A3 = 4;
32+
static const uint8_t A4 = 5;
33+
static const uint8_t A5 = 6;
34+
static const uint8_t A6 = 7;
35+
static const uint8_t A7 = 8;
36+
static const uint8_t A8 = 9;
37+
static const uint8_t A9 = 10;
38+
static const uint8_t A10 = 11;
39+
static const uint8_t A11 = 12;
40+
static const uint8_t A12 = 13;
41+
static const uint8_t A13 = 14;
42+
static const uint8_t A14 = 15;
43+
static const uint8_t A15 = 16;
44+
static const uint8_t A16 = 17;
45+
static const uint8_t A17 = 18;
46+
static const uint8_t A18 = 19;
47+
static const uint8_t A19 = 20;
48+
49+
static const uint8_t T1 = 1;
50+
static const uint8_t T2 = 2;
51+
static const uint8_t T3 = 3;
52+
static const uint8_t T4 = 4;
53+
static const uint8_t T5 = 5;
54+
static const uint8_t T6 = 6;
55+
static const uint8_t T7 = 7;
56+
static const uint8_t T8 = 8;
57+
static const uint8_t T9 = 9;
58+
static const uint8_t T10 = 10;
59+
static const uint8_t T11 = 11;
60+
static const uint8_t T12 = 12;
61+
static const uint8_t T13 = 13;
62+
static const uint8_t T14 = 14;
63+
64+
#endif /* Pins_Arduino_h */

‎variants/waveshare_esp32_s3_touch_lcd_4/pins_arduino.h‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
2+
#ifndef Pins_Arduino_h
3+
#define Pins_Arduino_h
4+
5+
#include <stdint.h>
6+
#include "soc/soc_caps.h"
7+
8+
// BN: ESP32 Family Device
9+
#define USB_VID 0x303a
10+
#define USB_PID 0x823D
11+
12+
#define USB_MANUFACTURER "Waveshare"
13+
#define USB_PRODUCT "ESP32-S3-Touch-LCD-4"
14+
#define USB_SERIAL ""
15+
16+
// UART0 pins
17+
static const uint8_t TX = 43;
18+
static const uint8_t RX = 44;
19+
20+
// Def for I2C that shares the IMU I2C pins
21+
static const uint8_t SDA = -1;
22+
static const uint8_t SCL = -1;
23+
24+
// Mapping based on the ESP32S3 data sheet - alternate for SPI2
25+
static const uint8_t SS = 34; // FSPICS0
26+
static const uint8_t MOSI = 35; // FSPID
27+
static const uint8_t MISO = 37; // FSPIQ
28+
static const uint8_t SCK = 36; // FSPICLK
29+
30+
// Mapping based on the ESP32S3 data sheet - alternate for OUTPUT
31+
static const uint8_t OUTPUT_IO2 = 2;
32+
static const uint8_t OUTPUT_IO3 = 3;
33+
static const uint8_t OUTPUT_IO17 = 17;
34+
static const uint8_t OUTPUT_IO18 = 18;
35+
36+
// Analog capable pins on the header
37+
static const uint8_t A0 = 1;
38+
static const uint8_t A1 = 2;
39+
static const uint8_t A2 = 3;
40+
static const uint8_t A3 = 4;
41+
static const uint8_t A4 = 5;
42+
static const uint8_t A5 = 6;
43+
static const uint8_t A6 = 7;
44+
45+
// GPIO capable pins on the header
46+
static const uint8_t D0 = 7;
47+
static const uint8_t D1 = 6;
48+
static const uint8_t D2 = 5;
49+
static const uint8_t D3 = 4;
50+
static const uint8_t D4 = 3;
51+
static const uint8_t D5 = 2;
52+
static const uint8_t D6 = 1;
53+
static const uint8_t D7 = 44;
54+
static const uint8_t D8 = 43;
55+
static const uint8_t D9 = 40;
56+
static const uint8_t D10 = 39;
57+
static const uint8_t D11 = 38;
58+
static const uint8_t D12 = 37;
59+
static const uint8_t D13 = 36;
60+
static const uint8_t D14 = 35;
61+
static const uint8_t D15 = 34;
62+
static const uint8_t D16 = 33;
63+
64+
// Touch input capable pins on the header
65+
static const uint8_t T1 = 1;
66+
static const uint8_t T2 = 2;
67+
static const uint8_t T3 = 3;
68+
static const uint8_t T4 = 4;
69+
static const uint8_t T5 = 5;
70+
static const uint8_t T6 = 6;
71+
static const uint8_t T7 = 7;
72+
73+
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)