OpenMANET/morse-feed
1
0
Fork 0
mirror of https://github.com/OpenMANET/morse-feed.git synced 2025-12-10 21:06:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

morse-regdb: (APP-4159, PR#ToDo) Revert S1G channel changes done for SG region

Browse Source 
Approved-by: James Haggerty
Approved-by: Andrew Dodd
This commit is contained in:
Prabha Murugesan 2025-03-06 03:18:09 +00:00 committed by Arien Judge
parent 010ab02eaa
commit cf2c204713
3 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
morse-regdb/Makefile
View File

@ -90,7 +90,9 @@ define Build/Compile
$(if $(REGENERATE),
mkdir -p artefacts
python3 $(PKG_BUILD_DIR)/regdbconverter.py -v -f csv $(PKG_BUILD_DIR)/regdb_Sub-1_GHz.tsv > artefacts/repo_channels.csv
find patch/ -type f -name '*.patch' -print0 | sort -z | xargs -r -t -0 -n 1 patch -p1 -i
)
mkdir -p $(PKG_BUILD_DIR)/artefacts
# Mash the 5g shim channels in.
python3 add_5g_shim_channels.py < artefacts/repo_channels.csv | $(FILTER) > $(PKG_BUILD_DIR)/artefacts/channels.csv

13
morse-regdb/artefacts/repo_channels.csv
View File

@ -414,21 +414,14 @@ SG,1,7,17,66,866.5,2.77,2.77,Singapore,29.14,False,100.0,0.0,1000.0,1
SG,1,9,17,66,867.5,2.77,2.77,Singapore,29.14,False,100.0,0.0,1000.0,1
SG,1,11,17,66,868.5,2.77,2.77,Singapore,29.14,False,100.0,0.0,1000.0,1
SG,2,10,19,67,868.0,2.77,2.77,Singapore,29.14,False,100.0,0.0,1000.0,1
SG,1,31,18,68,917.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,1,33,18,68,918.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,1,35,18,68,919.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,1,37,18,68,920.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,1,39,18,68,921.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,1,41,18,68,922.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,1,43,18,68,923.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,1,45,18,68,924.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,2,32,20,61,918.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,2,36,20,61,920.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,2,40,20,61,922.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,2,44,20,61,924.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,4,34,21,62,919.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,4,42,21,62,923.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,8,38,31,63,921.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,2,38,20,69,921.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,2,42,20,69,923.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,4,40,21,70,922.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SI,1,1,6,66,863.5,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1
SI,1,3,6,66,864.5,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1
SI,1,5,6,66,865.5,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1

1 country_code bw s1g_chan s1g_op_class global_op_class centre_freq_mhz duty_cycle_ap duty_cycle_sta country tx_power_max duty_cycle_omit_ctrl_resp pkt_spacing_ms airtime_min_ms airtime_max_ms usable_banff_c
414 SG 1 9 17 66 867.5 2.77 2.77 Singapore 29.14 False 100.0 0.0 1000.0 1
415 SG 1 11 17 66 868.5 2.77 2.77 Singapore 29.14 False 100.0 0.0 1000.0 1
416 SG 2 10 19 67 868.0 2.77 2.77 Singapore 29.14 False 100.0 0.0 1000.0 1
SG 1 31 18 68 917.5 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
SG 1 33 18 68 918.5 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
SG 1 35 18 68 919.5 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
417 SG 1 37 18 68 920.5 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
418 SG 1 39 18 68 921.5 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
419 SG 1 41 18 68 922.5 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
420 SG 1 43 18 68 923.5 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
421 SG 1 45 18 68 924.5 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
422 SG 2 32 38 20 61 69 918.0 921.0 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
423 SG 2 36 42 20 61 69 920.0 923.0 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
424 SG 2 4 40 20 21 61 70 922.0 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
SG 2 44 20 61 924.0 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
SG 4 34 21 62 919.0 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
SG 4 42 21 62 923.0 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
SG 8 38 31 63 921.0 100.0 100.0 Singapore 22.15 False 0.0 0.0 0.0 1
425 SI 1 1 6 66 863.5 10.0 2.8 Slovenia 16.13 False 0.0 0.0 0.0 1
426 SI 1 3 6 66 864.5 10.0 2.8 Slovenia 16.13 False 0.0 0.0 0.0 1
427 SI 1 5 6 66 865.5 10.0 2.8 Slovenia 16.13 False 0.0 0.0 0.0 1

35
morse-regdb/patch/001-SG_revert_to_2_1_1.patch Normal file
View File

@ -0,0 +1,35 @@
commit cf4182b2424159df07e6466cb1e437f091e0e99a
Author: Prabha Murugesan <prabha.murugesan@morsemicro.com>
Date: Mon Mar 3 18:27:46 2025 +1100
morse-regdb: (APP-4159, PR#ToDo) Revert S1G channel changes done for SG region
diff --git a/artefacts/repo_channels.csv b/artefacts/repo_channels.csv
index 41f156d..2917dc8 100644
--- a/artefacts/repo_channels.csv
+++ b/artefacts/repo_channels.csv
@@ -414,21 +414,14 @@ SG,1,7,17,66,866.5,2.77,2.77,Singapore,29.14,False,100.0,0.0,1000.0,1
SG,1,9,17,66,867.5,2.77,2.77,Singapore,29.14,False,100.0,0.0,1000.0,1
SG,1,11,17,66,868.5,2.77,2.77,Singapore,29.14,False,100.0,0.0,1000.0,1
SG,2,10,19,67,868.0,2.77,2.77,Singapore,29.14,False,100.0,0.0,1000.0,1
-SG,1,31,18,68,917.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
-SG,1,33,18,68,918.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
-SG,1,35,18,68,919.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,1,37,18,68,920.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,1,39,18,68,921.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,1,41,18,68,922.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,1,43,18,68,923.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SG,1,45,18,68,924.5,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
-SG,2,32,20,61,918.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
-SG,2,36,20,61,920.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
-SG,2,40,20,61,922.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
-SG,2,44,20,61,924.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
-SG,4,34,21,62,919.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
-SG,4,42,21,62,923.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
-SG,8,38,31,63,921.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
+SG,2,38,20,69,921.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
+SG,2,42,20,69,923.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
+SG,4,40,21,70,922.0,100.0,100.0,Singapore,22.15,False,0.0,0.0,0.0,1
SI,1,1,6,66,863.5,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1
SI,1,3,6,66,864.5,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1
SI,1,5,6,66,865.5,10.0,2.8,Slovenia,16.13,False,0.0,0.0,0.0,1