-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BREAKING CHANGES - Removed Anjay and FreeRTOS-Cellular-Interface submodules and added Anjay-esp-idf component into the components/ directory Improvements - Updated Anjay to version X.X.X - Revamped configuration of Anjay and its dependencies - The Anjay-esp-idf component includes a new `Component config/Anjay library configuration` menu for configuring the Anjay library - Updated recommended ESP IDF to v4.4.5
- Loading branch information
Showing
49 changed files
with
97 additions
and
1,789 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,3 @@ | ||
| [submodule "main/anjay"] | ||
| path = main/anjay | ||
| url = https://github.com/AVSystem/Anjay.git | ||
| [submodule "main/FreeRTOS-Cellular-Library"] | ||
| path = main/FreeRTOS-Cellular-Interface | ||
| url = https://github.com/AVSystem/FreeRTOS-Cellular-Interface | ||
| branch = esp32-client-v1.2.0 | ||
| [submodule "components/anjay-esp-idf"] | ||
| path = components/anjay-esp-idf | ||
| url = https://github.com/AVSystem/Anjay-esp-idf.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # Copyright 2021-2022 AVSystem <[email protected]> | ||
| # Copyright 2021-2023 AVSystem <[email protected]> | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # Copyright 2021-2022 AVSystem <[email protected]> | ||
| # Copyright 2021-2023 AVSystem <[email protected]> | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule anjay-esp-idf
added at
5448c8
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # Copyright 2021-2022 AVSystem <[email protected]> | ||
| # Copyright 2021-2023 AVSystem <[email protected]> | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
|
|
@@ -49,51 +49,6 @@ idf_component_register(SRCS ${sources} | |
| INCLUDE_DIRS "." | ||
| EMBED_FILES ${Embedded_cert}) | ||
|
|
||
| file(GLOB_RECURSE ANJAY_SOURCES | ||
| "anjay/src/*.c" | ||
| "anjay/deps/avs_coap/src/*.c" | ||
| "anjay/deps/avs_commons/src/*.c") | ||
|
|
||
| add_library(anjay MODULE ${ANJAY_SOURCES}) | ||
| target_include_directories(anjay PRIVATE | ||
| "anjay/src" | ||
| "anjay/deps/avs_coap/src" | ||
| "anjay/deps/avs_commons/src") | ||
| target_include_directories(anjay PUBLIC | ||
| "anjay-config" | ||
| "anjay/include_public" | ||
| "anjay/deps/avs_coap/include_public" | ||
| "anjay/deps/avs_commons/include_public") | ||
| target_link_libraries(anjay PRIVATE idf::mbedtls) | ||
|
|
||
| # NOTE: avs_coap contains some assertions that check if allocated memory | ||
| # follows alignment requirements. malloc() on ESP-IDF aligns everything | ||
| # to 4 bytes, even though alignof(max_align_t) == alignof(int64_t) | ||
| # == alignof(long double) == 8. This is just GCC being overly cautious, | ||
| # the maximum hardware-imposed alignment on ESP32 is actually 4 bytes. | ||
| # We disable assertions within anjay to work around that. | ||
| target_compile_definitions(anjay PRIVATE NDEBUG) | ||
|
|
||
| if (CONFIG_ANJAY_CLIENT_INTERFACE_BG96_MODULE) | ||
| file(GLOB_RECURSE FREERTOS_CELLULAR_LIBRARY_SOURCES | ||
| "FreeRTOS-Cellular-Interface/source/*.c" | ||
| "FreeRTOS-Cellular-Interface/modules/bg96/*.c" | ||
| "FreeRTOS-Cellular-Interface/modules/cellular_platform.c") | ||
|
|
||
| add_library(freertos_cellular_library MODULE ${FREERTOS_CELLULAR_LIBRARY_SOURCES}) | ||
| target_include_directories(freertos_cellular_library PRIVATE | ||
| "FreeRTOS-Cellular-Interface/source/include/private" | ||
| "FreeRTOS-Cellular-Interface/modules/bg96") | ||
| target_include_directories(freertos_cellular_library PUBLIC | ||
| "FreeRTOS-Cellular-Interface/source/include" | ||
| "FreeRTOS-Cellular-Interface/source/include/common" | ||
| "FreeRTOS-Cellular-Interface/source/logging" | ||
| "FreeRTOS-Cellular-Interface/source/cellular_network_transport" | ||
| "FreeRTOS-Cellular-Interface/source/interface" | ||
| "FreeRTOS-Cellular-Interface/modules") | ||
| target_link_libraries(freertos_cellular_library PRIVATE anjay) | ||
| endif() | ||
|
|
||
| add_custom_target( configure_git_version | ||
| COMMAND ${CMAKE_COMMAND} | ||
| -D GIT_EXECUTABLE=${GIT_EXECUTABLE} | ||
|
|
@@ -104,7 +59,6 @@ add_custom_target( configure_git_version | |
|
|
||
| add_dependencies(${COMPONENT_LIB} configure_git_version) | ||
|
|
||
| target_link_libraries(${COMPONENT_LIB} PRIVATE anjay) | ||
| if (CONFIG_ANJAY_CLIENT_INTERFACE_BG96_MODULE) | ||
| target_link_libraries(${COMPONENT_LIB} PRIVATE freertos_cellular_library) | ||
| endif() | ||
Submodule FreeRTOS-Cellular-Interface
deleted from
dc12cb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # Copyright 2021-2022 AVSystem <[email protected]> | ||
| # Copyright 2021-2023 AVSystem <[email protected]> | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
|
|
@@ -13,6 +13,7 @@ | |
| # limitations under the License. | ||
|
|
||
| menu "anjay-esp32-client" | ||
|
|
||
| choice ANJAY_CLIENT_DEVBOARD | ||
| prompt "Choose targeted development board" | ||
| default ANJAY_CLIENT_BOARD_UNKNOWN | ||
|
|
@@ -146,30 +147,14 @@ menu "anjay-esp32-client" | |
|
|
||
| config ANJAY_CLIENT_INTERFACE_BG96_MODULE | ||
| bool "External BG96 module" | ||
| select ANJAY_ESP_IDF_WITH_BG96_SUPPORT | ||
| endchoice | ||
|
|
||
| config ANJAY_CLIENT_CELLULAR_EVENT_LOOP | ||
| bool | ||
| default y if ANJAY_CLIENT_INTERFACE_BG96_MODULE | ||
| default n | ||
|
|
||
| if ANJAY_CLIENT_INTERFACE_BG96_MODULE | ||
| menu "BG96 module configuration" | ||
|
|
||
| config ANJAY_BG96_UART_PORT_NUMBER | ||
| int "UART port number" | ||
| default 0 | ||
|
|
||
| config ANJAY_BG96_TX_PIN | ||
| int "UART Tx pin" | ||
| default 0 | ||
|
|
||
| config ANJAY_BG96_RX_PIN | ||
| int "UART Rx pin" | ||
| default 0 | ||
| endmenu | ||
| endif | ||
|
|
||
| menu "Client options" | ||
| config ANJAY_CLIENT_ENDPOINT_NAME | ||
| string "Endpoint name" | ||
|
|
@@ -217,8 +202,8 @@ menu "anjay-esp32-client" | |
| endmenu | ||
| endmenu | ||
|
|
||
| menu "Connection configuration" | ||
| if ANJAY_CLIENT_INTERFACE_ONBOARD_WIFI | ||
| if ANJAY_CLIENT_INTERFACE_ONBOARD_WIFI | ||
| menu "Connection configuration" | ||
| config ANJAY_WIFI_SSID | ||
| string "WiFi SSID" | ||
| default "myssid" | ||
|
|
@@ -249,38 +234,6 @@ menu "anjay-esp32-client" | |
| bool "Unique Local Link Address" | ||
| endchoice | ||
| endif | ||
| endif | ||
|
|
||
| if ANJAY_CLIENT_INTERFACE_BG96_MODULE | ||
| config ANJAY_CELLULAR_APN | ||
| string "APN name" | ||
| default "Cellular APN" | ||
|
|
||
| choice ANJAY_CELLULAR_PDN_AUTH_TYPE | ||
| prompt "PDN authentication type" | ||
| default ANJAY_CELLULAR_PDN_AUTH_TYPE_NONE | ||
|
|
||
| config ANJAY_CELLULAR_PDN_AUTH_TYPE_NONE | ||
| bool "No authentication" | ||
|
|
||
| config ANJAY_CELLULAR_PDN_AUTH_TYPE_PAP | ||
| bool "PAP" | ||
|
|
||
| config ANJAY_CELLULAR_PDN_AUTH_TYPE_CHAP | ||
| bool "CHAP" | ||
|
|
||
| config ANJAY_CELLULAR_PDN_AUTH_TYPE_PAP_OR_CHAP | ||
| bool "PAP or CHAP" | ||
| endchoice | ||
|
|
||
| config ANJAY_CELLULAR_PDN_USERNAME | ||
| string "PDN username" if !ANJAY_CELLULAR_PDN_AUTH_TYPE_NONE | ||
| default "" | ||
|
|
||
| config ANJAY_CELLULAR_PDN_PASSWORD | ||
| string "PDN password" if !ANJAY_CELLULAR_PDN_AUTH_TYPE_NONE | ||
| default "" | ||
|
|
||
| endif | ||
| endmenu | ||
| endmenu | ||
| endif | ||
| endmenu | ||
Submodule anjay
deleted from
6bfb0b
Oops, something went wrong.