Revert "HTTP/S Server/Client Module (#118)"

This reverts commit 73f0021.
pycom · Jun 10, 2020 · 7f84b9c · 7f84b9c
1 parent 29d8021
commit 7f84b9c
Show file tree

Hide file tree

Showing 53 changed files with 227 additions and 1,741 deletions.
diff --git a/esp32/Makefile b/esp32/Makefile
@@ -14,7 +14,7 @@ ifeq ($(wildcard boards/$(BOARD)/.),)
     $(error Invalid BOARD specified)
 endif
 
-IDF_HASH=1f96153
+IDF_HASH=d072c55
 
 TARGET ?= boot_app
 
@@ -103,7 +103,7 @@ LIBS = -L$(ESP_IDF_COMP_PATH)/esp32/lib -L$(ESP_IDF_COMP_PATH)/esp32/ld -L$(ESP_
        $(ESP_IDF_COMP_PATH)/newlib/lib/libc-psram-workaround.a \
        -lfreertos -ljson -ljsmn -llwip -lnewlib -lvfs -lopenssl -lmbedtls -lwpa_supplicant \
        -lxtensa-debug-module -lbt -lsdmmc -lsoc -lheap -lbootloader_support -lmicro-ecc \
-       -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
+       -u ld_include_panic_highint_hdl -lsmartconfig_ack -lmesh -lesp_ringbuf -lcoap -lmdns -lefuse -lespcoredump -lapp_update
 ifeq ($(BOARD), $(filter $(BOARD), SIPY LOPY4 FIPY))
     LIBS += sigfox/modsigfox_$(BOARD).a
 $(BUILD)/application.elf: sigfox/modsigfox_$(BOARD).a

diff --git a/esp32/application.mk b/esp32/application.mk
@@ -78,17 +78,6 @@ APP_INC += -I$(ESP_IDF_COMP_PATH)/coap/libcoap/examples
 APP_INC += -I$(ESP_IDF_COMP_PATH)/coap/port/include
 APP_INC += -I$(ESP_IDF_COMP_PATH)/coap/port/include/coap
 APP_INC += -I$(ESP_IDF_COMP_PATH)/mdns/include
-APP_INC += -I$(ESP_IDF_COMP_PATH)/esp_https_server/include
-APP_INC += -I$(ESP_IDF_COMP_PATH)/esp_http_server/include
-APP_INC += -I$(ESP_IDF_COMP_PATH)/esp_http_server/src
-APP_INC += -I$(ESP_IDF_COMP_PATH)/esp_http_server/src/port/esp32
-APP_INC += -I$(ESP_IDF_COMP_PATH)/esp_http_client/include
-APP_INC += -I$(ESP_IDF_COMP_PATH)/esp_http_client/lib/include
-APP_INC += -I$(ESP_IDF_COMP_PATH)/openssl/include
-APP_INC += -I$(ESP_IDF_COMP_PATH)/nghttp/port/include
-APP_INC += -I$(ESP_IDF_COMP_PATH)/tcp_transport
-APP_INC += -I$(ESP_IDF_COMP_PATH)/esp-tls
-APP_INC += -I$(ESP_IDF_COMP_PATH)/tcp_transport/include
 APP_INC += -I../lib/mp-readline
 APP_INC += -I../lib/netutils
 APP_INC += -I../lib/oofatfs
@@ -173,7 +162,6 @@ APP_MODS_SRC_C = $(addprefix mods/,\
 	machtouch.c \
 	modcoap.c \
 	modmdns.c \
-        modhttp.c \
 	)
 
 APP_MODS_LORA_SRC_C = $(addprefix mods/,\

diff --git a/esp32/bootloader/lib/libbootloader_support.a b/esp32/bootloader/lib/libbootloader_support.a
diff --git a/esp32/bootloader/lib/libefuse.a b/esp32/bootloader/lib/libefuse.a
diff --git a/esp32/bootloader/lib/liblog.a b/esp32/bootloader/lib/liblog.a
diff --git a/esp32/bootloader/lib/libmicro-ecc.a b/esp32/bootloader/lib/libmicro-ecc.a
diff --git a/esp32/bootloader/lib/libsoc.a b/esp32/bootloader/lib/libsoc.a
diff --git a/esp32/bootloader/lib/libspi_flash.a b/esp32/bootloader/lib/libspi_flash.a
diff --git a/esp32/esp32.project.ld b/esp32/esp32.project.ld
diff --git a/esp32/get_idf_libs.py b/esp32/get_idf_libs.py
@@ -69,11 +69,7 @@ def main():
         shutil.copy(src + '/efuse/libefuse.a', dsttmpapp)
         shutil.copy(src + '/espcoredump/libespcoredump.a', dsttmpapp)
         shutil.copy(src + '/app_update/libapp_update.a', dsttmpapp)
-        shutil.copy(src + '/esp_http_server/libesp_http_server.a', dsttmpapp)
-        shutil.copy(src + '/esp_https_server/libesp_https_server.a', dsttmpapp)
-        shutil.copy(src + '/esp_http_client/libesp_http_client.a', dsttmpapp)
-        shutil.copy(src + '/tcp_transport/libtcp_transport.a', dsttmpapp)
-        shutil.copy(src + '/esp-tls/libesp-tls.a', dsttmpapp)
+
     except:
         print("Couldn't Copy IDF libs defaulting to Local Lib Folders!")
         traceback.print_exc()

diff --git a/esp32/lib/libapp_update.a b/esp32/lib/libapp_update.a
diff --git a/esp32/lib/libbootloader_support.a b/esp32/lib/libbootloader_support.a
diff --git a/esp32/lib/libbt.a b/esp32/lib/libbt.a
diff --git a/esp32/lib/libcoap.a b/esp32/lib/libcoap.a
diff --git a/esp32/lib/libcxx.a b/esp32/lib/libcxx.a
diff --git a/esp32/lib/libdriver.a b/esp32/lib/libdriver.a
diff --git a/esp32/lib/libefuse.a b/esp32/lib/libefuse.a
diff --git a/esp32/lib/libesp-tls.a b/esp32/lib/libesp-tls.a
diff --git a/esp32/lib/libesp32.a b/esp32/lib/libesp32.a
diff --git a/esp32/lib/libesp_adc_cal.a b/esp32/lib/libesp_adc_cal.a
diff --git a/esp32/lib/libesp_http_client.a b/esp32/lib/libesp_http_client.a
diff --git a/esp32/lib/libesp_http_server.a b/esp32/lib/libesp_http_server.a
diff --git a/esp32/lib/libesp_https_server.a b/esp32/lib/libesp_https_server.a
diff --git a/esp32/lib/libesp_ringbuf.a b/esp32/lib/libesp_ringbuf.a
diff --git a/esp32/lib/libespcoredump.a b/esp32/lib/libespcoredump.a
diff --git a/esp32/lib/libexpat.a b/esp32/lib/libexpat.a
diff --git a/esp32/lib/libfreertos.a b/esp32/lib/libfreertos.a
diff --git a/esp32/lib/libheap.a b/esp32/lib/libheap.a
diff --git a/esp32/lib/libjsmn.a b/esp32/lib/libjsmn.a
diff --git a/esp32/lib/libjson.a b/esp32/lib/libjson.a
diff --git a/esp32/lib/liblog.a b/esp32/lib/liblog.a
diff --git a/esp32/lib/liblwip.a b/esp32/lib/liblwip.a
diff --git a/esp32/lib/libmbedtls.a b/esp32/lib/libmbedtls.a
diff --git a/esp32/lib/libmdns.a b/esp32/lib/libmdns.a
diff --git a/esp32/lib/libmicro-ecc.a b/esp32/lib/libmicro-ecc.a
diff --git a/esp32/lib/libnewlib.a b/esp32/lib/libnewlib.a
diff --git a/esp32/lib/libnghttp.a b/esp32/lib/libnghttp.a
diff --git a/esp32/lib/libnvs_flash.a b/esp32/lib/libnvs_flash.a
diff --git a/esp32/lib/libopenssl.a b/esp32/lib/libopenssl.a
diff --git a/esp32/lib/libpthread.a b/esp32/lib/libpthread.a
diff --git a/esp32/lib/libsdmmc.a b/esp32/lib/libsdmmc.a
diff --git a/esp32/lib/libsmartconfig_ack.a b/esp32/lib/libsmartconfig_ack.a
diff --git a/esp32/lib/libsoc.a b/esp32/lib/libsoc.a
diff --git a/esp32/lib/libspi_flash.a b/esp32/lib/libspi_flash.a
diff --git a/esp32/lib/libtcp_transport.a b/esp32/lib/libtcp_transport.a
diff --git a/esp32/lib/libtcpip_adapter.a b/esp32/lib/libtcpip_adapter.a
diff --git a/esp32/lib/libvfs.a b/esp32/lib/libvfs.a
diff --git a/esp32/lib/libwpa_supplicant.a b/esp32/lib/libwpa_supplicant.a
diff --git a/esp32/lib/libxtensa-debug-module.a b/esp32/lib/libxtensa-debug-module.a