Move ID and name to the bottom of config script.

2018-08-31 11:54:07 -07:00
parent 17560c1a41
commit c548bf8ebe
12 changed files with 147 additions and 123 deletions
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -17,4 +17,4 @@ clean:
 .SUFFIXES: .conf .rdt

 .rdt.conf:
-	dmrconfig -r $< > $@
+	dmrconfig $< > $@
--- a/examples/md-uv380-empty.conf
+++ b/examples/md-uv380-empty.conf
@@ -1,17 +1,11 @@
 #
-# This configuration was generated 2018/08/30 by dmrconfig,
-# Version 0.1.40, Copyright (C) 2018 Serge Vakulenko KK6ABQ
+# This configuration was generated 2018/08/31 by dmrconfig,
+# Version 0.1.46, Copyright (C) 2018 Serge Vakulenko KK6ABQ
 #
 Radio: TYT MD-UV380
-Name: -
-ID: 1234
 Last Programmed Date: 2018-08-20 12:41:08
 CPS Software Version: V01.07

-# Text displayed when the radio powers up.
-Welcome Line 1: -
-Welcome Line 2: -
-
 # Table of analog channels.
 # 1) Channel number: 1-3000
 # 2) Name: up to 16 characters, use '_' instead of space
@@ -75,3 +69,11 @@ Grouplist Name             Contacts
 #
 Message Text
    1   Hello
+
+# Unique DMR ID and name of this radio.
+ID: 1234
+Name: -
+
+# Text displayed when the radio powers up.
+Intro Line 1: -
+Intro Line 2: -
--- a/examples/md-uv380-factory.conf
+++ b/examples/md-uv380-factory.conf
@@ -1,17 +1,11 @@
 #
-# This configuration was generated 2018/08/30 by dmrconfig,
-# Version 0.1.40, Copyright (C) 2018 Serge Vakulenko KK6ABQ
+# This configuration was generated 2018/08/31 by dmrconfig,
+# Version 0.1.46, Copyright (C) 2018 Serge Vakulenko KK6ABQ
 #
 Radio: TYT MD-UV380
-Name: -
-ID: 1234
 Last Programmed Date: 2018-07-13 16:02:59
 CPS Software Version: V01.07

-# Text displayed when the radio powers up.
-Welcome Line 1: -
-Welcome Line 2: -
-
 # Table of digital channels.
 # 1) Channel number: 1-3000
 # 2) Name: up to 16 characters, use '_' instead of space
@@ -104,3 +98,11 @@ Grouplist Name             Contacts
 #
 Message Text
    1   Hello
+
+# Unique DMR ID and name of this radio.
+ID: 1234
+Name: -
+
+# Text displayed when the radio powers up.
+Intro Line 1: -
+Intro Line 2: -
--- a/examples/md-uv380_bm_2018-08-07.conf
+++ b/examples/md-uv380_bm_2018-08-07.conf
@@ -1,17 +1,11 @@
 #
-# This configuration was generated 2018/08/30 by dmrconfig,
-# Version 0.1.40, Copyright (C) 2018 Serge Vakulenko KK6ABQ
+# This configuration was generated 2018/08/31 by dmrconfig,
+# Version 0.1.46, Copyright (C) 2018 Serge Vakulenko KK6ABQ
 #
 Radio: TYT MD-UV380
-Name: Dit_Call
-ID: 238
 Last Programmed Date: 2018-08-05 17:54:47
 CPS Software Version: V01.32

-# Text displayed when the radio powers up.
-Welcome Line 1: Husk_ID
-Welcome Line 2: og_Call
-
 # Table of digital channels.
 # 1) Channel number: 1-3000
 # 2) Name: up to 16 characters, use '_' instead of space
@@ -1162,3 +1156,11 @@ Grouplist Name             Contacts
 #
 Message Text
    1   Hello
+
+# Unique DMR ID and name of this radio.
+ID: 238
+Name: Dit_Call
+
+# Text displayed when the radio powers up.
+Intro Line 1: Husk_ID
+Intro Line 2: og_Call
--- a/examples/md2017-7-23-2017.conf
+++ b/examples/md2017-7-23-2017.conf
@@ -1,17 +1,11 @@
 #
-# This configuration was generated 2018/08/30 by dmrconfig,
-# Version 0.1.40, Copyright (C) 2018 Serge Vakulenko KK6ABQ
+# This configuration was generated 2018/08/31 by dmrconfig,
+# Version 0.1.46, Copyright (C) 2018 Serge Vakulenko KK6ABQ
 #
 Radio: TYT MD-UV380
-Name: -
-ID: 1234
 Last Programmed Date: 2017-07-23 19:19:23
 CPS Software Version: V01.17

-# Text displayed when the radio powers up.
-Welcome Line 1: -
-Welcome Line 2: -
-
 # Table of digital channels.
 # 1) Channel number: 1-3000
 # 2) Name: up to 16 characters, use '_' instead of space
@@ -685,3 +679,11 @@ Grouplist Name             Contacts
 #
 Message Text
    1   Hello
