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

Don't print unused scanlist fields.

Browse Source
This commit is contained in:
Serge Vakulenko 2018-08-27 19:12:43 -07:00
parent ca55c4ca9e
commit 0db478586e
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
md380.c
View File

@ -352,6 +352,9 @@ static void print_freq(FILE *out, unsigned data)
static void setup_channel(int i, char *name, double rx_mhz, double tx_mhz, static void setup_channel(int i, char *name, double rx_mhz, double tx_mhz,
int tmode, int power, int wide, int scan, int isam) int tmode, int power, int wide, int scan, int isam)
{ {
//TODO: set autoscan=0 for simplex channels and hotspots, 1 for repeaters
//TODO: always set Data Call Confirmed=1 (wait for SMS acknowledge)
//TODO: always set talkaround=0
#if 0 #if 0
memory_channel_t *ch = i + (memory_channel_t*) &radio_mem[OFFSET_CHANNELS]; memory_channel_t *ch = i + (memory_channel_t*) &radio_mem[OFFSET_CHANNELS];
@ -879,7 +882,11 @@ static void md380_print_config(FILE *out, int verbose)
fprintf(out, "# 3) List of channels: numbers and ranges (N-M) separated by comma\n"); fprintf(out, "# 3) List of channels: numbers and ranges (N-M) separated by comma\n");
fprintf(out, "#\n"); fprintf(out, "#\n");
} }
fprintf(out, "Scanlist Name PCh1 PCh2 TxCh Hold Smpl Channels\n"); fprintf(out, "Scanlist Name PCh1 PCh2 TxCh ");
#ifdef PRINT_RARE_PARAMS
fprintf(out, "Hold Smpl ");
#endif
fprintf(out, "Channels\n");
for (i=0; i<NSCANL; i++) { for (i=0; i<NSCANL; i++) {
scanlist_t *sl = (scanlist_t*) &radio_mem[OFFSET_SCANL + i*104]; scanlist_t *sl = (scanlist_t*) &radio_mem[OFFSET_SCANL + i*104];
@ -911,8 +918,10 @@ static void md380_print_config(FILE *out, int verbose)
} else { } else {
fprintf(out, "%-4d ", sl->tx_designated_ch); fprintf(out, "%-4d ", sl->tx_designated_ch);
} }
#ifdef PRINT_RARE_PARAMS
fprintf(out, "%-4d %-4d ", fprintf(out, "%-4d %-4d ",
sl->sign_hold_time * 25, sl->prio_sample_time * 250); sl->sign_hold_time * 25, sl->prio_sample_time * 250);
#endif
if (sl->member[0]) { if (sl->member[0]) {
print_chanlist(out, sl->member, 31); print_chanlist(out, sl->member, 31);
} else { } else {

13
uv380.c
View File

@ -368,6 +368,9 @@ static void print_freq(FILE *out, unsigned data)
static void setup_channel(int i, char *name, double rx_mhz, double tx_mhz, static void setup_channel(int i, char *name, double rx_mhz, double tx_mhz,
int tmode, int power, int wide, int scan, int isam) int tmode, int power, int wide, int scan, int isam)
{ {
//TODO: set autoscan=0 for simplex channels and hotspots, 1 for repeaters
//TODO: always set Data Call Confirmed=1 (wait for SMS acknowledge)
//TODO: always set talkaround=0
#if 0 #if 0
memory_channel_t *ch = i + (memory_channel_t*) &radio_mem[OFFSET_CHANNELS]; memory_channel_t *ch = i + (memory_channel_t*) &radio_mem[OFFSET_CHANNELS];
@ -625,7 +628,7 @@ static void print_chan_base(FILE *out, channel_t *ch, int cnum)
if (ch->squelch <= 9) if (ch->squelch <= 9)
fprintf(out, "%1d ", ch->squelch); fprintf(out, "%1d ", ch->squelch);
else else
fprintf(out, "?? "); fprintf(out, "1 ");
if (ch->tot == 0) if (ch->tot == 0)
fprintf(out, "- "); fprintf(out, "- ");
@ -915,7 +918,11 @@ static void uv380_print_config(FILE *out, int verbose)
fprintf(out, "# 3) List of channels: numbers and ranges (N-M) separated by comma\n"); fprintf(out, "# 3) List of channels: numbers and ranges (N-M) separated by comma\n");
fprintf(out, "#\n"); fprintf(out, "#\n");
} }
fprintf(out, "Scanlist Name PCh1 PCh2 TxCh Hold Smpl Channels\n"); fprintf(out, "Scanlist Name PCh1 PCh2 TxCh ");
#ifdef PRINT_RARE_PARAMS
fprintf(out, "Hold Smpl ");
#endif
fprintf(out, "Channels\n");
for (i=0; i<NSCANL; i++) { for (i=0; i<NSCANL; i++) {
scanlist_t *sl = (scanlist_t*) &radio_mem[OFFSET_SCANL + i*104]; scanlist_t *sl = (scanlist_t*) &radio_mem[OFFSET_SCANL + i*104];
@ -947,8 +954,10 @@ static void uv380_print_config(FILE *out, int verbose)
} else { } else {
fprintf(out, "%-4d ", sl->tx_designated_ch); fprintf(out, "%-4d ", sl->tx_designated_ch);
} }
#ifdef PRINT_RARE_PARAMS
fprintf(out, "%-4d %-4d ", fprintf(out, "%-4d %-4d ",
sl->sign_hold_time * 25, sl->prio_sample_time * 250); sl->sign_hold_time * 25, sl->prio_sample_time * 250);
#endif
if (sl->member[0]) { if (sl->member[0]) {
print_chanlist(out, sl->member, 31); print_chanlist(out, sl->member, 31);
} else { } else {