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

Stop mapping MICDATA ptt to PTT -- there should be no reason to do this and it was interfering with rigctld and MICDATA rigs TS480/590/890/990 

https://github.com/Hamlib/Hamlib/issues/998
pull/1031/head^2
Mike Black W9MDB 2022-05-15 11:53:38 -05:00
rodzic ecd78e7354
commit 4d8e64acfe
2 zmienionych plików z 10 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
src/rig.c
Wyświetl plik

@ -2751,10 +2751,12 @@ int HAMLIB_API rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
switch (rig->state.pttport.type.ptt)
{
case RIG_PTT_RIG:
#if 0 // https://github.com/Hamlib/Hamlib/issues/998 -- this is interfering with rigctld and MICDATA rigs
if (ptt == RIG_PTT_ON_MIC || ptt == RIG_PTT_ON_DATA)
{
ptt = RIG_PTT_ON;
}
#endif
/* fall through */
case RIG_PTT_RIG_MICDATA:

9
tests/rigctl_parse.c
Wyświetl plik

@ -2448,6 +2448,7 @@ declare_proto_rig(set_ptt)
CHKSCN1ARG(sscanf(arg1, "%d", &scr));
ptt = scr;
rig_debug(RIG_DEBUG_VERBOSE, "%s: set_ptt ptt=%d\n", __func__, ptt);
/*
* We allow RIG_PTT_ON_MIC and RIG_PTT_ON_DATA arriving from netrigctl.
@ -2462,11 +2463,16 @@ declare_proto_rig(set_ptt)
case RIG_PTT_ON_MIC:
case RIG_PTT_ON_DATA:
// No longer map this -- is confusing rigctld and MICDATA rigs
// https://github.com/Hamlib/Hamlib/issues/998
#if 0
// map to a legal value
if (rig->state.pttport.type.ptt != RIG_PTT_RIG_MICDATA)
if (rig->caps->ptt_type != RIG_PTT_RIG_MICDATA)
{
rig_debug(RIG_DEBUG_ERR, "%s: pttport.type.ptt=%d\n", __func__, rig->state.pttport.type.ptt);
ptt = RIG_PTT_ON;
}
#endif
break;
@ -2482,6 +2488,7 @@ declare_proto_rig(set_ptt)
RETURNFUNC(-RIG_EINVAL);
}
rig_debug(RIG_DEBUG_ERR, "%s: ptt=%d\n", __func__, ptt);
RETURNFUNC(rig_set_ptt(rig, vfo, ptt));
}