mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix newcat_get_mode for C4FM and PKTFMN 

https://github.com/Hamlib/Hamlib/issues/1027
pull/1031/head
Mike Black W9MDB 2022-05-13 15:19:04 -05:00
rodzic 49cbc18e19
commit c63a71601a
2 zmienionych plików z 9 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
rigs/yaesu/newcat.c
Wyświetl plik

@ -1331,7 +1331,6 @@ int newcat_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
RETURNFUNC(err); RETURNFUNC(err);
} }
int newcat_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) int newcat_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{ {
struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv; struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv;
@ -10754,9 +10753,13 @@ rmode_t newcat_rmode_width(RIG *rig, vfo_t vfo, char mode, pbwidth_t *width)
{ {
if (newcat_mode_conv[i].chk_width == TRUE) if (newcat_mode_conv[i].chk_width == TRUE)
{ {
if (newcat_is_rig(rig, RIG_MODEL_FT991) // crude fix because 991 hangs on NA0; command while in C4FM
&& mode == 'E') // crude fix because 991 hangs on NA0; command while in C4FM if (newcat_is_rig(rig, RIG_MODEL_FT991))
{ {
if (mode == 'E')
*width = 16000;
else if (mode == 'F')
*width = 9000;
rig_debug(RIG_DEBUG_TRACE, "991A & C4FM Skip newcat_get_narrow in %s\n", rig_debug(RIG_DEBUG_TRACE, "991A & C4FM Skip newcat_get_narrow in %s\n",
__func__); __func__);
} }
@ -10777,8 +10780,8 @@ rmode_t newcat_rmode_width(RIG *rig, vfo_t vfo, char mode, pbwidth_t *width)
} }
} }
} }
// don't use RETURNFUNC here as that macros expects an int for the return code
RETURNFUNC(newcat_mode_conv[i].mode); return(newcat_mode_conv[i].mode);
} }
} }

2
rigs/yaesu/newcat.h
Wyświetl plik

@ -50,7 +50,7 @@
typedef char ncboolean; typedef char ncboolean;
/* shared function version */ /* shared function version */
#define NEWCAT_VER "20220511" #define NEWCAT_VER "20220513"
/* Hopefully large enough for future use, 128 chars plus '\0' */ /* Hopefully large enough for future use, 128 chars plus '\0' */
#define NEWCAT_DATA_LEN 129 #define NEWCAT_DATA_LEN 129