From 90641c89eb83dbf6ac91b6fbc46ca55e7a83193f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20=C4=8Cerm=C3=A1k?= Date: Wed, 19 May 2021 23:00:28 +0800 Subject: [PATCH] esp_modem: Moved to component folder --- .../esp_modem}/.gitignore | 0 .../esp_modem}/CMakeLists.txt | 0 .../esp_modem/LICENSE | 0 {esp_modem => components/esp_modem}/README.md | 0 .../esp_modem}/docs/CMux_collaboration.png | Bin .../esp_modem}/docs/DCE_DTE_collaboration.png | Bin .../esp_modem}/docs/Doxyfile | 0 .../esp_modem}/docs/README.md | 0 .../esp_modem}/docs/advanced_api.rst | 0 .../esp_modem}/docs/api_docs.rst | 0 .../esp_modem}/docs/conf.py | 0 .../esp_modem}/docs/cxx_api_docs.rst | 0 .../esp_modem}/docs/cxx_api_links.rst | 0 .../esp_modem}/docs/esp_modem_api_commands.h | 0 .../esp_modem}/docs/esp_modem_dce.hpp | 0 .../esp_modem}/docs/generate_docs | 0 .../esp_modem}/docs/index.rst | 0 .../esp_modem}/docs/internal_design.md | 0 .../esp_modem}/docs/internal_docs.rst | 0 .../examples/ap_to_pppos/CMakeLists.txt | 0 .../esp_modem}/examples/ap_to_pppos/README.md | 0 .../examples/ap_to_pppos/main/CMakeLists.txt | 0 .../ap_to_pppos/main/Kconfig.projbuild | 0 .../examples/ap_to_pppos/main/ap_to_pppos.c | 0 .../examples/ap_to_pppos/main/network_dce.c | 0 .../examples/ap_to_pppos/main/network_dce.cpp | 0 .../examples/ap_to_pppos/main/network_dce.h | 0 .../examples/ap_to_pppos/sdkconfig.defaults | 0 .../examples/linux_modem/CMakeLists.txt | 0 .../esp_modem}/examples/linux_modem/README.md | 0 .../examples/linux_modem/main/CMakeLists.txt | 0 .../examples/linux_modem/main/modem_main.cpp | 0 .../examples/linux_modem/make_tun_netif | 0 .../examples/linux_modem/sdkconfig.defaults | 0 .../examples/modem_console/CMakeLists.txt | 0 .../examples/modem_console/Makefile | 0 .../examples/modem_console/README.md | 0 .../modem_console/main/CMakeLists.txt | 0 .../examples/modem_console/main/component.mk | 0 .../modem_console/main/console_helper.cpp | 0 .../modem_console/main/console_helper.hpp | 0 .../modem_console/main/httpget_handle.c | 0 .../modem_console/main/modem_console_main.cpp | 4 ++-- .../modem_console/main/my_module_dce.hpp | 0 .../examples/modem_console/main/ping_handle.c | 0 .../modem_console/main/repeat_helper.inc | 0 .../examples/modem_console/sdkconfig.defaults | 0 .../examples/pppos_client/CMakeLists.txt | 0 .../examples/pppos_client/README.md | 0 .../examples/pppos_client/main/CMakeLists.txt | 0 .../pppos_client/main/Kconfig.projbuild | 0 .../pppos_client/main/pppos_client_main.c | 2 +- .../examples/pppos_client/sdkconfig.defaults | 0 .../simple_cmux_client/CMakeLists.txt | 0 .../examples/simple_cmux_client/README.md | 0 .../examples/simple_cmux_client/adc.log | 0 .../simple_cmux_client/main/CMakeLists.txt | 0 .../simple_cmux_client/main/Kconfig.projbuild | 0 .../simple_cmux_client/main/simple_client.cpp | 0 .../main/simple_mqtt_client.cpp | 0 .../main/simple_mqtt_client.hpp | 0 .../simple_cmux_client/sdkconfig.defaults | 0 components/esp_modem/idf_component.yml | 6 +++++ .../include/cxx_include/esp_modem_api.hpp | 0 .../include/cxx_include/esp_modem_cmux.hpp | 0 .../cxx_include/esp_modem_command_library.hpp | 0 .../include/cxx_include/esp_modem_dce.hpp | 0 .../cxx_include/esp_modem_dce_factory.hpp | 0 .../cxx_include/esp_modem_dce_module.hpp | 0 .../include/cxx_include/esp_modem_dte.hpp | 0 .../cxx_include/esp_modem_exception.hpp | 0 .../include/cxx_include/esp_modem_netif.hpp | 0 .../cxx_include/esp_modem_primitives.hpp | 0 .../cxx_include/esp_modem_terminal.hpp | 0 .../include/cxx_include/esp_modem_types.hpp | 0 .../esp_modem}/include/esp_modem_api.h | 0 .../include/esp_modem_c_api_types.h | 0 .../esp_modem}/include/esp_modem_config.h | 0 .../esp_modem}/include/esp_modem_dce_config.h | 0 .../generate/esp_modem_command_declare.inc | 0 .../port/linux/esp_event_mock/CMakeLists.txt | 0 .../linux/esp_event_mock/esp_event_mock.c | 0 .../linux/esp_event_mock/include/esp_event.h | 0 .../esp_event_mock/include/esp_event_base.h | 0 .../port/linux/esp_netif_linux/CMakeLists.txt | 0 .../linux/esp_netif_linux/esp_netif_linux.cpp | 0 .../linux/esp_netif_linux/include/esp_netif.h | 0 .../include/esp_netif_ip_addr.h | 0 .../esp_netif_linux/include/esp_netif_ppp.h | 0 .../port/linux/esp_netif_linux/ip6_stub.c | 0 .../port/linux/esp_netif_linux/lwipopts.h | 0 .../port/linux/esp_netif_linux/tun_io.c | 0 .../esp_system_protocols_linux/CMakeLists.txt | 0 .../include/driver/uart.h | 0 .../include/esp_err.h | 0 .../include/esp_log.h | 0 .../include/machine/endian.h | 0 .../private_include/exception_stub.hpp | 0 .../private_include/uart_resource.hpp | 0 .../private_include/uart_terminal.hpp | 0 .../private_include/vfs_termial.hpp | 0 .../esp_modem}/src/esp_modem_api.cpp | 0 .../esp_modem}/src/esp_modem_c_api.cpp | 0 .../esp_modem}/src/esp_modem_cmux.cpp | 0 .../src/esp_modem_command_library.cpp | 0 .../esp_modem}/src/esp_modem_dce.cpp | 0 .../esp_modem}/src/esp_modem_dte.cpp | 0 .../esp_modem}/src/esp_modem_factory.cpp | 0 .../esp_modem}/src/esp_modem_modules.cpp | 0 .../esp_modem}/src/esp_modem_netif.cpp | 5 ++++- .../esp_modem}/src/esp_modem_netif_linux.cpp | 0 .../src/esp_modem_primitives_freertos.cpp | 0 .../src/esp_modem_primitives_linux.cpp | 0 .../esp_modem}/src/esp_modem_term_fs.cpp | 0 .../esp_modem}/src/esp_modem_term_uart.cpp | 0 .../esp_modem}/src/esp_modem_uart.cpp | 21 +++++++----------- .../esp_modem}/src/esp_modem_uart_linux.cpp | 0 .../esp_modem}/test/host_test/CMakeLists.txt | 0 .../esp_modem}/test/host_test/README.md | 0 .../test/host_test/main/CMakeLists.txt | 0 .../test/host_test/main/LoopbackTerm.cpp | 0 .../test/host_test/main/LoopbackTerm.h | 0 .../test/host_test/main/test_modem.cpp | 0 .../test/host_test/sdkconfig.defaults | 0 .../esp_modem}/test/host_test/sdkconfig.old | 0 .../esp_modem}/test/target/CMakeLists.txt | 0 .../test/target/main/CMakeLists.txt | 0 .../test/target/main/Kconfig.projbuild | 0 .../test/target/main/NetworkDCE.cpp | 0 .../esp_modem}/test/target/main/component.mk | 0 .../esp_modem}/test/target/main/pppd_test.cpp | 0 .../esp_modem}/test/target/sdkconfig.defaults | 0 esp_modem/idf_component.yml | 4 ---- 133 files changed, 21 insertions(+), 21 deletions(-) rename {esp_modem => components/esp_modem}/.gitignore (100%) rename {esp_modem => components/esp_modem}/CMakeLists.txt (100%) rename esp_modem/license.txt => components/esp_modem/LICENSE (100%) rename {esp_modem => components/esp_modem}/README.md (100%) rename {esp_modem => components/esp_modem}/docs/CMux_collaboration.png (100%) rename {esp_modem => components/esp_modem}/docs/DCE_DTE_collaboration.png (100%) rename {esp_modem => components/esp_modem}/docs/Doxyfile (100%) rename {esp_modem => components/esp_modem}/docs/README.md (100%) rename {esp_modem => components/esp_modem}/docs/advanced_api.rst (100%) rename {esp_modem => components/esp_modem}/docs/api_docs.rst (100%) rename {esp_modem => components/esp_modem}/docs/conf.py (100%) rename {esp_modem => components/esp_modem}/docs/cxx_api_docs.rst (100%) rename {esp_modem => components/esp_modem}/docs/cxx_api_links.rst (100%) rename {esp_modem => components/esp_modem}/docs/esp_modem_api_commands.h (100%) rename {esp_modem => components/esp_modem}/docs/esp_modem_dce.hpp (100%) rename {esp_modem => components/esp_modem}/docs/generate_docs (100%) rename {esp_modem => components/esp_modem}/docs/index.rst (100%) rename {esp_modem => components/esp_modem}/docs/internal_design.md (100%) rename {esp_modem => components/esp_modem}/docs/internal_docs.rst (100%) rename {esp_modem => components/esp_modem}/examples/ap_to_pppos/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/examples/ap_to_pppos/README.md (100%) rename {esp_modem => components/esp_modem}/examples/ap_to_pppos/main/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/examples/ap_to_pppos/main/Kconfig.projbuild (100%) rename {esp_modem => components/esp_modem}/examples/ap_to_pppos/main/ap_to_pppos.c (100%) rename {esp_modem => components/esp_modem}/examples/ap_to_pppos/main/network_dce.c (100%) rename {esp_modem => components/esp_modem}/examples/ap_to_pppos/main/network_dce.cpp (100%) rename {esp_modem => components/esp_modem}/examples/ap_to_pppos/main/network_dce.h (100%) rename {esp_modem => components/esp_modem}/examples/ap_to_pppos/sdkconfig.defaults (100%) rename {esp_modem => components/esp_modem}/examples/linux_modem/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/examples/linux_modem/README.md (100%) rename {esp_modem => components/esp_modem}/examples/linux_modem/main/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/examples/linux_modem/main/modem_main.cpp (100%) rename {esp_modem => components/esp_modem}/examples/linux_modem/make_tun_netif (100%) rename {esp_modem => components/esp_modem}/examples/linux_modem/sdkconfig.defaults (100%) rename {esp_modem => components/esp_modem}/examples/modem_console/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/examples/modem_console/Makefile (100%) rename {esp_modem => components/esp_modem}/examples/modem_console/README.md (100%) rename {esp_modem => components/esp_modem}/examples/modem_console/main/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/examples/modem_console/main/component.mk (100%) rename {esp_modem => components/esp_modem}/examples/modem_console/main/console_helper.cpp (100%) rename {esp_modem => components/esp_modem}/examples/modem_console/main/console_helper.hpp (100%) rename {esp_modem => components/esp_modem}/examples/modem_console/main/httpget_handle.c (100%) rename {esp_modem => components/esp_modem}/examples/modem_console/main/modem_console_main.cpp (99%) rename {esp_modem => components/esp_modem}/examples/modem_console/main/my_module_dce.hpp (100%) rename {esp_modem => components/esp_modem}/examples/modem_console/main/ping_handle.c (100%) rename {esp_modem => components/esp_modem}/examples/modem_console/main/repeat_helper.inc (100%) rename {esp_modem => components/esp_modem}/examples/modem_console/sdkconfig.defaults (100%) rename {esp_modem => components/esp_modem}/examples/pppos_client/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/examples/pppos_client/README.md (100%) rename {esp_modem => components/esp_modem}/examples/pppos_client/main/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/examples/pppos_client/main/Kconfig.projbuild (100%) rename {esp_modem => components/esp_modem}/examples/pppos_client/main/pppos_client_main.c (99%) rename {esp_modem => components/esp_modem}/examples/pppos_client/sdkconfig.defaults (100%) rename {esp_modem => components/esp_modem}/examples/simple_cmux_client/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/examples/simple_cmux_client/README.md (100%) rename {esp_modem => components/esp_modem}/examples/simple_cmux_client/adc.log (100%) rename {esp_modem => components/esp_modem}/examples/simple_cmux_client/main/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/examples/simple_cmux_client/main/Kconfig.projbuild (100%) rename {esp_modem => components/esp_modem}/examples/simple_cmux_client/main/simple_client.cpp (100%) rename {esp_modem => components/esp_modem}/examples/simple_cmux_client/main/simple_mqtt_client.cpp (100%) rename {esp_modem => components/esp_modem}/examples/simple_cmux_client/main/simple_mqtt_client.hpp (100%) rename {esp_modem => components/esp_modem}/examples/simple_cmux_client/sdkconfig.defaults (100%) create mode 100644 components/esp_modem/idf_component.yml rename {esp_modem => components/esp_modem}/include/cxx_include/esp_modem_api.hpp (100%) rename {esp_modem => components/esp_modem}/include/cxx_include/esp_modem_cmux.hpp (100%) rename {esp_modem => components/esp_modem}/include/cxx_include/esp_modem_command_library.hpp (100%) rename {esp_modem => components/esp_modem}/include/cxx_include/esp_modem_dce.hpp (100%) rename {esp_modem => components/esp_modem}/include/cxx_include/esp_modem_dce_factory.hpp (100%) rename {esp_modem => components/esp_modem}/include/cxx_include/esp_modem_dce_module.hpp (100%) rename {esp_modem => components/esp_modem}/include/cxx_include/esp_modem_dte.hpp (100%) rename {esp_modem => components/esp_modem}/include/cxx_include/esp_modem_exception.hpp (100%) rename {esp_modem => components/esp_modem}/include/cxx_include/esp_modem_netif.hpp (100%) rename {esp_modem => components/esp_modem}/include/cxx_include/esp_modem_primitives.hpp (100%) rename {esp_modem => components/esp_modem}/include/cxx_include/esp_modem_terminal.hpp (100%) rename {esp_modem => components/esp_modem}/include/cxx_include/esp_modem_types.hpp (100%) rename {esp_modem => components/esp_modem}/include/esp_modem_api.h (100%) rename {esp_modem => components/esp_modem}/include/esp_modem_c_api_types.h (100%) rename {esp_modem => components/esp_modem}/include/esp_modem_config.h (100%) rename {esp_modem => components/esp_modem}/include/esp_modem_dce_config.h (100%) rename {esp_modem => components/esp_modem}/include/generate/esp_modem_command_declare.inc (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_event_mock/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_event_mock/esp_event_mock.c (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_event_mock/include/esp_event.h (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_event_mock/include/esp_event_base.h (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_netif_linux/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_netif_linux/esp_netif_linux.cpp (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_netif_linux/include/esp_netif.h (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_netif_linux/include/esp_netif_ip_addr.h (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_netif_linux/include/esp_netif_ppp.h (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_netif_linux/ip6_stub.c (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_netif_linux/lwipopts.h (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_netif_linux/tun_io.c (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_system_protocols_linux/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_system_protocols_linux/include/driver/uart.h (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_system_protocols_linux/include/esp_err.h (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_system_protocols_linux/include/esp_log.h (100%) rename {esp_modem => components/esp_modem}/port/linux/esp_system_protocols_linux/include/machine/endian.h (100%) rename {esp_modem => components/esp_modem}/private_include/exception_stub.hpp (100%) rename {esp_modem => components/esp_modem}/private_include/uart_resource.hpp (100%) rename {esp_modem => components/esp_modem}/private_include/uart_terminal.hpp (100%) rename {esp_modem => components/esp_modem}/private_include/vfs_termial.hpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_api.cpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_c_api.cpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_cmux.cpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_command_library.cpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_dce.cpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_dte.cpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_factory.cpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_modules.cpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_netif.cpp (92%) rename {esp_modem => components/esp_modem}/src/esp_modem_netif_linux.cpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_primitives_freertos.cpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_primitives_linux.cpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_term_fs.cpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_term_uart.cpp (100%) rename {esp_modem => components/esp_modem}/src/esp_modem_uart.cpp (90%) rename {esp_modem => components/esp_modem}/src/esp_modem_uart_linux.cpp (100%) rename {esp_modem => components/esp_modem}/test/host_test/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/test/host_test/README.md (100%) rename {esp_modem => components/esp_modem}/test/host_test/main/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/test/host_test/main/LoopbackTerm.cpp (100%) rename {esp_modem => components/esp_modem}/test/host_test/main/LoopbackTerm.h (100%) rename {esp_modem => components/esp_modem}/test/host_test/main/test_modem.cpp (100%) rename {esp_modem => components/esp_modem}/test/host_test/sdkconfig.defaults (100%) rename {esp_modem => components/esp_modem}/test/host_test/sdkconfig.old (100%) rename {esp_modem => components/esp_modem}/test/target/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/test/target/main/CMakeLists.txt (100%) rename {esp_modem => components/esp_modem}/test/target/main/Kconfig.projbuild (100%) rename {esp_modem => components/esp_modem}/test/target/main/NetworkDCE.cpp (100%) rename {esp_modem => components/esp_modem}/test/target/main/component.mk (100%) rename {esp_modem => components/esp_modem}/test/target/main/pppd_test.cpp (100%) rename {esp_modem => components/esp_modem}/test/target/sdkconfig.defaults (100%) delete mode 100644 esp_modem/idf_component.yml diff --git a/esp_modem/.gitignore b/components/esp_modem/.gitignore similarity index 100% rename from esp_modem/.gitignore rename to components/esp_modem/.gitignore diff --git a/esp_modem/CMakeLists.txt b/components/esp_modem/CMakeLists.txt similarity index 100% rename from esp_modem/CMakeLists.txt rename to components/esp_modem/CMakeLists.txt diff --git a/esp_modem/license.txt b/components/esp_modem/LICENSE similarity index 100% rename from esp_modem/license.txt rename to components/esp_modem/LICENSE diff --git a/esp_modem/README.md b/components/esp_modem/README.md similarity index 100% rename from esp_modem/README.md rename to components/esp_modem/README.md diff --git a/esp_modem/docs/CMux_collaboration.png b/components/esp_modem/docs/CMux_collaboration.png similarity index 100% rename from esp_modem/docs/CMux_collaboration.png rename to components/esp_modem/docs/CMux_collaboration.png diff --git a/esp_modem/docs/DCE_DTE_collaboration.png b/components/esp_modem/docs/DCE_DTE_collaboration.png similarity index 100% rename from esp_modem/docs/DCE_DTE_collaboration.png rename to components/esp_modem/docs/DCE_DTE_collaboration.png diff --git a/esp_modem/docs/Doxyfile b/components/esp_modem/docs/Doxyfile similarity index 100% rename from esp_modem/docs/Doxyfile rename to components/esp_modem/docs/Doxyfile diff --git a/esp_modem/docs/README.md b/components/esp_modem/docs/README.md similarity index 100% rename from esp_modem/docs/README.md rename to components/esp_modem/docs/README.md diff --git a/esp_modem/docs/advanced_api.rst b/components/esp_modem/docs/advanced_api.rst similarity index 100% rename from esp_modem/docs/advanced_api.rst rename to components/esp_modem/docs/advanced_api.rst diff --git a/esp_modem/docs/api_docs.rst b/components/esp_modem/docs/api_docs.rst similarity index 100% rename from esp_modem/docs/api_docs.rst rename to components/esp_modem/docs/api_docs.rst diff --git a/esp_modem/docs/conf.py b/components/esp_modem/docs/conf.py similarity index 100% rename from esp_modem/docs/conf.py rename to components/esp_modem/docs/conf.py diff --git a/esp_modem/docs/cxx_api_docs.rst b/components/esp_modem/docs/cxx_api_docs.rst similarity index 100% rename from esp_modem/docs/cxx_api_docs.rst rename to components/esp_modem/docs/cxx_api_docs.rst diff --git a/esp_modem/docs/cxx_api_links.rst b/components/esp_modem/docs/cxx_api_links.rst similarity index 100% rename from esp_modem/docs/cxx_api_links.rst rename to components/esp_modem/docs/cxx_api_links.rst diff --git a/esp_modem/docs/esp_modem_api_commands.h b/components/esp_modem/docs/esp_modem_api_commands.h similarity index 100% rename from esp_modem/docs/esp_modem_api_commands.h rename to components/esp_modem/docs/esp_modem_api_commands.h diff --git a/esp_modem/docs/esp_modem_dce.hpp b/components/esp_modem/docs/esp_modem_dce.hpp similarity index 100% rename from esp_modem/docs/esp_modem_dce.hpp rename to components/esp_modem/docs/esp_modem_dce.hpp diff --git a/esp_modem/docs/generate_docs b/components/esp_modem/docs/generate_docs similarity index 100% rename from esp_modem/docs/generate_docs rename to components/esp_modem/docs/generate_docs diff --git a/esp_modem/docs/index.rst b/components/esp_modem/docs/index.rst similarity index 100% rename from esp_modem/docs/index.rst rename to components/esp_modem/docs/index.rst diff --git a/esp_modem/docs/internal_design.md b/components/esp_modem/docs/internal_design.md similarity index 100% rename from esp_modem/docs/internal_design.md rename to components/esp_modem/docs/internal_design.md diff --git a/esp_modem/docs/internal_docs.rst b/components/esp_modem/docs/internal_docs.rst similarity index 100% rename from esp_modem/docs/internal_docs.rst rename to components/esp_modem/docs/internal_docs.rst diff --git a/esp_modem/examples/ap_to_pppos/CMakeLists.txt b/components/esp_modem/examples/ap_to_pppos/CMakeLists.txt similarity index 100% rename from esp_modem/examples/ap_to_pppos/CMakeLists.txt rename to components/esp_modem/examples/ap_to_pppos/CMakeLists.txt diff --git a/esp_modem/examples/ap_to_pppos/README.md b/components/esp_modem/examples/ap_to_pppos/README.md similarity index 100% rename from esp_modem/examples/ap_to_pppos/README.md rename to components/esp_modem/examples/ap_to_pppos/README.md diff --git a/esp_modem/examples/ap_to_pppos/main/CMakeLists.txt b/components/esp_modem/examples/ap_to_pppos/main/CMakeLists.txt similarity index 100% rename from esp_modem/examples/ap_to_pppos/main/CMakeLists.txt rename to components/esp_modem/examples/ap_to_pppos/main/CMakeLists.txt diff --git a/esp_modem/examples/ap_to_pppos/main/Kconfig.projbuild b/components/esp_modem/examples/ap_to_pppos/main/Kconfig.projbuild similarity index 100% rename from esp_modem/examples/ap_to_pppos/main/Kconfig.projbuild rename to components/esp_modem/examples/ap_to_pppos/main/Kconfig.projbuild diff --git a/esp_modem/examples/ap_to_pppos/main/ap_to_pppos.c b/components/esp_modem/examples/ap_to_pppos/main/ap_to_pppos.c similarity index 100% rename from esp_modem/examples/ap_to_pppos/main/ap_to_pppos.c rename to components/esp_modem/examples/ap_to_pppos/main/ap_to_pppos.c diff --git a/esp_modem/examples/ap_to_pppos/main/network_dce.c b/components/esp_modem/examples/ap_to_pppos/main/network_dce.c similarity index 100% rename from esp_modem/examples/ap_to_pppos/main/network_dce.c rename to components/esp_modem/examples/ap_to_pppos/main/network_dce.c diff --git a/esp_modem/examples/ap_to_pppos/main/network_dce.cpp b/components/esp_modem/examples/ap_to_pppos/main/network_dce.cpp similarity index 100% rename from esp_modem/examples/ap_to_pppos/main/network_dce.cpp rename to components/esp_modem/examples/ap_to_pppos/main/network_dce.cpp diff --git a/esp_modem/examples/ap_to_pppos/main/network_dce.h b/components/esp_modem/examples/ap_to_pppos/main/network_dce.h similarity index 100% rename from esp_modem/examples/ap_to_pppos/main/network_dce.h rename to components/esp_modem/examples/ap_to_pppos/main/network_dce.h diff --git a/esp_modem/examples/ap_to_pppos/sdkconfig.defaults b/components/esp_modem/examples/ap_to_pppos/sdkconfig.defaults similarity index 100% rename from esp_modem/examples/ap_to_pppos/sdkconfig.defaults rename to components/esp_modem/examples/ap_to_pppos/sdkconfig.defaults diff --git a/esp_modem/examples/linux_modem/CMakeLists.txt b/components/esp_modem/examples/linux_modem/CMakeLists.txt similarity index 100% rename from esp_modem/examples/linux_modem/CMakeLists.txt rename to components/esp_modem/examples/linux_modem/CMakeLists.txt diff --git a/esp_modem/examples/linux_modem/README.md b/components/esp_modem/examples/linux_modem/README.md similarity index 100% rename from esp_modem/examples/linux_modem/README.md rename to components/esp_modem/examples/linux_modem/README.md diff --git a/esp_modem/examples/linux_modem/main/CMakeLists.txt b/components/esp_modem/examples/linux_modem/main/CMakeLists.txt similarity index 100% rename from esp_modem/examples/linux_modem/main/CMakeLists.txt rename to components/esp_modem/examples/linux_modem/main/CMakeLists.txt diff --git a/esp_modem/examples/linux_modem/main/modem_main.cpp b/components/esp_modem/examples/linux_modem/main/modem_main.cpp similarity index 100% rename from esp_modem/examples/linux_modem/main/modem_main.cpp rename to components/esp_modem/examples/linux_modem/main/modem_main.cpp diff --git a/esp_modem/examples/linux_modem/make_tun_netif b/components/esp_modem/examples/linux_modem/make_tun_netif similarity index 100% rename from esp_modem/examples/linux_modem/make_tun_netif rename to components/esp_modem/examples/linux_modem/make_tun_netif diff --git a/esp_modem/examples/linux_modem/sdkconfig.defaults b/components/esp_modem/examples/linux_modem/sdkconfig.defaults similarity index 100% rename from esp_modem/examples/linux_modem/sdkconfig.defaults rename to components/esp_modem/examples/linux_modem/sdkconfig.defaults diff --git a/esp_modem/examples/modem_console/CMakeLists.txt b/components/esp_modem/examples/modem_console/CMakeLists.txt similarity index 100% rename from esp_modem/examples/modem_console/CMakeLists.txt rename to components/esp_modem/examples/modem_console/CMakeLists.txt diff --git a/esp_modem/examples/modem_console/Makefile b/components/esp_modem/examples/modem_console/Makefile similarity index 100% rename from esp_modem/examples/modem_console/Makefile rename to components/esp_modem/examples/modem_console/Makefile diff --git a/esp_modem/examples/modem_console/README.md b/components/esp_modem/examples/modem_console/README.md similarity index 100% rename from esp_modem/examples/modem_console/README.md rename to components/esp_modem/examples/modem_console/README.md diff --git a/esp_modem/examples/modem_console/main/CMakeLists.txt b/components/esp_modem/examples/modem_console/main/CMakeLists.txt similarity index 100% rename from esp_modem/examples/modem_console/main/CMakeLists.txt rename to components/esp_modem/examples/modem_console/main/CMakeLists.txt diff --git a/esp_modem/examples/modem_console/main/component.mk b/components/esp_modem/examples/modem_console/main/component.mk similarity index 100% rename from esp_modem/examples/modem_console/main/component.mk rename to components/esp_modem/examples/modem_console/main/component.mk diff --git a/esp_modem/examples/modem_console/main/console_helper.cpp b/components/esp_modem/examples/modem_console/main/console_helper.cpp similarity index 100% rename from esp_modem/examples/modem_console/main/console_helper.cpp rename to components/esp_modem/examples/modem_console/main/console_helper.cpp diff --git a/esp_modem/examples/modem_console/main/console_helper.hpp b/components/esp_modem/examples/modem_console/main/console_helper.hpp similarity index 100% rename from esp_modem/examples/modem_console/main/console_helper.hpp rename to components/esp_modem/examples/modem_console/main/console_helper.hpp diff --git a/esp_modem/examples/modem_console/main/httpget_handle.c b/components/esp_modem/examples/modem_console/main/httpget_handle.c similarity index 100% rename from esp_modem/examples/modem_console/main/httpget_handle.c rename to components/esp_modem/examples/modem_console/main/httpget_handle.c diff --git a/esp_modem/examples/modem_console/main/modem_console_main.cpp b/components/esp_modem/examples/modem_console/main/modem_console_main.cpp similarity index 99% rename from esp_modem/examples/modem_console/main/modem_console_main.cpp rename to components/esp_modem/examples/modem_console/main/modem_console_main.cpp index e36a5cda9..0a193ff55 100644 --- a/esp_modem/examples/modem_console/main/modem_console_main.cpp +++ b/components/esp_modem/examples/modem_console/main/modem_console_main.cpp @@ -213,7 +213,7 @@ extern "C" void app_main(void) }); // start console REPL ESP_ERROR_CHECK(esp_console_start_repl(s_repl)); - ESP_LOGI(TAG, "Exiting...%d", esp_get_free_heap_size()); - // wait till for exit + // wait for exit exit_signal.wait_any(1, UINT32_MAX); + ESP_LOGI(TAG, "Exiting...%d", esp_get_free_heap_size()); } diff --git a/esp_modem/examples/modem_console/main/my_module_dce.hpp b/components/esp_modem/examples/modem_console/main/my_module_dce.hpp similarity index 100% rename from esp_modem/examples/modem_console/main/my_module_dce.hpp rename to components/esp_modem/examples/modem_console/main/my_module_dce.hpp diff --git a/esp_modem/examples/modem_console/main/ping_handle.c b/components/esp_modem/examples/modem_console/main/ping_handle.c similarity index 100% rename from esp_modem/examples/modem_console/main/ping_handle.c rename to components/esp_modem/examples/modem_console/main/ping_handle.c diff --git a/esp_modem/examples/modem_console/main/repeat_helper.inc b/components/esp_modem/examples/modem_console/main/repeat_helper.inc similarity index 100% rename from esp_modem/examples/modem_console/main/repeat_helper.inc rename to components/esp_modem/examples/modem_console/main/repeat_helper.inc diff --git a/esp_modem/examples/modem_console/sdkconfig.defaults b/components/esp_modem/examples/modem_console/sdkconfig.defaults similarity index 100% rename from esp_modem/examples/modem_console/sdkconfig.defaults rename to components/esp_modem/examples/modem_console/sdkconfig.defaults diff --git a/esp_modem/examples/pppos_client/CMakeLists.txt b/components/esp_modem/examples/pppos_client/CMakeLists.txt similarity index 100% rename from esp_modem/examples/pppos_client/CMakeLists.txt rename to components/esp_modem/examples/pppos_client/CMakeLists.txt diff --git a/esp_modem/examples/pppos_client/README.md b/components/esp_modem/examples/pppos_client/README.md similarity index 100% rename from esp_modem/examples/pppos_client/README.md rename to components/esp_modem/examples/pppos_client/README.md diff --git a/esp_modem/examples/pppos_client/main/CMakeLists.txt b/components/esp_modem/examples/pppos_client/main/CMakeLists.txt similarity index 100% rename from esp_modem/examples/pppos_client/main/CMakeLists.txt rename to components/esp_modem/examples/pppos_client/main/CMakeLists.txt diff --git a/esp_modem/examples/pppos_client/main/Kconfig.projbuild b/components/esp_modem/examples/pppos_client/main/Kconfig.projbuild similarity index 100% rename from esp_modem/examples/pppos_client/main/Kconfig.projbuild rename to components/esp_modem/examples/pppos_client/main/Kconfig.projbuild diff --git a/esp_modem/examples/pppos_client/main/pppos_client_main.c b/components/esp_modem/examples/pppos_client/main/pppos_client_main.c similarity index 99% rename from esp_modem/examples/pppos_client/main/pppos_client_main.c rename to components/esp_modem/examples/pppos_client/main/pppos_client_main.c index 5244170a8..5a63fabe9 100644 --- a/esp_modem/examples/pppos_client/main/pppos_client_main.c +++ b/components/esp_modem/examples/pppos_client/main/pppos_client_main.c @@ -149,7 +149,7 @@ void app_main(void) // check if PIN needed bool pin_ok = false; if (esp_modem_read_pin(dce, &pin_ok) == ESP_OK && pin_ok == false) { - if (esp_modem_set_pin(dce, "1234") == ESP_OK) { + if (esp_modem_set_pin(dce, CONFIG_EXAMPLE_SIM_PIN) == ESP_OK) { vTaskDelay(pdMS_TO_TICKS(1000)); } else { abort(); diff --git a/esp_modem/examples/pppos_client/sdkconfig.defaults b/components/esp_modem/examples/pppos_client/sdkconfig.defaults similarity index 100% rename from esp_modem/examples/pppos_client/sdkconfig.defaults rename to components/esp_modem/examples/pppos_client/sdkconfig.defaults diff --git a/esp_modem/examples/simple_cmux_client/CMakeLists.txt b/components/esp_modem/examples/simple_cmux_client/CMakeLists.txt similarity index 100% rename from esp_modem/examples/simple_cmux_client/CMakeLists.txt rename to components/esp_modem/examples/simple_cmux_client/CMakeLists.txt diff --git a/esp_modem/examples/simple_cmux_client/README.md b/components/esp_modem/examples/simple_cmux_client/README.md similarity index 100% rename from esp_modem/examples/simple_cmux_client/README.md rename to components/esp_modem/examples/simple_cmux_client/README.md diff --git a/esp_modem/examples/simple_cmux_client/adc.log b/components/esp_modem/examples/simple_cmux_client/adc.log similarity index 100% rename from esp_modem/examples/simple_cmux_client/adc.log rename to components/esp_modem/examples/simple_cmux_client/adc.log diff --git a/esp_modem/examples/simple_cmux_client/main/CMakeLists.txt b/components/esp_modem/examples/simple_cmux_client/main/CMakeLists.txt similarity index 100% rename from esp_modem/examples/simple_cmux_client/main/CMakeLists.txt rename to components/esp_modem/examples/simple_cmux_client/main/CMakeLists.txt diff --git a/esp_modem/examples/simple_cmux_client/main/Kconfig.projbuild b/components/esp_modem/examples/simple_cmux_client/main/Kconfig.projbuild similarity index 100% rename from esp_modem/examples/simple_cmux_client/main/Kconfig.projbuild rename to components/esp_modem/examples/simple_cmux_client/main/Kconfig.projbuild diff --git a/esp_modem/examples/simple_cmux_client/main/simple_client.cpp b/components/esp_modem/examples/simple_cmux_client/main/simple_client.cpp similarity index 100% rename from esp_modem/examples/simple_cmux_client/main/simple_client.cpp rename to components/esp_modem/examples/simple_cmux_client/main/simple_client.cpp diff --git a/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.cpp b/components/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.cpp similarity index 100% rename from esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.cpp rename to components/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.cpp diff --git a/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.hpp b/components/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.hpp similarity index 100% rename from esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.hpp rename to components/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.hpp diff --git a/esp_modem/examples/simple_cmux_client/sdkconfig.defaults b/components/esp_modem/examples/simple_cmux_client/sdkconfig.defaults similarity index 100% rename from esp_modem/examples/simple_cmux_client/sdkconfig.defaults rename to components/esp_modem/examples/simple_cmux_client/sdkconfig.defaults diff --git a/components/esp_modem/idf_component.yml b/components/esp_modem/idf_component.yml new file mode 100644 index 000000000..a7b972b2c --- /dev/null +++ b/components/esp_modem/idf_component.yml @@ -0,0 +1,6 @@ +version: "0.1.5" +description: esp modem +dependencies: + # Required IDF version + idf: + version: ">=4.1" diff --git a/esp_modem/include/cxx_include/esp_modem_api.hpp b/components/esp_modem/include/cxx_include/esp_modem_api.hpp similarity index 100% rename from esp_modem/include/cxx_include/esp_modem_api.hpp rename to components/esp_modem/include/cxx_include/esp_modem_api.hpp diff --git a/esp_modem/include/cxx_include/esp_modem_cmux.hpp b/components/esp_modem/include/cxx_include/esp_modem_cmux.hpp similarity index 100% rename from esp_modem/include/cxx_include/esp_modem_cmux.hpp rename to components/esp_modem/include/cxx_include/esp_modem_cmux.hpp diff --git a/esp_modem/include/cxx_include/esp_modem_command_library.hpp b/components/esp_modem/include/cxx_include/esp_modem_command_library.hpp similarity index 100% rename from esp_modem/include/cxx_include/esp_modem_command_library.hpp rename to components/esp_modem/include/cxx_include/esp_modem_command_library.hpp diff --git a/esp_modem/include/cxx_include/esp_modem_dce.hpp b/components/esp_modem/include/cxx_include/esp_modem_dce.hpp similarity index 100% rename from esp_modem/include/cxx_include/esp_modem_dce.hpp rename to components/esp_modem/include/cxx_include/esp_modem_dce.hpp diff --git a/esp_modem/include/cxx_include/esp_modem_dce_factory.hpp b/components/esp_modem/include/cxx_include/esp_modem_dce_factory.hpp similarity index 100% rename from esp_modem/include/cxx_include/esp_modem_dce_factory.hpp rename to components/esp_modem/include/cxx_include/esp_modem_dce_factory.hpp diff --git a/esp_modem/include/cxx_include/esp_modem_dce_module.hpp b/components/esp_modem/include/cxx_include/esp_modem_dce_module.hpp similarity index 100% rename from esp_modem/include/cxx_include/esp_modem_dce_module.hpp rename to components/esp_modem/include/cxx_include/esp_modem_dce_module.hpp diff --git a/esp_modem/include/cxx_include/esp_modem_dte.hpp b/components/esp_modem/include/cxx_include/esp_modem_dte.hpp similarity index 100% rename from esp_modem/include/cxx_include/esp_modem_dte.hpp rename to components/esp_modem/include/cxx_include/esp_modem_dte.hpp diff --git a/esp_modem/include/cxx_include/esp_modem_exception.hpp b/components/esp_modem/include/cxx_include/esp_modem_exception.hpp similarity index 100% rename from esp_modem/include/cxx_include/esp_modem_exception.hpp rename to components/esp_modem/include/cxx_include/esp_modem_exception.hpp diff --git a/esp_modem/include/cxx_include/esp_modem_netif.hpp b/components/esp_modem/include/cxx_include/esp_modem_netif.hpp similarity index 100% rename from esp_modem/include/cxx_include/esp_modem_netif.hpp rename to components/esp_modem/include/cxx_include/esp_modem_netif.hpp diff --git a/esp_modem/include/cxx_include/esp_modem_primitives.hpp b/components/esp_modem/include/cxx_include/esp_modem_primitives.hpp similarity index 100% rename from esp_modem/include/cxx_include/esp_modem_primitives.hpp rename to components/esp_modem/include/cxx_include/esp_modem_primitives.hpp diff --git a/esp_modem/include/cxx_include/esp_modem_terminal.hpp b/components/esp_modem/include/cxx_include/esp_modem_terminal.hpp similarity index 100% rename from esp_modem/include/cxx_include/esp_modem_terminal.hpp rename to components/esp_modem/include/cxx_include/esp_modem_terminal.hpp diff --git a/esp_modem/include/cxx_include/esp_modem_types.hpp b/components/esp_modem/include/cxx_include/esp_modem_types.hpp similarity index 100% rename from esp_modem/include/cxx_include/esp_modem_types.hpp rename to components/esp_modem/include/cxx_include/esp_modem_types.hpp diff --git a/esp_modem/include/esp_modem_api.h b/components/esp_modem/include/esp_modem_api.h similarity index 100% rename from esp_modem/include/esp_modem_api.h rename to components/esp_modem/include/esp_modem_api.h diff --git a/esp_modem/include/esp_modem_c_api_types.h b/components/esp_modem/include/esp_modem_c_api_types.h similarity index 100% rename from esp_modem/include/esp_modem_c_api_types.h rename to components/esp_modem/include/esp_modem_c_api_types.h diff --git a/esp_modem/include/esp_modem_config.h b/components/esp_modem/include/esp_modem_config.h similarity index 100% rename from esp_modem/include/esp_modem_config.h rename to components/esp_modem/include/esp_modem_config.h diff --git a/esp_modem/include/esp_modem_dce_config.h b/components/esp_modem/include/esp_modem_dce_config.h similarity index 100% rename from esp_modem/include/esp_modem_dce_config.h rename to components/esp_modem/include/esp_modem_dce_config.h diff --git a/esp_modem/include/generate/esp_modem_command_declare.inc b/components/esp_modem/include/generate/esp_modem_command_declare.inc similarity index 100% rename from esp_modem/include/generate/esp_modem_command_declare.inc rename to components/esp_modem/include/generate/esp_modem_command_declare.inc diff --git a/esp_modem/port/linux/esp_event_mock/CMakeLists.txt b/components/esp_modem/port/linux/esp_event_mock/CMakeLists.txt similarity index 100% rename from esp_modem/port/linux/esp_event_mock/CMakeLists.txt rename to components/esp_modem/port/linux/esp_event_mock/CMakeLists.txt diff --git a/esp_modem/port/linux/esp_event_mock/esp_event_mock.c b/components/esp_modem/port/linux/esp_event_mock/esp_event_mock.c similarity index 100% rename from esp_modem/port/linux/esp_event_mock/esp_event_mock.c rename to components/esp_modem/port/linux/esp_event_mock/esp_event_mock.c diff --git a/esp_modem/port/linux/esp_event_mock/include/esp_event.h b/components/esp_modem/port/linux/esp_event_mock/include/esp_event.h similarity index 100% rename from esp_modem/port/linux/esp_event_mock/include/esp_event.h rename to components/esp_modem/port/linux/esp_event_mock/include/esp_event.h diff --git a/esp_modem/port/linux/esp_event_mock/include/esp_event_base.h b/components/esp_modem/port/linux/esp_event_mock/include/esp_event_base.h similarity index 100% rename from esp_modem/port/linux/esp_event_mock/include/esp_event_base.h rename to components/esp_modem/port/linux/esp_event_mock/include/esp_event_base.h diff --git a/esp_modem/port/linux/esp_netif_linux/CMakeLists.txt b/components/esp_modem/port/linux/esp_netif_linux/CMakeLists.txt similarity index 100% rename from esp_modem/port/linux/esp_netif_linux/CMakeLists.txt rename to components/esp_modem/port/linux/esp_netif_linux/CMakeLists.txt diff --git a/esp_modem/port/linux/esp_netif_linux/esp_netif_linux.cpp b/components/esp_modem/port/linux/esp_netif_linux/esp_netif_linux.cpp similarity index 100% rename from esp_modem/port/linux/esp_netif_linux/esp_netif_linux.cpp rename to components/esp_modem/port/linux/esp_netif_linux/esp_netif_linux.cpp diff --git a/esp_modem/port/linux/esp_netif_linux/include/esp_netif.h b/components/esp_modem/port/linux/esp_netif_linux/include/esp_netif.h similarity index 100% rename from esp_modem/port/linux/esp_netif_linux/include/esp_netif.h rename to components/esp_modem/port/linux/esp_netif_linux/include/esp_netif.h diff --git a/esp_modem/port/linux/esp_netif_linux/include/esp_netif_ip_addr.h b/components/esp_modem/port/linux/esp_netif_linux/include/esp_netif_ip_addr.h similarity index 100% rename from esp_modem/port/linux/esp_netif_linux/include/esp_netif_ip_addr.h rename to components/esp_modem/port/linux/esp_netif_linux/include/esp_netif_ip_addr.h diff --git a/esp_modem/port/linux/esp_netif_linux/include/esp_netif_ppp.h b/components/esp_modem/port/linux/esp_netif_linux/include/esp_netif_ppp.h similarity index 100% rename from esp_modem/port/linux/esp_netif_linux/include/esp_netif_ppp.h rename to components/esp_modem/port/linux/esp_netif_linux/include/esp_netif_ppp.h diff --git a/esp_modem/port/linux/esp_netif_linux/ip6_stub.c b/components/esp_modem/port/linux/esp_netif_linux/ip6_stub.c similarity index 100% rename from esp_modem/port/linux/esp_netif_linux/ip6_stub.c rename to components/esp_modem/port/linux/esp_netif_linux/ip6_stub.c diff --git a/esp_modem/port/linux/esp_netif_linux/lwipopts.h b/components/esp_modem/port/linux/esp_netif_linux/lwipopts.h similarity index 100% rename from esp_modem/port/linux/esp_netif_linux/lwipopts.h rename to components/esp_modem/port/linux/esp_netif_linux/lwipopts.h diff --git a/esp_modem/port/linux/esp_netif_linux/tun_io.c b/components/esp_modem/port/linux/esp_netif_linux/tun_io.c similarity index 100% rename from esp_modem/port/linux/esp_netif_linux/tun_io.c rename to components/esp_modem/port/linux/esp_netif_linux/tun_io.c diff --git a/esp_modem/port/linux/esp_system_protocols_linux/CMakeLists.txt b/components/esp_modem/port/linux/esp_system_protocols_linux/CMakeLists.txt similarity index 100% rename from esp_modem/port/linux/esp_system_protocols_linux/CMakeLists.txt rename to components/esp_modem/port/linux/esp_system_protocols_linux/CMakeLists.txt diff --git a/esp_modem/port/linux/esp_system_protocols_linux/include/driver/uart.h b/components/esp_modem/port/linux/esp_system_protocols_linux/include/driver/uart.h similarity index 100% rename from esp_modem/port/linux/esp_system_protocols_linux/include/driver/uart.h rename to components/esp_modem/port/linux/esp_system_protocols_linux/include/driver/uart.h diff --git a/esp_modem/port/linux/esp_system_protocols_linux/include/esp_err.h b/components/esp_modem/port/linux/esp_system_protocols_linux/include/esp_err.h similarity index 100% rename from esp_modem/port/linux/esp_system_protocols_linux/include/esp_err.h rename to components/esp_modem/port/linux/esp_system_protocols_linux/include/esp_err.h diff --git a/esp_modem/port/linux/esp_system_protocols_linux/include/esp_log.h b/components/esp_modem/port/linux/esp_system_protocols_linux/include/esp_log.h similarity index 100% rename from esp_modem/port/linux/esp_system_protocols_linux/include/esp_log.h rename to components/esp_modem/port/linux/esp_system_protocols_linux/include/esp_log.h diff --git a/esp_modem/port/linux/esp_system_protocols_linux/include/machine/endian.h b/components/esp_modem/port/linux/esp_system_protocols_linux/include/machine/endian.h similarity index 100% rename from esp_modem/port/linux/esp_system_protocols_linux/include/machine/endian.h rename to components/esp_modem/port/linux/esp_system_protocols_linux/include/machine/endian.h diff --git a/esp_modem/private_include/exception_stub.hpp b/components/esp_modem/private_include/exception_stub.hpp similarity index 100% rename from esp_modem/private_include/exception_stub.hpp rename to components/esp_modem/private_include/exception_stub.hpp diff --git a/esp_modem/private_include/uart_resource.hpp b/components/esp_modem/private_include/uart_resource.hpp similarity index 100% rename from esp_modem/private_include/uart_resource.hpp rename to components/esp_modem/private_include/uart_resource.hpp diff --git a/esp_modem/private_include/uart_terminal.hpp b/components/esp_modem/private_include/uart_terminal.hpp similarity index 100% rename from esp_modem/private_include/uart_terminal.hpp rename to components/esp_modem/private_include/uart_terminal.hpp diff --git a/esp_modem/private_include/vfs_termial.hpp b/components/esp_modem/private_include/vfs_termial.hpp similarity index 100% rename from esp_modem/private_include/vfs_termial.hpp rename to components/esp_modem/private_include/vfs_termial.hpp diff --git a/esp_modem/src/esp_modem_api.cpp b/components/esp_modem/src/esp_modem_api.cpp similarity index 100% rename from esp_modem/src/esp_modem_api.cpp rename to components/esp_modem/src/esp_modem_api.cpp diff --git a/esp_modem/src/esp_modem_c_api.cpp b/components/esp_modem/src/esp_modem_c_api.cpp similarity index 100% rename from esp_modem/src/esp_modem_c_api.cpp rename to components/esp_modem/src/esp_modem_c_api.cpp diff --git a/esp_modem/src/esp_modem_cmux.cpp b/components/esp_modem/src/esp_modem_cmux.cpp similarity index 100% rename from esp_modem/src/esp_modem_cmux.cpp rename to components/esp_modem/src/esp_modem_cmux.cpp diff --git a/esp_modem/src/esp_modem_command_library.cpp b/components/esp_modem/src/esp_modem_command_library.cpp similarity index 100% rename from esp_modem/src/esp_modem_command_library.cpp rename to components/esp_modem/src/esp_modem_command_library.cpp diff --git a/esp_modem/src/esp_modem_dce.cpp b/components/esp_modem/src/esp_modem_dce.cpp similarity index 100% rename from esp_modem/src/esp_modem_dce.cpp rename to components/esp_modem/src/esp_modem_dce.cpp diff --git a/esp_modem/src/esp_modem_dte.cpp b/components/esp_modem/src/esp_modem_dte.cpp similarity index 100% rename from esp_modem/src/esp_modem_dte.cpp rename to components/esp_modem/src/esp_modem_dte.cpp diff --git a/esp_modem/src/esp_modem_factory.cpp b/components/esp_modem/src/esp_modem_factory.cpp similarity index 100% rename from esp_modem/src/esp_modem_factory.cpp rename to components/esp_modem/src/esp_modem_factory.cpp diff --git a/esp_modem/src/esp_modem_modules.cpp b/components/esp_modem/src/esp_modem_modules.cpp similarity index 100% rename from esp_modem/src/esp_modem_modules.cpp rename to components/esp_modem/src/esp_modem_modules.cpp diff --git a/esp_modem/src/esp_modem_netif.cpp b/components/esp_modem/src/esp_modem_netif.cpp similarity index 92% rename from esp_modem/src/esp_modem_netif.cpp rename to components/esp_modem/src/esp_modem_netif.cpp index bbac9c308..fa13c9b57 100644 --- a/esp_modem/src/esp_modem_netif.cpp +++ b/components/esp_modem/src/esp_modem_netif.cpp @@ -52,8 +52,11 @@ esp_err_t Netif::esp_modem_post_attach(esp_netif_t *esp_netif, void *args) { ESP_ERROR_CHECK(esp_netif_set_driver_config(esp_netif, &driver_ifconfig)); // check if PPP error events are enabled, if not, do enable the error occurred/state changed // to notify the modem layer when switching modes - esp_netif_ppp_config_t ppp_config; + esp_netif_ppp_config_t ppp_config = { .ppp_phase_event_enabled = true, // assuming phase enabled, as earlier IDFs + .ppp_error_event_enabled = false }; // don't provide cfg getters so we enable both events +#if ESP_IDF_VERSION_MAJOR >= 4 && ESP_IDF_VERSION_MINOR >= 4 esp_netif_ppp_get_params(esp_netif, &ppp_config); +#endif // ESP-IDF >= v4.4 if (!ppp_config.ppp_error_event_enabled) { ppp_config.ppp_error_event_enabled = true; esp_netif_ppp_set_params(esp_netif, &ppp_config); diff --git a/esp_modem/src/esp_modem_netif_linux.cpp b/components/esp_modem/src/esp_modem_netif_linux.cpp similarity index 100% rename from esp_modem/src/esp_modem_netif_linux.cpp rename to components/esp_modem/src/esp_modem_netif_linux.cpp diff --git a/esp_modem/src/esp_modem_primitives_freertos.cpp b/components/esp_modem/src/esp_modem_primitives_freertos.cpp similarity index 100% rename from esp_modem/src/esp_modem_primitives_freertos.cpp rename to components/esp_modem/src/esp_modem_primitives_freertos.cpp diff --git a/esp_modem/src/esp_modem_primitives_linux.cpp b/components/esp_modem/src/esp_modem_primitives_linux.cpp similarity index 100% rename from esp_modem/src/esp_modem_primitives_linux.cpp rename to components/esp_modem/src/esp_modem_primitives_linux.cpp diff --git a/esp_modem/src/esp_modem_term_fs.cpp b/components/esp_modem/src/esp_modem_term_fs.cpp similarity index 100% rename from esp_modem/src/esp_modem_term_fs.cpp rename to components/esp_modem/src/esp_modem_term_fs.cpp diff --git a/esp_modem/src/esp_modem_term_uart.cpp b/components/esp_modem/src/esp_modem_term_uart.cpp similarity index 100% rename from esp_modem/src/esp_modem_term_uart.cpp rename to components/esp_modem/src/esp_modem_term_uart.cpp diff --git a/esp_modem/src/esp_modem_uart.cpp b/components/esp_modem/src/esp_modem_uart.cpp similarity index 90% rename from esp_modem/src/esp_modem_uart.cpp rename to components/esp_modem/src/esp_modem_uart.cpp index 1dc2eea1b..9c670863c 100644 --- a/esp_modem/src/esp_modem_uart.cpp +++ b/components/esp_modem/src/esp_modem_uart.cpp @@ -43,13 +43,13 @@ struct uart_task { -class uart_terminal : public Terminal { +class UartTerminal : public Terminal { public: - explicit uart_terminal(const esp_modem_dte_config *config) : + explicit UartTerminal(const esp_modem_dte_config *config) : event_queue(), uart(config, &event_queue, -1), signal(), task_handle(config->task_stack_size, config->task_priority, this, s_task) {} - ~uart_terminal() override = default; + ~UartTerminal() override = default; void start() override { signal.set(TASK_START); @@ -70,7 +70,7 @@ public: private: static void s_task(void *task_param) { - auto t = static_cast(task_param); + auto t = static_cast(task_param); t->task(); vTaskDelete(nullptr); } @@ -98,13 +98,13 @@ private: std::unique_ptr create_uart_terminal(const esp_modem_dte_config *config) { TRY_CATCH_RET_NULL( - auto term = std::make_unique(config); + auto term = std::make_unique(config); term->start(); return term; ) } -void uart_terminal::task() { +void UartTerminal::task() { std::function on_data_priv = nullptr; uart_event_t event; size_t len; @@ -163,14 +163,9 @@ void uart_terminal::task() { } } -int uart_terminal::read(uint8_t *data, size_t len) { +int UartTerminal::read(uint8_t *data, size_t len) { size_t length = 0; uart_get_buffered_data_len(uart.port, &length); -// if (esp_random() < UINT32_MAX/4 && length > 32) { -// printf("ahoj!\n"); -// length -= length/4; -// } -// size_t new_size = length/2; length = std::min(len, length); if (length > 0) { return uart_read_bytes(uart.port, data, length, portMAX_DELAY); @@ -178,7 +173,7 @@ int uart_terminal::read(uint8_t *data, size_t len) { return 0; } -int uart_terminal::write(uint8_t *data, size_t len) { +int UartTerminal::write(uint8_t *data, size_t len) { return uart_write_bytes(uart.port, data, len); } diff --git a/esp_modem/src/esp_modem_uart_linux.cpp b/components/esp_modem/src/esp_modem_uart_linux.cpp similarity index 100% rename from esp_modem/src/esp_modem_uart_linux.cpp rename to components/esp_modem/src/esp_modem_uart_linux.cpp diff --git a/esp_modem/test/host_test/CMakeLists.txt b/components/esp_modem/test/host_test/CMakeLists.txt similarity index 100% rename from esp_modem/test/host_test/CMakeLists.txt rename to components/esp_modem/test/host_test/CMakeLists.txt diff --git a/esp_modem/test/host_test/README.md b/components/esp_modem/test/host_test/README.md similarity index 100% rename from esp_modem/test/host_test/README.md rename to components/esp_modem/test/host_test/README.md diff --git a/esp_modem/test/host_test/main/CMakeLists.txt b/components/esp_modem/test/host_test/main/CMakeLists.txt similarity index 100% rename from esp_modem/test/host_test/main/CMakeLists.txt rename to components/esp_modem/test/host_test/main/CMakeLists.txt diff --git a/esp_modem/test/host_test/main/LoopbackTerm.cpp b/components/esp_modem/test/host_test/main/LoopbackTerm.cpp similarity index 100% rename from esp_modem/test/host_test/main/LoopbackTerm.cpp rename to components/esp_modem/test/host_test/main/LoopbackTerm.cpp diff --git a/esp_modem/test/host_test/main/LoopbackTerm.h b/components/esp_modem/test/host_test/main/LoopbackTerm.h similarity index 100% rename from esp_modem/test/host_test/main/LoopbackTerm.h rename to components/esp_modem/test/host_test/main/LoopbackTerm.h diff --git a/esp_modem/test/host_test/main/test_modem.cpp b/components/esp_modem/test/host_test/main/test_modem.cpp similarity index 100% rename from esp_modem/test/host_test/main/test_modem.cpp rename to components/esp_modem/test/host_test/main/test_modem.cpp diff --git a/esp_modem/test/host_test/sdkconfig.defaults b/components/esp_modem/test/host_test/sdkconfig.defaults similarity index 100% rename from esp_modem/test/host_test/sdkconfig.defaults rename to components/esp_modem/test/host_test/sdkconfig.defaults diff --git a/esp_modem/test/host_test/sdkconfig.old b/components/esp_modem/test/host_test/sdkconfig.old similarity index 100% rename from esp_modem/test/host_test/sdkconfig.old rename to components/esp_modem/test/host_test/sdkconfig.old diff --git a/esp_modem/test/target/CMakeLists.txt b/components/esp_modem/test/target/CMakeLists.txt similarity index 100% rename from esp_modem/test/target/CMakeLists.txt rename to components/esp_modem/test/target/CMakeLists.txt diff --git a/esp_modem/test/target/main/CMakeLists.txt b/components/esp_modem/test/target/main/CMakeLists.txt similarity index 100% rename from esp_modem/test/target/main/CMakeLists.txt rename to components/esp_modem/test/target/main/CMakeLists.txt diff --git a/esp_modem/test/target/main/Kconfig.projbuild b/components/esp_modem/test/target/main/Kconfig.projbuild similarity index 100% rename from esp_modem/test/target/main/Kconfig.projbuild rename to components/esp_modem/test/target/main/Kconfig.projbuild diff --git a/esp_modem/test/target/main/NetworkDCE.cpp b/components/esp_modem/test/target/main/NetworkDCE.cpp similarity index 100% rename from esp_modem/test/target/main/NetworkDCE.cpp rename to components/esp_modem/test/target/main/NetworkDCE.cpp diff --git a/esp_modem/test/target/main/component.mk b/components/esp_modem/test/target/main/component.mk similarity index 100% rename from esp_modem/test/target/main/component.mk rename to components/esp_modem/test/target/main/component.mk diff --git a/esp_modem/test/target/main/pppd_test.cpp b/components/esp_modem/test/target/main/pppd_test.cpp similarity index 100% rename from esp_modem/test/target/main/pppd_test.cpp rename to components/esp_modem/test/target/main/pppd_test.cpp diff --git a/esp_modem/test/target/sdkconfig.defaults b/components/esp_modem/test/target/sdkconfig.defaults similarity index 100% rename from esp_modem/test/target/sdkconfig.defaults rename to components/esp_modem/test/target/sdkconfig.defaults diff --git a/esp_modem/idf_component.yml b/esp_modem/idf_component.yml deleted file mode 100644 index d42ecc2e8..000000000 --- a/esp_modem/idf_component.yml +++ /dev/null @@ -1,4 +0,0 @@ -version: "0.1.5" -targets: - - esp32 -description: esp modem