PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refine ptt gpiod.

This commit is contained in:
wb2osz 2023-11-26 01:12:34 +00:00
parent a3f68203c7
commit ad5dbaec73
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/config.c
View File

@ -1852,7 +1852,8 @@ void config_init (char *fname, struct audio_s *p_audio_config,
t = split(NULL,0); t = split(NULL,0);
if (t == NULL) { if (t == NULL) {
text_color_set(DW_COLOR_ERROR); text_color_set(DW_COLOR_ERROR);
dw_printf ("Config file line %d: Missing GPIO chip for %s.\n", line, otname); dw_printf ("Config file line %d: Missing GPIO chip name for %s.\n", line, otname);
dw_printf ("Use the \"gpioinfo\" command to get a list of gpio chip names and corresponding I/O lines.\n");
continue; continue;
} }
strlcpy(p_audio_config->achan[channel].octrl[ot].out_gpio_name, t, strlcpy(p_audio_config->achan[channel].octrl[ot].out_gpio_name, t,
@ -1876,7 +1877,8 @@ void config_init (char *fname, struct audio_s *p_audio_config,
p_audio_config->achan[channel].octrl[ot].ptt_method = PTT_METHOD_GPIOD; p_audio_config->achan[channel].octrl[ot].ptt_method = PTT_METHOD_GPIOD;
#else #else
text_color_set(DW_COLOR_ERROR); text_color_set(DW_COLOR_ERROR);
dw_printf ("GPIOD is not supported.\n"); dw_printf ("Application was not built with optional support for GPIOD.\n");
dw_printf ("Install packages gpiod and libgpiod-dev, remove 'build' subdirectory, then rebuild.\n");
#endif /* USE_GPIOD*/ #endif /* USE_GPIOD*/
#endif /* __WIN32__ */ #endif /* __WIN32__ */
} }

16
src/ptt.c
View File

@ -472,6 +472,20 @@ void export_gpio(int ch, int ot, int invert, int direction)
text_color_set(DW_COLOR_ERROR); text_color_set(DW_COLOR_ERROR);
dw_printf ("Error writing \"%s\" to %s, errno=%d\n", stemp, gpio_export_path, e); dw_printf ("Error writing \"%s\" to %s, errno=%d\n", stemp, gpio_export_path, e);
dw_printf ("%s\n", strerror(e)); dw_printf ("%s\n", strerror(e));
if (e == 22) {
// It appears that error 22 occurs when sysfs gpio is not available.
// (See https://github.com/wb2osz/direwolf/issues/503)
//
// The solution might be to use the new gpiod approach.
dw_printf ("It looks like gpio with sysfs is not supported on this operating system.\n");
dw_printf ("Rather than the following form, in the configuration file,\n);
dw_printf (" PTT GPIO %s\n", stemp);
dw_printf ("try using gpiod form instead. e.g.\n");
dw_printf (" PTT GPIOD gpiochip0 %s\n", stemp);
dw_printf ("You can get a list of gpio chip names and corresponding I/O lines with \"gpioinfo\" command.\n");
}
exit (1); exit (1);
} }
} }
@ -914,7 +928,7 @@ void ptt_init (struct audio_s *audio_config_p)
#if defined(USE_GPIOD) #if defined(USE_GPIOD)
// GPIOD // GPIOD
for (ch = 0; ch < MAX_CHANS; ch++) { for (ch = 0; ch < MAX_CHANS; ch++) {
if (save_audio_config_p->achan[ch].medium == MEDIUM_RADIO) { if (save_audio_config_p->chan_medium[ch] == MEDIUM_RADIO) {
for (int ot = 0; ot < NUM_OCTYPES; ot++) { for (int ot = 0; ot < NUM_OCTYPES; ot++) {
if (audio_config_p->achan[ch].octrl[ot].ptt_method == PTT_METHOD_GPIOD) { if (audio_config_p->achan[ch].octrl[ot].ptt_method == PTT_METHOD_GPIOD) {
const char *chip_name = audio_config_p->achan[ch].octrl[ot].out_gpio_name; const char *chip_name = audio_config_p->achan[ch].octrl[ot].out_gpio_name;