Skip to content

Commit ec3d597

Browse files
SuGliderSuGlider
authored
Merge branch 'master' into master
2 parents 530b263 + def319a commit ec3d597

File tree

8 files changed

+900
-13
lines changed

8 files changed

+900
-13
lines changed

Diff for: ‎boards.txt

+596
Large diffs are not rendered by default.

Diff for: ‎cores/esp32/esp32-hal-uart.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,8 @@ uart_t *uartBegin(
508508
#if SOC_UART_SUPPORT_XTAL_CLK
509509
uart_config.source_clk = UART_SCLK_XTAL; // valid for C2, S3, C3, C6, H2 and P4
510510
#elif SOC_UART_SUPPORT_REF_TICK
511-
if (baudrate <= 1000000) {
512-
uart_config.source_clk = UART_SCLK_REF_TICK; // valid for ESP32, S2 - MAX supported baud rate is 1MHz
511+
if (baudrate <= 250000) {
512+
uart_config.source_clk = UART_SCLK_REF_TICK; // valid for ESP32, S2 - MAX supported baud rate is 250 Kbps
513513
} else {
514514
uart_config.source_clk = UART_SCLK_APB; // baudrate may change with the APB Frequency!
515515
}

Diff for: ‎libraries/BLE/README.md

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
# ESP32 BLE for Arduino
22
The Arduino IDE provides an excellent library package manager where versions of libraries can be downloaded and installed. This Github project provides the repository for the ESP32 BLE support for Arduino.
33

4-
The actual source of the project which is being maintained can be found here:
4+
The original source of the project, **which is not maintained anymore**, can be found here: https://github.com/nkolban/esp32-snippets
55

6-
https://github.com/nkolban/esp32-snippets
6+
Issues and questions should be raised here: https://github.com/espressif/arduino-esp32/issues <br> (please don't use https://github.com/nkolban/esp32-snippets/issues!)
77

8-
Issues and questions should be raised here:
9-
10-
https://github.com/nkolban/esp32-snippets/issues
11-
12-
13-
Documentation for using the library can be found here:
14-
15-
https://github.com/nkolban/esp32-snippets/tree/master/Documentation
8+
Documentation for using the library can be found here: https://github.com/nkolban/esp32-snippets/tree/master/Documentation

Diff for: ‎libraries/BLE/library.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ maintainer=Dariusz Krempa <[email protected]>
55
sentence=BLE functions for ESP32
66
paragraph=This library provides an implementation Bluetooth Low Energy support for the ESP32 using the Arduino platform.
77
category=Communication
8-
url=https://github.com/nkolban/ESP32_BLE_Arduino
8+
url=https://github.com/espressif/arduino-esp32/tree/master/libraries/BLE
99
architectures=esp32
1010
includes=BLEDevice.h, BLEUtils.h, BLEScan.h, BLEAdvertisedDevice.h

Diff for: ‎variants/codecell/pins_arduino.h

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
#include "soc/soc_caps.h"
6+
7+
static const uint8_t TX = 21;
8+
static const uint8_t RX = 20;
9+
10+
static const uint8_t SDA = 8;
11+
static const uint8_t SCL = 9;
12+
13+
static const uint8_t SS = 7;
14+
static const uint8_t MOSI = 6;
15+
static const uint8_t MISO = 5;
16+
static const uint8_t SCK = 4;
17+
18+
static const uint8_t A0 = 0;
19+
static const uint8_t A1 = 1;
20+
static const uint8_t A2 = 2;
21+
static const uint8_t A3 = 3;
22+
static const uint8_t A4 = 4;
23+
static const uint8_t A5 = 5;
24+
25+
#endif /* Pins_Arduino_h */

Diff for: ‎variants/fri3d_2024_esp32s3/pins_arduino.h

+127
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
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 LED_BUILTIN = 21;
11+
#define BUILTIN_LED LED_BUILTIN // backward compatibility
12+
#define LED_BUILTIN LED_BUILTIN
13+
14+
static const uint8_t TX = 43;
15+
static const uint8_t RX = 44;
16+
17+
static const uint8_t SDA = 9;
18+
static const uint8_t SCL = 18;
19+
20+
static const uint8_t SS = 14;
21+
static const uint8_t MOSI = 6;
22+
static const uint8_t MISO = 8;
23+
static const uint8_t SCK = 7;
24+
25+
#define X_FRI3D_BADGE_2024 // General Define for use in sketches or lib files
26+
#define X_WS2812_NUM_LEDS 5 // Number of RBG LEDs
27+
28+
#define PIN_I2C_SDA SDA
29+
#define PIN_I2C_SCL SCL
30+
#define PIN_WS2812 12
31+
#define X_WS2812_NUM_LEDS 5
32+
33+
#define PIN_LED 21
34+
#define PIN_IR_RECEIVER 11
35+
#define PIN_BLASTER 10
36+
#define PIN_BUZZER 46
37+
#define PIN_BATTERY 13
38+
39+
#define PIN_SDCARD_CS SS
40+
41+
#define PIN_JOY_X 1
42+
#define PIN_JOY_Y 3
43+
44+
#define PIN_A 39
45+
#define PIN_B 40
46+
#define PIN_X 38
47+
#define PIN_Y 41
48+
#define PIN_MENU 45
49+
#define PIN_START 0
50+
51+
#define PIN_AUX 42 // Fri3d Badge 2024 Aux Pwr
52+
53+
#define CHANNEL_BUZZER 0
54+
55+
// Fri3d Badge 2024 Accelero Gyro
56+
#define X_ACCELERO_GYRO 21
57+
58+
// I2S microphone on communicator addon
59+
#define I2S_MIC_CHANNEL I2S_CHANNEL_FMT_ONLY_LEFT
60+
#define I2S_MIC_SERIAL_CLOCK 17 //serial clock SCLK: pin SCK
61+
#define I2S_MIC_LEFT_RIGHT_CLOCK 47 //left/right clock LRCK: pin WS
62+
#define I2S_MIC_SERIAL_DATA 15 //serial data DIN: pin SD
63+
64+
// Fri3d Badge 2024 LCD
65+
// For using display with TFT_eSPI library
66+
#define USER_SETUP_LOADED
67+
#define SPI_FREQUENCY 80000000
68+
#define ST7789_DRIVER
69+
#define USE_HSPI_PORT
70+
71+
#define TFT_RGB_ORDER TFT_BGR //# swap red and blue byte order
72+
#define TFT_INVERSION_OFF
73+
#define TFT_WIDTH 296 //;setting these will init the eSPI lib with correct dimensions
74+
#define TFT_HEIGHT 240 //;setting these will init the eSPI lib with correct dimensions
75+
#define TFT_MISO MISO
76+
#define TFT_MOSI MOSI
77+
#define TFT_SCLK SCK
78+
#define TFT_CS 5
79+
#define TFT_DC 4
80+
#define TFT_RST 48
81+
#define LOAD_GLCD 1
82+
#define LOAD_FONT2
83+
#define LOAD_FONT4
84+
#define LOAD_FONT6
85+
#define LOAD_FONT7
86+
#define LOAD_FONT8
87+
#define LOAD_GFXFF
88+
#define SMOOTH_FONT
89+
#define SPI_FREQUENCY 80000000
90+
91+
static const uint8_t A0 = 1;
92+
static const uint8_t A1 = 2;
93+
static const uint8_t A2 = 3;
94+
static const uint8_t A3 = 4;
95+
static const uint8_t A4 = 5;
96+
static const uint8_t A5 = 6;
97+
static const uint8_t A6 = 7;
98+
static const uint8_t A7 = 8;
99+
static const uint8_t A8 = 9;
100+
static const uint8_t A9 = 10;
101+
static const uint8_t A10 = 11;
102+
static const uint8_t A11 = 12;
103+
static const uint8_t A12 = 13;
104+
static const uint8_t A13 = 14;
105+
static const uint8_t A14 = 15;
106+
static const uint8_t A15 = 16;
107+
static const uint8_t A16 = 17;
108+
static const uint8_t A17 = 18;
109+
static const uint8_t A18 = 19;
110+
static const uint8_t A19 = 20;
111+
112+
static const uint8_t T1 = 1;
113+
static const uint8_t T2 = 2;
114+
static const uint8_t T3 = 3;
115+
static const uint8_t T4 = 4;
116+
static const uint8_t T5 = 5;
117+
static const uint8_t T6 = 6;
118+
static const uint8_t T7 = 7;
119+
static const uint8_t T8 = 8;
120+
static const uint8_t T9 = 9;
121+
static const uint8_t T10 = 10;
122+
static const uint8_t T11 = 11;
123+
static const uint8_t T12 = 12;
124+
static const uint8_t T13 = 13;
125+
static const uint8_t T14 = 14;
126+
127+
#endif /* Pins_Arduino_h */

Diff for: ‎variants/lilygo_twatch_s3/pins_arduino.h

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
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 0x821B
8+
#define USB_MANUFACTURER "LILYGO"
9+
#define USB_PRODUCT "T-Watch-S3"
10+
11+
#define DISP_WIDTH (240)
12+
#define DISP_HEIGHT (240)
13+
14+
#define DISP_MOSI (13)
15+
#define DISP_MISO (-1)
16+
#define DISP_SCK (18)
17+
#define DISP_RST (-1)
18+
#define DISP_CS (12)
19+
#define DISP_DC (38)
20+
#define DISP_BL (45)
21+
22+
// touch screen
23+
#define TP_INT (16)
24+
#define TP_SDA (39)
25+
#define TP_SCL (40)
26+
27+
// Interrupt IO port
28+
#define RTC_INT (17)
29+
#define PMU_INT (21)
30+
#define SENSOR_INT (14)
31+
32+
// PDM microphone
33+
#define MIC_SCK (44)
34+
#define MIC_DAT (47)
35+
36+
// MAX98357A
37+
#define I2S_BCLK (48)
38+
#define I2S_WCLK (15)
39+
#define I2S_DOUT (46)
40+
41+
#define IR_SEND (2)
42+
43+
// TX, RX pin connected to GPS
44+
static const uint8_t TX = 42;
45+
static const uint8_t RX = 41;
46+
47+
//BHI260,PCF85063,AXP2101,DRV2605L,PN532 share I2C Bus
48+
static const uint8_t SDA = 10;
49+
static const uint8_t SCL = 11;
50+
51+
// Default sd cs pin
52+
static const uint8_t SS = 5;
53+
static const uint8_t MOSI = 1;
54+
static const uint8_t MISO = 4;
55+
static const uint8_t SCK = 3;
56+
57+
// LoRa and SD card share SPI bus
58+
#define LORA_SCK (SCK) // share spi bus
59+
#define LORA_MISO (MISO) // share spi bus
60+
#define LORA_MOSI (MOSI) // share spi bus
61+
#define LORA_CS (5)
62+
#define LORA_RST (8)
63+
#define LORA_BUSY (7)
64+
#define LORA_IRQ (9)
65+
66+
#define GPS_TX (TX)
67+
#define GPS_RX (RX)
68+
69+
#endif /* Pins_Arduino_h */

Diff for: ‎variants/lilygo_twatch_ultra/pins_arduino.h

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#ifndef digitalPinToInterrupt
7+
#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
8+
#endif
9+
10+
#define USB_VID 0x303a
11+
#define USB_PID 0x8227
12+
#define USB_MANUFACTURER "LILYGO"
13+
#define USB_PRODUCT "T-Watch-Ultra"
14+
15+
#define DISP_WIDTH (240)
16+
#define DISP_HEIGHT (296)
17+
18+
#define DISP_D0 (39)
19+
#define DISP_D1 (40)
20+
#define DISP_D2 (45)
21+
#define DISP_D3 (42)
22+
#define DISP_SCK (41)
23+
#define DISP_RST (6)
24+
#define DISP_CS (38)
25+
#define DISP_TE (37)
26+
27+
// touch screen
28+
#define TP_INT (12)
29+
#define TP_RST (46)
30+
// Interrupt IO port
31+
#define RTC_INT (1)
32+
#define PMU_INT (7)
33+
#define NFC_INT (5)
34+
#define SENSOR_INT (8)
35+
#define NFC_RST (4)
36+
37+
// PDM microphone
38+
#define MIC_SCK (17)
39+
#define MIC_DAT (18)
40+
41+
// MAX98357A
42+
#define I2S_BCLK (9)
43+
#define I2S_WCLK (10)
44+
#define I2S_DOUT (11)
45+
46+
#define SD_CS (21)
47+
48+
// TX, RX pin connected to GPS
49+
static const uint8_t TX = 43;
50+
static const uint8_t RX = 44;
51+
52+
//BHI260,PCF85063,AXP2101,DRV2605L,PN532 share I2C Bus
53+
static const uint8_t SDA = 2;
54+
static const uint8_t SCL = 3;
55+
56+
// Default sd cs pin
57+
static const uint8_t SS = SD_CS;
58+
static const uint8_t MOSI = 34;
59+
static const uint8_t MISO = 33;
60+
static const uint8_t SCK = 35;
61+
62+
#define GPS_TX (TX)
63+
#define GPS_RX (RX)
64+
65+
#define TP_SDA (SDA)
66+
#define TP_SCL (SCL)
67+
68+
// LoRa and SD card share SPI bus
69+
#define LORA_SCK (SCK) // share spi bus
70+
#define LORA_MISO (MISO) // share spi bus
71+
#define LORA_MOSI (MOSI) // share spi bus
72+
#define LORA_CS (36)
73+
#define LORA_RST (47)
74+
#define LORA_BUSY (48)
75+
#define LORA_IRQ (14)
76+
77+
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)