From 5ba6acfbf2580e357437af68fcde53fc4fec2679 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 11:20:58 -0600 Subject: [PATCH 01/33] First Codeplug First Codeplug with this program. --- input/default/example-md-uv380.json | 6 ++--- .../k7abd/Digital-Repeaters__Hotspot.csv | 6 ++--- input/default/k7abd/Talkgroups__Hotspot.csv | 25 +++++++++++-------- input/default/order.csv | 11 ++++---- input/default/replacements.csv | 4 +-- 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/input/default/example-md-uv380.json b/input/default/example-md-uv380.json index 7ef071e..59355ee 100644 --- a/input/default/example-md-uv380.json +++ b/input/default/example-md-uv380.json @@ -172,7 +172,7 @@ "GroupCallMatch": "On", "IntroScreen": "Character String", "IntroScreenLine1": "$DATE", - "IntroScreenLine2": "PNWDigital", + "IntroScreenLine2": "Mike Kaylor", "KeypadTones": "Off", "LoneWorkerReminderTime": "10", "LoneWorkerResponseTime": "1", @@ -190,7 +190,7 @@ "RadioID1": "1", "RadioID2": "2", "RadioID3": "3", - "RadioName": "AA1AA", + "RadioName": "D878UVII", "RadioProgPassword": "", "RxLowBatteryInterval": "120", "SaveModeReceive": "On", @@ -199,7 +199,7 @@ "ScanDigitalHangTime": "5000", "SetKeypadLockTime": "Manual", "TalkPermitTone": "None", - "TimeZone": "UTC-8:00", + "TimeZone": "UTC-6:00", "TxMode": "Designated CH + Hand CH", "TxPreambleDuration": "300", "VoxSensitivity": "3" diff --git a/input/default/k7abd/Digital-Repeaters__Hotspot.csv b/input/default/k7abd/Digital-Repeaters__Hotspot.csv index a6b2a50..a5afedd 100644 --- a/input/default/k7abd/Digital-Repeaters__Hotspot.csv +++ b/input/default/k7abd/Digital-Repeaters__Hotspot.csv @@ -1,3 +1,3 @@ -Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,CNJHam,Colorado Mega,CO Skyhub,Illinois-Link,Olympic P,Oregon 1,Oregon TAC,PNW Rgnl,Quadnet Array,Reddit,Parrot BM,TAC 310-2,TAC 311-2,TAC 312-2,Texas,Washington 1,Worldwide -DPHS Static;DHS,Static Tgs,Low,430.4375,439.4375,1,-,-,-,-,2,1,2,2,-,2,2,-,-,-,-,1,- -DPHS Wide;DHW,Dynamic Tgs,Low,430.4375,439.4375,1,2,2,2,2,-,-,-,-,2,2,2,2,2,2,2,-,2 +Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local,Local-Cluster,Regional,Local-Reflect,Worldwide,Namerica,SIMPLEX,Mil Vets,World-Events,Reddit,Parrot BM,TAC 310-2,TAC 311-2,TAC 312-2,Arkansas,Texas,Texas Chat,North Texas,Texas,Pinoy,BC +DPHS Static;DHS,Static Tgs,Low,430.4375,439.4375,1,-,-,-,-,2,1,2,2,-,2,2,-,-,-,-,1,1,1,1,,- +DPHS Wide;DHW,Dynamic Tgs,Low,430.4375,439.4375,1,2,2,2,2,-,-,-,-,2,2,2,2,2,2,2,-,-,-,-,2,- diff --git a/input/default/k7abd/Talkgroups__Hotspot.csv b/input/default/k7abd/Talkgroups__Hotspot.csv index 928b6a4..1c05238 100644 --- a/input/default/k7abd/Talkgroups__Hotspot.csv +++ b/input/default/k7abd/Talkgroups__Hotspot.csv @@ -1,17 +1,22 @@ -CNJHam,31340 -Colorado Mega,310759 -CO Skyhub,310847 -Illinois-Link,31171 -Olympic P,31531 -Oregon 1,3141 -Oregon TAC,31410 -PNW Rgnl,31771 +Local,1 +Local-Cluster,2 +Regional,8 +Local-Reflect,9 +Worldwide,91 +NAmerica,93 +SIMPLEX,99 +Mil Vets,518 +World-Events,519 +AMSAT,98006 Quadnet Array,31012 Reddit,98003 Parrot BM,9990P TAC 310-2,310 TAC 311-2,311 TAC 312-2,312 +Arkansas,31305 Texas,3148 -Washington 1,3153 -Worldwide,91 +Texas-Chat,31480 +North Texas,31481 +Pinoy,515 +BC,30271 diff --git a/input/default/order.csv b/input/default/order.csv index b37bf92..b6941e7 100644 --- a/input/default/order.csv +++ b/input/default/order.csv @@ -1,10 +1,9 @@ zones,contacts,channels -PNWDigital,Oregon 1,Rainier Hill -Hotspot,Washington 1,DPHS Static -Local,Washington 2,DPHS Wide -SeattleDMR,Cascades 1, -Longview WA VHF 35mi,Local 1, -Longview WA UHF 35mi,Local 2, +Hotspot,Texas 1,DPHS Static +Local,Texas 2,DPHS Wide +Texas,Cascades 1, +North Texas,Local 1, +Arkansas,Local 2, Simplex A VHF,Parrot 1, Simplex A UHF,, Simplex D VHF,, diff --git a/input/default/replacements.csv b/input/default/replacements.csv index ef48aa5..0188321 100644 --- a/input/default/replacements.csv +++ b/input/default/replacements.csv @@ -1,3 +1 @@ -Channels_pattern,Channels_repl,Zones_pattern,Zones_repl,Contacts_pattern,Contacts_repl, -Oregon,OR,Longview/Rainier,Rainier Hill,,, -Washington,WA,,,,, +Channels_pattern,Channels_repl,Zones_pattern,Zones_repl,Contacts_pattern,Contacts_repl From 09fd917286be17a3168f2f18aa3fd268bc6f5eb8 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 11:42:24 -0600 Subject: [PATCH 02/33] Test 2 --- input/default/prox.csv | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/input/default/prox.csv b/input/default/prox.csv index 63b7d84..2617f1f 100644 --- a/input/default/prox.csv +++ b/input/default/prox.csv @@ -1,19 +1,4 @@ Zone Name,Lat,Long,Distance,Unit,Band(2m;1.25m;70cm),Use,Operational Status -Longview WA VHF 35mi,46.13819885,-122.93800354,35,miles,2m,OPEN,On-Air -Longview WA UHF 35mi,46.13819885,-122.93800354,35,miles,70cm,OPEN,On-Air -Astoria OR VHF 30mi,46.18790054,-123.83100128,30,miles,2m,OPEN,On-Air -Astoria OR UHF 30mi,46.18790054,-123.83100128,30,miles,70cm,OPEN,On-Air -Portland OR VHF 30mi,45.52310181,-122.67600250,30,miles,2m,OPEN,On-Air -Portland OR UHF 30mi,45.52310181,-122.67600250,30,miles,70cm,OPEN,On-Air -Salem OR VHF 39mi,44.94290161,-123.03500366,39,miles,2m,OPEN,On-Air -Salem OR UHF 39mi,44.94290161,-123.03500366,39,miles,70cm,OPEN,On-Air -Hood River OR VHF 35mi,45.70539856,-121.52100372,35,miles,2m,OPEN,On-Air -Hood River OR UHF 35mi,45.70539856,-121.52100372,35,miles,70cm,OPEN,On-Air -Olympia WA VHF 30mi,47.03789902,-122.90100098,30,miles,2m,OPEN,On-Air -Olympia WA UHF 30mi,47.03789902,-122.90100098,30,miles,70cm,OPEN,On-Air -Packwood WA VHF 40mi,46.60649872,-121.67099762,40,miles,2m,OPEN,On-Air -Packwood WA UHF 40mi,46.60649872,-121.67099762,40,miles,70cm,OPEN,On-Air -Seattle WA VHF 45mi,47.60620117,-122.33200073,45,miles,2m,OPEN,On-Air -Seattle WA UHF 45mi,47.60620117,-122.33200073,45,miles,70cm,OPEN,On-Air -Burlington WA VHF 45mi,48.47570038,-122.32499695,45,miles,2m,OPEN,On-Air -Burlington WA UHF 45mi,48.47570038,-122.32499695,45,miles,70cm,OPEN,On-Air +McKinney,33.21786,-96.6339,3,miles,2m,OPEN,On-Air +McKinney,33.21786,-96.6339,3,miles,70cm,OPEN,On-Air +Anna,33.31786,-96.6339,5,miles,70cm,OPEN,On-Air From 2e2c4359e3751e9bc334c50a6b8a55d6e9d796bf Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 14:28:41 -0600 Subject: [PATCH 03/33] Test 2 Test 2 Using Texas --- .../Digital-Repeaters__Washington.csv | 0 .../k7abd => hold}/Talkgroups__Washington.csv | 0 .../k7abd/Digital-Repeaters__Hotspot.csv | 6 +++--- .../k7abd/Digital-Repeaters__Texas.csv | 14 +++++++++++++ input/default/k7abd/Talkgroups__Texas.csv | 21 +++++++++++++++++++ input/default/prox.csv | 12 ++++++++++- 6 files changed, 49 insertions(+), 4 deletions(-) rename {input/default/k7abd => hold}/Digital-Repeaters__Washington.csv (100%) rename {input/default/k7abd => hold}/Talkgroups__Washington.csv (100%) create mode 100644 input/default/k7abd/Digital-Repeaters__Texas.csv create mode 100644 input/default/k7abd/Talkgroups__Texas.csv diff --git a/input/default/k7abd/Digital-Repeaters__Washington.csv b/hold/Digital-Repeaters__Washington.csv similarity index 100% rename from input/default/k7abd/Digital-Repeaters__Washington.csv rename to hold/Digital-Repeaters__Washington.csv diff --git a/input/default/k7abd/Talkgroups__Washington.csv b/hold/Talkgroups__Washington.csv similarity index 100% rename from input/default/k7abd/Talkgroups__Washington.csv rename to hold/Talkgroups__Washington.csv diff --git a/input/default/k7abd/Digital-Repeaters__Hotspot.csv b/input/default/k7abd/Digital-Repeaters__Hotspot.csv index a5afedd..89fa39a 100644 --- a/input/default/k7abd/Digital-Repeaters__Hotspot.csv +++ b/input/default/k7abd/Digital-Repeaters__Hotspot.csv @@ -1,3 +1,3 @@ -Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local,Local-Cluster,Regional,Local-Reflect,Worldwide,Namerica,SIMPLEX,Mil Vets,World-Events,Reddit,Parrot BM,TAC 310-2,TAC 311-2,TAC 312-2,Arkansas,Texas,Texas Chat,North Texas,Texas,Pinoy,BC -DPHS Static;DHS,Static Tgs,Low,430.4375,439.4375,1,-,-,-,-,2,1,2,2,-,2,2,-,-,-,-,1,1,1,1,,- -DPHS Wide;DHW,Dynamic Tgs,Low,430.4375,439.4375,1,2,2,2,2,-,-,-,-,2,2,2,2,2,2,2,-,-,-,-,2,- +Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local,Local-Cluster,N.Texas,NTX Wide,Texas,Texas Statewide,BM Texas,TX-OK,N.America,Worldwide,WW Eng,BM WW,DCI Bridge,TAC 310,TAC 311,TAC 312,TAC 311,Parrot,Audio Test,AMSAT,S.Plains,Cactus,TGIF +DPHS Static;DHS,Static Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 +DPHS Wide;DHW,Dynamic Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 diff --git a/input/default/k7abd/Digital-Repeaters__Texas.csv b/input/default/k7abd/Digital-Repeaters__Texas.csv new file mode 100644 index 0000000..5ec97f6 --- /dev/null +++ b/input/default/k7abd/Digital-Repeaters__Texas.csv @@ -0,0 +1,14 @@ +Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local-Cluster,N.Texas,NTX Wide,Texas,Texas Statewide,BM Texas,TX-OK,N.America,Worldwide,WW Eng,BM WW,DCI Bridge,TAC 310,TAC 311,TAC 312,TAC 311,Parrot,Audio Test,AMSAT,S.Plains,Cactus,TGIF +McKinney,N5GI,Turbo,145.35,144.75,1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,-,-,-,-,-,- +McKinney,N5ITU,Turbo,441.3375,446.3375,1,-,-,-,-,-,-,-,-,-,-,,-,1,-,-,-,-,-,-,-,-,- +McKinney,N5GI,Turbo,442.575," 447.57500",1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,-,-,-,-,-,- +Anna,WS5W,Turbo,440.525,445.525,1,2,-,-,2,2,-,-,1,1,1,,-,-,-,-,-,-,-,-,-,-,- +Fairview,N5ITU,Turbo,441.3375,446.3375,2,2,2,-,2,2,-,-,1,1,1,,2,2,-,-,-,2,2,-,-,-,- +Farmersville,WA5DKW,Turbo,440.0125,445.0125,1,1,-,1,,2,2,-,-,-,-,2,-,-,-,-,-,-,-,-,-,-,- +Little Elm,WB8GRS,Turbo,441.3875,446.3875,1,1,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,- +Richardson,K5RWK,Turbo,440.375,445.375,1,-,2,2,1,1,-,-,1,-,1,-,-,-,-,-,-,-,-,1,-,-,- +Dallas,W5EBQ,Turbo,440.6375,445.6375,1,1,-,-,2,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,- +Dallas,AB5U,Turbo,440.1375,445.1375,1,2,-,2,1,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,1 +Dallas,W5EBQ,Turbo,441.3375,446.3375,1,2,-,-,2,-,-,2,1,1,1,-,1,1,-,-,-,-,-,-,-,-,- +Dallas,N4MSE,Turbo,442.025,447.025,1,2,2,-,2,2,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,- +Dallas,UNKN,Turbo,442.5,447.5,1,-,-,-,-,-,-,-,1,1,-,-,-,-,-,-,-,-,-,-,2,2,- diff --git a/input/default/k7abd/Talkgroups__Texas.csv b/input/default/k7abd/Talkgroups__Texas.csv new file mode 100644 index 0000000..465c835 --- /dev/null +++ b/input/default/k7abd/Talkgroups__Texas.csv @@ -0,0 +1,21 @@ +Local-Cluster,2 +N.Texas,9 +Texas,3148 +Texas Statewide,31480 +TX-OK,3175 +NTX Wide,8205 +BM Texas,9000 +N.America,3 +Worldwide,1 +WW Eng,13 +BM WW,91 +DCI Bridge,3100 +TAC 310,310 +TAC 311,311 +TAC 312,312 +Parrot,9998 +Audio Test,9999 +AMSAT,98006 +S.Plains,3175 +Cactus,3185 +TGIF,31665 diff --git a/input/default/prox.csv b/input/default/prox.csv index 2617f1f..ed6e1ab 100644 --- a/input/default/prox.csv +++ b/input/default/prox.csv @@ -1,4 +1,14 @@ Zone Name,Lat,Long,Distance,Unit,Band(2m;1.25m;70cm),Use,Operational Status McKinney,33.21786,-96.6339,3,miles,2m,OPEN,On-Air McKinney,33.21786,-96.6339,3,miles,70cm,OPEN,On-Air -Anna,33.31786,-96.6339,5,miles,70cm,OPEN,On-Air +Anna,33.349,-96.5485,12,miles,70cm,OPEN,On-Air +Farmersville,33.16344,-96.3599,17,miles,70cm,OPEN,On-Air +Allen,33.1031,-96.6709,7,miles,70cm,OPEN,On-Air +Plano,33.0196,-96.6992,14,miles,70cm,OPEN,On-Air +Fairview,33.1579,-96.63166,3,miles,70cm,OPEN,On-Air +Murphy,33.01512,-96.61305,13,miles,70cm,OPEN,On-Air +Richardson,32.94818,-96.72972,18,miles,70cm,OPEN,On-Air +Melissa,33.28595,-96.57277,12,miles,70cm,OPEN,On-Air +Celina,33.32593,-96.7792,11,miles,70cm,OPEN,On-Air +Prosper,33.23623,-96.80111,6,miles,70cm,OPEN,On-Air +Dallas,32.78306,-96.80667,20,miles,70cm,OPEN,On-Air From 84e9ad35c9c8c02ec9b510fc967135087fd85c13 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 18:40:39 -0600 Subject: [PATCH 04/33] Test 4 Removing all but Texas --- input/default/generate.py | 10 +++++----- input/default/generate.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/input/default/generate.py b/input/default/generate.py index 282ee91..3bd5120 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -12,12 +12,12 @@ output = Path(os.environ.get("OUTPUT") or (cp_dir / ".." / ".." / "OUTPUT")) CodeplugRecipe( - source_pnwdigital=True, - source_seattledmr=True, - source_default_k7abd=True, + source_pnwdigital=False, + source_seattledmr=False, + source_default_k7abd=False, source_k7abd=[(cp_dir / "k7abd")], source_repeaterbook_proximity=cp_dir / "prox.csv", - repeaterbook_states=["washington", "oregon"], + repeaterbook_states=["Texas"], repeaterbook_name_format='{Callsign} {Nearest City} {Landmark}', scanlists_json=cp_dir / "scanlists.json", exclude=cp_dir / "exclude.csv", @@ -26,5 +26,5 @@ output_anytone=True, output_dmrconfig=[(cp_dir / "example-d878uv.conf")], output_farnsworth=[(cp_dir / "example-md-uv380.json")], - output_gb3gf=True + output_gb3gf=False ).generate(output / cp_dir.name) diff --git a/input/default/generate.sh b/input/default/generate.sh index adea950..6d020b5 100755 --- a/input/default/generate.sh +++ b/input/default/generate.sh @@ -11,7 +11,7 @@ python -m dzcb \ --default-k7abd \ --k7abd $DIR/k7abd \ --repeaterbook-proximity-csv "$DIR/prox.csv" \ - --repeaterbook-state washington oregon \ + --repeaterbook-state texas \ --repeaterbook-name-format '{Callsign} {Nearest City} {Landmark}' \ --scanlists-json "$DIR/scanlists.json" \ --exclude "$DIR/exclude.csv" \ From cec7de83ad89339c1a33b9e844e43b20ee9d9b76 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 18:44:03 -0600 Subject: [PATCH 05/33] Test 5 again --- input/default/generate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/default/generate.py b/input/default/generate.py index 3bd5120..dc84c85 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -17,7 +17,7 @@ source_default_k7abd=False, source_k7abd=[(cp_dir / "k7abd")], source_repeaterbook_proximity=cp_dir / "prox.csv", - repeaterbook_states=["Texas"], + repeaterbook_states=["texas"], repeaterbook_name_format='{Callsign} {Nearest City} {Landmark}', scanlists_json=cp_dir / "scanlists.json", exclude=cp_dir / "exclude.csv", From e49c4b7076c353971ee2f803753c8128be821097 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 18:49:39 -0600 Subject: [PATCH 06/33] test 6 --- input/default/generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/default/generate.sh b/input/default/generate.sh index 6d020b5..b58c33f 100755 --- a/input/default/generate.sh +++ b/input/default/generate.sh @@ -11,7 +11,7 @@ python -m dzcb \ --default-k7abd \ --k7abd $DIR/k7abd \ --repeaterbook-proximity-csv "$DIR/prox.csv" \ - --repeaterbook-state texas \ + --repeaterbook-state texas arkansas \ --repeaterbook-name-format '{Callsign} {Nearest City} {Landmark}' \ --scanlists-json "$DIR/scanlists.json" \ --exclude "$DIR/exclude.csv" \ From ec5551bb575244be730fb401cc6b912b4ee38f52 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 18:57:37 -0600 Subject: [PATCH 07/33] test 7 seven --- input/default/k7abd/Digital-Repeaters__Hotspot.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/input/default/k7abd/Digital-Repeaters__Hotspot.csv b/input/default/k7abd/Digital-Repeaters__Hotspot.csv index 89fa39a..1f7c722 100644 --- a/input/default/k7abd/Digital-Repeaters__Hotspot.csv +++ b/input/default/k7abd/Digital-Repeaters__Hotspot.csv @@ -1,3 +1,3 @@ Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local,Local-Cluster,N.Texas,NTX Wide,Texas,Texas Statewide,BM Texas,TX-OK,N.America,Worldwide,WW Eng,BM WW,DCI Bridge,TAC 310,TAC 311,TAC 312,TAC 311,Parrot,Audio Test,AMSAT,S.Plains,Cactus,TGIF -DPHS Static;DHS,Static Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 -DPHS Wide;DHW,Dynamic Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 +MDK Static,Static Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 +MDK Wide,Dynamic Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 From f1b1110dba647a409df757f60c13f1e29cbab99a Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:02:48 -0600 Subject: [PATCH 08/33] Number 8 8 --- input/default/generate.py | 2 +- input/default/k7abd/Talkgroups__Hotspot.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/input/default/generate.py b/input/default/generate.py index dc84c85..6538e09 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -14,7 +14,7 @@ CodeplugRecipe( source_pnwdigital=False, source_seattledmr=False, - source_default_k7abd=False, + source_default_k7abd=True, source_k7abd=[(cp_dir / "k7abd")], source_repeaterbook_proximity=cp_dir / "prox.csv", repeaterbook_states=["texas"], diff --git a/input/default/k7abd/Talkgroups__Hotspot.csv b/input/default/k7abd/Talkgroups__Hotspot.csv index 1c05238..29a9753 100644 --- a/input/default/k7abd/Talkgroups__Hotspot.csv +++ b/input/default/k7abd/Talkgroups__Hotspot.csv @@ -10,7 +10,7 @@ World-Events,519 AMSAT,98006 Quadnet Array,31012 Reddit,98003 -Parrot BM,9990P +Parrot BM,9990 TAC 310-2,310 TAC 311-2,311 TAC 312-2,312 From b45cb2987fe23d7c69c6c437506d72ad902fb732 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:14:08 -0600 Subject: [PATCH 09/33] 9 nine --- hold/prox.csv | 14 ++++++++++++++ input/default/prox.csv | 26 +++++++++++++------------- 2 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 hold/prox.csv diff --git a/hold/prox.csv b/hold/prox.csv new file mode 100644 index 0000000..ed6e1ab --- /dev/null +++ b/hold/prox.csv @@ -0,0 +1,14 @@ +Zone Name,Lat,Long,Distance,Unit,Band(2m;1.25m;70cm),Use,Operational Status +McKinney,33.21786,-96.6339,3,miles,2m,OPEN,On-Air +McKinney,33.21786,-96.6339,3,miles,70cm,OPEN,On-Air +Anna,33.349,-96.5485,12,miles,70cm,OPEN,On-Air +Farmersville,33.16344,-96.3599,17,miles,70cm,OPEN,On-Air +Allen,33.1031,-96.6709,7,miles,70cm,OPEN,On-Air +Plano,33.0196,-96.6992,14,miles,70cm,OPEN,On-Air +Fairview,33.1579,-96.63166,3,miles,70cm,OPEN,On-Air +Murphy,33.01512,-96.61305,13,miles,70cm,OPEN,On-Air +Richardson,32.94818,-96.72972,18,miles,70cm,OPEN,On-Air +Melissa,33.28595,-96.57277,12,miles,70cm,OPEN,On-Air +Celina,33.32593,-96.7792,11,miles,70cm,OPEN,On-Air +Prosper,33.23623,-96.80111,6,miles,70cm,OPEN,On-Air +Dallas,32.78306,-96.80667,20,miles,70cm,OPEN,On-Air diff --git a/input/default/prox.csv b/input/default/prox.csv index ed6e1ab..ad625ea 100644 --- a/input/default/prox.csv +++ b/input/default/prox.csv @@ -1,14 +1,14 @@ Zone Name,Lat,Long,Distance,Unit,Band(2m;1.25m;70cm),Use,Operational Status -McKinney,33.21786,-96.6339,3,miles,2m,OPEN,On-Air -McKinney,33.21786,-96.6339,3,miles,70cm,OPEN,On-Air -Anna,33.349,-96.5485,12,miles,70cm,OPEN,On-Air -Farmersville,33.16344,-96.3599,17,miles,70cm,OPEN,On-Air -Allen,33.1031,-96.6709,7,miles,70cm,OPEN,On-Air -Plano,33.0196,-96.6992,14,miles,70cm,OPEN,On-Air -Fairview,33.1579,-96.63166,3,miles,70cm,OPEN,On-Air -Murphy,33.01512,-96.61305,13,miles,70cm,OPEN,On-Air -Richardson,32.94818,-96.72972,18,miles,70cm,OPEN,On-Air -Melissa,33.28595,-96.57277,12,miles,70cm,OPEN,On-Air -Celina,33.32593,-96.7792,11,miles,70cm,OPEN,On-Air -Prosper,33.23623,-96.80111,6,miles,70cm,OPEN,On-Air -Dallas,32.78306,-96.80667,20,miles,70cm,OPEN,On-Air +McKinney,,,3,miles,2m,OPEN,On-Air +McKinney,,,3,miles,70cm,OPEN,On-Air +Anna,,,12,miles,70cm,OPEN,On-Air +Farmersville,,,17,miles,70cm,OPEN,On-Air +Allen,,,7,miles,70cm,OPEN,On-Air +Plano,,,14,miles,70cm,OPEN,On-Air +Fairview,,,3,miles,70cm,OPEN,On-Air +Murphy,,,13,miles,70cm,OPEN,On-Air +Richardson,,,18,miles,70cm,OPEN,On-Air +Melissa,,,12,miles,70cm,OPEN,On-Air +Celina,,,11,miles,70cm,OPEN,On-Air +Prosper,,,6,miles,70cm,OPEN,On-Air +Dallas,,,20,miles,70cm,OPEN,On-Air From 571cdfecae1230fb82474e1dd83cf606ff24e897 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:18:08 -0600 Subject: [PATCH 10/33] 10 again --- input/default/generate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/input/default/generate.py b/input/default/generate.py index 6538e09..0797906 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -20,9 +20,9 @@ repeaterbook_states=["texas"], repeaterbook_name_format='{Callsign} {Nearest City} {Landmark}', scanlists_json=cp_dir / "scanlists.json", - exclude=cp_dir / "exclude.csv", + # exclude=cp_dir / "exclude.csv", order=cp_dir / "order.csv", - replacements=cp_dir / "replacements.csv", + # replacements=cp_dir / "replacements.csv", output_anytone=True, output_dmrconfig=[(cp_dir / "example-d878uv.conf")], output_farnsworth=[(cp_dir / "example-md-uv380.json")], From 8873aa46a731535c8aa6cf8967e1f368c5d41962 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:20:59 -0600 Subject: [PATCH 11/33] 11 11 --- input/default/generate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/default/generate.py b/input/default/generate.py index 0797906..a3b28ef 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -26,5 +26,5 @@ output_anytone=True, output_dmrconfig=[(cp_dir / "example-d878uv.conf")], output_farnsworth=[(cp_dir / "example-md-uv380.json")], - output_gb3gf=False + output_gb3gf=True ).generate(output / cp_dir.name) From bd790aa2097437c30866e68d7ff24b70493ae338 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:22:07 -0600 Subject: [PATCH 12/33] 12 12 --- input/default/generate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/input/default/generate.py b/input/default/generate.py index a3b28ef..74d37d8 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -12,8 +12,8 @@ output = Path(os.environ.get("OUTPUT") or (cp_dir / ".." / ".." / "OUTPUT")) CodeplugRecipe( - source_pnwdigital=False, - source_seattledmr=False, + source_pnwdigital=True, + source_seattledmr=True, source_default_k7abd=True, source_k7abd=[(cp_dir / "k7abd")], source_repeaterbook_proximity=cp_dir / "prox.csv", From 5eebe7724acc18cc7ac0e560a1631eb791defe82 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:24:11 -0600 Subject: [PATCH 13/33] 12 12 --- input/default/generate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/default/generate.py b/input/default/generate.py index 74d37d8..1e85b5f 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -26,5 +26,5 @@ output_anytone=True, output_dmrconfig=[(cp_dir / "example-d878uv.conf")], output_farnsworth=[(cp_dir / "example-md-uv380.json")], - output_gb3gf=True + output_gb3gf=True, ).generate(output / cp_dir.name) From 74c34220fdab91dfd5369815fa17f72a79a49a59 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:28:09 -0600 Subject: [PATCH 14/33] again again --- input/default/generate.py | 2 +- input/default/prox.csv | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/input/default/generate.py b/input/default/generate.py index 1e85b5f..74d37d8 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -26,5 +26,5 @@ output_anytone=True, output_dmrconfig=[(cp_dir / "example-d878uv.conf")], output_farnsworth=[(cp_dir / "example-md-uv380.json")], - output_gb3gf=True, + output_gb3gf=True ).generate(output / cp_dir.name) diff --git a/input/default/prox.csv b/input/default/prox.csv index ad625ea..ed6e1ab 100644 --- a/input/default/prox.csv +++ b/input/default/prox.csv @@ -1,14 +1,14 @@ Zone Name,Lat,Long,Distance,Unit,Band(2m;1.25m;70cm),Use,Operational Status -McKinney,,,3,miles,2m,OPEN,On-Air -McKinney,,,3,miles,70cm,OPEN,On-Air -Anna,,,12,miles,70cm,OPEN,On-Air -Farmersville,,,17,miles,70cm,OPEN,On-Air -Allen,,,7,miles,70cm,OPEN,On-Air -Plano,,,14,miles,70cm,OPEN,On-Air -Fairview,,,3,miles,70cm,OPEN,On-Air -Murphy,,,13,miles,70cm,OPEN,On-Air -Richardson,,,18,miles,70cm,OPEN,On-Air -Melissa,,,12,miles,70cm,OPEN,On-Air -Celina,,,11,miles,70cm,OPEN,On-Air -Prosper,,,6,miles,70cm,OPEN,On-Air -Dallas,,,20,miles,70cm,OPEN,On-Air +McKinney,33.21786,-96.6339,3,miles,2m,OPEN,On-Air +McKinney,33.21786,-96.6339,3,miles,70cm,OPEN,On-Air +Anna,33.349,-96.5485,12,miles,70cm,OPEN,On-Air +Farmersville,33.16344,-96.3599,17,miles,70cm,OPEN,On-Air +Allen,33.1031,-96.6709,7,miles,70cm,OPEN,On-Air +Plano,33.0196,-96.6992,14,miles,70cm,OPEN,On-Air +Fairview,33.1579,-96.63166,3,miles,70cm,OPEN,On-Air +Murphy,33.01512,-96.61305,13,miles,70cm,OPEN,On-Air +Richardson,32.94818,-96.72972,18,miles,70cm,OPEN,On-Air +Melissa,33.28595,-96.57277,12,miles,70cm,OPEN,On-Air +Celina,33.32593,-96.7792,11,miles,70cm,OPEN,On-Air +Prosper,33.23623,-96.80111,6,miles,70cm,OPEN,On-Air +Dallas,32.78306,-96.80667,20,miles,70cm,OPEN,On-Air From aa02e424fe84a8942132348db7c3eaba7af580a8 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:35:32 -0600 Subject: [PATCH 15/33] 1 more time 1 more time --- input/default/generate.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/input/default/generate.py b/input/default/generate.py index 74d37d8..dff8c4c 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -12,16 +12,16 @@ output = Path(os.environ.get("OUTPUT") or (cp_dir / ".." / ".." / "OUTPUT")) CodeplugRecipe( - source_pnwdigital=True, - source_seattledmr=True, + source_pnwdigital=False, + source_seattledmr=False, source_default_k7abd=True, source_k7abd=[(cp_dir / "k7abd")], source_repeaterbook_proximity=cp_dir / "prox.csv", repeaterbook_states=["texas"], repeaterbook_name_format='{Callsign} {Nearest City} {Landmark}', - scanlists_json=cp_dir / "scanlists.json", + # scanlists_json=cp_dir / "scanlists.json", # exclude=cp_dir / "exclude.csv", - order=cp_dir / "order.csv", + # order=cp_dir / "order.csv", # replacements=cp_dir / "replacements.csv", output_anytone=True, output_dmrconfig=[(cp_dir / "example-d878uv.conf")], From 1d552a4cd80f24762cabfa2921cbac1281b03a17 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:38:03 -0600 Subject: [PATCH 16/33] try again yup --- input/default/prox.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/default/prox.csv b/input/default/prox.csv index ed6e1ab..3b9bd3b 100644 --- a/input/default/prox.csv +++ b/input/default/prox.csv @@ -11,4 +11,4 @@ Richardson,32.94818,-96.72972,18,miles,70cm,OPEN,On-Air Melissa,33.28595,-96.57277,12,miles,70cm,OPEN,On-Air Celina,33.32593,-96.7792,11,miles,70cm,OPEN,On-Air Prosper,33.23623,-96.80111,6,miles,70cm,OPEN,On-Air -Dallas,32.78306,-96.80667,20,miles,70cm,OPEN,On-Air +Dallas,32.78306,-96.80667,20,miles,70cm,OPEN,On-Air \ No newline at end of file From d691edd7c47082779720bdf4413e207985d38a7b Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:40:54 -0600 Subject: [PATCH 17/33] dud dud --- input/default/prox.csv | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/input/default/prox.csv b/input/default/prox.csv index 3b9bd3b..63b7d84 100644 --- a/input/default/prox.csv +++ b/input/default/prox.csv @@ -1,14 +1,19 @@ Zone Name,Lat,Long,Distance,Unit,Band(2m;1.25m;70cm),Use,Operational Status -McKinney,33.21786,-96.6339,3,miles,2m,OPEN,On-Air -McKinney,33.21786,-96.6339,3,miles,70cm,OPEN,On-Air -Anna,33.349,-96.5485,12,miles,70cm,OPEN,On-Air -Farmersville,33.16344,-96.3599,17,miles,70cm,OPEN,On-Air -Allen,33.1031,-96.6709,7,miles,70cm,OPEN,On-Air -Plano,33.0196,-96.6992,14,miles,70cm,OPEN,On-Air -Fairview,33.1579,-96.63166,3,miles,70cm,OPEN,On-Air -Murphy,33.01512,-96.61305,13,miles,70cm,OPEN,On-Air -Richardson,32.94818,-96.72972,18,miles,70cm,OPEN,On-Air -Melissa,33.28595,-96.57277,12,miles,70cm,OPEN,On-Air -Celina,33.32593,-96.7792,11,miles,70cm,OPEN,On-Air -Prosper,33.23623,-96.80111,6,miles,70cm,OPEN,On-Air -Dallas,32.78306,-96.80667,20,miles,70cm,OPEN,On-Air \ No newline at end of file +Longview WA VHF 35mi,46.13819885,-122.93800354,35,miles,2m,OPEN,On-Air +Longview WA UHF 35mi,46.13819885,-122.93800354,35,miles,70cm,OPEN,On-Air +Astoria OR VHF 30mi,46.18790054,-123.83100128,30,miles,2m,OPEN,On-Air +Astoria OR UHF 30mi,46.18790054,-123.83100128,30,miles,70cm,OPEN,On-Air +Portland OR VHF 30mi,45.52310181,-122.67600250,30,miles,2m,OPEN,On-Air +Portland OR UHF 30mi,45.52310181,-122.67600250,30,miles,70cm,OPEN,On-Air +Salem OR VHF 39mi,44.94290161,-123.03500366,39,miles,2m,OPEN,On-Air +Salem OR UHF 39mi,44.94290161,-123.03500366,39,miles,70cm,OPEN,On-Air +Hood River OR VHF 35mi,45.70539856,-121.52100372,35,miles,2m,OPEN,On-Air +Hood River OR UHF 35mi,45.70539856,-121.52100372,35,miles,70cm,OPEN,On-Air +Olympia WA VHF 30mi,47.03789902,-122.90100098,30,miles,2m,OPEN,On-Air +Olympia WA UHF 30mi,47.03789902,-122.90100098,30,miles,70cm,OPEN,On-Air +Packwood WA VHF 40mi,46.60649872,-121.67099762,40,miles,2m,OPEN,On-Air +Packwood WA UHF 40mi,46.60649872,-121.67099762,40,miles,70cm,OPEN,On-Air +Seattle WA VHF 45mi,47.60620117,-122.33200073,45,miles,2m,OPEN,On-Air +Seattle WA UHF 45mi,47.60620117,-122.33200073,45,miles,70cm,OPEN,On-Air +Burlington WA VHF 45mi,48.47570038,-122.32499695,45,miles,2m,OPEN,On-Air +Burlington WA UHF 45mi,48.47570038,-122.32499695,45,miles,70cm,OPEN,On-Air From 5398983ba4d1daa04c2bae308805ad9e1142a3ec Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:43:14 -0600 Subject: [PATCH 18/33] 3 3 --- input/default/prox.csv | 31 +++++++++++++------------------ input/default/replacements.csv | 4 +++- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/input/default/prox.csv b/input/default/prox.csv index 63b7d84..ed6e1ab 100644 --- a/input/default/prox.csv +++ b/input/default/prox.csv @@ -1,19 +1,14 @@ Zone Name,Lat,Long,Distance,Unit,Band(2m;1.25m;70cm),Use,Operational Status -Longview WA VHF 35mi,46.13819885,-122.93800354,35,miles,2m,OPEN,On-Air -Longview WA UHF 35mi,46.13819885,-122.93800354,35,miles,70cm,OPEN,On-Air -Astoria OR VHF 30mi,46.18790054,-123.83100128,30,miles,2m,OPEN,On-Air -Astoria OR UHF 30mi,46.18790054,-123.83100128,30,miles,70cm,OPEN,On-Air -Portland OR VHF 30mi,45.52310181,-122.67600250,30,miles,2m,OPEN,On-Air -Portland OR UHF 30mi,45.52310181,-122.67600250,30,miles,70cm,OPEN,On-Air -Salem OR VHF 39mi,44.94290161,-123.03500366,39,miles,2m,OPEN,On-Air -Salem OR UHF 39mi,44.94290161,-123.03500366,39,miles,70cm,OPEN,On-Air -Hood River OR VHF 35mi,45.70539856,-121.52100372,35,miles,2m,OPEN,On-Air -Hood River OR UHF 35mi,45.70539856,-121.52100372,35,miles,70cm,OPEN,On-Air -Olympia WA VHF 30mi,47.03789902,-122.90100098,30,miles,2m,OPEN,On-Air -Olympia WA UHF 30mi,47.03789902,-122.90100098,30,miles,70cm,OPEN,On-Air -Packwood WA VHF 40mi,46.60649872,-121.67099762,40,miles,2m,OPEN,On-Air -Packwood WA UHF 40mi,46.60649872,-121.67099762,40,miles,70cm,OPEN,On-Air -Seattle WA VHF 45mi,47.60620117,-122.33200073,45,miles,2m,OPEN,On-Air -Seattle WA UHF 45mi,47.60620117,-122.33200073,45,miles,70cm,OPEN,On-Air -Burlington WA VHF 45mi,48.47570038,-122.32499695,45,miles,2m,OPEN,On-Air -Burlington WA UHF 45mi,48.47570038,-122.32499695,45,miles,70cm,OPEN,On-Air +McKinney,33.21786,-96.6339,3,miles,2m,OPEN,On-Air +McKinney,33.21786,-96.6339,3,miles,70cm,OPEN,On-Air +Anna,33.349,-96.5485,12,miles,70cm,OPEN,On-Air +Farmersville,33.16344,-96.3599,17,miles,70cm,OPEN,On-Air +Allen,33.1031,-96.6709,7,miles,70cm,OPEN,On-Air +Plano,33.0196,-96.6992,14,miles,70cm,OPEN,On-Air +Fairview,33.1579,-96.63166,3,miles,70cm,OPEN,On-Air +Murphy,33.01512,-96.61305,13,miles,70cm,OPEN,On-Air +Richardson,32.94818,-96.72972,18,miles,70cm,OPEN,On-Air +Melissa,33.28595,-96.57277,12,miles,70cm,OPEN,On-Air +Celina,33.32593,-96.7792,11,miles,70cm,OPEN,On-Air +Prosper,33.23623,-96.80111,6,miles,70cm,OPEN,On-Air +Dallas,32.78306,-96.80667,20,miles,70cm,OPEN,On-Air diff --git a/input/default/replacements.csv b/input/default/replacements.csv index 0188321..ef48aa5 100644 --- a/input/default/replacements.csv +++ b/input/default/replacements.csv @@ -1 +1,3 @@ -Channels_pattern,Channels_repl,Zones_pattern,Zones_repl,Contacts_pattern,Contacts_repl +Channels_pattern,Channels_repl,Zones_pattern,Zones_repl,Contacts_pattern,Contacts_repl, +Oregon,OR,Longview/Rainier,Rainier Hill,,, +Washington,WA,,,,, From da98cb5b6f47724eb5516eb8f849b0cd2f9fc669 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:47:45 -0600 Subject: [PATCH 19/33] 2 --- input/default/generate.sh | 2 +- input/default/k7abd/Digital-Repeaters__Texas.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/input/default/generate.sh b/input/default/generate.sh index b58c33f..6d020b5 100755 --- a/input/default/generate.sh +++ b/input/default/generate.sh @@ -11,7 +11,7 @@ python -m dzcb \ --default-k7abd \ --k7abd $DIR/k7abd \ --repeaterbook-proximity-csv "$DIR/prox.csv" \ - --repeaterbook-state texas arkansas \ + --repeaterbook-state texas \ --repeaterbook-name-format '{Callsign} {Nearest City} {Landmark}' \ --scanlists-json "$DIR/scanlists.json" \ --exclude "$DIR/exclude.csv" \ diff --git a/input/default/k7abd/Digital-Repeaters__Texas.csv b/input/default/k7abd/Digital-Repeaters__Texas.csv index 5ec97f6..757a675 100644 --- a/input/default/k7abd/Digital-Repeaters__Texas.csv +++ b/input/default/k7abd/Digital-Repeaters__Texas.csv @@ -1,7 +1,7 @@ Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local-Cluster,N.Texas,NTX Wide,Texas,Texas Statewide,BM Texas,TX-OK,N.America,Worldwide,WW Eng,BM WW,DCI Bridge,TAC 310,TAC 311,TAC 312,TAC 311,Parrot,Audio Test,AMSAT,S.Plains,Cactus,TGIF McKinney,N5GI,Turbo,145.35,144.75,1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,-,-,-,-,-,- McKinney,N5ITU,Turbo,441.3375,446.3375,1,-,-,-,-,-,-,-,-,-,-,,-,1,-,-,-,-,-,-,-,-,- -McKinney,N5GI,Turbo,442.575," 447.57500",1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,-,-,-,-,-,- +McKinney,N5GI,Turbo,442.575,447.575,1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,-,-,-,-,-,- Anna,WS5W,Turbo,440.525,445.525,1,2,-,-,2,2,-,-,1,1,1,,-,-,-,-,-,-,-,-,-,-,- Fairview,N5ITU,Turbo,441.3375,446.3375,2,2,2,-,2,2,-,-,1,1,1,,2,2,-,-,-,2,2,-,-,-,- Farmersville,WA5DKW,Turbo,440.0125,445.0125,1,1,-,1,,2,2,-,-,-,-,2,-,-,-,-,-,-,-,-,-,-,- From 9a39f3f76b0be382c3bee2d7e457e8e5eefb10fc Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:55:24 -0600 Subject: [PATCH 20/33] work work --- input/default/generate.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/input/default/generate.py b/input/default/generate.py index dff8c4c..ffe39f9 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -19,10 +19,10 @@ source_repeaterbook_proximity=cp_dir / "prox.csv", repeaterbook_states=["texas"], repeaterbook_name_format='{Callsign} {Nearest City} {Landmark}', - # scanlists_json=cp_dir / "scanlists.json", - # exclude=cp_dir / "exclude.csv", - # order=cp_dir / "order.csv", - # replacements=cp_dir / "replacements.csv", + scanlists_json=cp_dir / "scanlists.json", + exclude=cp_dir / "exclude.csv", + order=cp_dir / "order.csv", + replacements=cp_dir / "replacements.csv", output_anytone=True, output_dmrconfig=[(cp_dir / "example-d878uv.conf")], output_farnsworth=[(cp_dir / "example-md-uv380.json")], From 6a0f3c45bce9bfd8ee97b3519101773e4bfa348f Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 19:58:06 -0600 Subject: [PATCH 21/33] 11 11 --- input/default/k7abd/Digital-Repeaters__Texas.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/input/default/k7abd/Digital-Repeaters__Texas.csv b/input/default/k7abd/Digital-Repeaters__Texas.csv index 757a675..d33d5c6 100644 --- a/input/default/k7abd/Digital-Repeaters__Texas.csv +++ b/input/default/k7abd/Digital-Repeaters__Texas.csv @@ -11,4 +11,3 @@ Dallas,W5EBQ,Turbo,440.6375,445.6375,1,1,-,-,2,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,- Dallas,AB5U,Turbo,440.1375,445.1375,1,2,-,2,1,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,1 Dallas,W5EBQ,Turbo,441.3375,446.3375,1,2,-,-,2,-,-,2,1,1,1,-,1,1,-,-,-,-,-,-,-,-,- Dallas,N4MSE,Turbo,442.025,447.025,1,2,2,-,2,2,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,- -Dallas,UNKN,Turbo,442.5,447.5,1,-,-,-,-,-,-,-,1,1,-,-,-,-,-,-,-,-,-,-,2,2,- From 40f37e80be0899a12860491d94a710178b46fde5 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 20:05:26 -0600 Subject: [PATCH 22/33] 3 3 --- .../k7abd/Digital-Repeaters__Texas.csv | 26 +++++++++---------- input/default/k7abd/Talkgroups__Texas.csv | 4 --- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/input/default/k7abd/Digital-Repeaters__Texas.csv b/input/default/k7abd/Digital-Repeaters__Texas.csv index d33d5c6..d0703e5 100644 --- a/input/default/k7abd/Digital-Repeaters__Texas.csv +++ b/input/default/k7abd/Digital-Repeaters__Texas.csv @@ -1,13 +1,13 @@ -Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local-Cluster,N.Texas,NTX Wide,Texas,Texas Statewide,BM Texas,TX-OK,N.America,Worldwide,WW Eng,BM WW,DCI Bridge,TAC 310,TAC 311,TAC 312,TAC 311,Parrot,Audio Test,AMSAT,S.Plains,Cactus,TGIF -McKinney,N5GI,Turbo,145.35,144.75,1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,-,-,-,-,-,- -McKinney,N5ITU,Turbo,441.3375,446.3375,1,-,-,-,-,-,-,-,-,-,-,,-,1,-,-,-,-,-,-,-,-,- -McKinney,N5GI,Turbo,442.575,447.575,1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,-,-,-,-,-,- -Anna,WS5W,Turbo,440.525,445.525,1,2,-,-,2,2,-,-,1,1,1,,-,-,-,-,-,-,-,-,-,-,- -Fairview,N5ITU,Turbo,441.3375,446.3375,2,2,2,-,2,2,-,-,1,1,1,,2,2,-,-,-,2,2,-,-,-,- -Farmersville,WA5DKW,Turbo,440.0125,445.0125,1,1,-,1,,2,2,-,-,-,-,2,-,-,-,-,-,-,-,-,-,-,- -Little Elm,WB8GRS,Turbo,441.3875,446.3875,1,1,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,- -Richardson,K5RWK,Turbo,440.375,445.375,1,-,2,2,1,1,-,-,1,-,1,-,-,-,-,-,-,-,-,1,-,-,- -Dallas,W5EBQ,Turbo,440.6375,445.6375,1,1,-,-,2,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,- -Dallas,AB5U,Turbo,440.1375,445.1375,1,2,-,2,1,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,1 -Dallas,W5EBQ,Turbo,441.3375,446.3375,1,2,-,-,2,-,-,2,1,1,1,-,1,1,-,-,-,-,-,-,-,-,- -Dallas,N4MSE,Turbo,442.025,447.025,1,2,2,-,2,2,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,- +Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local-Cluster,N.Texas,NTX Wide,Texas,Texas Statewide,BM Texas,TX-OK,N.America,Worldwide,WW Eng,BM WW,DCI Bridge,TAC 310,Parrot,Audio Test,AMSAT,TGIF +McKinney,N5GI,Turbo,145.35,144.75,1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,- +McKinney,N5ITU,Turbo,441.3375,446.3375,1,-,-,-,-,-,-,-,-,-,-,,-,1,-,-,-,- +McKinney,N5GI,Turbo,442.575,447.575,1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,- +Anna,WS5W,Turbo,440.525,445.525,1,2,-,-,2,2,-,-,1,1,1,,-,-,-,-,-,- +Fairview,N5ITU,Turbo,441.3375,446.3375,2,2,2,-,2,2,-,-,1,1,1,,2,2,2,2,-,- +Farmersville,WA5DKW,Turbo,440.0125,445.0125,1,1,-,1,,2,2,-,-,-,-,2,-,-,-,-,-,- +Little Elm,WB8GRS,Turbo,441.3875,446.3875,1,1,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,- +Richardson,K5RWK,Turbo,440.375,445.375,1,-,2,2,1,1,-,-,1,-,1,-,-,-,-,-,1,- +Dallas,W5EBQ,Turbo,440.6375,445.6375,1,1,-,-,2,-,-,-,-,-,-,-,-,-,-,-,-,- +Dallas,AB5U,Turbo,440.1375,445.1375,1,2,-,2,1,-,-,-,-,-,-,-,-,-,-,-,-,1 +Dallas,W5EBQ,Turbo,441.3375,446.3375,1,2,-,-,2,-,-,2,1,1,1,-,1,1,-,-,-,- +Dallas,N4MSE,Turbo,442.025,447.025,1,2,2,-,2,2,-,-,-,-,-,-,-,-,-,-,-,- diff --git a/input/default/k7abd/Talkgroups__Texas.csv b/input/default/k7abd/Talkgroups__Texas.csv index 465c835..5ae59db 100644 --- a/input/default/k7abd/Talkgroups__Texas.csv +++ b/input/default/k7abd/Talkgroups__Texas.csv @@ -11,11 +11,7 @@ WW Eng,13 BM WW,91 DCI Bridge,3100 TAC 310,310 -TAC 311,311 -TAC 312,312 Parrot,9998 Audio Test,9999 AMSAT,98006 -S.Plains,3175 -Cactus,3185 TGIF,31665 From 92af558241e029230aa7ec814bbb63fc08dd1fbc Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 20:17:46 -0600 Subject: [PATCH 23/33] washington wash --- input/default/generate.py | 2 +- input/default/generate.sh | 2 +- input/default/k7abd/Digital-Repeaters__Hotspot.csv | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/input/default/generate.py b/input/default/generate.py index ffe39f9..f72cb26 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -17,7 +17,7 @@ source_default_k7abd=True, source_k7abd=[(cp_dir / "k7abd")], source_repeaterbook_proximity=cp_dir / "prox.csv", - repeaterbook_states=["texas"], + repeaterbook_states=["Washington"], repeaterbook_name_format='{Callsign} {Nearest City} {Landmark}', scanlists_json=cp_dir / "scanlists.json", exclude=cp_dir / "exclude.csv", diff --git a/input/default/generate.sh b/input/default/generate.sh index 6d020b5..bea33ee 100755 --- a/input/default/generate.sh +++ b/input/default/generate.sh @@ -11,7 +11,7 @@ python -m dzcb \ --default-k7abd \ --k7abd $DIR/k7abd \ --repeaterbook-proximity-csv "$DIR/prox.csv" \ - --repeaterbook-state texas \ + --repeaterbook-state washington \ --repeaterbook-name-format '{Callsign} {Nearest City} {Landmark}' \ --scanlists-json "$DIR/scanlists.json" \ --exclude "$DIR/exclude.csv" \ diff --git a/input/default/k7abd/Digital-Repeaters__Hotspot.csv b/input/default/k7abd/Digital-Repeaters__Hotspot.csv index 1f7c722..3a33c63 100644 --- a/input/default/k7abd/Digital-Repeaters__Hotspot.csv +++ b/input/default/k7abd/Digital-Repeaters__Hotspot.csv @@ -1,3 +1,3 @@ -Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local,Local-Cluster,N.Texas,NTX Wide,Texas,Texas Statewide,BM Texas,TX-OK,N.America,Worldwide,WW Eng,BM WW,DCI Bridge,TAC 310,TAC 311,TAC 312,TAC 311,Parrot,Audio Test,AMSAT,S.Plains,Cactus,TGIF -MDK Static,Static Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 -MDK Wide,Dynamic Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 +Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local,Local-Cluster,N.Texas,NTX Wide,Texas,Texas Statewide,BM Texas,TX-OK,N.America,Worldwide,WW Eng,BM WW,DCI Bridge,TAC 310,Parrot,Audio Test,AMSAT,TGIF +MDK Static,Static Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 +MDK Wide,Dynamic Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 From 286e32946fad3c1afb1ab8b2f281152036f34f8c Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 20:21:07 -0600 Subject: [PATCH 24/33] T t --- input/default/generate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/default/generate.py b/input/default/generate.py index f72cb26..ffe39f9 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -17,7 +17,7 @@ source_default_k7abd=True, source_k7abd=[(cp_dir / "k7abd")], source_repeaterbook_proximity=cp_dir / "prox.csv", - repeaterbook_states=["Washington"], + repeaterbook_states=["texas"], repeaterbook_name_format='{Callsign} {Nearest City} {Landmark}', scanlists_json=cp_dir / "scanlists.json", exclude=cp_dir / "exclude.csv", From 6e2a94c48750b92cf1f4fe8ab3c2a678b070fcfd Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 20:22:51 -0600 Subject: [PATCH 25/33] TX TX --- input/default/generate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/default/generate.py b/input/default/generate.py index ffe39f9..54b29d8 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -17,7 +17,7 @@ source_default_k7abd=True, source_k7abd=[(cp_dir / "k7abd")], source_repeaterbook_proximity=cp_dir / "prox.csv", - repeaterbook_states=["texas"], + repeaterbook_states=["Texas"], repeaterbook_name_format='{Callsign} {Nearest City} {Landmark}', scanlists_json=cp_dir / "scanlists.json", exclude=cp_dir / "exclude.csv", From a193ee316e1d9fbbb8b817ee7f38767e42ccd3b7 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 21:25:05 -0600 Subject: [PATCH 26/33] Lets try now Here we go. --- input/default/generate.py | 2 +- input/default/generate.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/input/default/generate.py b/input/default/generate.py index 54b29d8..ffe39f9 100755 --- a/input/default/generate.py +++ b/input/default/generate.py @@ -17,7 +17,7 @@ source_default_k7abd=True, source_k7abd=[(cp_dir / "k7abd")], source_repeaterbook_proximity=cp_dir / "prox.csv", - repeaterbook_states=["Texas"], + repeaterbook_states=["texas"], repeaterbook_name_format='{Callsign} {Nearest City} {Landmark}', scanlists_json=cp_dir / "scanlists.json", exclude=cp_dir / "exclude.csv", diff --git a/input/default/generate.sh b/input/default/generate.sh index bea33ee..6d020b5 100755 --- a/input/default/generate.sh +++ b/input/default/generate.sh @@ -11,7 +11,7 @@ python -m dzcb \ --default-k7abd \ --k7abd $DIR/k7abd \ --repeaterbook-proximity-csv "$DIR/prox.csv" \ - --repeaterbook-state washington \ + --repeaterbook-state texas \ --repeaterbook-name-format '{Callsign} {Nearest City} {Landmark}' \ --scanlists-json "$DIR/scanlists.json" \ --exclude "$DIR/exclude.csv" \ From 9748d1915fa71edd92c2175a1afb899fd02b1325 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Fri, 19 Nov 2021 21:34:33 -0600 Subject: [PATCH 27/33] Now it should work --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index e08829c..7b77d7b 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ envlist = py3 [testenv] passenv = OUTPUT REQUIRE_VALID_TONE deps = - dzcb~=0.3.2 + dzcb~=0.3.3 commands = python {toxinidir}/input/generate_all.py From f498dcbdf9c1970c9b2543241865896cc9fd3fcc Mon Sep 17 00:00:00 2001 From: mkaylor Date: Sat, 20 Nov 2021 10:33:42 -0600 Subject: [PATCH 28/33] Sat Try Sat Try --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 7b77d7b..9f33659 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ envlist = py3 [testenv] passenv = OUTPUT REQUIRE_VALID_TONE deps = - dzcb~=0.3.3 + dzcb~=0.3.4 commands = python {toxinidir}/input/generate_all.py From 229dd07dd379fa0bdd3702531ea3214a76ef2931 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Sat, 20 Nov 2021 10:48:43 -0600 Subject: [PATCH 29/33] Saturday with Weather --- input/default/k7abd/Analog_WX.csv | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 input/default/k7abd/Analog_WX.csv diff --git a/input/default/k7abd/Analog_WX.csv b/input/default/k7abd/Analog_WX.csv new file mode 100644 index 0000000..981f522 --- /dev/null +++ b/input/default/k7abd/Analog_WX.csv @@ -0,0 +1,8 @@ +Zone,Channel Name,Bandwidth,Power,RX Freq,TX Freq,CTCSS Decode,CTCSS Encode,TX Prohibit +WX,WX.1,25K,Low,162.55,146.58,Off,Off,On +WX,WX.2,25K,Low,162.4,146.58,Off,Off,On +WX,WX.3,25K,Low,162.475,146.58,Off,Off,On +WX,WX.4,25K,Low,162.425,146.58,Off,Off,On +WX,WX.5,25K,Low,162.45,146.58,Off,Off,On +WX,WX.6,25K,Low,162.5,146.58,Off,Off,On +WX,WX.7,25K,Low,162.525,146.58,Off,Off,On From 61aeb6dc12b4694e4d25133b34827fd7e79ddcfb Mon Sep 17 00:00:00 2001 From: mkaylor Date: Sat, 20 Nov 2021 11:00:33 -0600 Subject: [PATCH 30/33] Sat 2nd Try at WX Fixed file name --- input/default/k7abd/{Analog_WX.csv => Analog__WX.csv} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename input/default/k7abd/{Analog_WX.csv => Analog__WX.csv} (100%) diff --git a/input/default/k7abd/Analog_WX.csv b/input/default/k7abd/Analog__WX.csv similarity index 100% rename from input/default/k7abd/Analog_WX.csv rename to input/default/k7abd/Analog__WX.csv From ac29d2c51a0a1a262a85ccdc8e616bca43325f95 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Sat, 20 Nov 2021 13:30:18 -0600 Subject: [PATCH 31/33] Big List Big List --- .../k7abd/Digital-Repeaters__Hotspot.csv | 6 ++-- input/default/k7abd/Talkgroups__Hotspot.csv | 34 +++++++++++++++++-- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/input/default/k7abd/Digital-Repeaters__Hotspot.csv b/input/default/k7abd/Digital-Repeaters__Hotspot.csv index 3a33c63..2247fa2 100644 --- a/input/default/k7abd/Digital-Repeaters__Hotspot.csv +++ b/input/default/k7abd/Digital-Repeaters__Hotspot.csv @@ -1,3 +1,3 @@ -Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local,Local-Cluster,N.Texas,NTX Wide,Texas,Texas Statewide,BM Texas,TX-OK,N.America,Worldwide,WW Eng,BM WW,DCI Bridge,TAC 310,Parrot,Audio Test,AMSAT,TGIF -MDK Static,Static Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 -MDK Wide,Dynamic Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 +Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local,Local-Cluster,N.Texas,NTX Wide,Texas,Texas Statewide,BM Texas,TX ARES,Ark-La-Tex,Arkansas,NC Ark,N.America,Worldwide,WW Eng,BM WW,DCI Bridge,TAC 310,Parrot,Audio Test,AMSAT,TGIF,Pinoy,PI Emergency,DX Pinoy,Pinoy DU5,Pinoy DU6,REACT,USA-0,USA-1,USA-2,USA-3,USA-4,USA-5,USA-6,USA-7,USA-8,USA-9,Pi-Star,Disconnect +MDK Static,Static Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 +MDK Wide,Dynamic Tgs,Low,430.4375,439.4375,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 diff --git a/input/default/k7abd/Talkgroups__Hotspot.csv b/input/default/k7abd/Talkgroups__Hotspot.csv index 29a9753..19e7f56 100644 --- a/input/default/k7abd/Talkgroups__Hotspot.csv +++ b/input/default/k7abd/Talkgroups__Hotspot.csv @@ -6,17 +6,45 @@ Worldwide,91 NAmerica,93 SIMPLEX,99 Mil Vets,518 +Vets,98008 World-Events,519 AMSAT,98006 Quadnet Array,31012 Reddit,98003 Parrot BM,9990 -TAC 310-2,310 -TAC 311-2,311 -TAC 312-2,312 +TAC 310,310 +TAC 311,311 +TAC 312,312 +TAC 313,313 +TAC 314,314 +TAC 315,315 +TAC 316,316 +TAC 317,317 +TAC 318,318 +TAC 319,319 Arkansas,31305 +NC Ark,31055 Texas,3148 Texas-Chat,31480 North Texas,31481 +TX ARES,31487 +Ark-La-Tex,31229 Pinoy,515 +PI Emergency,515911 +DX Pinoy,51573 +Pinoy DU5,5155 +Pinoy DU6,5156 BC,30271 +REACT,3740 +USA-0,4640 +USA-1,4641 +USA-2,4642 +USA-3,4643 +USA-4,4644 +USA-5,4645 +USA-6,4646 +USA-7,4647 +USA-8,4648 +USA-9,4649 +Pi-Star,31672 +Disconnect,4000 From 68f11bbcfcd82bc8fab826a621645d83b8adacf1 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Sat, 20 Nov 2021 17:00:24 -0600 Subject: [PATCH 32/33] again again --- input/default/k7abd/Digital-Repeaters__Texas.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/default/k7abd/Digital-Repeaters__Texas.csv b/input/default/k7abd/Digital-Repeaters__Texas.csv index d0703e5..fab84f1 100644 --- a/input/default/k7abd/Digital-Repeaters__Texas.csv +++ b/input/default/k7abd/Digital-Repeaters__Texas.csv @@ -1,5 +1,5 @@ Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local-Cluster,N.Texas,NTX Wide,Texas,Texas Statewide,BM Texas,TX-OK,N.America,Worldwide,WW Eng,BM WW,DCI Bridge,TAC 310,Parrot,Audio Test,AMSAT,TGIF -McKinney,N5GI,Turbo,145.35,144.75,1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,- +McKinney-V,N5GI,Turbo,145.35,144.75,1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,- McKinney,N5ITU,Turbo,441.3375,446.3375,1,-,-,-,-,-,-,-,-,-,-,,-,1,-,-,-,- McKinney,N5GI,Turbo,442.575,447.575,1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,- Anna,WS5W,Turbo,440.525,445.525,1,2,-,-,2,2,-,-,1,1,1,,-,-,-,-,-,- From 6037e7c9a05ba63eae83b767425b76dab2b5f778 Mon Sep 17 00:00:00 2001 From: mkaylor Date: Sat, 20 Nov 2021 17:02:56 -0600 Subject: [PATCH 33/33] Renamed Wasn't a problem before --- input/default/k7abd/Digital-Repeaters__Texas.csv | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/input/default/k7abd/Digital-Repeaters__Texas.csv b/input/default/k7abd/Digital-Repeaters__Texas.csv index fab84f1..666496e 100644 --- a/input/default/k7abd/Digital-Repeaters__Texas.csv +++ b/input/default/k7abd/Digital-Repeaters__Texas.csv @@ -1,13 +1,13 @@ Zone Name,Comment,Power,RX Freq,TX Freq,Color Code,Local-Cluster,N.Texas,NTX Wide,Texas,Texas Statewide,BM Texas,TX-OK,N.America,Worldwide,WW Eng,BM WW,DCI Bridge,TAC 310,Parrot,Audio Test,AMSAT,TGIF McKinney-V,N5GI,Turbo,145.35,144.75,1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,- -McKinney,N5ITU,Turbo,441.3375,446.3375,1,-,-,-,-,-,-,-,-,-,-,,-,1,-,-,-,- -McKinney,N5GI,Turbo,442.575,447.575,1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,- +McKinney-U1,N5ITU,Turbo,441.3375,446.3375,1,-,-,-,-,-,-,-,-,-,-,,-,1,-,-,-,- +McKinney-U2,N5GI,Turbo,442.575,447.575,1,2,2,-,2,2,-,-,-,-,-,,-,-,-,-,-,- Anna,WS5W,Turbo,440.525,445.525,1,2,-,-,2,2,-,-,1,1,1,,-,-,-,-,-,- Fairview,N5ITU,Turbo,441.3375,446.3375,2,2,2,-,2,2,-,-,1,1,1,,2,2,2,2,-,- Farmersville,WA5DKW,Turbo,440.0125,445.0125,1,1,-,1,,2,2,-,-,-,-,2,-,-,-,-,-,- Little Elm,WB8GRS,Turbo,441.3875,446.3875,1,1,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,- Richardson,K5RWK,Turbo,440.375,445.375,1,-,2,2,1,1,-,-,1,-,1,-,-,-,-,-,1,- -Dallas,W5EBQ,Turbo,440.6375,445.6375,1,1,-,-,2,-,-,-,-,-,-,-,-,-,-,-,-,- -Dallas,AB5U,Turbo,440.1375,445.1375,1,2,-,2,1,-,-,-,-,-,-,-,-,-,-,-,-,1 -Dallas,W5EBQ,Turbo,441.3375,446.3375,1,2,-,-,2,-,-,2,1,1,1,-,1,1,-,-,-,- -Dallas,N4MSE,Turbo,442.025,447.025,1,2,2,-,2,2,-,-,-,-,-,-,-,-,-,-,-,- +Dallas-U1,W5EBQ,Turbo,440.6375,445.6375,1,1,-,-,2,-,-,-,-,-,-,-,-,-,-,-,-,- +Dallas-U2,AB5U,Turbo,440.1375,445.1375,1,2,-,2,1,-,-,-,-,-,-,-,-,-,-,-,-,1 +Dallas-U3,W5EBQ,Turbo,441.3375,446.3375,1,2,-,-,2,-,-,2,1,1,1,-,1,1,-,-,-,- +Dallas-U4,N4MSE,Turbo,442.025,447.025,1,2,2,-,2,2,-,-,-,-,-,-,-,-,-,-,-,-