Skip to content
This repository was archived by the owner on Jun 12, 2023. It is now read-only.

define custom regions #1873

Open
mikev wants to merge 3 commits into
base: master
Choose a base branch
from
Open

define custom regions #1873

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c87435
define custom regions
Dec 20, 2022
49f2037
freq adjustment
Dec 29, 2022
8250e6e
fix EU868_F typo
Jan 4, 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
13 changes: 13 additions & 0 deletions config/sys.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,25 @@
{reg_domains_file, "countries_reg_domains.csv"},
{frequency_data, #{'US915' => [903.9, 904.1, 904.3, 904.5, 904.7, 904.9, 905.1, 905.3],
'EU868' => [867.1, 867.3, 867.5, 867.7, 867.9, 868.1, 868.3, 868.5],
'EU868_A' => [867.1, 867.3, 867.5, 867.7, 867.9, 868.1, 868.3, 868.5],
'EU868_B' => [868.1, 868.3, 868.5],
'EU868_C' => [867.1, 867.3, 867.5, 867.7, 867.9, 868.1, 868.3, 868.5],
'EU868_D' => [867.1, 867.3, 867.5, 867.7, 867.9, 868.1, 868.3, 868.5],
'EU868_E' => [867.1, 867.3, 867.5, 867.7, 867.9, 868.1, 868.3, 868.5],
'EU868_f' => [867.1, 867.3, 867.5, 867.7, 867.9, 868.1, 868.3, 868.5],
'EU433' => [433.175, 433.375, 433.575],
'CN470' => [486.3, 486.5, 486.7, 486.9, 487.1, 487.3, 487.5, 487.7 ],
'CN779' => [779.5, 779.7, 779.9],
'AU915' => [916.8, 917.0, 917.2, 917.4, 917.6, 917.8, 918.0, 918.2],
'AU915_SB1' => [915.2, 915.4, 915.6, 915.8, 916.0, 916.2, 916.4, 916.6],
'AU915_SB2' => [916.8, 917.0, 917.2, 917.4, 917.6, 917.8, 918.0, 918.2],
'AS923_1' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.6],
'AS923_1A' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.6],
'AS923_1B' => [922.0, 922.2, 922.4, 922.6, 922.8, 923.0, 923.2, 923.4],
'AS923_1C' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.6],
'AS923_1D' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.6],
'AS923_1E' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.6],
'AS923_1F' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.6],
'AS923_2' => [921.4, 921.6, 921.8, 922.0, 922.2, 922.4, 922.6, 922.8],
'AS923_3' => [916.6, 916.8, 917.0, 917.2, 917.4, 917.6, 917.8, 918.0],
'AS923_4' => [917.3, 917.5, 917.7, 917.9, 918.1, 918.3, 918.5, 918.7],
Expand Down
13 changes: 13 additions & 0 deletions config/testnet-sys.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,25 @@
{reg_domains_file, "countries_reg_domains.csv"},
{frequency_data, #{'US915' => [903.9, 904.1, 904.3, 904.5, 904.7, 904.9, 905.1, 905.3],
'EU868' => [867.1, 867.3, 867.5, 867.7, 867.9, 868.1, 868.3, 868.5],
'EU868_A' => [867.1, 867.3, 867.5, 867.7, 867.9, 868.1, 868.3, 868.5],
'EU868_B' => [868.1, 868.3, 868.5],
'EU868_C' => [867.1, 867.3, 867.5, 867.7, 867.9, 868.1, 868.3, 868.5],
'EU868_D' => [867.1, 867.3, 867.5, 867.7, 867.9, 868.1, 868.3, 868.5],
'EU868_E' => [867.1, 867.3, 867.5, 867.7, 867.9, 868.1, 868.3, 868.5],
'EU868_F' => [867.1, 867.3, 867.5, 867.7, 867.9, 868.1, 868.3, 868.5],
'EU433' => [433.175, 433.375, 433.575],
'CN470' => [486.3, 486.5, 486.7, 486.9, 487.1, 487.3, 487.5, 487.7 ],
'CN779' => [779.5, 779.7, 779.9],
'AU915' => [916.8, 917.0, 917.2, 917.4, 917.6, 917.8, 918.0, 918.2],
'AU915_SB1' => [915.2, 915.4, 915.6, 915.8, 916.0, 916.2, 916.4, 916.6],
'AU915_SB2' => [916.8, 917.0, 917.2, 917.4, 917.6, 917.8, 918.0, 918.2],
'AS923_1' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.6],
'AS923_1A' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.6],
'AS923_1B' => [922.0, 922.2, 922.4, 922.6, 922.8, 923.0, 923.2, 923.4],
'AS923_1C' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.6],
'AS923_1D' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.6],
'AS923_1E' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.6],
'AS923_1F' => [923.2, 923.4, 923.6, 923.8, 924.0, 924.2, 924.4, 924.6],
'AS923_2' => [921.4, 921.6, 921.8, 922.0, 922.2, 922.4, 922.6, 922.8],
'AS923_3' => [916.6, 916.8, 917.0, 917.2, 917.4, 917.6, 917.8, 918.0],
'AS923_4' => [917.3, 917.5, 917.7, 917.9, 918.1, 918.3, 918.5, 918.7],
Expand Down
52 changes: 52 additions & 0 deletions src/miner_lora_throttle.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,53 @@
-type region() ::
'AS923'
| 'AS923_1'
| 'AS923_1A'
| 'AS923_1B'
| 'AS923_1C'
| 'AS923_1D'
| 'AS923_1E'
| 'AS923_1F'
| 'AS923_2'
| 'AS923_3'
| 'AS923_4'
| 'AU915'
| 'AU915_SB1'
| 'AU915_SB2'
| 'CN470'
| 'CN779'
| 'EU433'
| 'EU868'
| 'EU868_A'
| 'EU868_B'
| 'EU868_C'
| 'EU868_D'
| 'EU868_E'
| 'EU868_F'
| 'IN865'
| 'KR920'
| 'US915'
| 'region_as923_1'
| 'region_as923_1a'
| 'region_as923_1b'
| 'region_as923_1c'
| 'region_as923_1d'
| 'region_as923_1e'
| 'region_as923_1f'
| 'region_as923_2'
| 'region_as923_3'
| 'region_as923_4'
| 'region_au915'
| 'region_au915_sb1'
| 'region_au915_sb2'
| 'region_cn470'
| 'region_eu433'
| 'region_eu868'
| 'region_eu868_a'
| 'region_eu868_b'
| 'region_eu868_c'
| 'region_eu868_d'
| 'region_eu868_e'
| 'region_eu868_f'
| 'region_in865'
| 'region_kr920'
| 'region_ru864'
Expand All @@ -74,30 +100,56 @@ model(Region) ->
case Region of
'AS923' -> ?COMMON_DUTY;
'AS923_1' -> ?COMMON_DUTY;
'AS923_1A' -> ?COMMON_DUTY;
'AS923_1B' -> ?COMMON_DUTY;
'AS923_1C' -> ?COMMON_DUTY;
'AS923_1D' -> ?COMMON_DUTY;
'AS923_1E' -> ?COMMON_DUTY;
'AS923_1F' -> ?COMMON_DUTY;
'AS923_2' -> ?COMMON_DUTY;
'AS923_3' -> ?COMMON_DUTY;
'AS923_4' -> ?COMMON_DUTY;
'AU915' -> ?COMMON_DUTY;
'AU915_SB1' -> ?COMMON_DUTY;
'AU915_SB2' -> ?COMMON_DUTY;
'CN470' -> ?COMMON_DUTY;
'CN779' -> ?COMMON_DUTY;
'EU433' -> ?COMMON_DUTY;
'EU868' -> ?COMMON_DUTY;
'EU868_A' -> ?COMMON_DUTY;
'EU868_B' -> ?COMMON_DUTY;
'EU868_C' -> ?COMMON_DUTY;
'EU868_D' -> ?COMMON_DUTY;
'EU868_E' -> ?COMMON_DUTY;
'EU868_F' -> ?COMMON_DUTY;
'IN865' -> ?COMMON_DUTY;
'KR920' -> ?COMMON_DUTY;
'US915' -> ?US_DWELL_TIME;

