Skip to content

Commit b4a0c48

Browse files
me-no-devme-no-dev
authored
Merge branch 'master' into esp32-s3-support
2 parents 4a4df51 + b254765 commit b4a0c48

File tree

4 files changed

+405
-28
lines changed

4 files changed

+405
-28
lines changed

‎.github/workflows/test_selfhosted_runner.yml

-28
This file was deleted.

‎boards.txt

+219
Original file line numberDiff line numberDiff line change
@@ -4387,6 +4387,93 @@ lolin_s2_mini.menu.DebugLevel.verbose.build.code_debug=5
43874387

43884388
##############################################################
43894389

4390+
lolin_s2_pico.name=LOLIN S2 PICO
4391+
lolin_s2_pico.vid.0=0x303a
4392+
lolin_s2_pico.pid.0=0x80C5
4393+
4394+
lolin_s2_pico.upload.tool=esptool_py
4395+
lolin_s2_pico.upload.maximum_size=1310720
4396+
lolin_s2_pico.upload.maximum_data_size=327680
4397+
lolin_s2_pico.upload.flags=
4398+
lolin_s2_pico.upload.extra_flags=
4399+
lolin_s2_pico.upload.use_1200bps_touch=true
4400+
lolin_s2_pico.upload.wait_for_upload_port=true
4401+
lolin_s2_pico.upload.speed=921600
4402+
4403+
lolin_s2_pico.serial.disableDTR=false
4404+
lolin_s2_pico.serial.disableRTS=false
4405+
4406+
lolin_s2_pico.build.tarch=xtensa
4407+
lolin_s2_pico.build.bootloader_addr=0x1000
4408+
lolin_s2_pico.build.target=esp32s2
4409+
lolin_s2_pico.build.mcu=esp32s2
4410+
lolin_s2_pico.build.core=esp32
4411+
lolin_s2_pico.build.variant=lolin_s2_pico
4412+
lolin_s2_pico.build.board=LOLIN_S2_PICO
4413+
4414+
lolin_s2_pico.build.cdc_on_boot=1
4415+
lolin_s2_pico.build.msc_on_boot=1
4416+
lolin_s2_pico.build.dfu_on_boot=1
4417+
lolin_s2_pico.build.f_cpu=240000000L
4418+
lolin_s2_pico.build.flash_size=4MB
4419+
lolin_s2_pico.build.flash_freq=80m
4420+
lolin_s2_pico.build.flash_mode=dio
4421+
lolin_s2_pico.build.boot=qio
4422+
lolin_s2_pico.build.partitions=default
4423+
lolin_s2_pico.build.defines=
4424+
4425+
lolin_s2_pico.build.defines=-DBOARD_HAS_PSRAM
4426+
4427+
lolin_s2_pico.menu.CDCOnBoot.default=Enabled
4428+
lolin_s2_pico.menu.CDCOnBoot.default.build.cdc_on_boot=1
4429+
lolin_s2_pico.menu.CDCOnBoot.dis_cdc=Disabled
4430+
lolin_s2_pico.menu.CDCOnBoot.dis_cdc.build.cdc_on_boot=0
4431+
4432+
lolin_s2_pico.menu.MSCOnBoot.default=Disabled
4433+
lolin_s2_pico.menu.MSCOnBoot.default.build.msc_on_boot=0
4434+
lolin_s2_pico.menu.MSCOnBoot.msc=Enabled
4435+
lolin_s2_pico.menu.MSCOnBoot.msc.build.msc_on_boot=1
4436+
4437+
lolin_s2_pico.menu.DFUOnBoot.default=Disabled
4438+
lolin_s2_pico.menu.DFUOnBoot.default.build.dfu_on_boot=0
4439+
lolin_s2_pico.menu.DFUOnBoot.dfu=Enabled
4440+
lolin_s2_pico.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
4441+
4442+
lolin_s2_pico.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
4443+
lolin_s2_pico.menu.PartitionScheme.default.build.partitions=default
4444+
lolin_s2_pico.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
4445+
lolin_s2_pico.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
4446+
lolin_s2_pico.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
4447+
lolin_s2_pico.menu.PartitionScheme.no_ota.build.partitions=no_ota
4448+
lolin_s2_pico.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
4449+
lolin_s2_pico.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
4450+
lolin_s2_pico.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
4451+
lolin_s2_pico.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
4452+
lolin_s2_pico.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
4453+
lolin_s2_pico.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
4454+
lolin_s2_pico.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
4455+
lolin_s2_pico.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
4456+
lolin_s2_pico.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
4457+
lolin_s2_pico.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
4458+
lolin_s2_pico.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
4459+
lolin_s2_pico.menu.PartitionScheme.huge_app.build.partitions=huge_app
4460+
lolin_s2_pico.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
4461+
4462+
lolin_s2_pico.menu.DebugLevel.none=None
4463+
lolin_s2_pico.menu.DebugLevel.none.build.code_debug=0
4464+
lolin_s2_pico.menu.DebugLevel.error=Error
4465+
lolin_s2_pico.menu.DebugLevel.error.build.code_debug=1
4466+
lolin_s2_pico.menu.DebugLevel.warn=Warn
4467+
lolin_s2_pico.menu.DebugLevel.warn.build.code_debug=2
4468+
lolin_s2_pico.menu.DebugLevel.info=Info
4469+
lolin_s2_pico.menu.DebugLevel.info.build.code_debug=3
4470+
lolin_s2_pico.menu.DebugLevel.debug=Debug
4471+
lolin_s2_pico.menu.DebugLevel.debug.build.code_debug=4
4472+
lolin_s2_pico.menu.DebugLevel.verbose=Verbose
4473+
lolin_s2_pico.menu.DebugLevel.verbose.build.code_debug=5
4474+
4475+
##############################################################
4476+
43904477
lolin32.name=WEMOS LOLIN32
43914478

