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

Merge pull request #27 from onovy/fix-rare-params-indent

Browse Source 
Fix config indent and header when PRINT_RARE_PARAMS is enabled
This commit is contained in:
Serge Vakulenko 2019-09-18 22:14:54 -07:00 committed by GitHub
commit 19691affdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gd77.c
View File

@ -944,10 +944,8 @@ static void print_chan_base(FILE *out, channel_t *ch, int cnum)
// //
// Print extended parameters of the channel: // Print extended parameters of the channel:
// TOT Rekey Delay // TOT Rekey Delay
// RX Ref Frequency
// RX Ref Frequency
// Lone Worker
// VOX // VOX
// Talkaround
// //
static void print_chan_ext(FILE *out, channel_t *ch) static void print_chan_ext(FILE *out, channel_t *ch)
{ {
@ -1013,6 +1011,8 @@ static void print_digital_channels(FILE *out, int verbose)
fprintf(out, "%-4d", ch->contact_name_index); fprintf(out, "%-4d", ch->contact_name_index);
#ifdef PRINT_RARE_PARAMS #ifdef PRINT_RARE_PARAMS
fprintf(out, " ");
print_chan_ext(out, ch); print_chan_ext(out, ch);
// Extended digital parameters of the channel: // Extended digital parameters of the channel:
@ -1075,7 +1075,7 @@ static void print_analog_channels(FILE *out, int verbose)
} }
fprintf(out, "Analog Name Receive Transmit Power Scan TOT RO Admit Squelch RxTone TxTone Width"); fprintf(out, "Analog Name Receive Transmit Power Scan TOT RO Admit Squelch RxTone TxTone Width");
#ifdef PRINT_RARE_PARAMS #ifdef PRINT_RARE_PARAMS
fprintf(out, " Dly RxRef TxRef LW VOX TA RxSign TxSign"); fprintf(out, " Dly VOX TA RxSign TxSign");
#endif #endif
fprintf(out, "\n"); fprintf(out, "\n");
for (i=0; i<NCHAN; i++) { for (i=0; i<NCHAN; i++) {
@ -1099,7 +1099,7 @@ static void print_analog_channels(FILE *out, int verbose)
print_tone(out, ch->ctcss_dcs_receive); print_tone(out, ch->ctcss_dcs_receive);
fprintf(out, " "); fprintf(out, " ");
print_tone(out, ch->ctcss_dcs_transmit); print_tone(out, ch->ctcss_dcs_transmit);
fprintf(out, " %s", BANDWIDTH[ch->bandwidth]); fprintf(out, " %-6s", BANDWIDTH[ch->bandwidth]);
#ifdef PRINT_RARE_PARAMS #ifdef PRINT_RARE_PARAMS
print_chan_ext(out, ch); print_chan_ext(out, ch);

2
md380.c
View File

@ -886,6 +886,8 @@ static void print_digital_channels(FILE *out, int verbose)
fprintf(out, "%-4d", ch->contact_name_index); fprintf(out, "%-4d", ch->contact_name_index);
#ifdef PRINT_RARE_PARAMS #ifdef PRINT_RARE_PARAMS
fprintf(out, " ");
print_chan_ext(out, ch); print_chan_ext(out, ch);
// Extended digital parameters of the channel: // Extended digital parameters of the channel:

8
rd5r.c
View File

@ -945,10 +945,8 @@ static void print_chan_base(FILE *out, channel_t *ch, int cnum)
// //
// Print extended parameters of the channel: // Print extended parameters of the channel:
// TOT Rekey Delay // TOT Rekey Delay
// RX Ref Frequency
// RX Ref Frequency
// Lone Worker
// VOX // VOX
// Talkaround
// //
static void print_chan_ext(FILE *out, channel_t *ch) static void print_chan_ext(FILE *out, channel_t *ch)
{ {
@ -1014,6 +1012,8 @@ static void print_digital_channels(FILE *out, int verbose)
fprintf(out, "%-4d", ch->contact_name_index); fprintf(out, "%-4d", ch->contact_name_index);
#ifdef PRINT_RARE_PARAMS #ifdef PRINT_RARE_PARAMS
fprintf(out, " ");
print_chan_ext(out, ch); print_chan_ext(out, ch);
// Extended digital parameters of the channel: // Extended digital parameters of the channel:
@ -1076,7 +1076,7 @@ static void print_analog_channels(FILE *out, int verbose)
} }
fprintf(out, "Analog Name Receive Transmit Power Scan TOT RO Admit Squelch RxTone TxTone Width"); fprintf(out, "Analog Name Receive Transmit Power Scan TOT RO Admit Squelch RxTone TxTone Width");
#ifdef PRINT_RARE_PARAMS #ifdef PRINT_RARE_PARAMS
fprintf(out, " Dly RxRef TxRef LW VOX TA RxSign TxSign"); fprintf(out, " Dly VOX TA RxSign TxSign");
#endif #endif
fprintf(out, "\n"); fprintf(out, "\n");
for (i=0; i<NCHAN; i++) { for (i=0; i<NCHAN; i++) {

4
uv380.c
View File

@ -913,7 +913,7 @@ static void print_digital_channels(FILE *out, int verbose)
} }
fprintf(out, "Digital Name Receive Transmit Power Scan TOT RO Admit Color Slot RxGL TxContact"); fprintf(out, "Digital Name Receive Transmit Power Scan TOT RO Admit Color Slot RxGL TxContact");
#ifdef PRINT_EXTENDED_PARAMS #ifdef PRINT_EXTENDED_PARAMS
fprintf(out, "AS InCall Sq Dly RxRef TxRef LW VOX EmSys Privacy PN PCC EAA DCC DCDM"); fprintf(out, " AS InCall Sq Dly RxRef TxRef LW VOX EmSys Privacy PN PCC EAA DCC DCDM");
#endif #endif
fprintf(out, "\n"); fprintf(out, "\n");
for (i=0; i<NCHAN; i++) { for (i=0; i<NCHAN; i++) {
@ -943,6 +943,8 @@ static void print_digital_channels(FILE *out, int verbose)
fprintf(out, "%-5d", ch->contact_name_index); fprintf(out, "%-5d", ch->contact_name_index);
#ifdef PRINT_EXTENDED_PARAMS #ifdef PRINT_EXTENDED_PARAMS
fprintf(out, " "):
print_chan_ext(out, ch); print_chan_ext(out, ch);
// Extended digital parameters of the channel: // Extended digital parameters of the channel: