Skip to content

Commit 0b9be28

Browse files
mbedmainmbedmain
authored
Merge pull request #204 from ARMmbed/development
Update for mbed-os-6.5.0
2 parents d3a43f3 + 22c9f2e commit 0b9be28

File tree

5 files changed

+89
-22
lines changed

5 files changed

+89
-22
lines changed

‎CMakeLists.txt

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Copyright (c) 2020 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
5+
6+
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "")
7+
set(MBED_CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.mbedbuild CACHE INTERNAL "")
8+
set(APP_TARGET mbed-os-example-lorawan)
9+
10+
include(${MBED_PATH}/tools/cmake/app.cmake)
11+
12+
add_subdirectory(${MBED_PATH})
13+
14+
add_executable(${APP_TARGET})
15+
16+
mbed_configure_app_target(${APP_TARGET})
17+
18+
mbed_set_mbed_target_linker_script(${APP_TARGET})
19+
20+
project(${APP_TARGET})
21+
22+
# Provide Mbed OS with the header file it needs to configure Mbed TLS for LoRa
23+
target_include_directories(${APP_TARGET}
24+
PUBLIC
25+
${CMAKE_CURRENT_SOURCE_DIR}
26+
)
27+
28+
target_sources(${APP_TARGET}
29+
PRIVATE
30+
main.cpp
31+
trace_helper.cpp
32+
)
33+
34+
target_link_libraries(${APP_TARGET}
35+
PRIVATE
36+
mbed-os
37+
mbed-lorawan
38+
mbed-mbedtls
39+
)
40+
41+
mbed_set_post_build(${APP_TARGET})
42+
43+
option(VERBOSE_BUILD "Have a verbose build process")
44+
if(VERBOSE_BUILD)
45+
set(CMAKE_VERBOSE_MAKEFILE ON)
46+
endif()

‎config/SX126X_example_config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"lora.phy": "EU868",
3131
"lora.device-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
3232
"lora.application-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
33-
"lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }"
33+
"lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
34+
"target.components_add": ["SX126X"]
3435
},
3536

3637
"NUCLEO_L073RZ": {

‎config/SX127X_example_config.json

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"lora.phy": "EU868",
3737
"lora.device-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
3838
"lora.application-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
39-
"lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }"
39+
"lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
40+
"target.components_add": ["SX1276"]
4041
},
4142

4243
"K64F": {
@@ -80,7 +81,8 @@
8081
"lora-rxctl": "PA_1",
8182
"lora-ant-switch": "NC",
8283
"lora-pwr-amp-ctl": "PC_1",
83-
"lora-tcxo": "PA_12"
84+
"lora-tcxo": "PA_12",
85+
"target.components_add": ["SX1276"]
8486
},
8587

8688
"MTB_MURATA_ABZ": {
@@ -103,7 +105,8 @@
103105
"lora-rxctl": "PA_1",
104106
"lora-ant-switch": "NC",
105107
"lora-pwr-amp-ctl": "PC_1",
106-
"lora-tcxo": "PA_12"
108+
"lora-tcxo": "PA_12",
109+
"target.components_add": ["SX1276"]
107110
},
108111

109112
"XDOT_L151CC": {
@@ -125,7 +128,8 @@
125128
"lora-rxctl": "NC",
126129
"lora-ant-switch": "NC",
127130
"lora-pwr-amp-ctl": "NC",
128-
"lora-tcxo": "NC"
131+
"lora-tcxo": "NC",
132+
"target.components_add": ["SX1272"]
129133
},
130134

131135
"MTB_MTS_XDOT": {
@@ -147,7 +151,8 @@
147151
"lora-rxctl": "NC",
148152
"lora-ant-switch": "NC",
149153
"lora-pwr-amp-ctl": "NC",
150-
"lora-tcxo": "NC"
154+
"lora-tcxo": "NC",
155+
"target.components_add": ["SX1272"]
151156
},
152157

153158
"FF1705_L151CC": {
@@ -169,7 +174,8 @@
169174
"lora-rxctl": "NC",
170175
"lora-ant-switch": "NC",
171176
"lora-pwr-amp-ctl": "NC",
172-
"lora-tcxo": "NC"
177+
"lora-tcxo": "NC",
178+
"target.components_add": ["SX1272"]
173179
},
174180

175181
"MTS_MDOT_F411RE": {
@@ -191,7 +197,8 @@
191197
"lora-rxctl": "LORA_RXCTL",
192198
"lora-ant-switch": "NC",
193199
"lora-pwr-amp-ctl": "NC",
194-
"lora-tcxo": "NC"
200+
"lora-tcxo": "NC",
201+
"target.components_add": ["SX1272"]
195202
},
196203

197204
"MTB_ADV_WISE_1510": {
@@ -213,7 +220,8 @@
213220
"lora-rxctl": "NC",
214221
"lora-ant-switch": "ANT_SWITCH",
215222
"lora-pwr-amp-ctl": "NC",
216-
"lora-tcxo": "NC"
223+
"lora-tcxo": "NC",
224+
"target.components_add": ["SX1276"]
217225
},
218226

