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

Finish balancing

pull/1570/head
George Baltz N3GB 2024-06-25 03:25:56 -04:00
rodzic c502556fdb
commit 8cdef7f4b1
3 zmienionych plików z 17 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
rigs/yaesu/ft1000mp.c
Wyświetl plik

@ -1792,6 +1792,7 @@ static int ft1000mp_set_split_mode(RIG *rig, vfo_t vfo, rmode_t tx_mode,
pbwidth_t tx_width)
{
int retval;
ENTERFUNC;
retval = rig_set_mode(rig, RIG_VFO_B, tx_mode, tx_width);
RETURNFUNC(retval);
}
@ -1800,6 +1801,7 @@ static int ft1000mp_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode,
pbwidth_t *tx_width)
{
int retval;
ENTERFUNC;
retval = rig_get_mode(rig, RIG_VFO_B, tx_mode, tx_width);
RETURNFUNC(retval);
}
@ -1808,6 +1810,7 @@ static int ft1000mp_set_split_freq_mode(RIG *rig, vfo_t vfo, freq_t freq,
rmode_t mode, pbwidth_t width)
{
int retval;
ENTERFUNC;
retval = rig_set_mode(rig, RIG_VFO_B, mode, width);
if (retval != RIG_OK)
@ -1832,6 +1835,7 @@ static int ft1000mp_get_split_freq_mode(RIG *rig, vfo_t vfo, freq_t *freq,
rmode_t *mode, pbwidth_t *width)
{
int retval;
ENTERFUNC;
retval = rig_get_mode(rig, RIG_VFO_B, mode, width);
if (retval != RIG_OK)

21
rigs/yaesu/newcat.c
Wyświetl plik

@ -1628,7 +1628,7 @@ int newcat_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
{
rig_debug(RIG_DEBUG_WARN, "%s: Cannot get from rig when power is off\n",
__func__);
return RIG_OK; // to prevent repeats
RETURNFUNC(RIG_OK); // to prevent repeats
}
err = newcat_set_vfo_from_alias(rig, &vfo);
@ -2749,6 +2749,7 @@ int newcat_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode,
int newcat_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
{
int err;
ENTERFUNC;
vfo_t rx_vfo = RIG_VFO_NONE;
rig_debug(RIG_DEBUG_TRACE, "%s: entered, rxvfo=%s, txvfo=%s, split=%d\n",
@ -2767,7 +2768,7 @@ int newcat_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
rig_debug(RIG_DEBUG_VERBOSE,
"%s: force set_split off since we're on 60M exception\n", __func__);
split = RIG_SPLIT_OFF;
//return RIG_OK; // fake the return code to make things happy
//RETURNFUNC(RIG_OK); // fake the return code to make things happy
}
if (is_ft991)
@ -4310,7 +4311,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: rig cannot set MG in CW/RTTY modes\n",
__func__);
return RIG_OK;
RETURNFUNC(RIG_OK);
}
@ -11081,7 +11082,7 @@ int newcat_get_vfo_mode(RIG *rig, vfo_t vfo, vfo_t *vfo_mode)
{
rig_debug(RIG_DEBUG_WARN, "%s: Cannot get from rig when power is off\n",
__func__);
return RIG_OK; // to prevent repeats
RETURNFUNC(RIG_OK); // to prevent repeats
}
/* vfo, mem, P7 ************************** */
@ -11179,7 +11180,7 @@ int newcat_get_cmd(RIG *rig)
{
rig_debug(RIG_DEBUG_WARN, "%s: Cannot get from rig when power is off\n",
__func__);
return RIG_OK; // to prevent repeats
RETURNFUNC(RIG_OK); // to prevent repeats
}
// try to cache rapid repeats of the IF command
@ -11599,7 +11600,7 @@ repeat:
if (strncmp(priv->cmd_str, "FA", 2) == 0
|| strncmp(priv->cmd_str, "FB", 2) == 0)
{
return RIG_OK;
RETURNFUNC(RIG_OK);
}
if (strncmp(priv->cmd_str, "PC", 2) == 0 && priv->ret_data[0] == '?')
@ -11961,7 +11962,7 @@ int newcat_send_voice_mem(RIG *rig, vfo_t vfo, int ch)
if (!newcat_valid_command(rig, "PB"))
{
RETURNFUNC(-RIG_ENAVAIL);
RETURNFUNC2(-RIG_ENAVAIL);
}
// we don't do any channel checking -- varies by rig -- could do it but not critical
@ -12185,7 +12186,7 @@ static int newcat_get_apf_frequency(RIG *rig, vfo_t vfo, int *freq)
if (!newcat_valid_command(rig, "CO"))
{
RETURNFUNC(-RIG_ENAVAIL);
RETURNFUNC2(-RIG_ENAVAIL);
}
if (is_ftdx101d || is_ftdx101mp)
@ -12203,12 +12204,12 @@ static int newcat_get_apf_frequency(RIG *rig, vfo_t vfo, int *freq)
}
else
{
RETURNFUNC(-RIG_ENIMPL);
RETURNFUNC2(-RIG_ENIMPL);
}
if ((err = newcat_get_cmd(rig)) != RIG_OK)
{
RETURNFUNC(err);
RETURNFUNC2(err);
}
ret_data_len = strlen(priv->ret_data);

4
src/network.c
Wyświetl plik

@ -1601,7 +1601,7 @@ int network_multicast_publisher_start(RIG *rig, const char *multicast_addr,
{
rig_debug(RIG_DEBUG_WARN, "%s: No network found...multicast disabled\n",
__func__);
return RIG_OK;
RETURNFUNC(RIG_OK);
}
#endif
@ -1610,7 +1610,7 @@ int network_multicast_publisher_start(RIG *rig, const char *multicast_addr,
{
rig_debug(RIG_DEBUG_TRACE, "%s(%d): not starting multicast publisher\n",
__FILE__, __LINE__);
return RIG_OK;
RETURNFUNC(RIG_OK);
}
status = network_init();