Pull Request

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

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"

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_pnwdigital=False,
+    source_seattledmr=False,
     source_default_k7abd=True,
     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",

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" \

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

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,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

input/default/k7abd/Digital-Repeaters__Texas.csv

@@ -0,0 +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-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-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,-,-,-,-,-,-,-,-,-,-,-,-

input/default/k7abd/Talkgroups__Hotspot.csv

@@ -1,17 +1,50 @@
-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
+Vets,98008
+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
+Parrot BM,9990
+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
-Washington 1,3153
-Worldwide,91
+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

input/default/k7abd/Talkgroups__Texas.csv

@@ -0,0 +1,17 @@
+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
+Parrot,9998
+Audio Test,9999
+AMSAT,98006
+TGIF,31665

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,,

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

tox.ini

@@ -7,7 +7,7 @@ envlist = py3
 [testenv]
 passenv = OUTPUT REQUIRE_VALID_TONE
 deps =
-    dzcb~=0.3.2
+    dzcb~=0.3.4
 commands =
     python {toxinidir}/input/generate_all.py