Skip to content

Commit 3bed4dd

Browse files
authored
Merge branch 'Lora-net:master' into develop
2 parents 0e28b84 + 2bf36bd commit 3bed4dd

File tree

358 files changed

+26188
-51534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

358 files changed

+26188
-51534
lines changed

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "src/radio/lr1110/lr1110_driver"]
2+
path = src/radio/lr1110/lr1110_driver
3+
url = https://github.com/Lora-net/lr1110_driver.git
4+
[submodule "src/peripherals/atecc608a-tnglora-se/cryptoauthlib"]
5+
path = src/peripherals/atecc608a-tnglora-se/cryptoauthlib
6+
url = https://github.com/MicrochipTech/cryptoauthlib

.vscode/c_cpp_properties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"cStandard": "c11",
1313
"cppStandard": "c++17",
14-
"configurationProvider": "vector-of-bool.cmake-tools"
14+
"configurationProvider": "ms-vscode.cmake-tools"
1515
}
1616
],
1717
"version": 4

.vscode/settings.json

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,14 @@
2727
"APPLICATION":"LoRaMac",
2828

2929
// Select LoRaMac sub project. You can choose between:
30-
// classA, classB or classC, periodic-uplink-lpp, fuota-test-01.
30+
// periodic-uplink-lpp, fuota-test-01.
3131
"SUB_PROJECT":"periodic-uplink-lpp",
3232

33+
// Select the default LoRaWAN class for periodic-uplink-lpp sub-project
34+
// In case `CLASS_B` or `CLASS_C` is selected the example will try to
35+
// switch to the given class as soon as possible
36+
"LORAWAN_DEFAULT_CLASS":"CLASS_A",
37+
3338
// Switch for Class B support of LoRaMac:
3439
"CLASSB_ENABLED":"ON",
3540

@@ -44,25 +49,42 @@
4449
"MODULATION":"LORA",
4550

4651
// Target board, the following boards are supported:
47-
// NAMote72, NucleoL073 (Default), NucleoL152, NucleoL476, SAML21, SKiM880B, SKiM980A, SKiM881AXL, B-L072Z-LRWAN1.
52+
// NAMote72, NucleoL073 (Default), NucleoL152, NucleoL476, SAMR34, SKiM880B, SKiM980A, SKiM881AXL, B-L072Z-LRWAN1.
4853
"BOARD":"NucleoL073",
4954

5055
// MBED Radio shield selection. (Applies only to Nucleo platforms)
5156
// The following shields are supported:
52-
// SX1272MB2DAS, SX1276MB1LAS, SX1276MB1MAS, SX1261MBXBAS(Default), SX1262MBXCAS, SX1262MBXDAS.
57+
// SX1272MB2DAS, SX1276MB1LAS, SX1276MB1MAS, SX1261MBXBAS(Default), SX1262MBXCAS, SX1262MBXDAS, LR1110MB1XXS.
5358
"MBED_RADIO_SHIELD":"SX1261MBXBAS",
5459

60+
// Secure element type selection the following are supported
61+
// SOFT_SE(Default), LR1110_SE, ATECC608A_TNGLORA_SE
62+
"SECURE_ELEMENT":"SOFT_SE",
63+
64+
// Secure element is pre-provisioned
65+
"SECURE_ELEMENT_PRE_PROVISIONED":"ON",
66+
5567
// Region support activation, Select the ones you want to support.
5668
// By default only REGION_EU868 support is enabled.
5769
"REGION_EU868":"ON",
5870
"REGION_US915":"OFF",
5971
"REGION_CN779":"OFF",
6072
"REGION_EU433":"OFF",
6173
"REGION_AU915":"OFF",
62-
"REGION_AS923":"OFF",
6374
"REGION_CN470":"OFF",
75+
"REGION_AS923":"OFF",
6476
"REGION_KR920":"OFF",
6577
"REGION_IN865":"OFF",
66-
"REGION_RU864":"OFF"
78+
"REGION_RU864":"OFF",
79+
80+
// Default channel plan for region AS923. Possible selections:
81+
// CHANNEL_PLAN_GROUP_AS923_1, CHANNEL_PLAN_GROUP_AS923_2, CHANNEL_PLAN_GROUP_AS923_3,
82+
// CHANNEL_PLAN_GROUP_AS923_4, CHANNEL_PLAN_GROUP_AS923_1_JP_CH24_CH38_LBT,
83+
// CHANNEL_PLAN_GROUP_AS923_1_JP_CH24_CH38_DC, CHANNEL_PLAN_GROUP_AS923_1_JP_CH37_CH61_LBT_DC
84+
"REGION_AS923_DEFAULT_CHANNEL_PLAN":"CHANNEL_PLAN_GROUP_AS923_1",
85+
86+
// Default channel plan for region CN470. Possible selections:
87+
// CHANNEL_PLAN_20MHZ_TYPE_A, CHANNEL_PLAN_20MHZ_TYPE_B, CHANNEL_PLAN_26MHZ_TYPE_A, CHANNEL_PLAN_26MHZ_TYPE_B
88+
"REGION_CN470_DEFAULT_CHANNEL_PLAN":"CHANNEL_PLAN_20MHZ_TYPE_A"
6789
}
6890
}

0 commit comments

Comments
 (0)