Skip to content

Commit c68c140

Browse files
authored
Merge pull request #187 from facchinm/wific3_new_buildscript
WiFiC3: replace old build script
2 parents b4438c5 + 607654d commit c68c140

15 files changed

+78
-2294
lines changed

Diff for: libraries/WiFi/extra/0001-ArduinoBLE-Support-C33.patch

-57
This file was deleted.

Diff for: libraries/WiFi/extra/0001-Defaults-for-C33-BLE.patch

+2-22
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ Date: Tue, 4 Apr 2023 18:57:39 +0200
44
Subject: [PATCH] Defaults for C33 BLE
55

66
---
7-
.../esp/esp_driver/network_adapter/main/slave_bt.c | 4 ++--
87
.../esp/esp_driver/network_adapter/main/slave_bt.h | 8 ++++----
9-
.../esp/esp_driver/network_adapter/sdkconfig.defaults | 8 +++-----
10-
3 files changed, 9 insertions(+), 11 deletions(-)
8+
1 file changed, 4 insertions(+), 4 deletions(-)
119

1210
diff --git a/esp_hosted_fg/esp/esp_driver/network_adapter/main/slave_bt.c b/esp_hosted_fg/esp/esp_driver/network_adapter/main/slave_bt.c
1311
index b2e8a73..3a7eae6 100644
@@ -24,6 +22,7 @@ index b2e8a73..3a7eae6 100644
2422

