Skip to content

Commit c69c20a

Browse files
author
Mangesh Malusare
committed
Merge branch 'release_binaries' into 'master'
release binaries added See merge request app-frameworks/esp_hosted!66
2 parents 7f31c9e + 7e047e7 commit c69c20a

File tree

8 files changed

+59
-5
lines changed

8 files changed

+59
-5
lines changed

docs/Linux_based_host/SDIO_setup.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,14 @@ Please reboot Raspberry-Pi after changing this file.
3131

3232
### ESP32 Setup
3333

34-
On ESP32 either use pre-provided hosted mode firmware binary or if you have source, compile the app against ESP-IDF 4.0 release. To use `make` build system, run following command in `esp/esp_driver/network_adapter` directory and navigate to `Example Configuration -> Transport layer -> SDIO interface -> select` and exit from menuconfig.
34+
For pre built hosted mode firmware is present in `release` tab. To flash it on ESP32 edit <serial_port> with ESP32's serial port and run following command.
35+
```sh
36+
esptool.py -p <serial_port> -b 960000 --before default_reset --after hard_reset write_flash --flash_mode dio --flash_freq 40m --flash_size detect 0x8000 partition-table_sdio_v0.2.bin 0x1000 bootloader_sdio_v0.2.bin 0x10000 esp_hosted_firmware_sdio_v0.2.bin
37+
```
38+
39+
For windows user, you can also program the binaries using ESP Flash Programming Tool.
40+
41+
Or if you have source, compile the app against ESP-IDF 4.0 release. To use `make` build system, run following command in `esp/esp_driver/network_adapter` directory and navigate to `Example Configuration -> Transport layer -> SDIO interface -> select` and exit from menuconfig.
3542
```
3643
$ make menuconfig
3744
```

docs/Linux_based_host/SPI_setup.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@ Please reboot Raspberry-Pi after changing this file.
2929

3030
### ESP32 Setup
3131

32-
On ESP32 either use pre-provided hosted mode firmware binary or if you have source, compile the app against ESP-IDF 4.0 release. To use `make` build system, run following command in `esp/esp_driver/network_adapter` directory and navigate to `Example Configuration -> Transport layer -> SPI interface -> select` and exit from menuconfig.
32+
For pre built hosted mode firmware is present in `release` tab. To flash it on ESP32 edit <serial_port> with ESP32's serial port and run following command.
33+
```sh
34+
esptool.py -p <serial_port> -b 960000 --before default_reset --after hard_reset write_flash --flash_mode dio --flash_freq 40m --flash_size detect 0x8000 partition-table_spi_v0.2.bin 0x1000 bootloader_spi_v0.2.bin 0x10000 esp_hosted_firmware_spi_v0.2.bin
35+
```
36+
For windows user, you can also program the binaries using ESP Flash Programming Tool.
37+
38+
Or if you have source, compile the app against ESP-IDF 4.0 release. To use `make` build system, run following command in `esp/esp_driver/network_adapter` directory and navigate to `Example Configuration -> Transport layer -> SPI interface -> select` and exit from menuconfig.
3339
```
3440
$ make menuconfig
3541
```

docs/Linux_based_host/UART_setup.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,13 @@ dwc_otg.lpm_enable=0 console=tty1 root=PARTUUID=5c2c80d1-02 rootfstype=ext4 elev
4141
4242
### ESP32 Setup
4343
44-
On ESP32 either use pre-provided hosted mode firmware binary or if you have source, compile the app against ESP-IDF 4.0 release. To use `make` build system, run following command in `esp/esp_driver/network_adapter` directory navigate to `Component config -> Bluetooth -> Bluetooth controller -> HCI mode -> UART(H4) -> select` also to set baud rate, `Component config -> Bluetooth -> Bluetooth controller -> HCI UART(H4) Options -> UART Baudrate for HCI -> <set baudrate> -> Ok` and exit from menuconfig.
44+
For pre built hosted mode firmware is present in `release` tab. To flash it on ESP32 edit <serial_port> with ESP32's serial port and run following command.
45+
```sh
46+
esptool.py -p <serial_port> -b 960000 --before default_reset --after hard_reset write_flash --flash_mode dio --flash_freq 40m --flash_size detect 0x8000 partition-table_sdio_uart_v0.2.bin 0x1000 bootloader_sdio_uart_v0.2.bin 0x10000 esp_hosted_firmware_sdio_uart_v0.2.bin
47+
```
48+
For windows user, you can also program the binaries using ESP Flash Programming Tool.
49+
50+
Or if you have source, compile the app against ESP-IDF 4.0 release. To use `make` build system, run following command in `esp/esp_driver/network_adapter` directory navigate to `Component config -> Bluetooth -> Bluetooth controller -> HCI mode -> UART(H4) -> select` also to set baud rate, `Component config -> Bluetooth -> Bluetooth controller -> HCI UART(H4) Options -> UART Baudrate for HCI -> <set baudrate> -> Ok` and exit from menuconfig.
4551
```
4652
$ make menuconfig
4753
```

