diff --git a/examples/md-uv380-empty.conf b/examples/md-uv380-empty.conf index 114ad79..10ee456 100644 --- a/examples/md-uv380-empty.conf +++ b/examples/md-uv380-empty.conf @@ -1,6 +1,6 @@ # -# This configuration was generated 2018/08/27 by dmrconfig, -# Version 0.1.29, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# This configuration was generated 2018/08/28 by dmrconfig, +# Version 0.1.31, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-UV380 Name: - @@ -10,12 +10,18 @@ CPS Software Version: V01.07 # Table of analog channels. # 1) Channel number: 1-3000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz # 5) Transmit power: High, Mid, Low -# 6) Bandwidth in kHz: 12.5, 20, 25 -# 7) Scan list: - or index +# 6) Scan list: - or index +# 7) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Guard tone for receive, or '-' to disable +# 12) Guard tone for transmit, or '-' to disable +# 13) Bandwidth in kHz: 12.5, 20, 25 # Analog Name Receive Transmit Power Scan Sq TOT RO Admit RxTone TxTone Width 1 Channel1 400.000 +0 High - 1 60 - - - - 12.5 diff --git a/examples/md-uv380-factory.conf b/examples/md-uv380-factory.conf index 333147f..3113ed9 100644 --- a/examples/md-uv380-factory.conf +++ b/examples/md-uv380-factory.conf @@ -1,6 +1,6 @@ # -# This configuration was generated 2018/08/27 by dmrconfig, -# Version 0.1.29, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# This configuration was generated 2018/08/28 by dmrconfig, +# Version 0.1.31, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-UV380 Name: - @@ -10,11 +10,20 @@ CPS Software Version: V01.07 # Table of digital channels. # 1) Channel number: 1-3000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz # 5) Transmit power: High, Mid, Low -# 6) Scan list: - or index +# 6) Scan list: - or index in Scanlist table +# 7) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 1, 2, 3... 15 +# 12) Time slot: 1 or 2 +# 13) In call criteria: -, Admit, TXInt +# 14) Receive group list: - or index in Grouplist table +# 15) Contact for transmit: - or index in Contacts table # Digital Name Receive Transmit Power Scan Sq TOT RO Admit Color Slot InCall RxGL TxContact 1 Channel1 431.125 +0 Low - 3 60 - - 1 1 - 1 1 @@ -28,12 +37,18 @@ Digital Name Receive Transmit Power Scan Sq TOT RO Admit Color Sl # Table of analog channels. # 1) Channel number: 1-3000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz # 5) Transmit power: High, Mid, Low -# 6) Bandwidth in kHz: 12.5, 20, 25 -# 7) Scan list: - or index +# 6) Scan list: - or index +# 7) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Guard tone for receive, or '-' to disable +# 12) Guard tone for transmit, or '-' to disable +# 13) Bandwidth in kHz: 12.5, 20, 25 # Analog Name Receive Transmit Power Scan Sq TOT RO Admit RxTone TxTone Width 5 Channel5 435.525 +0 High - 3 60 - - 82.5 82.5 12.5 diff --git a/examples/md-uv380_bm_2018-08-07.conf b/examples/md-uv380_bm_2018-08-07.conf index c80d53b..21aa51e 100644 --- a/examples/md-uv380_bm_2018-08-07.conf +++ b/examples/md-uv380_bm_2018-08-07.conf @@ -1,6 +1,6 @@ # -# This configuration was generated 2018/08/27 by dmrconfig, -# Version 0.1.29, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# This configuration was generated 2018/08/28 by dmrconfig, +# Version 0.1.31, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-UV380 Name: Dit Call @@ -10,11 +10,20 @@ CPS Software Version: V01.32 # Table of digital channels. # 1) Channel number: 1-3000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz # 5) Transmit power: High, Mid, Low -# 6) Scan list: - or index +# 6) Scan list: - or index in Scanlist table +# 7) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 1, 2, 3... 15 +# 12) Time slot: 1 or 2 +# 13) In call criteria: -, Admit, TXInt +# 14) Receive group list: - or index in Grouplist table +# 15) Contact for transmit: - or index in Contacts table # Digital Name Receive Transmit Power Scan Sq TOT RO Admit Color Slot InCall RxGL TxContact 1 Bandholm LK 238 434.650 -2 High 48 1 180 - Color 15 1 Admit 1 34 @@ -792,12 +801,18 @@ Digital Name Receive Transmit Power Scan Sq TOT RO Admit Color Sl # Table of analog channels. # 1) Channel number: 1-3000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz # 5) Transmit power: High, Mid, Low -# 6) Bandwidth in kHz: 12.5, 20, 25 -# 7) Scan list: - or index +# 6) Scan list: - or index +# 7) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Guard tone for receive, or '-' to disable +# 12) Guard tone for transmit, or '-' to disable +# 13) Bandwidth in kHz: 12.5, 20, 25 # Analog Name Receive Transmit Power Scan Sq TOT RO Admit RxTone TxTone Width 15 Bandholm FM 434.650 -2 High 54 1 180 - - 82.5 82.5 12.5 @@ -874,103 +889,103 @@ Analog Name Receive Transmit Power Scan Sq TOT RO Admit RxTone T Zone Name Channels 1a Lokal 741,743,745,749-750,757 1b - - - 2a BM Frederikshavn 641,643-654,657-659,16 + 2a BM Frederikshavn 641,643-654,657-659 2b - - - 3a BM Aarhus 480,482-489,496-497,499,761-764,16 + 3a BM Aarhus 480,482-489,496-497,499,761-764 3b - - - 4a BM Aarhus V 500,502-513,516-518,16 + 4a BM Aarhus V 500,502-513,516-518 4b - - - 5a BM Sunds 721,723-734,737-739,16 + 5a BM Sunds 721,723-734,737-739 5b - - - 6a BM Yding 741,743-750,757-758,760-764,16 + 6a BM Yding 741,743-750,757-758,760-764 6b - - - 7a BM Odense 681,683-694,697-699,16 + 7a BM Odense 681,683-694,697-699 7b - - - 8a BM Chrfeld 520,522-533,536-538,16 + 8a BM Chrfeld 520,522-533,536-538 8b - - - 9a BM Dronningmolle 540,542-553,556-558,16 + 9a BM Dronningmolle 540,542-553,556-558 9b - - - 10a BM Helsingoer 196,580,582-593,596-597,16 + 10a BM Helsingoer 196,580,582-593,596-597 10b - - - 11a BM Humlebaek 621,623-634,637-639,16 + 11a BM Humlebaek 621,623-634,637-639 11b - - - 12a BM Gorlose 560,562-573,576-578,16 + 12a BM Gorlose 560,562-573,576-578 12b - - - 13a BM Herlev 601,603-614,617-619,16 + 13a BM Herlev 601,603-614,617-619 13b - - - 14a BM Regnemark 701,703-714,717-719,16 + 14a BM Regnemark 701,703-714,717-719 14b - - - 15a BM Mogenstrup 661,663-674,677-679,16 + 15a BM Mogenstrup 661,663-674,677-679 15b - - - 16a Frederikhavn 142,144-155,761-763,16 + 16a Frederikhavn 142,144-155,761-763 16b - - - 17a Vodskov 452,454-465,761-763,16 + 17a Vodskov 452,454-465,761-763 17b - - - 18a Stoevring 325,327-338,761-763,16 + 18a Stoevring 325,327-338,761-763 18b - - - 19a Thyholm 353,355-366,761-763,16 + 19a Thyholm 353,355-366,761-763 19b - - - 20a Viborg 410,412-423,761-763,16 + 20a Viborg 410,412-423,761-763 20b - - - 21a Grenaa 170,172-183,761-763,16 + 21a Grenaa 170,172-183,761-763 21b - - - 22a Risskov 255,257-268,761-763,16 + 22a Risskov 255,257-268,761-763 22b - - - 23a Torphoej 368,370-381,761-763,16 + 23a Torphoej 368,370-381,761-763 23b - - - 24a Fredericia 128,130-141,761-763,16 + 24a Fredericia 128,130-141,761-763 24b - - - 25a Esbjerg N 86,88-99,761-763,16 + 25a Esbjerg N 86,88-99,761-763 25b - - - 26a Esbjerg 100,102-113,761-763,16 + 26a Esbjerg 100,102-113,761-763 26b - - - 27a Vissenbjerg 438,440-451,761-763,16 + 27a Vissenbjerg 438,440-451,761-763 27b - - - 28a Svendborg 339,341-352,761-763,16 + 28a Svendborg 339,341-352,761-763 28b - - - 29a Toender 382,384-395,761-763,16 + 29a Toender 382,384-395,761-763 29b - - - 30a Vejby 396,398-409,761-763,16 + 30a Vejby 396,398-409,761-763 30b - - - 31a Helsingoer 184,186-197,761-763,16 + 31a Helsingoer 184,186-197,761-763 31b - - - 32a Frederikssund 156,158-169,761-763,16 + 32a Frederikssund 156,158-169,761-763 32b - - - 33a Farum 114,116-127,761-763,16 + 33a Farum 114,116-127,761-763 33b - - - 34a CPH F. 58,60-71,761-763,16 + 34a CPH F. 58,60-71,761-763 34b - - - 35a Roedovre 269,271-282,761-763,16 + 35a Roedovre 269,271-282,761-763 35b - - - 36a CPH City 44,46-57,761-763,16 + 36a CPH City 44,46-57,761-763 36b - - - 37a Hoejby 198,200-211,761-763,16 + 37a Hoejby 198,200-211,761-763 37b - - - 38a Vig 424,426-437,761-763,16 + 38a Vig 424,426-437,761-763 38b - - - 39a Bregninge 30,32-43,761-763,16 + 39a Bregninge 30,32-43,761-763 39b - - - 40a Snertinge 311,313-324,761-763,16 + 40a Snertinge 311,313-324,761-763 40b - - - 41a Regstrup 241,243-254,761-763,16 + 41a Regstrup 241,243-254,761-763 41b - - - 42a Ebberup 72,74-85,761-763,16 + 42a Ebberup 72,74-85,761-763 42b - - - 43a Borup 16,18-29,761-763,16 + 43a Borup 16,18-29,761-763 43b - - - 44a Slagelse 297,299-310,761-763,16 + 44a Slagelse 297,299-310,761-763 44b - - - 45a Naestved 227,229-240,761-763,16 + 45a Naestved 227,229-240,761-763 45b - - - 46a Raadegaard 283,285-296,761-763,16 + 46a Raadegaard 283,285-296,761-763 46b - - - 47a Vordingborg 466,468-479,761-763,16 + 47a Vordingborg 466,468-479,761-763 47b - - - 48a Bandholm 1,3-14,761-763,16 + 48a Bandholm 1,3-14,761-763 48b - - - 49a Nakskov 212,214-225,761-763,16 + 49a Nakskov 212,214-225,761-763 49b - - - 50a DMR Simplex 761-776,16 + 50a DMR Simplex 761-776 50b - - 51a FM Nordjylland 367,777-781,793-796,798-799,801,804 51b - - @@ -980,7 +995,7 @@ Zone Name Channels 53b - - 54a FM Hovedstaden 600,777-779,820-828 54b - - - 55a FM Sjaelland 15,23,226,777-784,830-834,16 + 55a FM Sjaelland 15,23,226,777-784,830-834 55b - - # Table of scan lists. diff --git a/examples/md2017-7-23-2017.conf b/examples/md2017-7-23-2017.conf index 6587246..f26fb44 100644 --- a/examples/md2017-7-23-2017.conf +++ b/examples/md2017-7-23-2017.conf @@ -1,6 +1,6 @@ # -# This configuration was generated 2018/08/27 by dmrconfig, -# Version 0.1.29, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# This configuration was generated 2018/08/28 by dmrconfig, +# Version 0.1.31, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-UV380 Name: - @@ -10,11 +10,20 @@ CPS Software Version: V01.17 # Table of digital channels. # 1) Channel number: 1-3000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz # 5) Transmit power: High, Mid, Low -# 6) Scan list: - or index +# 6) Scan list: - or index in Scanlist table +# 7) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 1, 2, 3... 15 +# 12) Time slot: 1 or 2 +# 13) In call criteria: -, Admit, TXInt +# 14) Receive group list: - or index in Grouplist table +# 15) Contact for transmit: - or index in Contacts table # Digital Name Receive Transmit Power Scan Sq TOT RO Admit Color Slot InCall RxGL TxContact 1 MB-Local 442.2875 +5 High 1 1 180 - - 1 2 - - 1 @@ -483,12 +492,18 @@ Digital Name Receive Transmit Power Scan Sq TOT RO Admit Color Sl # Table of analog channels. # 1) Channel number: 1-3000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz # 5) Transmit power: High, Mid, Low -# 6) Bandwidth in kHz: 12.5, 20, 25 -# 7) Scan list: - or index +# 6) Scan list: - or index +# 7) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Guard tone for receive, or '-' to disable +# 12) Guard tone for transmit, or '-' to disable +# 13) Bandwidth in kHz: 12.5, 20, 25 # Analog Name Receive Transmit Power Scan Sq TOT RO Admit RxTone TxTone Width 464 N6DL 147.33 147.330 +0.6 High - 1 180 - - - 100.0 25 @@ -514,25 +529,25 @@ Analog Name Receive Transmit Power Scan Sq TOT RO Admit RxTone T # 3) List of channels: numbers and ranges (N-M) separated by comma # Zone Name Channels - 1a Bullion-MtWest U 1-16,42528 + 1a Bullion-MtWest U 1-16 1b - - - 2a Meadow-MtnWest U 17-32,42528 + 2a Meadow-MtnWest U 17-32 2b - - - 3a DT-MtnWest U 33-48,16 + 3a DT-MtnWest U 33-48 3b - - - 4a Bear-MtnWest U 49-64,16 + 4a Bear-MtnWest U 49-64 4b - - - 5a Park-MtnWest U 65-80,16 + 5a Park-MtnWest U 65-80 5b - - - 6a BRidge-MtnWest U 81-96,16 + 6a BRidge-MtnWest U 81-96 6b - - - 7a Rita-MtnWest U 97-112,16 + 7a Rita-MtnWest U 97-112 7b - - - 8a RndMtn-MtnWest U 113-128,16 + 8a RndMtn-MtnWest U 113-128 8b - - - 9a SLO-MtnWest U 129-144,16 + 9a SLO-MtnWest U 129-144 9b - - - 10a HFD-MtnWest U 145-160,16 + 10a HFD-MtnWest U 145-160 10b - - 11a SCruz-NorCal U 161-175 11b - - diff --git a/examples/md2017-DualHotspot-PNW-2017-07-19.conf b/examples/md2017-DualHotspot-PNW-2017-07-19.conf index 212dd79..f4b2e91 100644 --- a/examples/md2017-DualHotspot-PNW-2017-07-19.conf +++ b/examples/md2017-DualHotspot-PNW-2017-07-19.conf @@ -1,6 +1,6 @@ # -# This configuration was generated 2018/08/27 by dmrconfig, -# Version 0.1.29, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# This configuration was generated 2018/08/28 by dmrconfig, +# Version 0.1.31, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-UV380 Name: YourCall-Here @@ -10,11 +10,20 @@ CPS Software Version: V01.16 # Table of digital channels. # 1) Channel number: 1-3000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz # 5) Transmit power: High, Mid, Low -# 6) Scan list: - or index +# 6) Scan list: - or index in Scanlist table +# 7) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 1, 2, 3... 15 +# 12) Time slot: 1 or 2 +# 13) In call criteria: -, Admit, TXInt +# 14) Receive group list: - or index in Grouplist table +# 15) Contact for transmit: - or index in Contacts table # Digital Name Receive Transmit Power Scan Sq TOT RO Admit Color Slot InCall RxGL TxContact 171 dSmplx1 441.000 441.000 +0 High - 1 180 - Color 1 1 Admit - 10 @@ -860,12 +869,18 @@ Digital Name Receive Transmit Power Scan Sq TOT RO Admit Color Sl # Table of analog channels. # 1) Channel number: 1-3000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz # 5) Transmit power: High, Mid, Low -# 6) Bandwidth in kHz: 12.5, 20, 25 -# 7) Scan list: - or index +# 6) Scan list: - or index +# 7) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Guard tone for receive, or '-' to disable +# 12) Guard tone for transmit, or '-' to disable +# 13) Bandwidth in kHz: 12.5, 20, 25 # Analog Name Receive Transmit Power Scan Sq TOT RO Admit RxTone TxTone Width 1 01 PRMARY 145.37 145.370 -0.6 High - 1 180 - - - 136.5 25 @@ -1045,21 +1060,21 @@ Analog Name Receive Transmit Power Scan Sq TOT RO Admit RxTone T # 3) List of channels: numbers and ranges (N-M) separated by comma # Zone Name Channels - 1a PNW Home Zone 993-1008,16,1009-1010 + 1a PNW Home Zone 993-1008,1009-1010 1b - 171-176,691-692,735-738,985-986,994-1001,1003-1010 2a Mobile Zone - 2b - - - 3a Pierce Cty ARES 1-16,16 + 3a Pierce Cty ARES 1-16 3b - 17-57,117-123 - 4a Favorites Zone 1,7-8,10,28,37,41-45,58-59,61,65-66,16,67-68,68-84,86-90,112-116,171-176,185,233,296,306,597,605,615,671,683,691,699,735,737,16 - 4b - 1,7-8,10,28,37,41-45,58-59,61,65-68,68-84,86-90,112-116,171-176,186,234,296,306,598,606,616,672,684,692,700,736,738,16 - 5a Non-Ham Zone 124-139,16 + 4a Favorites Zone 1,7-8,10,28,37,41-45,58-59,61,65-66,67-68,68-84,86-90,112-116,171-176,185,233,296,306,597,605,615,671,683,691,699,735,737 + 4b - 1,7-8,10,28,37,41-45,58-59,61,65-68,68-84,86-90,112-116,171-176,186,234,296,306,598,606,616,672,684,692,700,736,738 + 5a Non-Ham Zone 124-139 5b - 112-123,156-165 6a Testing Zone 126,133,171,175 6b - 126,133,171,175 - 7a BeachNet Rptrs 68-83,16,84,185,187,189,243,245,247,249,251,253,255,257,259,261,319,597,671,691,715,735,737,785,787,789 + 7a BeachNet Rptrs 68-83,84,185,187,189,243,245,247,249,251,253,255,257,259,261,319,597,671,691,715,735,737,785,787,789 7b - 68-84,186,188,190,244,246,248,250,252,254,256,258,260,262,320,598,672,692,716,736,738,786,788,790 - 8a California Zone 605,713,717,735,737,807,815,817,819,821,823,825,827,829,831,847,16 + 8a California Zone 605,713,717,735,737,807,815,817,819,821,823,825,827,829,831,847 8b - 606,714,718,736,738,808,816,818,820,822,824,826,828,830,832,848 # Table of scan lists. diff --git a/examples/md380-baynet-full-codeplug-rev1.conf b/examples/md380-baynet-full-codeplug-rev1.conf index 49c01f5..7b70331 100644 --- a/examples/md380-baynet-full-codeplug-rev1.conf +++ b/examples/md380-baynet-full-codeplug-rev1.conf @@ -1,6 +1,6 @@ # -# This configuration was generated 2018/08/27 by dmrconfig, -# Version 0.1.29, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# This configuration was generated 2018/08/28 by dmrconfig, +# Version 0.1.31, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-380 Name: YOURCALL @@ -10,11 +10,20 @@ CPS Software Version: V01.34 # Table of digital channels. # 1) Channel number: 1-1000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz -# 5) Transmit power: High, Low -# 6) Scan list: - or index +# 5) Transmit power: High, Mid, Low +# 6) Scan list: - or index in Scanlist table +# 7) Squelch level: Normal, Tight +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 1, 2, 3... 15 +# 12) Time slot: 1 or 2 +# 13) In call criteria: -, Admit, TXInt +# 14) Receive group list: - or index in Grouplist table +# 15) Contact for transmit: - or index in Contacts table # Digital Name Receive Transmit Power Scan Squelch TOT RO Admit Color Slot InCall RxGL TxContact 1 Black DMR 444.350 +5 High - Normal 60 - - 1 2 - - 15 @@ -25,12 +34,18 @@ Digital Name Receive Transmit Power Scan Squelch TOT RO Admit Col # Table of analog channels. # 1) Channel number: 1-1000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz -# 5) Transmit power: High, Low -# 6) Bandwidth in kHz: 12.5, 20, 25 -# 7) Scan list: - or index +# 5) Transmit power: High, Mid, Low +# 6) Scan list: - or index +# 7) Squelch level: Normal, Tight +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Guard tone for receive, or '-' to disable +# 12) Guard tone for transmit, or '-' to disable +# 13) Bandwidth in kHz: 12.5, 20, 25 # Analog Name Receive Transmit Power Scan Squelch TOT RO Admit RxTone TxTone Width 3 Black FM 443.225 +5 High - Normal - - - 100.0 100.0 25 diff --git a/examples/md380-generic-norcal-uhf-20161103b.conf b/examples/md380-generic-norcal-uhf-20161103b.conf index f52c222..e92ba48 100644 --- a/examples/md380-generic-norcal-uhf-20161103b.conf +++ b/examples/md380-generic-norcal-uhf-20161103b.conf @@ -1,6 +1,6 @@ # -# This configuration was generated 2018/08/27 by dmrconfig, -# Version 0.1.29, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# This configuration was generated 2018/08/28 by dmrconfig, +# Version 0.1.31, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-380 Name: noname @@ -10,11 +10,20 @@ CPS Software Version: V01.32 # Table of digital channels. # 1) Channel number: 1-1000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz -# 5) Transmit power: High, Low -# 6) Scan list: - or index +# 5) Transmit power: High, Mid, Low +# 6) Scan list: - or index in Scanlist table +# 7) Squelch level: Normal, Tight +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 1, 2, 3... 15 +# 12) Time slot: 1 or 2 +# 13) In call criteria: -, Admit, TXInt +# 14) Receive group list: - or index in Grouplist table +# 15) Contact for transmit: - or index in Contacts table # Digital Name Receive Transmit Power Scan Squelch TOT RO Admit Color Slot InCall RxGL TxContact 1 PAARA (SJ) w6otx 444.475 +5 High 1 Normal 90 - Color 1 2 - 2 1 @@ -942,12 +951,18 @@ Digital Name Receive Transmit Power Scan Squelch TOT RO Admit Col # Table of analog channels. # 1) Channel number: 1-1000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz -# 5) Transmit power: High, Low -# 6) Bandwidth in kHz: 12.5, 20, 25 -# 7) Scan list: - or index +# 5) Transmit power: High, Mid, Low +# 6) Scan list: - or index +# 7) Squelch level: Normal, Tight +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Guard tone for receive, or '-' to disable +# 12) Guard tone for transmit, or '-' to disable +# 13) Bandwidth in kHz: 12.5, 20, 25 # Analog Name Receive Transmit Power Scan Squelch TOT RO Admit RxTone TxTone Width 323 NatlSmplx 446.0 446.000 +0 High 14 Normal 90 - - - - 25 diff --git a/examples/md380-norcal-brandmeister.conf b/examples/md380-norcal-brandmeister.conf index 3f857fa..1a8d1d4 100644 --- a/examples/md380-norcal-brandmeister.conf +++ b/examples/md380-norcal-brandmeister.conf @@ -1,6 +1,6 @@ # -# This configuration was generated 2018/08/27 by dmrconfig, -# Version 0.1.29, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# This configuration was generated 2018/08/28 by dmrconfig, +# Version 0.1.31, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-380 Name: MYCALL @@ -10,11 +10,20 @@ CPS Software Version: V01.32 # Table of digital channels. # 1) Channel number: 1-1000 -# 2) Name: up to 16 characters, no spaces +# 2) Name: up to 16 characters, use '_' instead of space # 3) Receive frequency in MHz # 4) Transmit frequency or +/- offset in MHz -# 5) Transmit power: High, Low -# 6) Scan list: - or index +# 5) Transmit power: High, Mid, Low +# 6) Scan list: - or index in Scanlist table +# 7) Squelch level: Normal, Tight +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 1, 2, 3... 15 +# 12) Time slot: 1 or 2 +# 13) In call criteria: -, Admit, TXInt +# 14) Receive group list: - or index in Grouplist table +# 15) Contact for transmit: - or index in Contacts table # Digital Name Receive Transmit Power Scan Squelch TOT RO Admit Color Slot InCall RxGL TxContact 1 K6ACR MB CA 444.7875 +5 High 14 Normal 60 - Color 1 1 - 1 9 diff --git a/md380.c b/md380.c index 8ceb49d..7404b5f 100644 --- a/md380.c +++ b/md380.c @@ -127,7 +127,7 @@ typedef struct { uint16_t contact_name_index; // Contact Name: Contact1... // Bytes 8-9 - uint8_t tot; // TOT x 15sec: 0-Infinite, 1=15s... 37=255s + uint8_t tot; // TOT x 15sec: 0-Infinite, 1=15s... 37=555s uint8_t tot_rekey_delay; // TOT Rekey Delay: 0s...255s // Bytes 10-11 @@ -635,11 +635,20 @@ static void print_digital_channels(FILE *out, int verbose) if (verbose) { fprintf(out, "# Table of digital channels.\n"); fprintf(out, "# 1) Channel number: 1-%d\n", NCHAN); - fprintf(out, "# 2) Name: up to 16 characters, no spaces\n"); + fprintf(out, "# 2) Name: up to 16 characters, use '_' instead of space\n"); fprintf(out, "# 3) Receive frequency in MHz\n"); fprintf(out, "# 4) Transmit frequency or +/- offset in MHz\n"); - fprintf(out, "# 5) Transmit power: High, Low\n"); - fprintf(out, "# 6) Scan list: - or index\n"); + fprintf(out, "# 5) Transmit power: High, Mid, Low\n"); + fprintf(out, "# 6) Scan list: - or index in Scanlist table\n"); + fprintf(out, "# 7) Squelch level: Normal, Tight\n"); + fprintf(out, "# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555\n"); + fprintf(out, "# 9) Receive only: -, +\n"); + fprintf(out, "# 10) Admit criteria: -, Free, Color\n"); + fprintf(out, "# 11) Color code: 1, 2, 3... 15\n"); + fprintf(out, "# 12) Time slot: 1 or 2\n"); + fprintf(out, "# 13) In call criteria: -, Admit, TXInt\n"); + fprintf(out, "# 14) Receive group list: - or index in Grouplist table\n"); + fprintf(out, "# 15) Contact for transmit: - or index in Contacts table\n"); fprintf(out, "#\n"); } fprintf(out, "Digital Name Receive Transmit Power Scan Squelch TOT RO Admit Color Slot InCall RxGL TxContact"); @@ -716,12 +725,18 @@ static void print_analog_channels(FILE *out, int verbose) if (verbose) { fprintf(out, "# Table of analog channels.\n"); fprintf(out, "# 1) Channel number: 1-%d\n", NCHAN); - fprintf(out, "# 2) Name: up to 16 characters, no spaces\n"); + fprintf(out, "# 2) Name: up to 16 characters, use '_' instead of space\n"); fprintf(out, "# 3) Receive frequency in MHz\n"); fprintf(out, "# 4) Transmit frequency or +/- offset in MHz\n"); - fprintf(out, "# 5) Transmit power: High, Low\n"); - fprintf(out, "# 6) Bandwidth in kHz: 12.5, 20, 25\n"); - fprintf(out, "# 7) Scan list: - or index\n"); + fprintf(out, "# 5) Transmit power: High, Mid, Low\n"); + fprintf(out, "# 6) Scan list: - or index\n"); + fprintf(out, "# 7) Squelch level: Normal, Tight\n"); + fprintf(out, "# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555\n"); + fprintf(out, "# 9) Receive only: -, +\n"); + fprintf(out, "# 10) Admit criteria: -, Free, Tone\n"); + fprintf(out, "# 11) Guard tone for receive, or '-' to disable\n"); + fprintf(out, "# 12) Guard tone for transmit, or '-' to disable\n"); + fprintf(out, "# 13) Bandwidth in kHz: 12.5, 20, 25\n"); fprintf(out, "#\n"); } fprintf(out, "Analog Name Receive Transmit Power Scan Squelch TOT RO Admit RxTone TxTone Width"); diff --git a/uv380.c b/uv380.c index f4471dc..2b35e31 100644 --- a/uv380.c +++ b/uv380.c @@ -124,7 +124,7 @@ typedef struct { uint16_t contact_name_index; // Contact Name: Contact1... // Bytes 8-9 - uint8_t tot; // TOT x 15sec: 0-Infinite, 1=15s... 37=255s + uint8_t tot; // TOT x 15sec: 0-Infinite, 1=15s... 37=555s uint8_t tot_rekey_delay; // TOT Rekey Delay: 0s...255s // Bytes 10-11 @@ -483,7 +483,7 @@ static void print_chanlist(FILE *out, uint16_t *unsorted, int nchan) // Sort the list before printing. memcpy(data, unsorted, nchan * sizeof(uint16_t)); qsort(data, nchan, sizeof(uint16_t), compare_uint16); - for (n=0; n<=nchan; n++) { + for (n=0; n