Merge branch 'bugfix/CMake_esp_https_ota_dependencies' into master

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
pull/5815/head
Shubham Kulkarni 2019-10-14 17:56:21 -03:00 zatwierdzone przez bot
rodzic 3bdebe2383
commit 465d517fbd
3 zmienionych plików z 3 dodań i 2 usunięć

Wyświetl plik

@ -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)

Wyświetl plik

@ -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" {

Wyświetl plik

@ -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