docs/MCU_based_host/Setup.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ The control path between host and ESP32 is based on `protobuf`. For that `protoc
4444
```
4545
$ git mv components/protocomm/src/common/protocomm_priv.h components/protocomm/include/common/
4646
```
47+
For pre built hosted mode firmware is present in `release` tab. To flash it on ESP32 edit <serial_port> with ESP32's serial port and run following command.
48+
```sh
49+
esptool.py -p <serial_port> -b 960000 --before default_reset --after hard_reset write_flash --flash_mode dio --flash_freq 40m --flash_size detect 0x8000 partition-table_spi_v0.2.bin 0x1000 bootloader_spi_v0.2.bin 0x10000 esp_hosted_firmware_spi_v0.2.bin
50+
```
51+
For windows user, you can also program the binaries using ESP Flash Programming Tool.
52+
53+
Or if you have source, follow below procedure.
54+
4755
Currently ESP32 and STM32 communicates over SPI transport. To use `make` build system, run following command in `esp/esp_driver/network_adapter` directory and navigate to `Example Configuration -> Transport layer -> SPI interface -> select` and exit from menuconfig.
4856
```
4957
$ make menuconfig

esp/esp_driver/network_adapter/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
# in this exact order for cmake to work correctly
33
cmake_minimum_required(VERSION 3.5)
44

5+
set(PROJECT_VER "0.2")
6+
message(*************************************************************************************)
7+
message(" Building ESP-Hosted Firmware version :: ${PROJECT_VER} ")
8+
message(*************************************************************************************)
9+
510
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
611
project(network_adapter)

esp/esp_driver/network_adapter/Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
# project subdirectory.
44
#
55

6-
PROJECT_NAME := network_adapter
6+
PROJECT_VER := 0.2
7+
$(info *********************************************************************************)
8+
$(info * Building ESP-Hosted firmware version :: $(PROJECT_VER) )
9+
$(info *********************************************************************************)
10+
11+
PROJECT_NAME := network_adapter_$(PROJECT_VER)
12+
CPPFLAGS += -DPROJECT_VER=$(PROJECT_VER)
13+
714
EXTRA_COMPONENT_DIRS := $(realpath ../../../common)
815
include $(IDF_PATH)/make/project.mk
9-

esp/esp_driver/network_adapter/main/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@ else(CONFIG_ESP_SPI_HOST_INTERFACE)
77
list(APPEND COMPONENT_SRCS spi_slave_api.c)
88
endif()
99

10+
1011
register_component()
12+
set(PROJECT_VER "-DPROJECT_VER=0.2")
13+
target_compile_definitions(${COMPONENT_LIB} PRIVATE ${PROJECT_VER})

esp/esp_driver/network_adapter/main/app_main.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,18 @@ static inline int min(int x, int y) {
9999
return (x < y) ? x : y;
100100
}
101101

102+
static void print_firmware_version()
103+
{
104+
ESP_LOGI(TAG, "*********************************************************************");
105+
ESP_LOGI(TAG, " ESP-Hosted Firmware version :: %.1f ", PROJECT_VER);
106+
#if CONFIG_ESP_SPI_HOST_INTERFACE
107+
ESP_LOGI(TAG, " Supported Transport :: SPI ");
108+
#else
109+
ESP_LOGI(TAG, " Supported Transport :: SDIO ");
110+
#endif
111+
ESP_LOGI(TAG, "*********************************************************************");
112+
}
113+
102114
static uint8_t get_capabilities()
103115
{
104116
uint8_t cap = 0;
@@ -613,6 +625,7 @@ void app_main()
613625
{
614626
esp_err_t ret;
615627
uint8_t capa = 0;
628+
print_firmware_version();
616629

617630
capa = get_capabilities();
618631

0 commit comments

Comments
 (0)