+
+# Unique DMR ID and name of this radio.
+ID: 1234
+Name: -
+
+# Text displayed when the radio powers up.
+Intro Line 1: -
+Intro Line 2: -
--- a/examples/md2017-DualHotspot-PNW-2017-07-19.conf
+++ b/examples/md2017-DualHotspot-PNW-2017-07-19.conf
@@ -1,17 +1,11 @@
 #
-# This configuration was generated 2018/08/30 by dmrconfig,
-# Version 0.1.40, Copyright (C) 2018 Serge Vakulenko KK6ABQ
+# This configuration was generated 2018/08/31 by dmrconfig,
+# Version 0.1.46, Copyright (C) 2018 Serge Vakulenko KK6ABQ
 #
 Radio: TYT MD-UV380
-Name: YourCall-Here
-ID: 12345678
 Last Programmed Date: 2017-07-19 07:09:13
 CPS Software Version: V01.16

-# Text displayed when the radio powers up.
-Welcome Line 1: YourName
-Welcome Line 2: YourCall
-
 # Table of digital channels.
 # 1) Channel number: 1-3000
 # 2) Name: up to 16 characters, use '_' instead of space
@@ -1549,3 +1543,11 @@ Grouplist Name             Contacts
 #
 Message Text
    1   Hello
+
+# Unique DMR ID and name of this radio.
+ID: 12345678
+Name: YourCall-Here
+
+# Text displayed when the radio powers up.
+Intro Line 1: YourName
+Intro Line 2: YourCall
--- a/examples/md380-baynet-full-codeplug-rev1.conf
+++ b/examples/md380-baynet-full-codeplug-rev1.conf
@@ -1,17 +1,11 @@
 #
-# This configuration was generated 2018/08/30 by dmrconfig,
-# Version 0.1.40, Copyright (C) 2018 Serge Vakulenko KK6ABQ
+# This configuration was generated 2018/08/31 by dmrconfig,
+# Version 0.1.46, Copyright (C) 2018 Serge Vakulenko KK6ABQ
 #
 Radio: TYT MD-380
-Name: YOURCALL
-ID: 1234567
 Last Programmed Date: 2018-03-29 10:33:50
 CPS Software Version: V01.34

-# Text displayed when the radio powers up.
-Welcome Line 1: WELCOME
-Welcome Line 2: YOURCALL
-
 # Table of digital channels.
 # 1) Channel number: 1-1000
 # 2) Name: up to 16 characters, use '_' instead of space
@@ -156,3 +150,11 @@ Grouplist Name             Contacts
 #
 Message Text
    1   Hello
+
+# Unique DMR ID and name of this radio.
+ID: 1234567
+Name: YOURCALL
+
+# Text displayed when the radio powers up.
+Intro Line 1: WELCOME
+Intro Line 2: YOURCALL
--- a/examples/md380-generic-norcal-uhf-20161103b.conf
+++ b/examples/md380-generic-norcal-uhf-20161103b.conf
@@ -1,17 +1,11 @@
 #
-# This configuration was generated 2018/08/30 by dmrconfig,
-# Version 0.1.40, Copyright (C) 2018 Serge Vakulenko KK6ABQ
+# This configuration was generated 2018/08/31 by dmrconfig,
+# Version 0.1.46, Copyright (C) 2018 Serge Vakulenko KK6ABQ
 #
 Radio: TYT MD-380
-Name: noname
-ID: 1234
 Last Programmed Date: 2016-09-11 21:46:59
 CPS Software Version: V01.32

-# Text displayed when the radio powers up.
-Welcome Line 1: noname
-Welcome Line 2: noDMRid
-
 # Table of digital channels.
 # 1) Channel number: 1-1000
 # 2) Name: up to 16 characters, use '_' instead of space
@@ -1614,3 +1608,11 @@ Message Text
    5   Be Right Back
    6   My email is mycall@arrl.net
    7   73 . .
+
+# Unique DMR ID and name of this radio.
+ID: 1234
+Name: noname
+
+# Text displayed when the radio powers up.
+Intro Line 1: noname
+Intro Line 2: noDMRid
--- a/examples/md380-norcal-brandmeister.conf
+++ b/examples/md380-norcal-brandmeister.conf
@@ -1,17 +1,11 @@
 #
-# This configuration was generated 2018/08/30 by dmrconfig,
-# Version 0.1.40, Copyright (C) 2018 Serge Vakulenko KK6ABQ
+# This configuration was generated 2018/08/31 by dmrconfig,
+# Version 0.1.46, Copyright (C) 2018 Serge Vakulenko KK6ABQ
 #
 Radio: TYT MD-380
-Name: MYCALL
-ID: 1234
 Last Programmed Date: 2016-10-20 17:49:09
 CPS Software Version: V01.32

-# Text displayed when the radio powers up.
-Welcome Line 1: MYCALL
-Welcome Line 2: MYNAME
-
 # Table of digital channels.
 # 1) Channel number: 1-1000
 # 2) Name: up to 16 characters, use '_' instead of space
@@ -425,3 +419,11 @@ Grouplist Name             Contacts
 #
 Message Text
    1   Hello
+
+# Unique DMR ID and name of this radio.
+ID: 1234
+Name: MYCALL
+
+# Text displayed when the radio powers up.
+Intro Line 1: MYCALL
+Intro Line 2: MYNAME