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

Change Icom 0x26 behavior to leave filter# alone 

Rigs should remember filter based on last filter used for the mode
pull/1441/head
Mike Black W9MDB 2023-11-30 10:31:56 -06:00
rodzic 8940d91522
commit cc49669b49
2 zmienionych plików z 4 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
rigs/icom/icom.c
Wyświetl plik

@ -950,6 +950,7 @@ static vfo_t icom_current_vfo(RIG *rig)
} }
rig_debug(RIG_DEBUG_TRACE, "%s: currVFO=%s\n", __func__, rig_strvfo(currVFO)); rig_debug(RIG_DEBUG_TRACE, "%s: currVFO=%s\n", __func__, rig_strvfo(currVFO));
if (rig->state.current_vfo != RIG_VFO_NONE) currVFO = rig->state.current_vfo;
return currVFO; return currVFO;
} }
@ -2211,9 +2212,9 @@ static int icom_set_mode_x26(RIG *rig, vfo_t vfo, rmode_t mode, int datamode,
buf[1] = datamode; buf[1] = datamode;
// filter fixed to filter 1 due to IC7300 bug defaulting to filter 2 on mode changed -- yuck!! // filter fixed to filter 1 due to IC7300 bug defaulting to filter 2 on mode changed -- yuck!!
// buf[2] = filter // if Icom ever fixed this // buf[2] = filter // if Icom ever fixed this
buf[2] = 1; // buf[2] = 1; // let's skip the filter selection
retval = icom_transaction(rig, cmd2, subcmd2, buf, 3, ackbuf, &ack_len); retval = icom_transaction(rig, cmd2, subcmd2, buf, 2, ackbuf, &ack_len);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {

2
rigs/icom/icom.h
Wyświetl plik

@ -35,7 +35,7 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#define BACKEND_VER "20231116" #define BACKEND_VER "20231130"
#define ICOM_IS_ID31 rig_is_model(rig, RIG_MODEL_ID31) #define ICOM_IS_ID31 rig_is_model(rig, RIG_MODEL_ID31)
#define ICOM_IS_ID51 rig_is_model(rig, RIG_MODEL_ID51) #define ICOM_IS_ID51 rig_is_model(rig, RIG_MODEL_ID51)