greg
/
dmrconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/sergev/dmrconfig

This commit is contained in:
Serge Vakulenko 2018-09-25 10:52:55 -07:00
parent 663cbb4bc8 64100aa498
commit 986bf6642a
3 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/Makefile
View File

@ -5,7 +5,16 @@ CONF = md2017-7-23-2017.conf \
md380-norcal-brandmeister.conf \
md-uv380_bm_2018-08-07.conf \
md-uv380-empty.conf \
md-uv380-factory.conf
md-uv380-factory.conf \
rd5r-baden-wuertemburg-codeplug-v3.conf \
rd5r-bayern-codeplug-v3.conf \
rd5r-s-yorks-codeplug-v3.conf \
rd5r-v21x-Charlotte-NC.conf \
rd5r-v21x-Ft-Launderdale-FL.conf \
rd5r-v21x-Los-Angeles-CA.conf \
rd5r-v21x-Tampa-FL.conf \
rd5r-empty.conf \
rd5r-factory.conf
VPATH = ../../dmrconfig.wiki/files
@ -14,7 +23,10 @@ all: $(CONF)
clean:
rm -f $(CONF)
.SUFFIXES: .conf .rdt
.SUFFIXES: .conf .rdt .dat
.rdt.conf:
dmrconfig $< > $@
.dat.conf:
dmrconfig $< > $@

26
examples/rd5r-s-yorks-codeplug-v3.conf
View File

@ -136,6 +136,32 @@ Contact Name Type ID RxTone
12 BM_EUR Group 92 +
13 G4APO-Rowland Private 2345085 -
14 D+_REG_NE_ENGLND Group 860 +
25 BM_D.A.CH Group 920 +
26 BM_Austria Group 232 +
27 DD5LP_-_Ed Private 2638415 -
28 BMRef4000_Disc Group 4000 +
29 BMRef4001_DL Group 4001 +
40 BMRef4012_D-Star Group 4012 +
41 BMRef4013_RLP Group 4013 +
42 BMRef4014_Test Group 4014 +
47 BMRef4019gerTst Group 4019 +
49 BMRef4021May-Kob Group 4021 +
50 BMRef4022WhiteSt Group 4022 +
60 BMRef4034Workshp Group 4034 +
61 BMRef4035DV4Mini Group 4035 +
67 BMRef5000Status Group 5000 +
68 DV_Simplex Group 99 +
69 BM-YSF262 Group 26208 -
70 BM/D+_France Group 208 +
71 BM/D+_Italy Group 222 +
72 BM/D+Luxemburg Group 270 +
73 BM/D+_Sweden Group 240 +
74 BM/D+Switzerland Group 228 +
75 BM/D+_Spain Group 214 +
76 BM/D+TAC310USA Group 310 +
77 BM_BAYNET Group 31075 +
83 G3CWI_-_Richard Private 2344756 -
89 BM/D+__UK Group 235 -
# Table of group lists.
# 1) Group list number: 1-64

14
rd5r.c
View File

@ -1159,9 +1159,15 @@ static int have_scanlists()
static int have_contacts()
{
contact_t *ct = GET_CONTACT(0);
int i;
return VALID_CONTACT(ct);
for (i=0; i<NCONTACTS; i++) {
contact_t *ct = GET_CONTACT(i);
if (VALID_CONTACT(ct))
return 1;
}
return 0;
}
static int have_grouplists()
@ -1321,7 +1327,7 @@ static void rd5r_print_config(radio_device_t *radio, FILE *out, int verbose)
if (!VALID_CONTACT(ct)) {
// Contact is disabled
break;
continue;
}
fprintf(out, "%5d ", i+1);
@ -2320,7 +2326,7 @@ static int rd5r_verify_config(radio_device_t *radio)
contact_t *ct = GET_CONTACT(i);
if (!VALID_CONTACT(ct))
break;
continue;
ncontacts++;
}