%% NOTE: Starting with poc-v11 the Regions are tagged
%% And we don't support region_cn779
'region_as923_1' -> ?COMMON_DUTY;
'region_as923_1a' -> ?COMMON_DUTY;
'region_as923_1b' -> ?COMMON_DUTY;
'region_as923_1c' -> ?COMMON_DUTY;
'region_as923_1e' -> ?COMMON_DUTY;
'region_as923_1e' -> ?COMMON_DUTY;
'region_as923_1f' -> ?COMMON_DUTY;
'region_as923_2' -> ?COMMON_DUTY;
'region_as923_3' -> ?COMMON_DUTY;
'region_as923_4' -> ?COMMON_DUTY;
'region_au915' -> ?COMMON_DUTY;
'region_au915_sb1' -> ?COMMON_DUTY;
'region_au915_sb2' -> ?COMMON_DUTY;
'region_cn470' -> ?COMMON_DUTY;
'region_eu433' -> ?COMMON_DUTY;
'region_eu868' -> ?COMMON_DUTY;
'region_eu868_a' -> ?COMMON_DUTY;
'region_eu868_b' -> ?COMMON_DUTY;
'region_eu868_c' -> ?COMMON_DUTY;
'region_eu868_d' -> ?COMMON_DUTY;
'region_eu868_e' -> ?COMMON_DUTY;
'region_eu868_f' -> ?COMMON_DUTY;
'region_in865' -> ?COMMON_DUTY;
'region_kr920' -> ?COMMON_DUTY;
'region_us915' -> ?US_DWELL_TIME;
Expand Down