Skip to content

Commit 57f2ba7

Browse files
nikiwaibelnikiwaibel
authored
Merge branch 'master' into fix-asyncudp-multicast-ipv4-only
2 parents 7b85dd0 + 0007815 commit 57f2ba7

File tree

4 files changed

+84
-98
lines changed

4 files changed

+84
-98
lines changed

‎.github/workflows/publishsizes.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,17 @@ jobs:
4444
gh api "$artifacts_url" -q '.artifacts[] | [.name, .archive_download_url] | @tsv' | while read artifact
4545
do
4646
IFS=$'\t' read name url <<< "$artifact"
47-
gh api $url > "$name.zip"
48-
unzip -j "$name.zip" -d "temp_$name"
49-
if [[ "$name" == "pr_number" ]]; then
50-
mv "temp_$name"/* sizes-report
51-
elif [[ "$name" == "pr_cli"* ]]; then
52-
mv "temp_$name"/* sizes-report/pr
53-
else
54-
mv "temp_$name"/* sizes-report
47+
# Only process pr_number and pr_cli_compile artifacts
48+
if [[ "$name" == "pr_number" || "$name" =~ ^pr_cli_compile_[0-9]+$ ]]; then
49+
gh api $url > "$name.zip"
50+
unzip -o -j "$name.zip" -d "temp_$name"
51+
if [[ "$name" == "pr_number" ]]; then
52+
mv "temp_$name"/* sizes-report
53+
elif [[ "$name" =~ ^pr_cli_compile_[0-9]+$ ]]; then
54+
mv "temp_$name"/* sizes-report/pr
55+
fi
56+
rm -r "temp_$name"
5557
fi
56-
rm -r "temp_$name"
5758
done
5859
echo "Contents of parent directory:"
5960
ls -R ..

‎boards.txt

Lines changed: 33 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,15 @@ esp32p4.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
282282
esp32p4.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
283283
esp32p4.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
284284
esp32p4.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
285+
esp32p4.menu.PartitionScheme.app5M_fat24M_32MB=32M Flash (4.8MB APP/22MB FATFS)
286+
esp32p4.menu.PartitionScheme.app5M_fat24M_32MB.build.partitions=large_fat_32MB
287+
esp32p4.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
288+
esp32p4.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
289+
esp32p4.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
290+
esp32p4.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
291+
esp32p4.menu.PartitionScheme.app13M_data7M_32MB=32M Flash (13MB APP/6.75MB SPIFFS)
292+
esp32p4.menu.PartitionScheme.app13M_data7M_32MB.build.partitions=default_32MB
293+
esp32p4.menu.PartitionScheme.app13M_data7M_32MB.upload.maximum_size=13107200
285294
esp32p4.menu.PartitionScheme.custom=Custom
286295
esp32p4.menu.PartitionScheme.custom.build.partitions=
287296
esp32p4.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -314,6 +323,8 @@ esp32p4.menu.FlashSize.2M.build.flash_size=2MB
314323
esp32p4.menu.FlashSize.2M.build.partitions=minimal
315324
esp32p4.menu.FlashSize.16M=16MB (128Mb)
316325
esp32p4.menu.FlashSize.16M.build.flash_size=16MB
326+
esp32p4.menu.FlashSize.32M=32MB (256Mb)
327+
esp32p4.menu.FlashSize.32M.build.flash_size=32MB
317328

318329
esp32p4.menu.UploadSpeed.921600=921600
319330
esp32p4.menu.UploadSpeed.921600.upload.speed=921600
@@ -31513,23 +31524,26 @@ wifiduino32c3.build.target=esp
3151331524
wifiduino32c3.build.mcu=esp32c3
3151431525
wifiduino32c3.build.core=esp32
3151531526
wifiduino32c3.build.variant=wifiduinov2
31516-
wifiduino32c3.build.board=WiFiduinoV2
31527+
wifiduino32c3.build.board=WIFIDUINOV2
3151731528
wifiduino32c3.build.bootloader_addr=0x0
3151831529

3151931530
wifiduino32c3.build.cdc_on_boot=0
3152031531
wifiduino32c3.build.f_cpu=160000000L
3152131532
wifiduino32c3.build.flash_size=4MB
3152231533
wifiduino32c3.build.flash_freq=80m
31523-
wifiduino32c3.build.flash_mode=qio
31524-
wifiduino32c3.build.boot=qio
31525-
wifiduino32c3.build.partitions=default
31534+
wifiduino32c3.build.flash_mode=dio
31535+
wifiduino32c3.build.boot=dio
31536+
wifiduino32c3.build.partitions=no_ota
3152631537
wifiduino32c3.build.defines=
3152731538

3152831539
wifiduino32c3.menu.CDCOnBoot.default=Disabled
3152931540
wifiduino32c3.menu.CDCOnBoot.default.build.cdc_on_boot=0
3153031541
wifiduino32c3.menu.CDCOnBoot.cdc=Enabled
3153131542
wifiduino32c3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
3153231543

31544+
wifiduino32c3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
31545+
wifiduino32c3.menu.PartitionScheme.no_ota.build.partitions=no_ota
31546+
wifiduino32c3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
3153331547
wifiduino32c3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
3153431548
wifiduino32c3.menu.PartitionScheme.default.build.partitions=default
3153531549
wifiduino32c3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -31539,9 +31553,6 @@ wifiduino32c3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
3153931553
wifiduino32c3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
3154031554
wifiduino32c3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
3154131555
wifiduino32c3.menu.PartitionScheme.minimal.build.partitions=minimal
31542-
wifiduino32c3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
31543-
wifiduino32c3.menu.PartitionScheme.no_ota.build.partitions=no_ota
31544-
wifiduino32c3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
3154531556
wifiduino32c3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
3154631557
wifiduino32c3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
3154731558
wifiduino32c3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
@@ -31584,12 +31595,12 @@ wifiduino32c3.menu.CPUFreq.20.build.f_cpu=20000000L
3158431595
wifiduino32c3.menu.CPUFreq.10=10MHz
3158531596
wifiduino32c3.menu.CPUFreq.10.build.f_cpu=10000000L
3158631597

31587-
wifiduino32c3.menu.FlashMode.qio=QIO
31588-
wifiduino32c3.menu.FlashMode.qio.build.flash_mode=dio
31589-
wifiduino32c3.menu.FlashMode.qio.build.boot=qio
3159031598
wifiduino32c3.menu.FlashMode.dio=DIO
3159131599
wifiduino32c3.menu.FlashMode.dio.build.flash_mode=dio
3159231600
wifiduino32c3.menu.FlashMode.dio.build.boot=dio
31601+
wifiduino32c3.menu.FlashMode.qio=QIO
31602+
wifiduino32c3.menu.FlashMode.qio.build.flash_mode=dio
31603+
wifiduino32c3.menu.FlashMode.qio.build.boot=qio
3159331604

3159431605
wifiduino32c3.menu.FlashFreq.80=80MHz
3159531606
wifiduino32c3.menu.FlashFreq.80.build.flash_freq=80m
@@ -31665,34 +31676,34 @@ wifiduino32s3.build.target=esp32s3
3166531676
wifiduino32s3.build.mcu=esp32s3
3166631677
wifiduino32s3.build.core=esp32
3166731678
wifiduino32s3.build.variant=wifiduino32s3
31668-
wifiduino32s3.build.board=WiFiduino32S3
31679+
wifiduino32s3.build.board=WIFIDUINO32S3
3166931680

3167031681
wifiduino32s3.build.usb_mode=1
3167131682
wifiduino32s3.build.cdc_on_boot=0
3167231683
wifiduino32s3.build.msc_on_boot=0
3167331684
wifiduino32s3.build.dfu_on_boot=0
3167431685
wifiduino32s3.build.f_cpu=240000000L
31675-
wifiduino32s3.build.flash_size=4MB
31686+
wifiduino32s3.build.flash_size=16MB
3167631687
wifiduino32s3.build.flash_freq=80m
3167731688
wifiduino32s3.build.flash_mode=dio
3167831689
wifiduino32s3.build.boot=qio
3167931690
wifiduino32s3.build.boot_freq=80m
31680-
wifiduino32s3.build.partitions=default
31691+
wifiduino32s3.build.partitions=app3M_fat9M_16MB
3168131692
wifiduino32s3.build.defines=
3168231693
wifiduino32s3.build.loop_core=
3168331694
wifiduino32s3.build.event_core=
31684-
wifiduino32s3.build.psram_type=qspi
31695+
wifiduino32s3.build.psram_type=opi
3168531696
wifiduino32s3.build.memory_type={build.boot}_{build.psram_type}
3168631697

31698+
wifiduino32s3.menu.PSRAM.opi=OPI PSRAM
31699+
wifiduino32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
31700+
wifiduino32s3.menu.PSRAM.opi.build.psram_type=opi
3168731701
wifiduino32s3.menu.PSRAM.disabled=Disabled
3168831702
wifiduino32s3.menu.PSRAM.disabled.build.defines=
3168931703
wifiduino32s3.menu.PSRAM.disabled.build.psram_type=qspi
3169031704
wifiduino32s3.menu.PSRAM.enabled=QSPI PSRAM
3169131705
wifiduino32s3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
3169231706
wifiduino32s3.menu.PSRAM.enabled.build.psram_type=qspi
31693-
wifiduino32s3.menu.PSRAM.opi=OPI PSRAM
31694-
wifiduino32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
31695-
wifiduino32s3.menu.PSRAM.opi.build.psram_type=opi
3169631707

3169731708
wifiduino32s3.menu.FlashMode.qio=QIO 80MHz
3169831709
wifiduino32s3.menu.FlashMode.qio.build.flash_mode=dio
@@ -31715,12 +31726,10 @@ wifiduino32s3.menu.FlashMode.opi.build.boot=opi
3171531726
wifiduino32s3.menu.FlashMode.opi.build.boot_freq=80m
3171631727
wifiduino32s3.menu.FlashMode.opi.build.flash_freq=80m
3171731728

31718-
wifiduino32s3.menu.FlashSize.4M=4MB (32Mb)
31719-
wifiduino32s3.menu.FlashSize.4M.build.flash_size=4MB
31720-
wifiduino32s3.menu.FlashSize.8M=8MB (64Mb)
31721-
wifiduino32s3.menu.FlashSize.8M.build.flash_size=8MB
3172231729
wifiduino32s3.menu.FlashSize.16M=16MB (128Mb)
3172331730
wifiduino32s3.menu.FlashSize.16M.build.flash_size=16MB
31731+
wifiduino32s3.menu.FlashSize.8M=8MB (64Mb)
31732+
wifiduino32s3.menu.FlashSize.8M.build.flash_size=8MB
3172431733
#wifiduino32s3.menu.FlashSize.32M=32MB (256Mb)
3172531734
#wifiduino32s3.menu.FlashSize.32M.build.flash_size=32MB
3172631735

@@ -31761,6 +31770,9 @@ wifiduino32s3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
3176131770
wifiduino32s3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
3176231771
wifiduino32s3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
3176331772

31773+
wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
31774+
wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
31775+
wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
3176431776
wifiduino32s3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
3176531777
wifiduino32s3.menu.PartitionScheme.default.build.partitions=default
3176631778
wifiduino32s3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -31791,9 +31803,6 @@ wifiduino32s3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
3179131803
wifiduino32s3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
3179231804
wifiduino32s3.menu.PartitionScheme.fatflash.build.partitions=ffat
3179331805
wifiduino32s3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
31794-
wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
31795-
wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
31796-
wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
3179731806
wifiduino32s3.menu.PartitionScheme.rainmaker=RainMaker 4MB
3179831807
wifiduino32s3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
3179931808
wifiduino32s3.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080
@@ -41589,11 +41598,6 @@ Geekble_ESP32C3.build.boot=qio
4158941598
Geekble_ESP32C3.build.partitions=default
4159041599
Geekble_ESP32C3.build.defines=
4159141600

41592-
Geekble_ESP32C3.menu.CDCOnBoot.default=Enabled
41593-
Geekble_ESP32C3.menu.CDCOnBoot.default.build.cdc_on_boot=1
41594-
Geekble_ESP32C3.menu.CDCOnBoot.cdc=Disabled
41595-
Geekble_ESP32C3.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
41596-
4159741601
Geekble_ESP32C3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
4159841602
Geekble_ESP32C3.menu.PartitionScheme.default.build.partitions=default
4159941603
Geekble_ESP32C3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -41614,39 +41618,6 @@ Geekble_ESP32C3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
4161441618
Geekble_ESP32C3.menu.PartitionScheme.huge_app.build.partitions=huge_app
4161541619
Geekble_ESP32C3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
4161641620

41617-
Geekble_ESP32C3.menu.CPUFreq.160=160MHz (WiFi) (Default)
41618-
Geekble_ESP32C3.menu.CPUFreq.160.build.f_cpu=160000000L
41619-
Geekble_ESP32C3.menu.CPUFreq.80=80MHz (WiFi)
41620-
Geekble_ESP32C3.menu.CPUFreq.80.build.f_cpu=80000000L
41621-
Geekble_ESP32C3.menu.CPUFreq.40=40MHz
41622-
Geekble_ESP32C3.menu.CPUFreq.40.build.f_cpu=40000000L
41623-
Geekble_ESP32C3.menu.CPUFreq.20=20MHz
41624-
Geekble_ESP32C3.menu.CPUFreq.20.build.f_cpu=20000000L
41625-
Geekble_ESP32C3.menu.CPUFreq.10=10MHz
41626-
Geekble_ESP32C3.menu.CPUFreq.10.build.f_cpu=10000000L
41627-
41628-
Geekble_ESP32C3.menu.FlashMode.qio=QIO (Default)
41629-
Geekble_ESP32C3.menu.FlashMode.qio.build.flash_mode=dio
41630-
Geekble_ESP32C3.menu.FlashMode.qio.build.boot=qio
41631-
Geekble_ESP32C3.menu.FlashMode.dio=DIO
41632-
Geekble_ESP32C3.menu.FlashMode.dio.build.flash_mode=dio
41633-
Geekble_ESP32C3.menu.FlashMode.dio.build.boot=dio
41634-
Geekble_ESP32C3.menu.FlashMode.qout=QOUT
41635-
Geekble_ESP32C3.menu.FlashMode.qout.build.flash_mode=dout
41636-
Geekble_ESP32C3.menu.FlashMode.qout.build.boot=qout
41637-
Geekble_ESP32C3.menu.FlashMode.dout=DOUT
41638-
Geekble_ESP32C3.menu.FlashMode.dout.build.flash_mode=dout
41639-
41640-
Geekble_ESP32C3.menu.FlashFreq.80=80MHz (Default)
41641-
Geekble_ESP32C3.menu.FlashFreq.80.build.flash_freq=80m
41642-
Geekble_ESP32C3.menu.FlashFreq.40=40MHz
41643-
Geekble_ESP32C3.menu.FlashFreq.40.build.flash_freq=40m
41644-
41645-
Geekble_ESP32C3.menu.FlashSize.4M=4MB (Default)
41646-
Geekble_ESP32C3.menu.FlashSize.4M.build.flash_size=4MB
41647-
Geekble_ESP32C3.menu.FlashSize.2M=2MB
41648-
Geekble_ESP32C3.menu.FlashSize.2M.build.flash_size=2MB
41649-
4165041621
Geekble_ESP32C3.menu.UploadSpeed.921600=921600 (Default)
4165141622
Geekble_ESP32C3.menu.UploadSpeed.921600.upload.speed=921600
4165241623
Geekble_ESP32C3.menu.UploadSpeed.115200=115200

‎cores/esp32/esp32-hal-misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "esp_ota_ops.h"
2626
#endif //CONFIG_APP_ROLLBACK_ENABLE
2727
#include "esp_private/startup_internal.h"
28-
#if defined(CONFIG_BT_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
28+
#if defined(CONFIG_BT_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED && __has_include("esp_bt.h")
2929
#include "esp_bt.h"
3030
#endif //CONFIG_BT_BLUEDROID_ENABLED
3131
#include <sys/time.h>

‎variants/wifiduino32s3/pins_arduino.h

Lines changed: 40 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,57 @@
22
#define Pins_Arduino_h
33

44
#include <stdint.h>
5-
6-
#define USB_VID 0x303a
7-
#define USB_PID 0x1001
8-
9-
// No USER LED or NeoLED
10-
11-
static const uint8_t TX = 45;
5+
#include "soc/soc_caps.h"
6+
7+
#define USB_VID 0x303a
8+
#define USB_PID 0x1001
9+
#define USB_MANUFACTURER "openjumper"
10+
#define USB_PRODUCT "Wifiduino32-S3"
11+
#define USB_SERIAL "" // Empty string for MAC address
12+
13+
// Some boards have too low voltage on this pin (board design bug)
14+
// Use different pin with 3V and connect with 48
15+
// and change this setup for the chosen pin (for example 38)
16+
#define PIN_RGB_LED 48
17+
// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
18+
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
19+
#define BUILTIN_LED LED_BUILTIN // backward compatibility
20+
#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN
21+
// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
22+
#define RGB_BUILTIN LED_BUILTIN
23+
#define RGB_BRIGHTNESS 64
24+
25+
static const uint8_t TX = 43;
1226
static const uint8_t RX = 44;
1327

1428
static const uint8_t SDA = 4;
1529
static const uint8_t SCL = 5;
1630

17-
static const uint8_t SS = 46;
18-
static const uint8_t MOSI = 3;
19-
static const uint8_t MISO = 20;
20-
static const uint8_t SCK = 19;
31+
static const uint8_t SS = 10;
32+
static const uint8_t MOSI = 11;
33+
static const uint8_t MISO = 13;
34+
static const uint8_t SCK = 12;
2135

22-
static const uint8_t A0 = 7;
23-
static const uint8_t A1 = 6;
36+
static const uint8_t A0 = 0;
37+
static const uint8_t A1 = 1;
2438
static const uint8_t A2 = 2;
25-
static const uint8_t A3 = 1;
39+
static const uint8_t A3 = 3;
2640
static const uint8_t A4 = 4;
2741
static const uint8_t A5 = 5;
2842

2943
static const uint8_t D0 = 44;
30-
static const uint8_t D1 = 45;
31-
static const uint8_t D2 = 42;
32-
static const uint8_t D3 = 41;
33-
static const uint8_t D4 = 0;
34-
static const uint8_t D5 = 45;
35-
static const uint8_t D6 = 48;
36-
static const uint8_t D7 = 47;
44+
static const uint8_t D1 = 43;
45+
static const uint8_t D2 = 45;
46+
static const uint8_t D3 = 46;
47+
static const uint8_t D4 = 47;
48+
static const uint8_t D5 = 48;
49+
static const uint8_t D6 = 18;
50+
static const uint8_t D7 = 17;
3751
static const uint8_t D8 = 21;
38-
static const uint8_t D9 = 14;
39-
static const uint8_t D10 = 46;
40-
static const uint8_t D11 = 3;
41-
static const uint8_t D12 = 20;
42-
static const uint8_t D13 = 19;
52+
static const uint8_t D9 = 42;
53+
static const uint8_t D10 = 41;
54+
static const uint8_t D11 = 40;
55+
static const uint8_t D12 = 38;
56+
static const uint8_t D13 = 39;
4357

4458
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)