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

Add SCAN_VFO to icom.c and fix ic707.c to support correct scan modes

pull/1626/head
Mike Black W9MDB 2024-10-07 08:11:31 -05:00
rodzic ba62edc51b
commit baf2897e76
3 zmienionych plików z 7 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
rigs/icom/ic707.c
Wyświetl plik

@ -40,7 +40,7 @@
#define IC707_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY) #define IC707_VFO_OPS (RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_CPY)
#define IC707_SCAN_OPS (RIG_SCAN_VFO|RIG_SCAN_MEM|RIG_SCAN_STOP|RIG_SCAN_SLCT) #define IC707_SCAN_OPS (RIG_SCAN_VFO|RIG_SCAN_MEM|RIG_SCAN_STOP)
#define IC707_ANTS RIG_ANT_1 #define IC707_ANTS RIG_ANT_1
@ -59,7 +59,7 @@ struct rig_caps ic707_caps =
RIG_MODEL(RIG_MODEL_IC707), RIG_MODEL(RIG_MODEL_IC707),
.model_name = "IC-707", .model_name = "IC-707",
.mfg_name = "Icom", .mfg_name = "Icom",
.version = BACKEND_VER ".2", .version = BACKEND_VER ".3",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,

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

@ -8675,9 +8675,10 @@ int icom_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
scan_sc = S_SCAN_STOP; scan_sc = S_SCAN_STOP;
break; break;
case RIG_SCAN_VFO:
case RIG_SCAN_MEM: case RIG_SCAN_MEM:
HAMLIB_TRACE; HAMLIB_TRACE;
retval = rig_set_vfo(rig, RIG_VFO_MEM); retval = rig_set_vfo(rig, scan==RIG_SCAN_MEM?RIG_VFO_MEM:RIG_VFO_A);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -8688,7 +8689,7 @@ int icom_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
* but some old models don't have it. * but some old models don't have it.
* Should be put in icom_priv_caps ? * Should be put in icom_priv_caps ?
*/ */
if (rig->caps->rig_type == RIG_TYPE_RECEIVER) if (rig->caps->rig_type == RIG_TYPE_RECEIVER && scan == RIG_SCAN_MEM)
{ {
scan_sc = S_SCAN_MEM2; scan_sc = S_SCAN_MEM2;
} }
@ -8738,7 +8739,7 @@ int icom_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
break; break;
default: default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported scan %#x", __func__, scan); rig_debug(RIG_DEBUG_ERR, "%s: unsupported scan %#x\n", __func__, scan);
RETURNFUNC(-RIG_EINVAL); RETURNFUNC(-RIG_EINVAL);
} }

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 "20241005" #define BACKEND_VER "20241007"
#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)