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

Really fix CM108 ptt_bitnum usage 

https://github.com/Hamlib/Hamlib/issues/1203
pull/1215/head
Mike Black W9MDB 2023-01-09 22:53:01 -06:00
rodzic aa1cf567f6
commit 5ebde1ca34
2 zmienionych plików z 10 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
NEWS
Wyświetl plik

@ -24,6 +24,9 @@ Version 4.6
* Add FLIR PTU-D48, E46, D100, D300 rotors * Add FLIR PTU-D48, E46, D100, D300 rotors
* Fix FTDX3000 rig split * Fix FTDX3000 rig split
Version 4.5.5
* Really fix CM108 ptt_bitnum usage
Version 4.5.4 Version 4.5.4
* 2023-XX-XX * 2023-XX-XX
* Fix CM108 ptt setting for non-default usage * Fix CM108 ptt setting for non-default usage

5
src/rig.c
Wyświetl plik

@ -1114,8 +1114,12 @@ int HAMLIB_API rig_open(RIG *rig)
rs->pttport.fd = cm108_open(&rs->pttport); rs->pttport.fd = cm108_open(&rs->pttport);
strncpy(rs->rigport.pathname, DEFAULT_CM108_PORT, HAMLIB_FILPATHLEN); strncpy(rs->rigport.pathname, DEFAULT_CM108_PORT, HAMLIB_FILPATHLEN);
if (rs->rigport.parm.cm108.ptt_bitnum == 0)
{
rs->rigport.parm.cm108.ptt_bitnum = DEFAULT_CM108_PTT_BITNUM; rs->rigport.parm.cm108.ptt_bitnum = DEFAULT_CM108_PTT_BITNUM;
rs->pttport.parm.cm108.ptt_bitnum = DEFAULT_CM108_PTT_BITNUM; rs->pttport.parm.cm108.ptt_bitnum = DEFAULT_CM108_PTT_BITNUM;
}
if (rs->pttport.fd < 0) if (rs->pttport.fd < 0)
{ {
@ -6019,6 +6023,7 @@ int HAMLIB_API rig_set_powerstat(RIG *rig, powerstat_t status)
HAMLIB_TRACE; HAMLIB_TRACE;
retcode = rig->caps->set_powerstat(rig, status); retcode = rig->caps->set_powerstat(rig, status);
rig_flush(&rig->state.rigport); // if anything is queued up flush it rig_flush(&rig->state.rigport); // if anything is queued up flush it
rig->state.auto_power_on = 1; // ensure we auto power on in the future
RETURNFUNC(retcode); RETURNFUNC(retcode);
} }