Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SimpleUSB: show RX level #411

Merged
merged 2 commits into from
Oct 30, 2024
Merged

SimpleUSB: show RX level #411

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99fb3fd
SimpleUSB: show RX level
Allan-N Sep 27, 2024
70cde40
Merge branch 'master' into show-rx-level
Allan-N Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions channels/chan_simpleusb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3326,10 +3326,22 @@ static void tune_menusupport(int fd, struct chan_simpleusb_pvt *o, const char *c
option_verbose = 0;
switch (cmd[0]) {
case '0': /* return audio processing configuration */
ast_cli(fd, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\n",
o->txmixaset, o->txmixbset, o->echomode, o->rxboost, o->preemphasis,
o->deemphasis, o->plfilter, o->invertptt, o->rxcdtype, o->rxsdtype,
o->rxondelay, o->txoffdelay);
/* note: to maintain backward compatibility for those expecting a specific # of
values to be returned (and in a specific order). So, we only add to the end
of the returned list. Also, once an update has been released we can't change
the format/content of any previously returned string */
if (!strcmp(cmd, "0+4")) {
ast_cli(fd, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\n",
o->txmixaset, o->txmixbset, o->echomode, o->rxboost, o->preemphasis,
o->deemphasis, o->plfilter, o->invertptt, o->rxcdtype, o->rxsdtype,
o->rxondelay, o->txoffdelay, o->rxmixerset,
o->micplaymax, o->spkrmax, o->micmax);
} else {
ast_cli(fd, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\n",
o->txmixaset, o->txmixbset, o->echomode, o->rxboost, o->preemphasis,
o->deemphasis, o->plfilter, o->invertptt, o->rxcdtype, o->rxsdtype,
o->rxondelay, o->txoffdelay);
}
break;
case '1': /* return usb device name list */
for (x = 0, oy = simpleusb_default.next; oy && oy->name; oy = oy->next, x++) {
Expand Down
29 changes: 24 additions & 5 deletions channels/chan_usbradio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3696,9 +3696,14 @@ static void _menu_print(int fd, struct chan_usbradio_pvt *o)
ast_cli(fd, "off.\n");
}

if (o->rxdemod == RX_AUDIO_FLAT) {
ast_cli(fd, "Rx Level currently set to %d\n", (int) ((o->rxvoiceadj * 200.0) + .5));
} else {
ast_cli(fd, "Rx Level currently set to %d\n", o->rxmixerset);
}
ast_cli(fd, "Rx Squelch currently set to %d\n", o->rxsquelchadj);
ast_cli(fd, "Tx Voice Level currently set to %d\n", o->txmixaset);
ast_cli(fd, "Tx Tone Level currently set to %d\n", o->txctcssadj);
ast_cli(fd, "Rx Squelch currently set to %d\n", o->rxsquelchadj);
return;
}

Expand Down Expand Up @@ -3963,10 +3968,24 @@ static void tune_menusupport(int fd, struct chan_usbradio_pvt *o, const char *cm
}
switch (cmd[0]) {
case '0': /* return audio processing configuration */
ast_cli(fd, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\n",
flatrx, txhasctcss, o->echomode, o->rxboost, o->txboost,
o->rxcdtype, o->rxsdtype, o->rxondelay, o->txoffdelay,
o->txprelim, o->txlimonly, o->rxdemod, o->txmixa, o->txmixb);
/* note: to maintain backward compatibility for those expecting a specific # of
values to be returned (and in a specific order). So, we only add to the end
of the returned list. Also, once an update has been released we can't change
the format/content of any previously returned string */
if (!strcmp(cmd, "0+9")) {
ast_cli(fd, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%f,%d,%d,%d,%d,%d,%d,%d\n",
flatrx, txhasctcss, o->echomode, o->rxboost, o->txboost,
o->rxcdtype, o->rxsdtype, o->rxondelay, o->txoffdelay,
o->txprelim, o->txlimonly, o->rxdemod, o->txmixa, o->txmixb,
o->rxmixerset, o->rxvoiceadj, o->rxsquelchadj, o->txmixaset,
o->txmixbset, o->txctcssadj, o->micplaymax, o->spkrmax,
o->micmax);
} else {
ast_cli(fd, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\n",
flatrx, txhasctcss, o->echomode, o->rxboost, o->txboost,
o->rxcdtype, o->rxsdtype, o->rxondelay, o->txoffdelay,
o->txprelim, o->txlimonly, o->rxdemod, o->txmixa, o->txmixb);
}
break;
case '1': /* return usb device name list */
for (x = 0, oy = usbradio_default.next; oy && oy->name; oy = oy->next, x++) {
Expand Down
58 changes: 43 additions & 15 deletions utils/radio-tune-menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ static const char * const sd_signal_type[] = {"no", "usb", "usbinvert", "dsp", "
static const char * const demodulation_type[] = {"no", "speaker", "flat"};

/*! \brief mixer type */
enum { TX_OUT_OFF, TX_OUT_VOICE, TX_OUT_LSD, TX_OUT_COMPOSITE, TX_OUT_AUX };
static const char * const mixer_type[] = {"no", "voice", "tone", "composite", "auxvoice"};

/*! \brief command prefix for Asterisk - simpleusb channel driver access */
Expand Down Expand Up @@ -975,6 +976,10 @@ static void options_menu(void)
int rxboost = 0, txboost = 0, carrierfrom = 0, ctcssfrom = 0;
int rxondelay = 0, txoffdelay = 0, txprelim = 0, txlimonly = 0;
int rxdemod = 0, txmixa = 0, txmixb = 0;
int rxmixerset = 0, rxsquelchadj = 0;
float rxvoiceadj = 0;
int txmixaset = 0, txmixbset = 0, txctcssadj = 0;
int micplaymax = 0, spkrmax = 0, micmax = 0;
char str[256];
int result;

Expand All @@ -983,15 +988,17 @@ static void options_menu(void)
for (;;) {

/* get device parameters from Asterisk */
if (astgetline(COMMAND_PREFIX "tune menu-support 0", str, sizeof(str) - 1)) {
if (astgetline(COMMAND_PREFIX "tune menu-support 0+9", str, sizeof(str) - 1)) {
printf("The setup information for chan_usbradio could not be retrieved!\n\n");
printf("Verify that Asterisk is running and chan_usbradio is loaded.\n\n");
exit(255);
}
if (sscanf(str, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
if (sscanf(str, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%f,%d,%d,%d,%d,%d,%d,%d",
&flatrx, &txhasctcss, &echomode, &rxboost, &txboost,
&carrierfrom, &ctcssfrom, &rxondelay, &txoffdelay,
&txprelim, & txlimonly, &rxdemod, &txmixa, &txmixb) != 14) {
&txprelim, &txlimonly, &rxdemod, &txmixa, &txmixb,
&rxmixerset, &rxvoiceadj, &rxsquelchadj, &txmixaset,
&txmixbset, &txctcssadj, &micplaymax, &spkrmax, &micmax) != 23) {
fprintf(stderr, "Error parsing device parameters: %s\n", str);
exit(255);
}
Expand All @@ -1005,38 +1012,59 @@ static void options_menu(void)
if (flatrx) {
printf("2) Auto-Detect Rx Noise Level Value (with no carrier)\n");
} else {
printf("2) Does not apply to this USB device configuration\n");
printf("2) Auto-Detect Rx Noise Level does not apply to this devices configuration\n");
}
if (flatrx) {
printf("3) Set Rx Voice Level using display (currently '%d')\n", (int) ((rxvoiceadj * 200.0) + .5));
} else {
printf("3) Set Rx Voice Level using display (currently '%d')\n", rxmixerset);
}
printf("3) Set Rx Voice Level (using display)\n");
if (flatrx) {
printf("4) Auto-Detect Rx CTCSS Level Value (with carrier + CTCSS)\n");
} else {
printf("4) Does not apply to this USB device configuration\n");
printf("4) Auto-Detect Rx CTCSS Level does not apply to this devices configuration\n");
}
if (flatrx) {
printf("5) Set Rx Squelch Level\n");
printf("5) Set Rx Squelch Level (currently '%d')\n", rxsquelchadj);
} else {
printf("5) Does not apply to this USB device configuration\n");
printf("5) Set Rx Squelch Level does not apply to this devices configuration\n");
}
if (keying) {
printf("6) Set Transmit Voice Level and send test tone (no CTCSS)\n");
if ((txmixa == TX_OUT_VOICE) || (txmixa == TX_OUT_COMPOSITE) ||
(txmixb == TX_OUT_VOICE) || (txmixb == TX_OUT_COMPOSITE)) {
if (keying) {
printf("6) Set Transmit Voice Level and send test tone (no CTCSS)\n");
} else {
if ((txmixa == TX_OUT_VOICE) || (txmixa == TX_OUT_COMPOSITE)) {
printf("6) Set Transmit Voice Level (currently '%d')\n", txmixaset);
} else {
printf("6) Set Transmit Voice Level (currently '%d')\n", txmixbset);
}
}
} else {
printf("7) Set Transmit Voice Level not available as configured\n");
}
if ((txmixa == TX_OUT_AUX) || (txmixb == TX_OUT_AUX)) {
if (txmixa == TX_OUT_AUX) {
printf("7) Set Transmit Aux Voice Level (currently '%d')\n", txmixaset);
} else {
printf("7) Set Transmit Aux Voice Level (currently '%d')\n", txmixbset);
}
} else {
printf("6) Set Transmit Voice Level\n");
printf("7) Set Transmit Aux Voice Level not available as configured\n");
}
printf("7) Set Transmit Aux Voice Level\n");
if (txhasctcss) {
if (keying) {
printf("8) Set Transmit CTCSS Level and send CTCSS tone\n");
} else {
printf("8) Set Transmit CTCSS Level\n");
printf("8) Set Transmit CTCSS Level (currently '%d')\n", txctcssadj);
}
} else {
printf("8) Does not apply to this USB device configuration\n");
printf("8) Set Transmit CTCSS Level does not apply to this devices configuration\n");
}
if (flatrx) {
printf("9) Auto-Detect Rx Voice Level Value (with carrier + 1KHz @ 3KHz Dev)\n");
} else {
printf("9) Does not apply to this USB device configuration\n");
printf("9) Auto-Detect Rx Voice Level does not apply to this devices configuration\n");
}
printf("E) Toggle Echo Mode (currently '%s')\n", (echomode) ? "enabled" : "disabled");
printf("F) Flash (Toggle PTT and Tone output several times)\n");
Expand Down
12 changes: 7 additions & 5 deletions utils/simpleusb-tune-menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,7 @@ static int astgetresp(char *cmd)
int rxboost = 0, preemphasis = 0, deemphasis = 0;
int plfilter = 0, pttmode = 0, carrierfrom = 0, ctcssfrom = 0;
int rxondelay = 0, txoffdelay = 0;
int rxmixerset = 0, micplaymax = 0, spkrmax = 0, micmax = 0;
int result;
char str[256];

Expand All @@ -755,14 +756,15 @@ static int astgetresp(char *cmd)
for (;;) {

/* get device parameters from Asterisk */
if (astgetline(COMMAND_PREFIX "tune menu-support 0", str, sizeof(str) - 1)) {
printf("The setup information for chan_simpleusb could not be retrieved!\n\n");
if (astgetline(COMMAND_PREFIX "tune menu-support 0+4", str, sizeof(str) - 1)) {
printf("The chan_simpleusb setup information could not be retrieved!\n\n");
printf("Verify that Asterisk is running and chan_simpleusb is loaded.\n\n");
exit(255);
}
if (sscanf(str, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
if (sscanf(str, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
&txmixaset, &txmixbset, &echomode, &rxboost, &preemphasis, &deemphasis,
&plfilter, &pttmode, &carrierfrom, &ctcssfrom, &rxondelay, &txoffdelay) != 12) {
&plfilter, &pttmode, &carrierfrom, &ctcssfrom, &rxondelay, &txoffdelay,
&rxmixerset, &micplaymax, &spkrmax, &micmax) != 16) {
fprintf(stderr, "Error parsing device parameters: %s\n", str);
exit(255);
}
Expand All @@ -774,7 +776,7 @@ static int astgetresp(char *cmd)
}

printf("1) Select active USB device\n");
printf("2) Set Rx Voice Level (using display)\n");
printf("2) Set Rx Voice Level using display (currently '%d')\n", rxmixerset);
if (keying) {
printf("3) Set Transmit A Level (currently '%d') and send test tone\n", txmixaset);
} else {
Expand Down
Loading