43924479
lolin32.upload.tool=esptool_py
@@ -11521,6 +11608,11 @@ deneyapkart.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
1152111608
deneyapkart.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
1152211609
deneyapkart.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
1152311610
deneyapkart.menu.PartitionScheme.fatflash.build.partitions=ffat
11611+
deneyapkart.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
11612+
deneyapkart.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
11613+
deneyapkart.menu.PartitionScheme.rainmaker=RainMaker
11614+
deneyapkart.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
11615+
deneyapkart.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
1152411616

1152511617
deneyapkart.menu.CPUFreq.240=240MHz (WiFi/BT)
1152611618
deneyapkart.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -12645,3 +12737,130 @@ watchy.menu.DebugLevel.verbose=Verbose
1264512737
watchy.menu.DebugLevel.verbose.build.code_debug=5
1264612738

1264712739
##############################################################
12740+
12741+
deneyapkart1A.name=Deneyap Kart 1A
12742+
12743+
deneyapkart1A.upload.tool=esptool_py
12744+
deneyapkart1A.upload.maximum_size=1310720
12745+
deneyapkart1A.upload.maximum_data_size=327680
12746+
deneyapkart1A.upload.wait_for_upload_port=true
12747+
deneyapkart1A.upload.flags=
12748+
deneyapkart1A.upload.extra_flags=
12749+
12750+
deneyapkart1A.serial.disableDTR=true
12751+
deneyapkart1A.serial.disableRTS=true
12752+
12753+
deneyapkart1A.build.tarch=xtensa
12754+
deneyapkart1A.build.bootloader_addr=0x1000
12755+
deneyapkart1A.build.target=esp32
12756+
deneyapkart1A.build.mcu=esp32
12757+
deneyapkart1A.build.core=esp32
12758+
deneyapkart1A.build.variant=deneyapkart1A
12759+
deneyapkart1A.build.board=DYDK1A
12760+
12761+
deneyapkart1A.build.f_cpu=240000000L
12762+
deneyapkart1A.build.flash_size=4MB
12763+
deneyapkart1A.build.flash_freq=40m
12764+
deneyapkart1A.build.flash_mode=dio
12765+
deneyapkart1A.build.boot=dio
12766+
deneyapkart1A.build.partitions=default
12767+
deneyapkart1A.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw
12768+
deneyapkart1A.build.extra_libs=
12769+
12770+
deneyapkart1A.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
12771+
deneyapkart1A.menu.PartitionScheme.default.build.partitions=default
12772+
deneyapkart1A.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
12773+
deneyapkart1A.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
12774+
deneyapkart1A.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
12775+
deneyapkart1A.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
12776+
deneyapkart1A.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
12777+
deneyapkart1A.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
12778+
deneyapkart1A.menu.PartitionScheme.minimal.build.partitions=minimal
12779+
deneyapkart1A.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
12780+
deneyapkart1A.menu.PartitionScheme.no_ota.build.partitions=no_ota
12781+
deneyapkart1A.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
12782+
deneyapkart1A.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
12783+
deneyapkart1A.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
12784+
deneyapkart1A.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
12785+
deneyapkart1A.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
12786+
deneyapkart1A.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
12787+
deneyapkart1A.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
12788+
deneyapkart1A.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
12789+
deneyapkart1A.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
12790+
deneyapkart1A.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
12791+
deneyapkart1A.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
12792+
deneyapkart1A.menu.PartitionScheme.huge_app.build.partitions=huge_app
12793+
deneyapkart1A.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
12794+
deneyapkart1A.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
12795+
deneyapkart1A.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
12796+
deneyapkart1A.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
12797+
deneyapkart1A.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
12798+
deneyapkart1A.menu.PartitionScheme.fatflash.build.partitions=ffat
12799+
deneyapkart1A.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
12800+
deneyapkart1A.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
12801+
deneyapkart1A.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
12802+
deneyapkart1A.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
12803+
deneyapkart1A.menu.PartitionScheme.rainmaker=RainMaker
12804+
deneyapkart1A.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
12805+
deneyapkart1A.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
12806+
12807+
deneyapkart1A.menu.CPUFreq.240=240MHz (WiFi/BT)
12808+
deneyapkart1A.menu.CPUFreq.240.build.f_cpu=240000000L
12809+
deneyapkart1A.menu.CPUFreq.160=160MHz (WiFi/BT)
12810+
deneyapkart1A.menu.CPUFreq.160.build.f_cpu=160000000L
12811+
deneyapkart1A.menu.CPUFreq.80=80MHz (WiFi/BT)
12812+
deneyapkart1A.menu.CPUFreq.80.build.f_cpu=80000000L
12813+
deneyapkart1A.menu.CPUFreq.40=40MHz
12814+
deneyapkart1A.menu.CPUFreq.40.build.f_cpu=40000000L
12815+
deneyapkart1A.menu.CPUFreq.20=20MHz
12816+
deneyapkart1A.menu.CPUFreq.20.build.f_cpu=20000000L
12817+
deneyapkart1A.menu.CPUFreq.10=10MHz
12818+
deneyapkart1A.menu.CPUFreq.10.build.f_cpu=10000000L
12819+
12820+
deneyapkart1A.menu.FlashMode.qio=QIO
12821+
deneyapkart1A.menu.FlashMode.qio.build.flash_mode=dio
12822+
deneyapkart1A.menu.FlashMode.qio.build.boot=qio
12823+
deneyapkart1A.menu.FlashMode.dio=DIO
12824+
deneyapkart1A.menu.FlashMode.dio.build.flash_mode=dio
12825+
deneyapkart1A.menu.FlashMode.dio.build.boot=dio
12826+
deneyapkart1A.menu.FlashMode.qout=QOUT
12827+
deneyapkart1A.menu.FlashMode.qout.build.flash_mode=dout
12828+
deneyapkart1A.menu.FlashMode.qout.build.boot=qout
12829+
deneyapkart1A.menu.FlashMode.dout=DOUT
12830+
deneyapkart1A.menu.FlashMode.dout.build.flash_mode=dout
12831+
deneyapkart1A.menu.FlashMode.dout.build.boot=dout
12832+
12833+
deneyapkart1A.menu.FlashFreq.80=80MHz
12834+
deneyapkart1A.menu.FlashFreq.80.build.flash_freq=80m
12835+
deneyapkart1A.menu.FlashFreq.40=40MHz
12836+
deneyapkart1A.menu.FlashFreq.40.build.flash_freq=40m
12837+
12838+
deneyapkart1A.menu.UploadSpeed.921600=921600
12839+
deneyapkart1A.menu.UploadSpeed.921600.upload.speed=921600
12840+
deneyapkart1A.menu.UploadSpeed.115200=115200
12841+
deneyapkart1A.menu.UploadSpeed.115200.upload.speed=115200
12842+
deneyapkart1A.menu.UploadSpeed.256000.windows=256000
12843+
deneyapkart1A.menu.UploadSpeed.256000.upload.speed=256000
12844+
deneyapkart1A.menu.UploadSpeed.230400.windows.upload.speed=256000
12845+
deneyapkart1A.menu.UploadSpeed.230400=230400
12846+
deneyapkart1A.menu.UploadSpeed.230400.upload.speed=230400
12847+
deneyapkart1A.menu.UploadSpeed.460800.linux=460800
12848+
deneyapkart1A.menu.UploadSpeed.460800.macosx=460800
12849+
deneyapkart1A.menu.UploadSpeed.460800.upload.speed=460800
12850+
deneyapkart1A.menu.UploadSpeed.512000.windows=512000
12851+
deneyapkart1A.menu.UploadSpeed.512000.upload.speed=512000
12852+
12853+
deneyapkart1A.menu.DebugLevel.none=None
12854+
deneyapkart1A.menu.DebugLevel.none.build.code_debug=0
12855+
deneyapkart1A.menu.DebugLevel.error=Error
12856+
deneyapkart1A.menu.DebugLevel.error.build.code_debug=1
12857+
deneyapkart1A.menu.DebugLevel.warn=Warn
12858+
deneyapkart1A.menu.DebugLevel.warn.build.code_debug=2
12859+
deneyapkart1A.menu.DebugLevel.info=Info
12860+
deneyapkart1A.menu.DebugLevel.info.build.code_debug=3
12861+
deneyapkart1A.menu.DebugLevel.debug=Debug
12862+
deneyapkart1A.menu.DebugLevel.debug.build.code_debug=4
12863+
deneyapkart1A.menu.DebugLevel.verbose=Verbose
12864+
deneyapkart1A.menu.DebugLevel.verbose.build.code_debug=5
12865+
12866+
##############################################################

