Skip to content

Commit 71113c3

Browse files
me-no-devme-no-dev
authored
Merge branch 'master' into release/v2.x
2 parents a115594 + fe5cbcf commit 71113c3

File tree

6 files changed

+288
-5
lines changed

6 files changed

+288
-5
lines changed

Diff for: ‎.github/scripts/find_new_boards.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,5 @@ then
8686
echo $json_matrix
8787
echo "FQBNS=${json_matrix}" >> $GITHUB_ENV
8888
else
89-
echo "FQBNS=''" >> $GITHUB_ENV
89+
echo "FQBNS=" >> $GITHUB_ENV
9090
fi

Diff for: ‎.github/workflows/boards.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: New Board Test
1+
name: Boards Test
22

33
# The workflow will run on schedule and labeled pull requests
44
on:
@@ -30,7 +30,7 @@ jobs:
3030
test-boards:
3131
needs: find-boards
3232
runs-on: ubuntu-latest
33-
if: ${{ needs.changes.outputs.services != '' }}
33+
if: needs.find-boards.outputs.fqbns != ''
3434

3535
env:
3636
REPOSITORY: |
@@ -58,4 +58,4 @@ jobs:
5858
- --warnings="all"
5959
exit-on-fail: true
6060
sketch-paths:
61-
"- ./libraries/ESP32/examples/ChipID/GetChipID/GetChipID.ino"
61+
"- ./libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino"

Diff for: ‎boards.txt

+168
Original file line numberDiff line numberDiff line change
@@ -6095,6 +6095,174 @@ lolin_s3.menu.EraseFlash.all.upload.erase_cmd=-e
60956095

60966096
##############################################################
60976097

