Skip to content

Commit 3769eea

Browse files
committed
Merge branch 'docfix/fg_references' into 'master'
Minor fixes in documentation See merge request app-frameworks/esp_hosted!263
2 parents e0bb23b + 8a77b73 commit 3769eea

File tree

10 files changed

+66
-246
lines changed

10 files changed

+66
-246
lines changed

esp_hosted_fg/docs/Linux_based_host/Getting_started.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ Wi-Fi can be configured as either as `STATION` mode or `SOFTAP` mode or `STATION
3333
- C based solution also could be used from [C based demo app](../common/c_demo.md). For simplicity,
3434

3535

36-
Python App is placed in [host/linux/host_control/python_support/](../../host/linux/host_control/python_support/) directory. Use below command to navigate to this directory.
36+
Python App is placed in [esp_hosted_fg/host/linux/host_control/python_support/](../../host/linux/host_control/python_support/) directory. Use below command to navigate to this directory.
3737
```sh
38-
$ cd host/linux/host_control/python_support/
38+
$ cd esp_hosted_fg/host/linux/host_control/python_support/
3939
```
4040

4141
#### 2.1.1 Wi-Fi Station Mode Operations

esp_hosted_fg/docs/Linux_based_host/Linux_based_readme.md

+15-22
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,17 @@ Make sure that Raspberry-Pi is equipped with following:
5050
```sh
5151
$ sudo apt install python3
5252
```
53-
* Clone ESP-Hosted code repository
53+
* Using released codebase
54+
* Download pre-built ESP-Hosted firmware release binaries from [releases](https://github.com/espressif/esp-hosted/releases)
55+
* :warning: Make sure that you use `Source code (zip)` in `Assets` fold with associated release for host building.
56+
* Using latest master
57+
* Clone ESP-Hosted code repository
5458
```
5559
$ git clone --recurse-submodules <url_of_esp_hosted_repository>
5660
$ cd esp-hosted
5761
$ git submodule update --init --recursive
5862
```
59-
* Download pre-built ESP-Hosted firmware release binaries from [releases](https://github.com/espressif/esp-hosted/releases)
60-
63+
* Please use the exact same git commit for ESP flashing using source code.
6164

6265
### 1.3 Setup
6366

@@ -70,7 +73,7 @@ Prepare connections based on interface requirements and setup host as below.
7073
* Prepare Raspberry-Pi as per section [1.2 Raspberry-Pi Software Setup](SDIO_setup.md#12-raspberry-pi-software-setup) of [SDIO setup document](SDIO_setup.md)
7174
* Compile and load host driver as below:
7275
```sh
73-
$ cd host/linux/host_control/
76+
$ cd esp_hosted_fg/host/linux/host_control/
7477
$ ./rpi_init.sh sdio
7578
```
7679
* **Wi-Fi and Bluetooth over SPI**
@@ -80,7 +83,7 @@ Prepare connections based on interface requirements and setup host as below.
8083
* Prepare Raspberry-Pi as per [1.2 Raspberry-Pi Software Setup](SPI_setup.md#12-raspberry-pi-software-setup) of [SPI Setup document](SPI_setup.md)
8184
* Compile and load host driver as below:
8285
```sh
83-
$ cd host/linux/host_control/
86+
$ cd esp_hosted_fg/host/linux/host_control/
8487
$ ./rpi_init.sh spi
8588
```
8689
* **Wi-Fi over SDIO and Bluetooth over UART**
@@ -92,7 +95,7 @@ Prepare connections based on interface requirements and setup host as below.
9295
* Prepare Raspberry-Pi for UART operations as per section [1.2 Raspberry-Pi Software Setup](UART_setup.md#12-raspberry-pi-software-setup) of [UART setup document](UART_setup.md)
9396
* Compile and load host driver as below:
9497
```sh
95-
$ cd host/linux/host_control/
98+
$ cd esp_hosted_fg/host/linux/host_control/
9699
$ ./rpi_init.sh sdio btuart
97100
```
98101
* After loading ESP firmware, execute below command to create `hci0` interface
@@ -108,7 +111,7 @@ Prepare connections based on interface requirements and setup host as below.
108111
* Prepare Raspberry-Pi for UART operations as per section [1.2 Raspberry-Pi Software Setup](UART_setup.md#12-raspberry-pi-software-setup) of [UART setup document](UART_setup.md)
109112
* Compile and load host driver as below:
110113
```sh
111-
$ cd host/linux/host_control/
114+
$ cd esp_hosted_fg/host/linux/host_control/
112115
$ ./rpi_init.sh spi btuart
113116
```
114117
* After loading ESP firmware, execute below command to create `hci0` interface
@@ -117,21 +120,9 @@ Prepare connections based on interface requirements and setup host as below.
117120
```
118121

