Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit 7f84b9c

Browse files
committed
Revert "HTTP/S Server/Client Module (#118)"
This reverts commit 73f0021.
1 parent 29d8021 commit 7f84b9c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+227
-1741
lines changed

esp32/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ifeq ($(wildcard boards/$(BOARD)/.),)
1414
$(error Invalid BOARD specified)
1515
endif
1616

17-
IDF_HASH=1f96153
17+
IDF_HASH=d072c55
1818

1919
TARGET ?= boot_app
2020

@@ -103,7 +103,7 @@ LIBS = -L$(ESP_IDF_COMP_PATH)/esp32/lib -L$(ESP_IDF_COMP_PATH)/esp32/ld -L$(ESP_
103103
$(ESP_IDF_COMP_PATH)/newlib/lib/libc-psram-workaround.a \
104104
-lfreertos -ljson -ljsmn -llwip -lnewlib -lvfs -lopenssl -lmbedtls -lwpa_supplicant \
105105
-lxtensa-debug-module -lbt -lsdmmc -lsoc -lheap -lbootloader_support -lmicro-ecc \
106-
-u ld_include_panic_highint_hdl -lsmartconfig_ack -lmesh -lesp_ringbuf -lcoap -lmdns -lefuse -lespcoredump -lapp_update -lesp_http_server -lesp_https_server -lesp_http_client -ltcp_transport -lesp-tls
106+
-u ld_include_panic_highint_hdl -lsmartconfig_ack -lmesh -lesp_ringbuf -lcoap -lmdns -lefuse -lespcoredump -lapp_update
107107
ifeq ($(BOARD), $(filter $(BOARD), SIPY LOPY4 FIPY))
108108
LIBS += sigfox/modsigfox_$(BOARD).a
109109
$(BUILD)/application.elf: sigfox/modsigfox_$(BOARD).a

esp32/application.mk

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,6 @@ APP_INC += -I$(ESP_IDF_COMP_PATH)/coap/libcoap/examples
7878
APP_INC += -I$(ESP_IDF_COMP_PATH)/coap/port/include
7979
APP_INC += -I$(ESP_IDF_COMP_PATH)/coap/port/include/coap
8080
APP_INC += -I$(ESP_IDF_COMP_PATH)/mdns/include
81-
APP_INC += -I$(ESP_IDF_COMP_PATH)/esp_https_server/include
82-
APP_INC += -I$(ESP_IDF_COMP_PATH)/esp_http_server/include
83-
APP_INC += -I$(ESP_IDF_COMP_PATH)/esp_http_server/src
84-
APP_INC += -I$(ESP_IDF_COMP_PATH)/esp_http_server/src/port/esp32
85-
APP_INC += -I$(ESP_IDF_COMP_PATH)/esp_http_client/include
86-
APP_INC += -I$(ESP_IDF_COMP_PATH)/esp_http_client/lib/include
87-
APP_INC += -I$(ESP_IDF_COMP_PATH)/openssl/include
88-
APP_INC += -I$(ESP_IDF_COMP_PATH)/nghttp/port/include
89-
APP_INC += -I$(ESP_IDF_COMP_PATH)/tcp_transport
90-
APP_INC += -I$(ESP_IDF_COMP_PATH)/esp-tls
91-
APP_INC += -I$(ESP_IDF_COMP_PATH)/tcp_transport/include
9281
APP_INC += -I../lib/mp-readline
9382
APP_INC += -I../lib/netutils
9483
APP_INC += -I../lib/oofatfs
@@ -173,7 +162,6 @@ APP_MODS_SRC_C = $(addprefix mods/,\
173162
machtouch.c \
174163
modcoap.c \
175164
modmdns.c \
176-
modhttp.c \
177165
)
178166

179167
APP_MODS_LORA_SRC_C = $(addprefix mods/,\
-1.04 KB
Binary file not shown.

esp32/bootloader/lib/libefuse.a

-272 Bytes
Binary file not shown.

esp32/bootloader/lib/liblog.a

-60 Bytes
Binary file not shown.
-20 Bytes
Binary file not shown.

esp32/bootloader/lib/libsoc.a

-592 Bytes
Binary file not shown.
-32 Bytes
Binary file not shown.

esp32/esp32.project.ld

Lines changed: 224 additions & 224 deletions
Large diffs are not rendered by default.

esp32/get_idf_libs.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,7 @@ def main():
6969
shutil.copy(src + '/efuse/libefuse.a', dsttmpapp)
7070
shutil.copy(src + '/espcoredump/libespcoredump.a', dsttmpapp)
7171
shutil.copy(src + '/app_update/libapp_update.a', dsttmpapp)
72-
shutil.copy(src + '/esp_http_server/libesp_http_server.a', dsttmpapp)
73-
shutil.copy(src + '/esp_https_server/libesp_https_server.a', dsttmpapp)
74-
shutil.copy(src + '/esp_http_client/libesp_http_client.a', dsttmpapp)
75-
shutil.copy(src + '/tcp_transport/libtcp_transport.a', dsttmpapp)
76-
shutil.copy(src + '/esp-tls/libesp-tls.a', dsttmpapp)
72+
7773
except:
7874
print("Couldn't Copy IDF libs defaulting to Local Lib Folders!")
7975
traceback.print_exc()

0 commit comments

Comments
 (0)