From 28d7415f72826c0dba7d9ec252a1da6163b525e6 Mon Sep 17 00:00:00 2001 From: Serge Vakulenko Date: Mon, 10 Sep 2018 21:31:00 -0700 Subject: [PATCH] Increase version. --- Makefile | 2 +- examples/md-uv380-empty.conf | 10 +++---- examples/md-uv380-factory.conf | 27 +++++++++---------- examples/md-uv380_bm_2018-08-07.conf | 27 +++++++++---------- examples/md2017-7-23-2017.conf | 27 +++++++++---------- .../md2017-DualHotspot-PNW-2017-07-19.conf | 27 +++++++++---------- examples/md380-baynet-full-codeplug-rev1.conf | 27 +++++++++---------- .../md380-generic-norcal-uhf-20161103b.conf | 27 +++++++++---------- examples/md380-norcal-brandmeister.conf | 19 +++++++------ md380.c | 25 +++++++++-------- uv380.c | 25 +++++++++-------- 11 files changed, 117 insertions(+), 126 deletions(-) diff --git a/Makefile b/Makefile index 4581198..375d5b7 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ CC = gcc -VERSION = 0.4 +VERSION = 0.5 GITCOUNT = $(shell git rev-list HEAD --count) CFLAGS = -g -O -Wall -Werror -DVERSION='"$(VERSION).$(GITCOUNT)"' LDFLAGS = -g diff --git a/examples/md-uv380-empty.conf b/examples/md-uv380-empty.conf index 0ca4716..15587f8 100644 --- a/examples/md-uv380-empty.conf +++ b/examples/md-uv380-empty.conf @@ -1,6 +1,6 @@ # # This configuration was generated 2018/09/10 by dmrconfig, -# Version 0.4.71, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# Version 0.5.74, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-UV380 Last Programmed Date: 2018-08-20 12:41:08 @@ -14,10 +14,10 @@ CPS Software Version: V01.07 # 5) Transmit power: High, Mid, Low # 6) Scan list: - or index # 7) Autoscan flag: -, + -# 8) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Tone +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 # 12) Guard tone for receive, or '-' to disable # 13) Guard tone for transmit, or '-' to disable # 14) Bandwidth in kHz: 12.5, 20, 25 diff --git a/examples/md-uv380-factory.conf b/examples/md-uv380-factory.conf index 1b96f41..9c05375 100644 --- a/examples/md-uv380-factory.conf +++ b/examples/md-uv380-factory.conf @@ -1,6 +1,6 @@ # # This configuration was generated 2018/09/10 by dmrconfig, -# Version 0.4.71, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# Version 0.5.74, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-UV380 Last Programmed Date: 2018-07-13 16:02:59 @@ -14,15 +14,14 @@ CPS Software Version: V01.07 # 5) Transmit power: High, Mid, Low # 6) Scan list: - or index in Scanlist table # 7) Autoscan flag: -, + -# 8) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Color -# 12) Color code: 0, 1, 2, 3... 15 -# 13) Time slot: 1 or 2 -# 14) In call criteria: -, Admit, TXInt -# 15) Receive group list: - or index in Grouplist table -# 16) Contact for transmit: - or index in Contacts table +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 0, 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 AS TOT RO Admit Color Slot InCall RxGL TxContact 1 Channel1 431.125 +0 Low - - 60 - - 1 1 - 1 1 # Contact1 @@ -42,10 +41,10 @@ Digital Name Receive Transmit Power Scan AS TOT RO Admit Color Sl # 5) Transmit power: High, Mid, Low # 6) Scan list: - or index # 7) Autoscan flag: -, + -# 8) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Tone +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 # 12) Guard tone for receive, or '-' to disable # 13) Guard tone for transmit, or '-' to disable # 14) Bandwidth in kHz: 12.5, 20, 25 diff --git a/examples/md-uv380_bm_2018-08-07.conf b/examples/md-uv380_bm_2018-08-07.conf index 3aa832b..d744242 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/09/10 by dmrconfig, -# Version 0.4.71, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# Version 0.5.74, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-UV380 Last Programmed Date: 2018-08-05 17:54:47 @@ -14,15 +14,14 @@ CPS Software Version: V01.32 # 5) Transmit power: High, Mid, Low # 6) Scan list: - or index in Scanlist table # 7) Autoscan flag: -, + -# 8) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Color -# 12) Color code: 0, 1, 2, 3... 15 -# 13) Time slot: 1 or 2 -# 14) In call criteria: -, Admit, TXInt -# 15) Receive group list: - or index in Grouplist table -# 16) Contact for transmit: - or index in Contacts table +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 0, 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 AS TOT RO Admit Color Slot InCall RxGL TxContact 1 Bandholm_LK_238 434.650 -2 High 48 - 180 - Color 15 1 Admit 1 34 # 238_DNK @@ -806,10 +805,10 @@ Digital Name Receive Transmit Power Scan AS TOT RO Admit Color Sl # 5) Transmit power: High, Mid, Low # 6) Scan list: - or index # 7) Autoscan flag: -, + -# 8) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Tone +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 # 12) Guard tone for receive, or '-' to disable # 13) Guard tone for transmit, or '-' to disable # 14) Bandwidth in kHz: 12.5, 20, 25 diff --git a/examples/md2017-7-23-2017.conf b/examples/md2017-7-23-2017.conf index 5d61cc0..657f1c8 100644 --- a/examples/md2017-7-23-2017.conf +++ b/examples/md2017-7-23-2017.conf @@ -1,6 +1,6 @@ # # This configuration was generated 2018/09/10 by dmrconfig, -# Version 0.4.71, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# Version 0.5.74, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-UV380 Last Programmed Date: 2017-07-23 19:19:23 @@ -14,15 +14,14 @@ CPS Software Version: V01.17 # 5) Transmit power: High, Mid, Low # 6) Scan list: - or index in Scanlist table # 7) Autoscan flag: -, + -# 8) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Color -# 12) Color code: 0, 1, 2, 3... 15 -# 13) Time slot: 1 or 2 -# 14) In call criteria: -, Admit, TXInt -# 15) Receive group list: - or index in Grouplist table -# 16) Contact for transmit: - or index in Contacts table +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 0, 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 AS TOT RO Admit Color Slot InCall RxGL TxContact 1 MB-Local 442.2875 +5 High 1 - 180 - - 1 2 - - 1 # Local @@ -497,10 +496,10 @@ Digital Name Receive Transmit Power Scan AS TOT RO Admit Color Sl # 5) Transmit power: High, Mid, Low # 6) Scan list: - or index # 7) Autoscan flag: -, + -# 8) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Tone +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 # 12) Guard tone for receive, or '-' to disable # 13) Guard tone for transmit, or '-' to disable # 14) Bandwidth in kHz: 12.5, 20, 25 diff --git a/examples/md2017-DualHotspot-PNW-2017-07-19.conf b/examples/md2017-DualHotspot-PNW-2017-07-19.conf index ecaac05..e3cde94 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/09/10 by dmrconfig, -# Version 0.4.71, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# Version 0.5.74, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-UV380 Last Programmed Date: 2017-07-19 07:09:13 @@ -14,15 +14,14 @@ CPS Software Version: V01.16 # 5) Transmit power: High, Mid, Low # 6) Scan list: - or index in Scanlist table # 7) Autoscan flag: -, + -# 8) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Color -# 12) Color code: 0, 1, 2, 3... 15 -# 13) Time slot: 1 or 2 -# 14) In call criteria: -, Admit, TXInt -# 15) Receive group list: - or index in Grouplist table -# 16) Contact for transmit: - or index in Contacts table +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 0, 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 AS TOT RO Admit Color Slot InCall RxGL TxContact 171 dSmplx1_441.000 441.000 +0 High - - 180 - Color 1 1 Admit - 10 # Simplex_99 @@ -874,10 +873,10 @@ Digital Name Receive Transmit Power Scan AS TOT RO Admit Color Sl # 5) Transmit power: High, Mid, Low # 6) Scan list: - or index # 7) Autoscan flag: -, + -# 8) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Tone +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 # 12) Guard tone for receive, or '-' to disable # 13) Guard tone for transmit, or '-' to disable # 14) Bandwidth in kHz: 12.5, 20, 25 diff --git a/examples/md380-baynet-full-codeplug-rev1.conf b/examples/md380-baynet-full-codeplug-rev1.conf index 2362e1a..8218f0b 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/09/10 by dmrconfig, -# Version 0.4.71, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# Version 0.5.74, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-380 Last Programmed Date: 2018-03-29 10:33:50 @@ -14,15 +14,14 @@ CPS Software Version: V01.34 # 5) Transmit power: High, Low # 6) Scan list: - or index in Scanlist table # 7) Autoscan flag: -, + -# 8) Squelch level: Normal, Tight -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Color -# 12) Color code: 0, 1, 2, 3... 15 -# 13) Time slot: 1 or 2 -# 14) In call criteria: -, Admit, TXInt -# 15) Receive group list: - or index in Grouplist table -# 16) Contact for transmit: - or index in Contacts table +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 0, 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 AS TOT RO Admit Color Slot InCall RxGL TxContact 1 Black_DMR 444.350 +5 High - - 60 - - 1 2 - - 15 # BayNet @@ -39,10 +38,10 @@ Digital Name Receive Transmit Power Scan AS TOT RO Admit Color Sl # 5) Transmit power: High, Low # 6) Scan list: - or index # 7) Autoscan flag: -, + -# 8) Squelch level: Normal, Tight -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Tone +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Squelch level: Normal, Tight # 12) Guard tone for receive, or '-' to disable # 13) Guard tone for transmit, or '-' to disable # 14) Bandwidth in kHz: 12.5, 20, 25 diff --git a/examples/md380-generic-norcal-uhf-20161103b.conf b/examples/md380-generic-norcal-uhf-20161103b.conf index 633a35b..cc2f240 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/09/10 by dmrconfig, -# Version 0.4.71, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# Version 0.5.74, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-380 Last Programmed Date: 2016-09-11 21:46:59 @@ -14,15 +14,14 @@ CPS Software Version: V01.32 # 5) Transmit power: High, Low # 6) Scan list: - or index in Scanlist table # 7) Autoscan flag: -, + -# 8) Squelch level: Normal, Tight -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Color -# 12) Color code: 0, 1, 2, 3... 15 -# 13) Time slot: 1 or 2 -# 14) In call criteria: -, Admit, TXInt -# 15) Receive group list: - or index in Grouplist table -# 16) Contact for transmit: - or index in Contacts table +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 0, 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 AS TOT RO Admit Color Slot InCall RxGL TxContact 1 PAARA_(SJ)_w6otx 444.475 +5 High 1 + 90 - Color 1 2 - 2 1 # Local @@ -956,10 +955,10 @@ Digital Name Receive Transmit Power Scan AS TOT RO Admit Color Sl # 5) Transmit power: High, Low # 6) Scan list: - or index # 7) Autoscan flag: -, + -# 8) Squelch level: Normal, Tight -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Tone +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Tone +# 11) Squelch level: Normal, Tight # 12) Guard tone for receive, or '-' to disable # 13) Guard tone for transmit, or '-' to disable # 14) Bandwidth in kHz: 12.5, 20, 25 diff --git a/examples/md380-norcal-brandmeister.conf b/examples/md380-norcal-brandmeister.conf index 2239caf..68ef897 100644 --- a/examples/md380-norcal-brandmeister.conf +++ b/examples/md380-norcal-brandmeister.conf @@ -1,6 +1,6 @@ # # This configuration was generated 2018/09/10 by dmrconfig, -# Version 0.4.71, Copyright (C) 2018 Serge Vakulenko KK6ABQ +# Version 0.5.74, Copyright (C) 2018 Serge Vakulenko KK6ABQ # Radio: TYT MD-380 Last Programmed Date: 2016-10-20 17:49:09 @@ -14,15 +14,14 @@ CPS Software Version: V01.32 # 5) Transmit power: High, Low # 6) Scan list: - or index in Scanlist table # 7) Autoscan flag: -, + -# 8) Squelch level: Normal, Tight -# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 -# 10) Receive only: -, + -# 11) Admit criteria: -, Free, Color -# 12) Color code: 0, 1, 2, 3... 15 -# 13) Time slot: 1 or 2 -# 14) In call criteria: -, Admit, TXInt -# 15) Receive group list: - or index in Grouplist table -# 16) Contact for transmit: - or index in Contacts table +# 8) Transmit timeout timer in seconds: 0, 15, 30, 45... 555 +# 9) Receive only: -, + +# 10) Admit criteria: -, Free, Color +# 11) Color code: 0, 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 AS TOT RO Admit Color Slot InCall RxGL TxContact 1 K6ACR_MB_CA 444.7875 +5 High 14 + 60 - Color 1 1 - 1 9 # California diff --git a/md380.c b/md380.c index 3d09f45..963113d 100644 --- a/md380.c +++ b/md380.c @@ -850,15 +850,14 @@ static void print_digital_channels(FILE *out, int verbose) fprintf(out, "# 5) Transmit power: High, Low\n"); fprintf(out, "# 6) Scan list: - or index in Scanlist table\n"); fprintf(out, "# 7) Autoscan flag: -, +\n"); - fprintf(out, "# 8) Squelch level: Normal, Tight\n"); - fprintf(out, "# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555\n"); - fprintf(out, "# 10) Receive only: -, +\n"); - fprintf(out, "# 11) Admit criteria: -, Free, Color\n"); - fprintf(out, "# 12) Color code: 0, 1, 2, 3... 15\n"); - fprintf(out, "# 13) Time slot: 1 or 2\n"); - fprintf(out, "# 14) In call criteria: -, Admit, TXInt\n"); - fprintf(out, "# 15) Receive group list: - or index in Grouplist table\n"); - fprintf(out, "# 16) Contact for transmit: - or index in Contacts table\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: 0, 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 AS TOT RO Admit Color Slot InCall RxGL TxContact"); @@ -948,10 +947,10 @@ static void print_analog_channels(FILE *out, int verbose) fprintf(out, "# 5) Transmit power: High, Low\n"); fprintf(out, "# 6) Scan list: - or index\n"); fprintf(out, "# 7) Autoscan flag: -, +\n"); - fprintf(out, "# 8) Squelch level: Normal, Tight\n"); - fprintf(out, "# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555\n"); - fprintf(out, "# 10) Receive only: -, +\n"); - fprintf(out, "# 11) Admit criteria: -, Free, Tone\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) Squelch level: Normal, Tight\n"); fprintf(out, "# 12) Guard tone for receive, or '-' to disable\n"); fprintf(out, "# 13) Guard tone for transmit, or '-' to disable\n"); fprintf(out, "# 14) Bandwidth in kHz: 12.5, 20, 25\n"); diff --git a/uv380.c b/uv380.c index 71c5536..bd8e237 100644 --- a/uv380.c +++ b/uv380.c @@ -908,15 +908,14 @@ static void print_digital_channels(FILE *out, int verbose) fprintf(out, "# 5) Transmit power: High, Mid, Low\n"); fprintf(out, "# 6) Scan list: - or index in Scanlist table\n"); fprintf(out, "# 7) Autoscan flag: -, +\n"); - fprintf(out, "# 8) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9\n"); - fprintf(out, "# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555\n"); - fprintf(out, "# 10) Receive only: -, +\n"); - fprintf(out, "# 11) Admit criteria: -, Free, Color\n"); - fprintf(out, "# 12) Color code: 0, 1, 2, 3... 15\n"); - fprintf(out, "# 13) Time slot: 1 or 2\n"); - fprintf(out, "# 14) In call criteria: -, Admit, TXInt\n"); - fprintf(out, "# 15) Receive group list: - or index in Grouplist table\n"); - fprintf(out, "# 16) Contact for transmit: - or index in Contacts table\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: 0, 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 AS TOT RO Admit Color Slot InCall RxGL TxContact"); @@ -1010,10 +1009,10 @@ static void print_analog_channels(FILE *out, int verbose) fprintf(out, "# 5) Transmit power: High, Mid, Low\n"); fprintf(out, "# 6) Scan list: - or index\n"); fprintf(out, "# 7) Autoscan flag: -, +\n"); - fprintf(out, "# 8) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9\n"); - fprintf(out, "# 9) Transmit timeout timer in seconds: 0, 15, 30, 45... 555\n"); - fprintf(out, "# 10) Receive only: -, +\n"); - fprintf(out, "# 11) Admit criteria: -, Free, Tone\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) Squelch level: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9\n"); fprintf(out, "# 12) Guard tone for receive, or '-' to disable\n"); fprintf(out, "# 13) Guard tone for transmit, or '-' to disable\n"); fprintf(out, "# 14) Bandwidth in kHz: 12.5, 20, 25\n");