119122
#### 1.3.1 ESP Firmware Setup
120-
* Flash pre-built binaries as below.
121-
122-
```sh
123-
$ esptool.py -p <serial_port> -b 960000 --before default_reset --after hard_reset \
124-
write_flash --flash_mode dio --flash_freq 40m --flash_size detect \
125-
0x8000 esp_hosted_partition-table_<esp_peripheral>_<interface_type>_v<release_version>.bin \
126-
0x1000 esp_hosted_bootloader_<esp_peripheral>_<interface_type>_v<release_version>.bin \
127-
0x10000 esp_hosted_firmware_<esp_peripheral>_<interface_type>_v<release_version>.bin
128-
129-
Where,
130-
<serial_port> : serial port of ESP peripheral
131-
<esp_peripheral> : esp32/esp32s2/esp32c2/esp32c3/esp32s3
132-
<interface_type> : sdio/spi/sdio_uart
133-
<release_version>: 0.1,0.2 etc
134-
```
123+
* Download pre-built firmware binaries from [releases](https://github.com/espressif/esp-hosted/releases)
124+
* Follow `readme.txt` from release tarball to flash the ESP binary
125+
* :warning: Make sure that you use `Source code (zip)` in `Assets` fold with associated release for host building.
135126

136127
#### 1.3.2 Setup Validation
137128
Once everything is setup and host software and ESP firmware are loaded
@@ -204,6 +195,7 @@ This section identifies Raspberry-Pi specific setup requirements.
204195
:warning:`Note: ESP-IDF is needed to compile ESP-Hosted firmware source. Skip this step if you are planning to use pre-built release binaries.`
205196

206197
- Clone the ESP-IDF [release/v5.0](https://github.com/espressif/esp-idf/tree/release/v5.0) and git checkout to `release/v5.0` branch.
198+
- [Set-up the ESP-IDF](https://docs.espressif.com/projects/esp-idf/en/release-v5.0/esp32/get-started/index.html)
207199
- The control path between MCU host and ESP peripheral is based on `protobuf`. For that, corresponding stack layer, `protocomm` from ESP-IDF is used. It will be already present in ESP-IDF, no extra setup required for that.
208200

209201
### 2.3 ESP-Hosted Code Repository
@@ -213,6 +205,7 @@ $ git clone --recurse-submodules <url_of_esp_hosted_repository>
213205
$ cd esp-hosted
214206
$ git submodule update --init --recursive
215207
```
208+
Please make sure that ESP and host checkeout to **same git commit**.
216209

217210
### 2.4 ESP-Hosted Setup and Load Project
218211

esp_hosted_fg/docs/Linux_based_host/SDIO_setup.md

+8-20
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Please reboot Raspberry-Pi after changing this file.
3232
### 2.1 Host Software
3333
* Execute following commands in root directory of cloned ESP-Hosted repository on Raspberry-Pi
3434
```sh
35-
$ cd host/linux/host_control/
35+
$ cd esp_hosted_fg/host/linux/host_control/
3636
$ ./rpi_init.sh sdio
3737
```
3838
* This script compiles and loads host driver on Raspberry-Pi. It also creates virtual serial interface `/dev/esps0` which is used as a control interface for Wi-Fi on ESP peripheral
@@ -42,31 +42,19 @@ One can load pre-built release binaries on ESP peripheral or compile those from
4242

4343
#### 2.2.1 Load Pre-built Release Binaries
4444
* Download pre-built firmware binaries from [releases](https://github.com/espressif/esp-hosted/releases)
45-
* Linux users can run below command to flash these binaries. Edit <serial_port> with ESP peripheral's serial port.
46-
```sh
47-
$ python esptool.py --chip esp32 --port <serial_port> --baud <flash_baud_rate> --before default_reset \
48-
--after hard_reset write_flash --flash_mode dio --flash_size detect --flash_freq 40m \
49-
0x1000 esp_hosted_bootloader_esp32_sdio_v<release_version>.bin \
50-
0x8000 esp_hosted_partition-table_esp32_sdio_v<release_version>.bin \
51-
0xd000 esp_hosted_ota_data_initial_esp32_sdio_v<release_version>.bin \
52-
0x10000 esp_hosted_firmware_esp32_sdio_v<release_version>.bin
53-
54-
Where,
55-
<serial_port> : serial port of ESP peripheral
56-
<flash_baud_rate> : flash baud rate of ESP peripheral, ex.115200, 921600, 2Mbps
57-
<release_version> : 0.1,0.2 etc. Latest from [release page](https://github.com/espressif/esp-hosted/releases)
58-
```
59-
* This command will flash `SDIO` interface binaries on `esp32` chip.
60-
45+
* Follow `readme.txt` from release tarball to flash the ESP binary
46+
* :warning: Make sure that you use `Source code (zip)` in `Assets` fold with associated release for host building.
6147
* Windows user can use ESP Flash Programming Tool to flash the pre-built binary.
6248

6349

6450
#### 2.2.2 Source Compilation
65-
:warning:<code>Note:Please check [ESP-IDF Setup](Linux_based_readme.md#22-esp-idf-setup) and use appropriate ESP-IDF version</code>
66-
* In root directory of ESP-Hosted repository, execute below command
51+
- Note: Please use the same git commit both at ESP and Host
52+
- Clone the ESP-IDF [release/v5.0](https://github.com/espressif/esp-idf/tree/release/v5.0) and git checkout to `release/v5.0` branch.
53+
- [Set-up the ESP-IDF](https://docs.espressif.com/projects/esp-idf/en/release-v5.0/esp32/get-started/index.html)
54+
- In root directory of ESP-Hosted repository, execute below command
6755

6856
```sh
69-
$ cd esp/esp_driver/network_adapter
57+
$ cd esp_hosted_fg/esp/esp_driver/network_adapter
7058
```
7159

7260
##### Using cmake

esp_hosted_fg/docs/Linux_based_host/SPI_setup.md

+8-90
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Please reboot Raspberry-Pi after changing this file.
105105
### 2.1 Host Software
106106
* Execute following commands in root directory of cloned ESP-Hosted repository on Raspberry-Pi
107107
```sh
108-
$ cd host/linux/host_control/
108+
$ cd esp_hosted_fg/host/linux/host_control/
109109
$ ./rpi_init.sh spi
110110
```
111111
* This script compiles and loads host driver on Raspberry-Pi. It also creates virtual serial interface `/dev/esps0` which is used as a control interface for Wi-Fi on ESP peripheral
@@ -115,100 +115,18 @@ One can load pre-built release binaries on ESP peripheral or compile those from
115115

116116
#### 2.2.1 Load Pre-built Release Binaries
117117
* Download pre-built firmware binaries from [releases](https://github.com/espressif/esp-hosted/releases)
118-
* Linux users can run below command to flash these binaries.
119-
##### ESP32
120-
```sh
121-
$ python esptool.py --chip esp32 --port <serial_port> --baud <flash_baud_rate> --before default_reset \
122-
--after hard_reset write_flash --flash_mode dio --flash_size detect --flash_freq 40m \
123-
0x1000 esp_hosted_bootloader_esp32_spi_v<release_version>.bin \
124-
0x8000 esp_hosted_partition-table_esp32_spi_v<release_version>.bin \
125-
0xd000 esp_hosted_ota_data_initial_esp32_spi_v<release_version>.bin \
126-
0x10000 esp_hosted_firmware_esp32_spi_v<release_version>.bin
127-
128-
Where,
129-
<serial_port> : serial port of ESP peripheral
130-
<flash_baud_rate> : flash baud rate of ESP peripheral, ex.115200, 921600, 2Mbps
131-
<release_version> : 0.1,0.2 etc. Latest from [release page](https://github.com/espressif/esp-hosted/releases)
132-
```
133-
* This command will flash `SPI` interface binaries on `esp32` chip.
134-
135-
##### ESP32-S2
136-
```sh
137-
$ python esptool.py --chip esp32s2 --port <serial_port> --baud <flash_baud_rate> --before default_reset \
138-
--after hard_reset write_flash --flash_mode dio --flash_size detect --flash_freq 80m \
139-
0x1000 esp_hosted_bootloader_esp32s2_spi_v<release_version>.bin \
140-
0x8000 esp_hosted_partition-table_esp32s2_spi_v<release_version>.bin \
141-
0xd000 esp_hosted_ota_data_initial_esp32s2_spi_v<release_version>.bin \
142-
0x10000 esp_hosted_firmware_esp32s2_spi_v<release_version>.bin
143-
144-
Where,
145-
<serial_port> : serial port of ESP peripheral
146-
<flash_baud_rate> : flash baud rate of ESP peripheral, ex.115200, 921600, 2Mbps
147-
<release_version> : 0.1,0.2 etc. Latest from [release page](https://github.com/espressif/esp-hosted/releases)
148-
```
149-
* This command will flash `SPI` interface binaries on `esp32s2` chip.
150-
151-
##### ESP32-C2
152-
```sh
153-
$ python esptool.py --chip esp32c2 --port <serial_port> --baud <flash_baud_rate> --before default_reset \
154-
--after hard_reset write_flash --flash_mode dio --flash_size detect --flash_freq 80m \
155-
0x0 esp_hosted_bootloader_esp32c2_spi_v<release_version>.bin \
156-
0x8000 esp_hosted_partition-table_esp32c2_spi_v<release_version>.bin \
157-
0xd000 esp_hosted_ota_data_initial_esp32c2_spi_v<release_version>.bin \
158-
0x10000 esp_hosted_firmware_esp32c2_spi_v<release_version>.bin
159-
160-
Where,
161-
<serial_port> : serial port of ESP peripheral
162-
<flash_baud_rate> : flash baud rate of ESP peripheral, ex.115200, 921600, 2Mbps
163-
<release_version> : 0.1,0.2 etc. Latest from [release page](https://github.com/espressif/esp-hosted/releases)
164-
```
165-
* This command will flash `SPI` interface binaries on `esp32c2` chip.
166-
167-
* Windows user can use ESP Flash Programming Tool to flash the pre-built binary.
168-
169-
##### ESP32-C3
170-
```sh
171-
$ python esptool.py --chip esp32c3 --port <serial_port> --baud <flash_baud_rate> --before default_reset \
172-
--after hard_reset write_flash --flash_mode dio --flash_size detect --flash_freq 80m \
173-
0x0 esp_hosted_bootloader_esp32c3_spi_v<release_version>.bin \
174-
0x8000 esp_hosted_partition-table_esp32c3_spi_v<release_version>.bin \
175-
0xd000 esp_hosted_ota_data_initial_esp32c3_spi_v<release_version>.bin \
176-
0x10000 esp_hosted_firmware_esp32c3_spi_v<release_version>.bin
177-
178-
Where,
179-
<serial_port> : serial port of ESP peripheral
180-
<flash_baud_rate> : flash baud rate of ESP peripheral, ex.115200, 921600, 2Mbps
181-
<release_version> : 0.1,0.2 etc. Latest from [release page](https://github.com/espressif/esp-hosted/releases)
182-
```
183-
* This command will flash `SPI` interface binaries on `esp32c3` chip.
184-
185-
* Windows user can use ESP Flash Programming Tool to flash the pre-built binary.
186-
187-
##### ESP32-S3
188-
```sh
189-
$ python esptool.py --chip esp32s3 --port <serial_port> --baud <flash_baud_rate> --before default_reset \
190-
--after hard_reset write_flash --flash_mode dio --flash_size detect --flash_freq 80m \
191-
0x0 esp_hosted_bootloader_esp32s3_spi_v<release_version>.bin \
192-
0x8000 esp_hosted_partition-table_esp32s3_spi_v<release_version>.bin \
193-
0xd000 esp_hosted_ota_data_initial_esp32s3_spi_v<release_version>.bin \
194-
0x10000 esp_hosted_firmware_esp32s3_spi_v<release_version>.bin
195-
196-
Where,
197-
<serial_port> : serial port of ESP peripheral
198-
<flash_baud_rate> : flash baud rate of ESP peripheral, ex.115200, 921600, 2Mbps
199-
<release_version> : 0.1,0.2 etc. Latest from [release page](https://github.com/espressif/esp-hosted/releases)
200-
```
201-
* This command will flash `SPI` interface binaries on `esp32s3` chip.
202-
118+
* Follow `readme.txt` from release tarball to flash the ESP binary
119+
* :warning: Make sure that you use `Source code (zip)` in `Assets` fold with associated release for host building.
203120
* Windows user can use ESP Flash Programming Tool to flash the pre-built binary.
204121

205122
#### 2.2.2 Source Compilation
206-
:warning:<code>Note: Please check [ESP-IDF Setup](Linux_based_readme.md#22-esp-idf-setup) and use appropriate ESP-IDF version</code>
207-
208-
* In root directory of ESP-Hosted repository, execute below command
123+
- Note: Please use the same git commit both at ESP and Host
124+
- Clone the ESP-IDF [release/v5.0](https://github.com/espressif/esp-idf/tree/release/v5.0) and git checkout to `release/v5.0` branch.
125+
- [Set-up the ESP-IDF](https://docs.espressif.com/projects/esp-idf/en/release-v5.0/esp32/get-started/index.html)
126+
- In root directory of ESP-Hosted repository, execute below command
209127

210128
```sh
211-
$ cd esp/esp_driver/network_adapter
129+
$ cd esp_hosted_fg/esp/esp_driver/network_adapter
212130
```
213131

214132
##### Using cmake

0 commit comments

Comments
 (0)