Skip to content

Update for mbed-os-6.5.0 #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 23, 2020
Merged

Update for mbed-os-6.5.0 #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66f6629
Add CMakelists (#193)
0xc0170 Nov 9, 2020
e532e7d
Update mbed-os to its development branch
Patater Nov 18, 2020
22c9f2e
Updating mbed-os to mbed-os-6.5.0
Nov 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)

set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "")
set(MBED_CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.mbedbuild CACHE INTERNAL "")
set(APP_TARGET mbed-os-example-lorawan)

include(${MBED_PATH}/tools/cmake/app.cmake)

add_subdirectory(${MBED_PATH})

add_executable(${APP_TARGET})

mbed_configure_app_target(${APP_TARGET})

mbed_set_mbed_target_linker_script(${APP_TARGET})

project(${APP_TARGET})

# Provide Mbed OS with the header file it needs to configure Mbed TLS for LoRa
target_include_directories(${APP_TARGET}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)

target_sources(${APP_TARGET}
PRIVATE
main.cpp
trace_helper.cpp
)

target_link_libraries(${APP_TARGET}
PRIVATE
mbed-os
mbed-lorawan
mbed-mbedtls
)

mbed_set_post_build(${APP_TARGET})

option(VERBOSE_BUILD "Have a verbose build process")
if(VERBOSE_BUILD)
set(CMAKE_VERBOSE_MAKEFILE ON)
endif()
3 changes: 2 additions & 1 deletion config/SX126X_example_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"lora.phy": "EU868",
"lora.device-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
"lora.application-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
"lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }"
"lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
"target.components_add": ["SX126X"]
},

"NUCLEO_L073RZ": {
Expand Down
30 changes: 20 additions & 10 deletions config/SX127X_example_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
"lora.phy": "EU868",
"lora.device-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
"lora.application-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
"lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }"
"lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
"target.components_add": ["SX1276"]
},

"K64F": {
Expand Down Expand Up @@ -80,7 +81,8 @@
"lora-rxctl": "PA_1",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "PC_1",
"lora-tcxo": "PA_12"
"lora-tcxo": "PA_12",
"target.components_add": ["SX1276"]
},

"MTB_MURATA_ABZ": {
Expand All @@ -103,7 +105,8 @@
"lora-rxctl": "PA_1",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "PC_1",
"lora-tcxo": "PA_12"
"lora-tcxo": "PA_12",
"target.components_add": ["SX1276"]
},

"XDOT_L151CC": {
Expand All @@ -125,7 +128,8 @@
"lora-rxctl": "NC",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"lora-tcxo": "NC",
"target.components_add": ["SX1272"]
},

"MTB_MTS_XDOT": {
Expand All @@ -147,7 +151,8 @@
"lora-rxctl": "NC",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"lora-tcxo": "NC",
"target.components_add": ["SX1272"]
},

"FF1705_L151CC": {
Expand All @@ -169,7 +174,8 @@
"lora-rxctl": "NC",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"lora-tcxo": "NC",
"target.components_add": ["SX1272"]
},

"MTS_MDOT_F411RE": {
Expand All @@ -191,7 +197,8 @@
"lora-rxctl": "LORA_RXCTL",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"lora-tcxo": "NC",
"target.components_add": ["SX1272"]
},

"MTB_ADV_WISE_1510": {
Expand All @@ -213,7 +220,8 @@
"lora-rxctl": "NC",
"lora-ant-switch": "ANT_SWITCH",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"lora-tcxo": "NC",
"target.components_add": ["SX1276"]
},

"MTB_RAK811": {
Expand All @@ -235,7 +243,8 @@
"lora-rxctl": "ANT_CRX_RX",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "RF_TCXO_EN"
"lora-tcxo": "RF_TCXO_EN",
"target.components_add": ["SX1276"]
},

"IM880B": {
Expand All @@ -258,7 +267,8 @@
"lora-rxctl": "ANT_CRX_RX",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"lora-tcxo": "NC",
"target.components_add": ["SX1272"]
}
},
"macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_lora_config.h\""]
Expand Down
2 changes: 1 addition & 1 deletion mbed-os.lib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/ARMmbed/mbed-os/#8ef0a435b2356f8159dea8e427b2935d177309f8
https://github.com/ARMmbed/mbed-os/#f2278567d09b9ae9f4843e1d9d393526b9462783
30 changes: 20 additions & 10 deletions mbed_app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
"lora.phy": "EU868",
"lora.device-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
"lora.application-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
"lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }"
"lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
"target.components_add": ["SX1276"]
},

"K64F": {
Expand Down Expand Up @@ -80,7 +81,8 @@
"lora-rxctl": "PA_1",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "PC_1",
"lora-tcxo": "PA_12"
"lora-tcxo": "PA_12",
"target.components_add": ["SX1276"]
},

"MTB_MURATA_ABZ": {
Expand All @@ -103,7 +105,8 @@
"lora-rxctl": "PA_1",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "PC_1",
"lora-tcxo": "PA_12"
"lora-tcxo": "PA_12",
"target.components_add": ["SX1276"]
},

"XDOT_L151CC": {
Expand All @@ -125,7 +128,8 @@
"lora-rxctl": "NC",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"lora-tcxo": "NC",
"target.components_add": ["SX1272"]
},

"MTB_MTS_XDOT": {
Expand All @@ -147,7 +151,8 @@
"lora-rxctl": "NC",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"lora-tcxo": "NC",
"target.components_add": ["SX1272"]
},

"FF1705_L151CC": {
Expand All @@ -169,7 +174,8 @@
"lora-rxctl": "NC",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"lora-tcxo": "NC",
"target.components_add": ["SX1272"]
},

"MTS_MDOT_F411RE": {
Expand All @@ -191,7 +197,8 @@
"lora-rxctl": "LORA_RXCTL",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"lora-tcxo": "NC",
"target.components_add": ["SX1272"]
},

"MTB_ADV_WISE_1510": {
Expand All @@ -213,7 +220,8 @@
"lora-rxctl": "NC",
"lora-ant-switch": "ANT_SWITCH",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"lora-tcxo": "NC",
"target.components_add": ["SX1276"]
},

"MTB_RAK811": {
Expand All @@ -235,7 +243,8 @@
"lora-rxctl": "ANT_CRX_RX",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "RF_TCXO_EN"
"lora-tcxo": "RF_TCXO_EN",
"target.components_add": ["SX1276"]
},

"IM880B": {
Expand All @@ -258,7 +267,8 @@
"lora-rxctl": "ANT_CRX_RX",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"lora-tcxo": "NC",
"target.components_add": ["SX1272"]
},

"EP_AGORA": {
Expand Down