Only allow x25cmdfails when not set

https://github.com/Hamlib/Hamlib/issues/1277
Hamlib-4.5.6
Mike Black W9MDB 2023-04-21 16:12:53 -05:00
rodzic 6eecd3d016
commit a0cd186b68
2 zmienionych plików z 4 dodań i 3 usunięć

Wyświetl plik

@ -686,7 +686,7 @@ int icom_init(RIG *rig)
priv->rx_vfo = RIG_VFO_NONE;
rig->state.current_vfo = RIG_VFO_NONE;
priv->filter = RIG_PASSBAND_NOCHANGE;
priv->x25cmdfails = 0;
priv->x25cmdfails = -1;
priv->x1cx03cmdfails = 0;
// we can add rigs here that will never use the 0x25 cmd
@ -1656,7 +1656,8 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
if (retval != RIG_OK)
{
priv->x25cmdfails = 1;
// only reset if not known -- means cannot change dynamically without restart
if (priv->x25cmdfails < 0) priv->x25cmdfails = 1;
rig_debug(RIG_DEBUG_WARN,
"%s: rig probe shows 0x25 CI-V cmd not available\n", __func__);
}

Wyświetl plik

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