Skip to content

define new custom regions #27

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
mikev merged 8 commits into from
May 6, 2023
Merged

define new custom regions #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f619aad
define new custom regions
Dec 20, 2022
74e2424
remove AU915_DP dead code
Dec 20, 2022
f985f5f
fix typos
Dec 20, 2022
5116398
plan corrections
Dec 26, 2022
5acb724
fix AU915_SB1 typo
Dec 29, 2022
a51f3cf
add EU868_A
mikev May 2, 2023
2ccdb99
fix format warning
mikev May 2, 2023
3aa6f37
review suggestions
mikev May 6, 2023
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
21 changes: 10 additions & 11 deletions src/lora_adr.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,15 +391,6 @@ adr_datarates(Region) ->
{4, {8, 125}},
{5, {7, 125}}
];
'AU915_DP' ->
[
{0, {12, 125}},
{1, {11, 125}},
{2, {10, 125}},
{3, {9, 125}},
{4, {8, 125}},
{5, {7, 125}}
];
'CN470' ->
[
{0, {12, 125}},
Expand Down Expand Up @@ -433,25 +424,33 @@ adr_sf_range(Region) ->
case Region of
'US915' -> {7, 10};
'EU868' -> {7, 12};
'EU868_A' -> {7, 12};
'EU868_B' -> {7, 12};
'AU915' -> {7, 12};
'AU915_SB1' -> {7, 12};
'AU915_SB2' -> {7, 12};
'AU915_SB5' -> {7, 12};
'AU915_DP' -> {7, 12};
'CN470' -> {7, 12};
'AS923' -> {7, 12};
'AS923_1B' -> {7, 12};
'AS923_1C' -> {7, 12};
_ -> {7, 12}
end.

adr_datarate_range(Region) ->
case Region of
'US915' -> {0, 3};
'EU868' -> {0, 5};
'EU868_A' -> {0, 5};
'EU868_B' -> {0, 5};
'AU915' -> {0, 5};
'AU915_SB1' -> {0, 5};
'AU915_SB2' -> {0, 5};
'AU915_SB5' -> {0, 5};
'AU915_DP' -> {0, 5};
'CN470' -> {0, 5};
'AS923' -> {0, 5};
'AS923_1B' -> {0, 5};
'AS923_1C' -> {0, 5};
_ -> {0, 5}
end.

Expand Down
55 changes: 46 additions & 9 deletions src/lora_chmask.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,18 @@ join_cf_list('US915') ->
cflist_type_1({8, 15});
join_cf_list('AU915') ->
cflist_type_1({8, 15});
join_cf_list('AU915_DP') ->
cflist_type_1({34, 41});
join_cf_list('AU915_SB1') ->
cflist_type_1({0, 7});
join_cf_list('AU915_SB2') ->
cflist_type_1({8, 15});
join_cf_list('AU915_SB5') ->
cflist_type_1({40, 47});
join_cf_list('EU868') ->
cflist_type_0([8671000, 8673000, 8675000, 8677000, 8679000]);
join_cf_list('EU868_A') ->
cflist_type_0([8671000, 8673000, 8675000, 8677000, 8679000]);
join_cf_list('EU868_B') ->
cflist_type_0([8671000, 8673000, 8675000, 8677000, 8679000]);
join_cf_list('EU433') ->
cflist_type_0([4331750, 4333750, 4335750, 0, 0]);
join_cf_list('CN470') ->
Expand All @@ -100,6 +106,8 @@ join_cf_list('AS923_1') ->
cflist_type_0([9236000, 9238000, 9240000, 9242000, 9244000]);
join_cf_list('AS923_1B') ->
cflist_type_0([9220000, 9222000, 9234000, 9228000, 9230000]);
join_cf_list('AS923_1C') ->
cflist_type_0([9236000, 9238000, 9240000, 9242000, 9244000]);
join_cf_list('AS923_2') ->
cflist_type_0([9218000, 9220000, 9222000, 9224000, 9226000]);
join_cf_list('AS923_3') ->
Expand Down Expand Up @@ -134,7 +142,11 @@ make_link_adr_req(Region, Tuple, FOptsOut) ->
%% link_adr_req command

make_link_adr_req_(Region, {0, <<"NoChange">>, Chans}, FOptsOut) when
Region == 'US915'; Region == 'AU915'; Region == 'AU915_SB5'; Region == 'AU915_DP'
Region == 'US915';
Region == 'AU915';
Region == 'AU915_SB1';
Region == 'AU915_SB2';
Region == 'AU915_SB5'
->
case all_bit({0, 63}, Chans) of
true ->
Expand All @@ -149,7 +161,11 @@ make_link_adr_req_(Region, {0, <<"NoChange">>, Chans}, FOptsOut) when
]
end;
make_link_adr_req_(Region, {TXPower, DataRate, Chans}, FOptsOut) when
Region == 'US915'; Region == 'AU915'; Region == 'AU915_SB5'; Region == 'AU915_DP'
Region == 'US915';
Region == 'AU915';
Region == 'AU915_SB1';
Region == 'AU915_SB2';
Region == 'AU915_SB5'
->
Plan = lora_plan:region_to_plan(Region),
DRIndex = lora_plan:datarate_to_index(Plan, DataRate),
Expand Down Expand Up @@ -256,14 +272,20 @@ build_link_adr_req(Plan, {TXPower0, DataRate}, FOptsOut) ->
{link_adr_req, DRIndex1, TXPower1, 0, 7, 0}
| append_mask(Region, 3, {TXPower1, DataRate, Chans}, FOptsOut)
];
'AU915_SB5' ->
Chans = [{40, 47}],
'AU915_SB1' ->
Chans = [{0, 7}],
[
{link_adr_req, DRIndex1, TXPower1, 0, 7, 0}
| append_mask(Region, 3, {TXPower1, DataRate, Chans}, FOptsOut)
];
'AU915_SB2' ->
Chans = [{8, 15}],
[
{link_adr_req, DRIndex1, TXPower1, 0, 7, 0}
| append_mask(Region, 3, {TXPower1, DataRate, Chans}, FOptsOut)
];
'AU915_DP' ->
Chans = [{34, 41}],
'AU915_SB5' ->
Chans = [{40, 47}],
[
{link_adr_req, DRIndex1, TXPower1, 0, 7, 0}
| append_mask(Region, 3, {TXPower1, DataRate, Chans}, FOptsOut)
Expand Down Expand Up @@ -386,8 +408,9 @@ validate_req(Plan, TxPower, DataRate) ->
case Region of
'US915' -> [{8, 15}];
'AU915' -> [{8, 15}];
'AU915_SB1' -> [{0, 7}];
'AU915_SB2' -> [{8, 15}];
'AU915_SB5' -> [{40, 47}];
'AU915_DP' -> [{34, 41}];
_ -> [{0, 7}]
end,
M1 = make_link_adr_req(Region, {TxPower, DataRate, Chans}, []),
Expand All @@ -405,12 +428,16 @@ exercise_req({Region, TxPower, DataRate}) ->
exercise_req_test_() ->
Regions = [
'EU868',
'EU868_B',
'US915',
'AU915',
'AU915_SB1',
'AU915_SB2',
'AU915_SB5',
'CN470',
'AS923_1',
'AS923_1B',
'AS923_1C',
'KR920',
'IN865',
'EU433'
Expand Down Expand Up @@ -446,6 +473,11 @@ join_cf_list_test_() ->
<<0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1>>,
join_cf_list('AU915')
),
?_assertEqual(
%% Active Channels 8-15
<<255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1>>,
join_cf_list('AU915_SB1')
),
?_assertEqual(
%% Active Channels 40-47
<<0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1>>,
Expand All @@ -461,6 +493,11 @@ join_cf_list_test_() ->
<<160, 175, 140, 112, 183, 140, 80, 230, 140, 224, 206, 140, 176, 214, 140, 0>>,
join_cf_list('AS923_1B')
),
?_assertEqual(
%% Freqs 923.6, 923.8, 924.0, 924.2, 924.4
<<32, 238, 140, 240, 245, 140, 192, 253, 140, 144, 5, 141, 96, 13, 141, 0>>,
join_cf_list('AS923_1C')
),
?_assertEqual(
%% Freqs 921.8, 922.0, 922.2, 922.4, 922.6
<<208, 167, 140, 160, 175, 140, 112, 183, 140, 64, 191, 140, 16, 199, 140, 0>>,
Expand Down
Loading