6098+
lolin_s3_mini.name=LOLIN S3 Mini
6099+
lolin_s3_mini.vid.0=0x303a
6100+
lolin_s3_mini.pid.0=0x8167
6101+
6102+
lolin_s3_mini.bootloader.tool=esptool_py
6103+
lolin_s3_mini.bootloader.tool.default=esptool_py
6104+
6105+
lolin_s3_mini.upload.tool=esptool_py
6106+
lolin_s3_mini.upload.tool.default=esptool_py
6107+
lolin_s3_mini.upload.tool.network=esp_ota
6108+
6109+
lolin_s3_mini.upload.maximum_size=1310720
6110+
lolin_s3_mini.upload.maximum_data_size=327680
6111+
lolin_s3_mini.upload.flags=
6112+
lolin_s3_mini.upload.extra_flags=
6113+
lolin_s3_mini.upload.use_1200bps_touch=false
6114+
lolin_s3_mini.upload.wait_for_upload_port=false
6115+
6116+
lolin_s3_mini.serial.disableDTR=false
6117+
lolin_s3_mini.serial.disableRTS=false
6118+
6119+
lolin_s3_mini.build.tarch=xtensa
6120+
lolin_s3_mini.build.bootloader_addr=0x0
6121+
lolin_s3_mini.build.target=esp32s3
6122+
lolin_s3_mini.build.mcu=esp32s3
6123+
lolin_s3_mini.build.core=esp32
6124+
lolin_s3_mini.build.variant=lolin_s3_mini
6125+
lolin_s3_mini.build.board=LOLIN_S3_MINI
6126+
6127+
lolin_s3_mini.build.usb_mode=1
6128+
lolin_s3_mini.build.cdc_on_boot=0
6129+
lolin_s3_mini.build.msc_on_boot=0
6130+
lolin_s3_mini.build.dfu_on_boot=0
6131+
lolin_s3_mini.build.f_cpu=240000000L
6132+
lolin_s3_mini.build.flash_size=4MB
6133+
lolin_s3_mini.build.flash_freq=80m
6134+
lolin_s3_mini.build.flash_mode=dio
6135+
lolin_s3_mini.build.boot=qio
6136+
lolin_s3_mini.build.boot_freq=80m
6137+
lolin_s3_mini.build.partitions=default
6138+
lolin_s3_mini.build.defines=-DBOARD_HAS_PSRAM
6139+
lolin_s3_mini.build.loop_core=
6140+
lolin_s3_mini.build.event_core=
6141+
lolin_s3_mini.build.psram_type=qspi
6142+
lolin_s3_mini.build.memory_type={build.boot}_{build.psram_type}
6143+
6144+
lolin_s3_mini.menu.FlashMode.qio=QIO 80MHz
6145+
lolin_s3_mini.menu.FlashMode.qio.build.flash_mode=dio
6146+
lolin_s3_mini.menu.FlashMode.qio.build.boot=qio
6147+
lolin_s3_mini.menu.FlashMode.qio.build.boot_freq=80m
6148+
lolin_s3_mini.menu.FlashMode.qio.build.flash_freq=80m
6149+
lolin_s3_mini.menu.FlashMode.qio120=QIO 120MHz
6150+
lolin_s3_mini.menu.FlashMode.qio120.build.flash_mode=dio
6151+
lolin_s3_mini.menu.FlashMode.qio120.build.boot=qio
6152+
lolin_s3_mini.menu.FlashMode.qio120.build.boot_freq=120m
6153+
lolin_s3_mini.menu.FlashMode.qio120.build.flash_freq=80m
6154+
6155+
lolin_s3_mini.menu.LoopCore.1=Core 1
6156+
lolin_s3_mini.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
6157+
lolin_s3_mini.menu.LoopCore.0=Core 0
6158+
lolin_s3_mini.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
6159+
6160+
lolin_s3_mini.menu.EventsCore.1=Core 1
6161+
lolin_s3_mini.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
6162+
lolin_s3_mini.menu.EventsCore.0=Core 0
6163+
lolin_s3_mini.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
6164+
6165+
lolin_s3_mini.menu.USBMode.hwcdc=Hardware CDC and JTAG
6166+
lolin_s3_mini.menu.USBMode.hwcdc.build.usb_mode=1
6167+
lolin_s3_mini.menu.USBMode.default=USB-OTG (TinyUSB)
6168+
lolin_s3_mini.menu.USBMode.default.build.usb_mode=0
6169+
6170+
lolin_s3_mini.menu.CDCOnBoot.default=Disabled
6171+
lolin_s3_mini.menu.CDCOnBoot.default.build.cdc_on_boot=0
6172+
lolin_s3_mini.menu.CDCOnBoot.cdc=Enabled
6173+
lolin_s3_mini.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
6174+
6175+
lolin_s3_mini.menu.MSCOnBoot.default=Disabled
6176+
lolin_s3_mini.menu.MSCOnBoot.default.build.msc_on_boot=0
6177+
lolin_s3_mini.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
6178+
lolin_s3_mini.menu.MSCOnBoot.msc.build.msc_on_boot=1
6179+
6180+
lolin_s3_mini.menu.DFUOnBoot.default=Disabled
6181+
lolin_s3_mini.menu.DFUOnBoot.default.build.dfu_on_boot=0
6182+
lolin_s3_mini.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
6183+
lolin_s3_mini.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
6184+
6185+
lolin_s3_mini.menu.UploadMode.default=UART0 / Hardware CDC
6186+
lolin_s3_mini.menu.UploadMode.default.upload.use_1200bps_touch=false
6187+
lolin_s3_mini.menu.UploadMode.default.upload.wait_for_upload_port=false
6188+
lolin_s3_mini.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
6189+
lolin_s3_mini.menu.UploadMode.cdc.upload.use_1200bps_touch=true
6190+
lolin_s3_mini.menu.UploadMode.cdc.upload.wait_for_upload_port=true
6191+
6192+
lolin_s3_mini.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
6193+
lolin_s3_mini.menu.PartitionScheme.default.build.partitions=default
6194+
lolin_s3_mini.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
6195+
lolin_s3_mini.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
6196+
lolin_s3_mini.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
6197+
lolin_s3_mini.menu.PartitionScheme.no_ota.build.partitions=no_ota
6198+
lolin_s3_mini.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
6199+
lolin_s3_mini.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
6200+
lolin_s3_mini.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
6201+
lolin_s3_mini.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
6202+
lolin_s3_mini.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
6203+
lolin_s3_mini.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
6204+
lolin_s3_mini.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
6205+
lolin_s3_mini.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
6206+
lolin_s3_mini.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
6207+
lolin_s3_mini.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
6208+
lolin_s3_mini.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
6209+
lolin_s3_mini.menu.PartitionScheme.huge_app.build.partitions=huge_app
6210+
lolin_s3_mini.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
6211+
lolin_s3_mini.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
6212+
lolin_s3_mini.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
6213+
lolin_s3_mini.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
6214+
lolin_s3_mini.menu.PartitionScheme.rainmaker=RainMaker
6215+
lolin_s3_mini.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
6216+
lolin_s3_mini.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
6217+
6218+
lolin_s3_mini.menu.CPUFreq.240=240MHz (WiFi)
6219+
lolin_s3_mini.menu.CPUFreq.240.build.f_cpu=240000000L
6220+
lolin_s3_mini.menu.CPUFreq.160=160MHz (WiFi)
6221+
lolin_s3_mini.menu.CPUFreq.160.build.f_cpu=160000000L
6222+
lolin_s3_mini.menu.CPUFreq.80=80MHz (WiFi)
6223+
lolin_s3_mini.menu.CPUFreq.80.build.f_cpu=80000000L
6224+
lolin_s3_mini.menu.CPUFreq.40=40MHz
6225+
lolin_s3_mini.menu.CPUFreq.40.build.f_cpu=40000000L
6226+
lolin_s3_mini.menu.CPUFreq.20=20MHz
6227+
lolin_s3_mini.menu.CPUFreq.20.build.f_cpu=20000000L
6228+
lolin_s3_mini.menu.CPUFreq.10=10MHz
6229+
lolin_s3_mini.menu.CPUFreq.10.build.f_cpu=10000000L
6230+
6231+
lolin_s3_mini.menu.UploadSpeed.921600=921600
6232+
lolin_s3_mini.menu.UploadSpeed.921600.upload.speed=921600
6233+
lolin_s3_mini.menu.UploadSpeed.115200=115200
6234+
lolin_s3_mini.menu.UploadSpeed.115200.upload.speed=115200
6235+
lolin_s3_mini.menu.UploadSpeed.256000.windows=256000
6236+
lolin_s3_mini.menu.UploadSpeed.256000.upload.speed=256000
6237+
lolin_s3_mini.menu.UploadSpeed.230400.windows.upload.speed=256000
6238+
lolin_s3_mini.menu.UploadSpeed.230400=230400
6239+
lolin_s3_mini.menu.UploadSpeed.230400.upload.speed=230400
6240+
lolin_s3_mini.menu.UploadSpeed.460800.linux=460800
6241+
lolin_s3_mini.menu.UploadSpeed.460800.macosx=460800
6242+
lolin_s3_mini.menu.UploadSpeed.460800.upload.speed=460800
6243+
lolin_s3_mini.menu.UploadSpeed.512000.windows=512000
6244+
lolin_s3_mini.menu.UploadSpeed.512000.upload.speed=512000
6245+
6246+
lolin_s3_mini.menu.DebugLevel.none=None
6247+
lolin_s3_mini.menu.DebugLevel.none.build.code_debug=0
6248+
lolin_s3_mini.menu.DebugLevel.error=Error
6249+
lolin_s3_mini.menu.DebugLevel.error.build.code_debug=1
6250+
lolin_s3_mini.menu.DebugLevel.warn=Warn
6251+
lolin_s3_mini.menu.DebugLevel.warn.build.code_debug=2
6252+
lolin_s3_mini.menu.DebugLevel.info=Info
6253+
lolin_s3_mini.menu.DebugLevel.info.build.code_debug=3
6254+
lolin_s3_mini.menu.DebugLevel.debug=Debug
6255+
lolin_s3_mini.menu.DebugLevel.debug.build.code_debug=4
6256+
lolin_s3_mini.menu.DebugLevel.verbose=Verbose
6257+
lolin_s3_mini.menu.DebugLevel.verbose.build.code_debug=5
6258+
6259+
lolin_s3_mini.menu.EraseFlash.none=Disabled
6260+
lolin_s3_mini.menu.EraseFlash.none.upload.erase_cmd=
6261+
lolin_s3_mini.menu.EraseFlash.all=Enabled
6262+
lolin_s3_mini.menu.EraseFlash.all.upload.erase_cmd=-e
6263+
6264+
##############################################################
6265+
60986266
lolin_s3_pro.name=LOLIN S3 Pro
60996267
lolin_s3_pro.vid.0=0x303a
61006268
lolin_s3_pro.pid.0=0x8161

