From 7c87435f15f79dbbd62436983759c8d73cb640bd Mon Sep 17 00:00:00 2001 From: Michael Vierling Date: Mon, 19 Dec 2022 16:31:52 -0800 Subject: [PATCH 1/3] define custom regions --- config/sys.config | 13 +++++++++ config/testnet-sys.config | 13 +++++++++ priv/countries_reg_domains.csv | 2 +- src/miner_lora_throttle.erl | 52 ++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 1 deletion(-) diff --git a/config/sys.config b/config/sys.config index 8f8a92128..9ecbabcaf 100644 --- a/config/sys.config +++ b/config/sys.config @@ -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' => [867.1, 867.3, 867.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], diff --git a/config/testnet-sys.config b/config/testnet-sys.config index d1559ef91..ca2c5671c 100644 --- a/config/testnet-sys.config +++ b/config/testnet-sys.config @@ -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' => [867.1, 867.3, 867.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], diff --git a/priv/countries_reg_domains.csv b/priv/countries_reg_domains.csv index e11326b1f..187f5ca8f 100644 --- a/priv/countries_reg_domains.csv +++ b/priv/countries_reg_domains.csv @@ -112,7 +112,7 @@ JP,36.204824,138.252924,Japan,AS923_1,zone3 JE,49.214439,-2.13125,Jersey,EU868,zone1 JO,30.585164,36.238414,Jordan,IN865,zone1 KZ,48.019573,66.923684,Kazakhstan,EU433,zone1 -KE,-0.023559,37.906193,Kenya,EU868,zone1 +KE,-0.023559,37.906193,Kenya,EU868_B,zone1 KI,-3.370417,-168.734039,Kiribati,,zone1 XK,42.602636,20.902977,Kosovo,,zone1 KW,29.31166,47.481766,Kuwait,EU868,zone1 diff --git a/src/miner_lora_throttle.erl b/src/miner_lora_throttle.erl index cce0eb8be..355d8a33a 100644 --- a/src/miner_lora_throttle.erl +++ b/src/miner_lora_throttle.erl @@ -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' @@ -74,15 +100,28 @@ 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; @@ -90,14 +129,27 @@ model(Region) -> %% 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; From 49f2037ac8ff53eb3b8dd853411670657c3a0132 Mon Sep 17 00:00:00 2001 From: Michael Vierling Date: Thu, 29 Dec 2022 13:34:47 -0800 Subject: [PATCH 2/3] freq adjustment --- config/sys.config | 2 +- config/testnet-sys.config | 2 +- priv/countries_reg_domains.csv | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sys.config b/config/sys.config index 9ecbabcaf..44b61f29d 100644 --- a/config/sys.config +++ b/config/sys.config @@ -167,7 +167,7 @@ {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' => [867.1, 867.3, 867.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], diff --git a/config/testnet-sys.config b/config/testnet-sys.config index ca2c5671c..0930246cf 100644 --- a/config/testnet-sys.config +++ b/config/testnet-sys.config @@ -133,7 +133,7 @@ {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' => [867.1, 867.3, 867.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], diff --git a/priv/countries_reg_domains.csv b/priv/countries_reg_domains.csv index 187f5ca8f..e11326b1f 100644 --- a/priv/countries_reg_domains.csv +++ b/priv/countries_reg_domains.csv @@ -112,7 +112,7 @@ JP,36.204824,138.252924,Japan,AS923_1,zone3 JE,49.214439,-2.13125,Jersey,EU868,zone1 JO,30.585164,36.238414,Jordan,IN865,zone1 KZ,48.019573,66.923684,Kazakhstan,EU433,zone1 -KE,-0.023559,37.906193,Kenya,EU868_B,zone1 +KE,-0.023559,37.906193,Kenya,EU868,zone1 KI,-3.370417,-168.734039,Kiribati,,zone1 XK,42.602636,20.902977,Kosovo,,zone1 KW,29.31166,47.481766,Kuwait,EU868,zone1 From 8250e6e307c9b93e5df9f44867fcba64fc3e98c8 Mon Sep 17 00:00:00 2001 From: Michael Vierling Date: Tue, 3 Jan 2023 16:52:08 -0800 Subject: [PATCH 3/3] fix EU868_F typo --- config/sys.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sys.config b/config/sys.config index 44b61f29d..bc7410a6a 100644 --- a/config/sys.config +++ b/config/sys.config @@ -171,7 +171,7 @@ '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], + '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],