2523
gdma_strategy_config_t strategy_config = {
2624
.auto_update_desc = false,
25+
2726
diff --git a/esp_hosted_fg/esp/esp_driver/network_adapter/main/slave_bt.h b/esp_hosted_fg/esp/esp_driver/network_adapter/main/slave_bt.h
2827
index 87e29f7..30acaf1 100644
2928
--- a/esp_hosted_fg/esp/esp_driver/network_adapter/main/slave_bt.h
@@ -43,25 +42,6 @@ index 87e29f7..30acaf1 100644
4342

4443
#elif defined(CONFIG_IDF_TARGET_ESP32S3)
4544

46-
diff --git a/esp_hosted_fg/esp/esp_driver/network_adapter/sdkconfig.defaults b/esp_hosted_fg/esp/esp_driver/network_adapter/sdkconfig.defaults
47-
index bc3ec56..351dc63 100644
48-
--- a/esp_hosted_fg/esp/esp_driver/network_adapter/sdkconfig.defaults
49-
+++ b/esp_hosted_fg/esp/esp_driver/network_adapter/sdkconfig.defaults
50-
@@ -7,11 +7,9 @@ CONFIG_SDIO_DAT2_DISABLED=
51-
CONFIG_BT_ENABLED=y
52-
CONFIG_BT_CONTROLLER_ONLY=y
53-
CONFIG_BT_BLUEDROID_ENABLED=
54-
-CONFIG_BTDM_CTRL_MODE_BTDM=y
55-
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
56-
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
57-
+CONFIG_BTDM_CTRL_MODE_BTDM=n
58-
CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y
59-
60-
CONFIG_ESP32_WIFI_NVS_ENABLED=
61-
-
62-
-# OTA
63-
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
64-
-CONFIG_PARTITION_TABLE_TWO_OTA=y
6545
--
6646
2.40.0
6747

Diff for: libraries/WiFi/extra/ESP32-C3.bin

1010 KB
Binary file not shown.

Diff for: libraries/WiFi/extra/README.md

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Build script for esp-hosted (Portenta C33)
2+
3+
```
4+
git clone https://github.com/espressif/esp-hosted.git --recursive
5+
cd esp-hosted/
6+
#git checkout release/fg-v0.0.5
7+
git checkout fe0b10584417629908cee8141699c2f35ea05a25
8+
patch -p1 < ../0001-Defaults-for-C33-BLE.patch
9+
cd esp_hosted_fg/esp/esp_driver/
10+
./esp-idf/install.sh esp32s3
11+
. ./esp-idf/export.sh
12+
cd network_adapter/
13+
idf.py set-target esp32c3
14+
cp ../../../../../sdkconfig.default.c33 sdkconfig
15+
idf.py build
16+
cd ../../../../../
17+
python combine.py
18+
```
19+
# How to flash the firmware
20+
21+
```
22+
espflash write-bin 0x0 ESP32-C3.bin
23+
```
24+
25+
or
26+
27+
```
28+
esptool.py --chip esp32c3 -p /dev/ttyACM0 -b 230400 --before=default_reset --after=hard_reset --no-stub write_flash --flash_mode dio --flash_freq 80m --flash_size 2MB 0x0 ESP32-C3.bin
29+
```

Diff for: libraries/WiFi/extra/README.txt

-1
This file was deleted.

Diff for: libraries/WiFi/extra/bootloader.bin

-19.8 KB
Binary file not shown.

Diff for: libraries/WiFi/extra/combine.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import sys;
44

5-
booloaderData = open("bootloader.bin", "rb").read()
6-
partitionData = open("partition-table.bin", "rb").read()
7-
networkData = open("network_adapter.bin", "rb").read()
5+
basePath = "esp-hosted/esp_hosted_fg/esp/esp_driver/network_adapter/"
6+
7+
booloaderData = open(basePath + "build/bootloader/bootloader.bin", "rb").read()
8+
partitionData = open(basePath + "build/partition_table/partition-table.bin", "rb").read()
9+
networkData = open(basePath + "build/network_adapter.bin", "rb").read()
810

911
# 0x0 bootloader.bin 0x8000 partition-table.bin 0x10000 network_adapter.bin
1012

Diff for: libraries/WiFi/extra/esptool

Submodule esptool deleted from 2c69163

Diff for: libraries/WiFi/extra/flasher.sh

-25
This file was deleted.

Diff for: libraries/WiFi/extra/network_adapter.bin

-833 KB
Binary file not shown.

Diff for: libraries/WiFi/extra/ota_data_initial.bin

-1
This file was deleted.

Diff for: libraries/WiFi/extra/partition-table.bin

-3 KB
Binary file not shown.

Diff for: libraries/WiFi/extra/sdkconfig.default.c33

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
CONFIG_ESP32_DEFAULT_CPU_FREQ_160=y
2+
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=160
3+
CONFIG_FREERTOS_UNICORE=y
4+
CONFIG_SDIO_DAT2_DISABLED=
5+
6+
CONFIG_ESP_SPI_GPIO_HANDSHAKE=5
7+
CONFIG_ESP_SPI_GPIO_DATA_READY=9
8+
CONFIG_SPI_SLAVE_ISR_IN_IRAM=n
9+
CONFIG_SPI_MASTER_ISR_IN_IRAM=n
10+
11+
# BT Configuration
12+
CONFIG_BT_ENABLED=y
13+
CONFIG_BT_CONTROLLER_ONLY=y
14+
CONFIG_BT_BLUEDROID_ENABLED=
15+
CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
16+
CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
17+
CONFIG_BTDM_CTRL_MODE_BTDM=n
18+
CONFIG_BT_CTRL_HCI_MODE_VHCI=n
19+
CONFIG_BT_CTRL_HCI_MODE_UART_H4=y
20+
CONFIG_BT_CTRL_HCI_TL=0
21+
CONFIG_BT_CTRL_HCI_TL_EFF=0
22+
CONFIG_EXAMPLE_HCI_UART_BAUDRATE=921600
23+
24+
CONFIG_ESP32_WIFI_NVS_ENABLED=
25+
26+
CONFIG_COMPILER_DISABLE_GCC12_WARNINGS=y
27+
28+
CONFIG_ESP_SPI_TX_Q_SIZE=20
29+
CONFIG_ESP_SPI_RX_Q_SIZE=20
30+
CONFIG_PARTITION_TABLE_SINGLE_APP=y
31+
CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
32+
CONFIG_ESPTOOLPY_FLASHSIZE="2MB"
33+
CONFIG_ESP_HTTP_CLIENT_ENABLE_DIGEST_AUTH=y
34+
35+
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED=n
36+
CONFIG_ESP_IPC_TASK_STACK_SIZE=1536
37+
38+
CONFIG_ESP_PHY_REDUCE_TX_POWER=y
39+
CONFIG_REDUCE_PHY_TX_POWER=y
40+
CONFIG_ESP32_REDUCE_PHY_TX_POWER=y
41+

0 commit comments

Comments
 (0)