Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/CMake_esp_https_ota_dependencies' into master

Browse source 
components/esp_https_ota: Changes in public requirement list for CMake and esp_ota_ops.h is included in esp_https_ota.c

bootloader_support is added in public requirements of CMake

bootloader_common.h is included in esp_https_ota.h

Closes https://github.com/espressif/esp-idf/issues/4198

Closes IDFGH-2066
This commit is contained in:
Shubham Kulkarni 2019-10-14 17:56:21 -03:00
parent 02f6bc5438
commit 0dafdd2984
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/esp_https_ota/CMakeLists.txt
View file

@ -1,4 +1,4 @@
idf_component_register(SRCS "src/esp_https_ota.c" idf_component_register(SRCS "src/esp_https_ota.c"
INCLUDE_DIRS "include" INCLUDE_DIRS "include"
REQUIRES esp_http_client REQUIRES esp_http_client bootloader_support
PRIV_REQUIRES log app_update) PRIV_REQUIRES log app_update)

2
components/esp_https_ota/include/esp_https_ota.h
View file

@ -15,7 +15,7 @@
#pragma once #pragma once
#include <esp_http_client.h> #include <esp_http_client.h>
#include <esp_ota_ops.h> #include <bootloader_common.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

1
components/esp_https_ota/src/esp_https_ota.c
View file

@ -17,6 +17,7 @@
#include <string.h> #include <string.h>
#include <esp_https_ota.h> #include <esp_https_ota.h>
#include <esp_log.h> #include <esp_log.h>
#include <esp_ota_ops.h>
#define IMAGE_HEADER_SIZE sizeof(esp_image_header_t) + sizeof(esp_image_segment_header_t) + sizeof(esp_app_desc_t) + 1 #define IMAGE_HEADER_SIZE sizeof(esp_image_header_t) + sizeof(esp_image_segment_header_t) + sizeof(esp_app_desc_t) + 1
#define DEFAULT_OTA_BUF_SIZE IMAGE_HEADER_SIZE #define DEFAULT_OTA_BUF_SIZE IMAGE_HEADER_SIZE