Diff for: ‎libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#include <Wire.h>
2+
#include <SPI.h>
3+
4+
void setup() {
5+
// UART initialization
6+
Serial.begin(9600);
7+
8+
// I2C initialization
9+
Wire.begin();
10+
11+
// SPI initialization
12+
SPI.begin();
13+
}
14+
15+
void loop() {
16+
// UART echo
17+
if (Serial.available()) {
18+
Serial.write(Serial.read());
19+
}
20+
21+
// I2C read/write
22+
Wire.beginTransmission(0x68); // I2C address of device
23+
Wire.write(0x00); // register to read/write
24+
Wire.write(0xFF); // data to write (if writing)
25+
Wire.endTransmission();
26+
27+
Wire.requestFrom(0x68, 1); // number of bytes to read
28+
29+
while (Wire.available()) {
30+
Serial.println(Wire.read());
31+
}
32+
33+
// SPI read/write
34+
digitalWrite(SS, LOW); // select slave device
35+
SPI.transfer(0x01); // data to write
36+
digitalWrite(SS, HIGH); // deselect slave device
37+
38+
digitalWrite(SS, LOW); // select slave device
39+
byte data = SPI.transfer(0x00);// data to read
40+
digitalWrite(SS, HIGH); // deselect slave device
41+
42+
Serial.println(data);
43+
44+
delay(1000); // wait for 1 second before repeating loop
45+
}

