kopia lustrzana https://github.com/Hamlib/Hamlib
Add get_mode to funcube, funcubepro, and rs_hfiq
https://github.com/Hamlib/Hamlib/issues/829pull/846/head
rodzic
6553373ad1
commit
9186702776
|
@ -107,7 +107,7 @@ const struct rig_caps funcube_caps =
|
||||||
RIG_MODEL(RIG_MODEL_FUNCUBEDONGLE),
|
RIG_MODEL(RIG_MODEL_FUNCUBEDONGLE),
|
||||||
.model_name = "FUNcube Dongle",
|
.model_name = "FUNcube Dongle",
|
||||||
.mfg_name = "AMSAT-UK",
|
.mfg_name = "AMSAT-UK",
|
||||||
.version = BACKEND_VER ".0",
|
.version = BACKEND_VER ".1",
|
||||||
.copyright = "LGPL",
|
.copyright = "LGPL",
|
||||||
.status = RIG_STATUS_STABLE,
|
.status = RIG_STATUS_STABLE,
|
||||||
.rig_type = RIG_TYPE_TUNER,
|
.rig_type = RIG_TYPE_TUNER,
|
||||||
|
@ -162,6 +162,7 @@ const struct rig_caps funcube_caps =
|
||||||
.get_level = funcube_get_level,
|
.get_level = funcube_get_level,
|
||||||
.set_level = funcube_set_level,
|
.set_level = funcube_set_level,
|
||||||
.get_info = funcube_get_info,
|
.get_info = funcube_get_info,
|
||||||
|
.get_mode = funcube_get_mode,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -170,7 +171,7 @@ const struct rig_caps funcubeplus_caps =
|
||||||
RIG_MODEL(RIG_MODEL_FUNCUBEDONGLEPLUS),
|
RIG_MODEL(RIG_MODEL_FUNCUBEDONGLEPLUS),
|
||||||
.model_name = "FUNcube Dongle Pro+",
|
.model_name = "FUNcube Dongle Pro+",
|
||||||
.mfg_name = "AMSAT-UK",
|
.mfg_name = "AMSAT-UK",
|
||||||
.version = BACKEND_VER ".0",
|
.version = BACKEND_VER ".1",
|
||||||
.copyright = "LGPL",
|
.copyright = "LGPL",
|
||||||
.status = RIG_STATUS_STABLE,
|
.status = RIG_STATUS_STABLE,
|
||||||
.rig_type = RIG_TYPE_TUNER,
|
.rig_type = RIG_TYPE_TUNER,
|
||||||
|
@ -226,6 +227,7 @@ const struct rig_caps funcubeplus_caps =
|
||||||
.get_level = funcubepro_get_level,
|
.get_level = funcubepro_get_level,
|
||||||
.set_level = funcubepro_set_level,
|
.set_level = funcubepro_set_level,
|
||||||
.get_info = funcube_get_info,
|
.get_info = funcube_get_info,
|
||||||
|
.get_mode = funcube_get_mode,
|
||||||
};
|
};
|
||||||
|
|
||||||
int funcube_init(RIG *rig)
|
int funcube_init(RIG *rig)
|
||||||
|
@ -940,4 +942,18 @@ int funcubepro_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
||||||
return RIG_OK;
|
return RIG_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int funcube_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
|
||||||
|
{
|
||||||
|
if (rig->state.rig_model == RIG_MODEL_FUNCUBEDONGLE)
|
||||||
|
{
|
||||||
|
*mode = RIG_MODE_USB;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
*mode = RIG_MODE_IQ;
|
||||||
|
}
|
||||||
|
*width = 192000;
|
||||||
|
return RIG_OK;
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* defined(HAVE_LIBUSB) && defined(HAVE_LIBUSB_H) */
|
#endif /* defined(HAVE_LIBUSB) && defined(HAVE_LIBUSB_H) */
|
||||||
|
|
|
@ -341,12 +341,19 @@ static int rshfiq_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int rshfiq_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
|
||||||
|
{
|
||||||
|
*mode = RIG_MODE_IQ;
|
||||||
|
return RIG_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
const struct rig_caps rshfiq_caps =
|
const struct rig_caps rshfiq_caps =
|
||||||
{
|
{
|
||||||
RIG_MODEL(RIG_MODEL_RSHFIQ),
|
RIG_MODEL(RIG_MODEL_RSHFIQ),
|
||||||
.model_name = "RS-HFIQ",
|
.model_name = "RS-HFIQ",
|
||||||
.mfg_name = "HobbyPCB",
|
.mfg_name = "HobbyPCB",
|
||||||
.version = "20210805.0",
|
.version = "20211020.0",
|
||||||
.copyright = "LGPL",
|
.copyright = "LGPL",
|
||||||
.status = RIG_STATUS_STABLE,
|
.status = RIG_STATUS_STABLE,
|
||||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||||
|
@ -388,6 +395,6 @@ const struct rig_caps rshfiq_caps =
|
||||||
.set_freq = rshfiq_set_freq,
|
.set_freq = rshfiq_set_freq,
|
||||||
.set_ptt = rshfiq_set_ptt,
|
.set_ptt = rshfiq_set_ptt,
|
||||||
.get_level = rshfiq_get_level,
|
.get_level = rshfiq_get_level,
|
||||||
|
.get_mode = rshfiq_get_mode,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue