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

Fix admit values for d868uv.

Browse Source
This commit is contained in:
Serge Vakulenko 2018-10-25 18:05:52 -07:00
parent 0e7b2cbf62
commit 56f86cfdbe
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
d868uv.c
View File

@ -266,7 +266,8 @@ typedef struct {
} radioid_t; } radioid_t;
static const char *POWER_NAME[] = { "Low", "Mid", "High", "Turbo" }; static const char *POWER_NAME[] = { "Low", "Mid", "High", "Turbo" };
static const char *ADMIT_NAME[] = { "-", "Free", "DiffCC", "Color" }; static const char *DIGITAL_ADMIT_NAME[] = { "-", "Free", "NColor", "Color" };
static const char *ANALOG_ADMIT_NAME[] = { "-", "Tone", "Free", "Free" };
static const char *BANDWIDTH[] = { "12.5", "25" }; static const char *BANDWIDTH[] = { "12.5", "25" };
// //
@ -532,7 +533,6 @@ static void print_tx_offset(FILE *out, unsigned tx_offset_bcd, unsigned mode)
// Scan List // Scan List
// TOT // TOT
// RX Only // RX Only
// Admit Criteria
// //
static void print_chan_base(FILE *out, channel_t *ch, int cnum) static void print_chan_base(FILE *out, channel_t *ch, int cnum)
{ {
@ -557,9 +557,6 @@ static void print_chan_base(FILE *out, channel_t *ch, int cnum)
// fprintf(out, "%-3d ", ch->tot * 15); // fprintf(out, "%-3d ", ch->tot * 15);
fprintf(out, "%c ", "-+"[ch->rx_only]); fprintf(out, "%c ", "-+"[ch->rx_only]);
fprintf(out, "%-6s ", ADMIT_NAME[ch->tx_permit]);
//TODO: Busy Lock for analog channels
} }
static void print_digital_channels(FILE *out, int verbose) static void print_digital_channels(FILE *out, int verbose)
@ -597,10 +594,12 @@ static void print_digital_channels(FILE *out, int verbose)
print_chan_base(out, ch, i+1); print_chan_base(out, ch, i+1);
// Print digital parameters of the channel: // Print digital parameters of the channel:
// Admit Criteria
// Color Code // Color Code
// Repeater Slot // Repeater Slot
// Group List // Group List
// Contact Name // Contact Name
fprintf(out, "%-6s ", DIGITAL_ADMIT_NAME[ch->tx_permit]);
fprintf(out, "%-5d %-3d ", ch->color_code, 1 + ch->slot2); fprintf(out, "%-5d %-3d ", ch->color_code, 1 + ch->slot2);
if (ch->group_list_index == 0xff) if (ch->group_list_index == 0xff)
@ -674,10 +673,12 @@ static void print_analog_channels(FILE *out, int verbose)
print_chan_base(out, ch, i+1); print_chan_base(out, ch, i+1);
// Print analog parameters of the channel: // Print analog parameters of the channel:
// Admit Criteria
// Squelch // Squelch
// CTCSS/DCS Dec // CTCSS/DCS Dec
// CTCSS/DCS Enc // CTCSS/DCS Enc
// Bandwidth // Bandwidth
fprintf(out, "%-6s ", ANALOG_ADMIT_NAME[ch->tx_permit]);
fprintf(out, "%-7s ", "Normal"); fprintf(out, "%-7s ", "Normal");
if (ch->rx_ctcss) if (ch->rx_ctcss)