Diff for: ‎libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,8 @@
155155
#define HREF_GPIO_NUM 23
156156
#define PCLK_GPIO_NUM 22
157157

158-
#define LED_GPIO_NUM 33
158+
// 4 for flash led or 33 for normal led
159+
#define LED_GPIO_NUM 4
159160

160161
#elif defined(CAMERA_MODEL_TTGO_T_JOURNAL)
161162
#define PWDN_GPIO_NUM 0

Diff for: ‎variants/lolin_s3_mini/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 0x8167
8+
9+
#define EXTERNAL_NUM_INTERRUPTS 46
10+
#define NUM_DIGITAL_PINS 48
11+
#define NUM_ANALOG_INPUTS 18
12+
13+
14+
static const uint8_t LED_BUILTIN = 47;
15+
#define BUILTIN_LED LED_BUILTIN // backward compatibility
16+
#define LED_BUILTIN LED_BUILTIN
17+
#define RGB_BUILTIN LED_BUILTIN
18+
#define RGB_BRIGHTNESS 64
19+
20+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
21+
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
22+
#define digitalPinHasPWM(p) (p < 46)
23+
24+
static const uint8_t TX = 43;
25+
static const uint8_t RX = 44;
26+
27+
static const uint8_t SDA = 35;
28+
static const uint8_t SCL = 36;
29+
30+
static const uint8_t SS = 10;
31+
static const uint8_t MOSI = 11;
32+
static const uint8_t MISO = 13;
33+
static const uint8_t SCK = 12;
34+
35+
static const uint8_t A0 = 1;
36+
static const uint8_t A1 = 2;
37+
static const uint8_t A2 = 3;
38+
static const uint8_t A3 = 4;
39+
static const uint8_t A4 = 5;
40+
static const uint8_t A5 = 6;
41+
static const uint8_t A6 = 7;
42+
static const uint8_t A7 = 8;
43+
static const uint8_t A8 = 9;
44+
static const uint8_t A9 = 10;
45+
static const uint8_t A10 = 11;
46+
static const uint8_t A11 = 12;
47+
static const uint8_t A12 = 13;
48+
static const uint8_t A13 = 14;
49+
static const uint8_t A14 = 15;
50+
static const uint8_t A15 = 16;
51+
static const uint8_t A16 = 17;
52+
static const uint8_t A17 = 18;
53+
54+
static const uint8_t T1 = 1;
55+
static const uint8_t T2 = 2;
56+
static const uint8_t T3 = 3;
57+
static const uint8_t T4 = 4;
58+
static const uint8_t T5 = 5;
59+
static const uint8_t T6 = 6;
60+
static const uint8_t T7 = 7;
61+
static const uint8_t T8 = 8;
62+
static const uint8_t T9 = 9;
63+
static const uint8_t T10 = 10;
64+
static const uint8_t T11 = 11;
65+
static const uint8_t T12 = 12;
66+
static const uint8_t T13 = 13;
67+
static const uint8_t T14 = 14;
68+
69+
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)