219227
"MTB_RAK811": {
@@ -235,7 +243,8 @@
235243
"lora-rxctl": "ANT_CRX_RX",
236244
"lora-ant-switch": "NC",
237245
"lora-pwr-amp-ctl": "NC",
238-
"lora-tcxo": "RF_TCXO_EN"
246+
"lora-tcxo": "RF_TCXO_EN",
247+
"target.components_add": ["SX1276"]
239248
},
240249

241250
"IM880B": {
@@ -258,7 +267,8 @@
258267
"lora-rxctl": "ANT_CRX_RX",
259268
"lora-ant-switch": "NC",
260269
"lora-pwr-amp-ctl": "NC",
261-
"lora-tcxo": "NC"
270+
"lora-tcxo": "NC",
271+
"target.components_add": ["SX1272"]
262272
}
263273
},
264274
"macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_lora_config.h\""]

‎mbed-os.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-os/#8ef0a435b2356f8159dea8e427b2935d177309f8
1+
https://github.com/ARMmbed/mbed-os/#f2278567d09b9ae9f4843e1d9d393526b9462783

‎mbed_app.json

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"lora.phy": "EU868",
3737
"lora.device-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
3838
"lora.application-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
39-
"lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }"
39+
"lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
40+
"target.components_add": ["SX1276"]
4041
},
4142

4243
"K64F": {
@@ -80,7 +81,8 @@
8081
"lora-rxctl": "PA_1",
8182
"lora-ant-switch": "NC",
8283
"lora-pwr-amp-ctl": "PC_1",
83-
"lora-tcxo": "PA_12"
84+
"lora-tcxo": "PA_12",
85+
"target.components_add": ["SX1276"]
8486
},
8587

8688
"MTB_MURATA_ABZ": {
@@ -103,7 +105,8 @@
103105
"lora-rxctl": "PA_1",
104106
"lora-ant-switch": "NC",
105107
"lora-pwr-amp-ctl": "PC_1",
106-
"lora-tcxo": "PA_12"
108+
"lora-tcxo": "PA_12",
109+
"target.components_add": ["SX1276"]
107110
},
108111

109112
"XDOT_L151CC": {
@@ -125,7 +128,8 @@
125128
"lora-rxctl": "NC",
126129
"lora-ant-switch": "NC",
127130
"lora-pwr-amp-ctl": "NC",
128-
"lora-tcxo": "NC"
131+
"lora-tcxo": "NC",
132+
"target.components_add": ["SX1272"]
129133
},
130134

131135
"MTB_MTS_XDOT": {
@@ -147,7 +151,8 @@
147151
"lora-rxctl": "NC",
148152
"lora-ant-switch": "NC",
149153
"lora-pwr-amp-ctl": "NC",
150-
"lora-tcxo": "NC"
154+
"lora-tcxo": "NC",
155+
"target.components_add": ["SX1272"]
151156
},
152157

153158
"FF1705_L151CC": {
@@ -169,7 +174,8 @@
169174
"lora-rxctl": "NC",
170175
"lora-ant-switch": "NC",
171176
"lora-pwr-amp-ctl": "NC",
172-
"lora-tcxo": "NC"
177+
"lora-tcxo": "NC",
178+
"target.components_add": ["SX1272"]
173179
},
174180

175181
"MTS_MDOT_F411RE": {
@@ -191,7 +197,8 @@
191197
"lora-rxctl": "LORA_RXCTL",
192198
"lora-ant-switch": "NC",
193199
"lora-pwr-amp-ctl": "NC",
194-
"lora-tcxo": "NC"
200+
"lora-tcxo": "NC",
201+
"target.components_add": ["SX1272"]
195202
},
196203

197204
"MTB_ADV_WISE_1510": {
@@ -213,7 +220,8 @@
213220
"lora-rxctl": "NC",
214221
"lora-ant-switch": "ANT_SWITCH",
215222
"lora-pwr-amp-ctl": "NC",
216-
"lora-tcxo": "NC"
223+
"lora-tcxo": "NC",
224+
"target.components_add": ["SX1276"]
217225
},
218226

219227
"MTB_RAK811": {
@@ -235,7 +243,8 @@
235243
"lora-rxctl": "ANT_CRX_RX",
236244
"lora-ant-switch": "NC",
237245
"lora-pwr-amp-ctl": "NC",
238-
"lora-tcxo": "RF_TCXO_EN"
246+
"lora-tcxo": "RF_TCXO_EN",
247+
"target.components_add": ["SX1276"]
239248
},
240249

241250
"IM880B": {
@@ -258,7 +267,8 @@
258267
"lora-rxctl": "ANT_CRX_RX",
259268
"lora-ant-switch": "NC",
260269
"lora-pwr-amp-ctl": "NC",
261-
"lora-tcxo": "NC"
270+
"lora-tcxo": "NC",
271+
"target.components_add": ["SX1272"]
262272
},
263273

264274
"EP_AGORA": {

0 commit comments

Comments
 (0)