‎variants/deneyapkart1A/pins_arduino.h

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define EXTERNAL_NUM_INTERRUPTS 16
7+
#define NUM_DIGITAL_PINS 40
8+
#define NUM_ANALOG_INPUTS 16
9+
10+
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
11+
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
12+
#define digitalPinHasPWM(p) (p < 34)
13+
14+
static const uint8_t TX = 1;
15+
static const uint8_t RX = 3;
16+
17+
static const uint8_t SDA = 4;
18+
static const uint8_t SCL = 15;
19+
20+
static const uint8_t SS = 21;
21+
static const uint8_t MOSI = 5;
22+
static const uint8_t MISO = 18;
23+
static const uint8_t SCK = 19;
24+
25+
static const uint8_t D0 = 23;
26+
static const uint8_t D1 = 22;
27+
static const uint8_t D2 = 1;
28+
static const uint8_t D3 = 3;
29+
static const uint8_t D4 = 21;
30+
static const uint8_t D5 = 19;
31+
static const uint8_t D6 = 18;
32+
static const uint8_t D7 = 5;
33+
static const uint8_t D8 = 0;
34+
static const uint8_t D9 = 2;
35+
static const uint8_t D10 = 4;
36+
static const uint8_t D11 = 15;
37+
static const uint8_t D12 = 13;
38+
static const uint8_t D13 = 12;
39+
static const uint8_t D14 = 14;
40+
static const uint8_t D15 = 27;
41+
42+
static const uint8_t A0 = 36;
43+
static const uint8_t A1 = 39;
44+
static const uint8_t A2 = 34;
45+
static const uint8_t A3 = 35;
46+
static const uint8_t A4 = 32;
47+
static const uint8_t A5 = 33;
48+
// static const uint8_t A6 = 34;
49+
// static const uint8_t A7 = 35;
50+
// static const uint8_t A10 = 4;
51+
// static const uint8_t A11 = 0;
52+
// static const uint8_t A12 = 2;
53+
// static const uint8_t A13 = 15;
54+
// static const uint8_t A14 = 13;
55+
// static const uint8_t A15 = 12;
56+
// static const uint8_t A16 = 14;
57+
// static const uint8_t A17 = 27;
58+
// static const uint8_t A18 = 25;
59+
// static const uint8_t A19 = 26;
60+
61+
static const uint8_t T0 = 32;
62+
static const uint8_t T1 = 33;
63+
static const uint8_t T2 = 27;
64+
static const uint8_t T3 = 14;
65+
static const uint8_t T4 = 12;
66+
static const uint8_t T5 = 13;
67+
// static const uint8_t T6 = 14;
68+
// static const uint8_t T7 = 27;
69+
// static const uint8_t T8 = 33;
70+
// static const uint8_t T9 = 32;
71+
72+
static const uint8_t DAC1 = 25;
73+
static const uint8_t DAC2 = 26;
74+
75+
static const uint8_t CAMSD = 33;
76+
static const uint8_t CAMSC = 25;
77+
static const uint8_t CAMD2 = 19;
78+
static const uint8_t CAMD3 = 22;
79+
static const uint8_t CAMD4 = 23;
80+
static const uint8_t CAMD5 = 21;
81+
static const uint8_t CAMD6 = 18;
82+
static const uint8_t CAMD7 = 26;
83+
static const uint8_t CAMD8 = 35;
84+
static const uint8_t CAMD9 = 34;
85+
static const uint8_t CAMPC = 5;
86+
static const uint8_t CAMXC = 32;
87+
static const uint8_t CAMH = 39;
88+
static const uint8_t CAMV = 36;
89+
90+
static const uint8_t RGBLED = 13;
91+
static const uint8_t BUILTIN_KEY = 0;
92+
static const uint8_t GPKEY = 0;
93+
94+
static const uint8_t PWM0 = 23;
95+
static const uint8_t PWM1 = 22;
96+
97+
static const uint8_t SDMI = 2;
98+
static const uint8_t SDMO = 14;
99+
static const uint8_t SDCS = 12;
100+
static const uint8_t SDCK = 27;
101+
102+
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)