Merge branch 'feature/update_coap_from_idf' into 'master'

Feature/update coap from idf

See merge request sdk/ESP8266_RTOS_SDK!1318

Author: donghengqaz

.gitmodules

@@ -13,3 +13,7 @@
 [submodule "components/mqtt/esp-mqtt"]
 	path = components/mqtt/esp-mqtt
 	url = ../../espressif/esp-mqtt.git
+
+[submodule "components/coap/libcoap"]
+	path = components/coap/libcoap
+	url = ../../espressif/libcoap

components/coap/CMakeLists.txt

@@ -1,43 +1,41 @@
-set(COMPONENT_ADD_INCLUDEDIRS port/include port/include/coap libcoap/include libcoap/include/coap)
+if(CONFIG_ENABLE_COAP)
+    set(include_dirs port/include port/include/coap libcoap/include libcoap/include/coap2)
 
-set(COMPONENT_SRCS
-    libcoap/src/address.c
-    libcoap/src/async.c
-    libcoap/src/block.c
-    libcoap/src/coap_time.c
-    libcoap/src/debug.c
-    libcoap/src/encode.c
-    libcoap/src/hashkey.c
-    libcoap/src/mem.c
-    libcoap/src/net.c
-    libcoap/src/option.c
-    libcoap/src/pdu.c
-    libcoap/src/resource.c
-    libcoap/src/str.c
-    libcoap/src/subscribe.c
-    libcoap/src/uri.c
-    port/coap_io_socket.c
-    )
+    set(srcs
+        "libcoap/src/address.c"
+        "libcoap/src/async.c"
+        "libcoap/src/block.c"
+        "libcoap/src/coap_event.c"
+        "libcoap/src/coap_hashkey.c"
+        "libcoap/src/coap_session.c"
+        "libcoap/src/coap_time.c"
+        "libcoap/src/coap_debug.c"
+        "libcoap/src/encode.c"
+        "libcoap/src/mem.c"
+        "libcoap/src/net.c"
+        "libcoap/src/option.c"
+        "libcoap/src/pdu.c"
+        "libcoap/src/resource.c"
+        "libcoap/src/str.c"
+        "libcoap/src/subscribe.c"
+        "libcoap/src/uri.c"
+        "libcoap/src/coap_notls.c"
+        "port/coap_io.c")
 
-set(COMPONENT_REQUIRES lwip)
+    set(COMPONENT_REQUIRES lwip)
 
-register_component()
+    idf_component_register(SRCS "${srcs}"
+                    INCLUDE_DIRS "${include_dirs}"
+                    REQUIRES lwip)
 
-# Needed for coap headers in public builds, also.
-#
-# TODO: find a way to move this to a port header
-target_compile_definitions(${COMPONENT_LIB} PUBLIC WITH_POSIX)
+    # Silence format truncation warning, until it is fixed upstream
+    set_source_files_properties(libcoap/src/coap_debug.c PROPERTIES COMPILE_FLAGS -Wno-format-truncation)
 
-set_source_files_properties(
-    libcoap/src/debug.c
-    libcoap/src/pdu.c
-    PROPERTIES COMPILE_FLAGS
-    -Wno-write-strings)
+    # Needed for coap headers in public builds, also.
+    #
+    # TODO: find a way to move this to a port header
+    target_compile_definitions(${COMPONENT_LIB} PUBLIC WITH_POSIX)
+else()
+    register_component()
+endif()
 
-# Temporary suppress "fallthrough" warnings until they are fixed in libcoap repo
-set_source_files_properties(
-    libcoap/src/option.c
-    PROPERTIES COMPILE_FLAGS
-    -Wno-implicit-fallthrough)
-
-target_compile_definitions(${COMPONENT_LIB} PUBLIC -D WITH_POSIX)

components/coap/Kconfig

@@ -0,0 +1,10 @@
+menu "COAP"
+
+config ENABLE_COAP
+    bool "Enable coap"
+    default n
+    select LWIP_IPV6
+    help
+        Enable this option and coap is to be used, IPv6 is to be Enable.
+endmenu
+

components/coap/Makefile.projbuild

@@ -2,13 +2,15 @@
 # Component Makefile
 #
 
-COMPONENT_ADD_INCLUDEDIRS := port/include port/include/coap libcoap/include libcoap/include/coap
+ifdef CONFIG_ENABLE_COAP
+COMPONENT_ADD_INCLUDEDIRS := port/include port/include/coap libcoap/include libcoap/include/coap2
 
-COMPONENT_OBJS = libcoap/src/address.o libcoap/src/async.o libcoap/src/block.o libcoap/src/coap_time.o libcoap/src/debug.o libcoap/src/encode.o libcoap/src/hashkey.o libcoap/src/mem.o libcoap/src/net.o libcoap/src/option.o libcoap/src/pdu.o libcoap/src/resource.o libcoap/src/str.o libcoap/src/subscribe.o libcoap/src/uri.o port/coap_io_socket.o
+COMPONENT_OBJS = libcoap/src/address.o libcoap/src/async.o libcoap/src/block.o libcoap/src/coap_event.o libcoap/src/coap_hashkey.o libcoap/src/coap_session.o libcoap/src/coap_time.o libcoap/src/coap_debug.o libcoap/src/encode.o libcoap/src/mem.o libcoap/src/net.o libcoap/src/option.o libcoap/src/pdu.o libcoap/src/resource.o libcoap/src/str.o libcoap/src/subscribe.o libcoap/src/uri.o libcoap/src/coap_notls.o port/coap_io.o
 
 COMPONENT_SRCDIRS := libcoap/src libcoap port
 
-libcoap/src/debug.o: CFLAGS += -Wno-write-strings
-libcoap/src/pdu.o: CFLAGS += -Wno-write-strings
-# Temporary suppress "fallthrough" warnings until they are fixed in libcoap repo
-libcoap/src/option.o: CFLAGS += -Wno-implicit-fallthrough
+COMPONENT_SUBMODULES += libcoap
+
+# Silence format truncation warning, until it is fixed upstream
+libcoap/src/coap_debug.o: CFLAGS += -Wno-format-truncation
+endif