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

Update astyle for 4.5 release

pull/1119/head
Mike Black W9MDB 2022-09-20 08:46:28 -05:00
rodzic 9ffd0a4ba5
commit 67b933ddb5
8 zmienionych plików z 73 dodań i 49 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -8851,11 +8851,14 @@ int icom_process_async_frame(RIG *rig, size_t frame_length,
// TODO: rig_set_cache_timeout_ms(rig, HAMLIB_CACHE_FREQ, HAMLIB_CACHE_ALWAYS);
freq_t freq = (freq_t) from_bcd(frame + 5, (priv->civ_731_mode ? 4 : 5) * 2);
rig_fire_freq_event(rig, RIG_VFO_CURR, freq);
if (rs->use_cached_freq != 1)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): use_cached_freq turning on\n", __func__, __LINE__);
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): use_cached_freq turning on\n", __func__,
__LINE__);
rs->use_cached_freq = 1;
}
break;
}
@ -8864,11 +8867,14 @@ int icom_process_async_frame(RIG *rig, size_t frame_length,
// TODO: rig_set_cache_timeout_ms(rig, HAMLIB_CACHE_MODE, HAMLIB_CACHE_ALWAYS);
icom2rig_mode(rig, frame[5], frame[6], &mode, &width);
rig_fire_mode_event(rig, RIG_VFO_CURR, mode, width);
if (rs->use_cached_mode != 1)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): use_cached_mode turning on\n", __func__, __LINE__);
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): use_cached_mode turning on\n", __func__,
__LINE__);
rs->use_cached_mode = 1;
}
break;
case C_CTL_SCP:

1
rigs/kenwood/kenwood.c
Wyświetl plik

@ -755,6 +755,7 @@ int kenwood_init(RIG *rig)
priv->micgain_min = -1;
priv->micgain_max = -1;
priv->has_ps = 1; // until proven otherwise
if (rig->caps->rig_model == RIG_MODEL_TS450S
|| rig->caps->rig_model == RIG_MODEL_TS50
|| rig->caps->rig_model == RIG_MODEL_TS140S

7
simulators/simftdx5000.c
Wyświetl plik

@ -239,9 +239,10 @@ int main(int argc, char *argv[])
{
int tmp;
sscanf(buf, "FT%d", &tmp);
if (tmp == 2) ft=0;
else if (tmp == 3) ft=1;
else printf("%s expected FT2; or FT3;\n", buf);
if (tmp == 2) { ft = 0; }
else if (tmp == 3) { ft = 1; }
else { printf("%s expected FT2; or FT3;\n", buf); }
}
else if (strcmp(buf, "MD0;") == 0)
{

15
src/cache.c
Wyświetl plik

@ -99,7 +99,8 @@ int rig_set_cache_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
break;
default:
rig_debug(RIG_DEBUG_WARN, "%s(%d): unknown vfo=%s\n", __func__, __LINE__, rig_strvfo(vfo));
rig_debug(RIG_DEBUG_WARN, "%s(%d): unknown vfo=%s\n", __func__, __LINE__,
rig_strvfo(vfo));
RETURNFUNC(-RIG_EINTERNAL);
}
@ -116,7 +117,8 @@ int rig_set_cache_freq(RIG *rig, vfo_t vfo, freq_t freq)
rig_cache_show(rig, __func__, __LINE__);
}
rig_debug(RIG_DEBUG_CACHE, "%s(%d): vfo=%s, current_vfo=%s\n", __func__, __LINE__,
rig_debug(RIG_DEBUG_CACHE, "%s(%d): vfo=%s, current_vfo=%s\n", __func__,
__LINE__,
rig_strvfo(vfo), rig_strvfo(rig->state.current_vfo));
if (vfo == RIG_VFO_CURR)
@ -135,7 +137,8 @@ int rig_set_cache_freq(RIG *rig, vfo_t vfo, freq_t freq)
if (rig_need_debug(RIG_DEBUG_CACHE))
{
rig_debug(RIG_DEBUG_CACHE, "%s(%d): set vfo=%s to freq=%.0f\n", __func__, __LINE__,
rig_debug(RIG_DEBUG_CACHE, "%s(%d): set vfo=%s to freq=%.0f\n", __func__,
__LINE__,
rig_strvfo(vfo), freq);
}
@ -251,7 +254,8 @@ int rig_get_cache(RIG *rig, vfo_t vfo, freq_t *freq, int *cache_ms_freq,
ENTERFUNC2;
}
rig_debug(RIG_DEBUG_CACHE, "%s(%d): vfo=%s, current_vfo=%s\n", __func__, __LINE__,
rig_debug(RIG_DEBUG_CACHE, "%s(%d): vfo=%s, current_vfo=%s\n", __func__,
__LINE__,
rig_strvfo(vfo), rig_strvfo(rig->state.current_vfo));
if (vfo == RIG_VFO_CURR)
@ -295,7 +299,8 @@ int rig_get_cache(RIG *rig, vfo_t vfo, freq_t *freq, int *cache_ms_freq,
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s(%d): unknown vfo=%s\n", __func__, __LINE__, rig_strvfo(vfo));
rig_debug(RIG_DEBUG_ERR, "%s(%d): unknown vfo=%s\n", __func__, __LINE__,
rig_strvfo(vfo));
}
}

18
src/rig.c
Wyświetl plik

@ -891,7 +891,9 @@ int HAMLIB_API rig_open(RIG *rig)
free(cwd);
// Enable async data only if it's enabled through conf settings *and* supported by the backend
rig_debug(RIG_DEBUG_TRACE, "%s: async_data_enable=%d, async_data_supported=%d\n", __func__, rs->async_data_enabled, caps->async_data_supported);
rig_debug(RIG_DEBUG_TRACE,
"%s: async_data_enable=%d, async_data_supported=%d\n", __func__,
rs->async_data_enabled, caps->async_data_supported);
rs->async_data_enabled = rs->async_data_enabled && caps->async_data_supported;
rs->rigport.asyncio = rs->async_data_enabled;
@ -1340,6 +1342,7 @@ int HAMLIB_API rig_open(RIG *rig)
rmode_t mode;
pbwidth_t width;
rig_get_mode(rig, RIG_VFO_A, &mode, &width);
if (split)
{
rig_debug(RIG_DEBUG_VERBOSE, "xxxsplit=%d\n", split);
@ -2021,7 +2024,8 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
|| (rig->state.cache.timeout_ms == HAMLIB_CACHE_ALWAYS
|| rig->state.use_cached_freq)))
{
rig_debug(RIG_DEBUG_TRACE, "%s: %s cache hit age=%dms, freq=%.0f, use_cached_freq=%d\n", __func__,
rig_debug(RIG_DEBUG_TRACE,
"%s: %s cache hit age=%dms, freq=%.0f, use_cached_freq=%d\n", __func__,
rig_strvfo(vfo), cache_ms_freq, *freq, rig->state.use_cached_freq);
ELAPSED2;
return (RIG_OK);
@ -2029,7 +2033,8 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
else
{
rig_debug(RIG_DEBUG_TRACE,
"%s: cache miss age=%dms, cached_vfo=%s, asked_vfo=%s, use_cached_freq=%d\n", __func__,
"%s: cache miss age=%dms, cached_vfo=%s, asked_vfo=%s, use_cached_freq=%d\n",
__func__,
cache_ms_freq,
rig_strvfo(vfo), rig_strvfo(vfo), rig->state.use_cached_freq);
}
@ -2753,7 +2758,8 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
if (vfo != rig->state.current_vfo && rig_get_vfo(rig, &tmp_vfo) == -RIG_ENAVAIL)
{
rig_debug(RIG_DEBUG_TRACE, "%s: Expiring all cache due to VFO change and no get_vfo\n", __func__);
rig_debug(RIG_DEBUG_TRACE,
"%s: Expiring all cache due to VFO change and no get_vfo\n", __func__);
// expire all cached items when we switch VFOs and get_vfo does not work
rig_set_cache_freq(rig, RIG_VFO_ALL, 0);
}
@ -7196,7 +7202,9 @@ static int async_data_handler_start(RIG *rig)
if (!rs->async_data_enabled)
{
rig_debug(RIG_DEBUG_TRACE, "%s: async data support disabled since asynd_data_enabled=%d\n", __func__, rs->async_data_enabled);
rig_debug(RIG_DEBUG_TRACE,
"%s: async data support disabled since asynd_data_enabled=%d\n", __func__,
rs->async_data_enabled);
RETURNFUNC(RIG_OK);
}

6
tests/rigctl_parse.c
Wyświetl plik

@ -1738,7 +1738,8 @@ readline_repeat:
}
// Allow only certain commands when the rig is powered off
if (retcode == RIG_OK && (rig_powerstat == RIG_POWER_OFF || rig_powerstat == RIG_POWER_STANDBY)
if (retcode == RIG_OK && (rig_powerstat == RIG_POWER_OFF
|| rig_powerstat == RIG_POWER_STANDBY)
&& cmd_entry->cmd != '1' // dump_caps
&& cmd_entry->cmd != '3' // dump_conf
&& cmd_entry->cmd != 0x8f // dump_state
@ -1746,7 +1747,8 @@ readline_repeat:
&& cmd_entry->cmd != 0x87) // set_powerstat
{
rig_debug(RIG_DEBUG_WARN,
"%s: command %s not allowed when rig is powered off\n", __func__, cmd_entry->name);
"%s: command %s not allowed when rig is powered off\n", __func__,
cmd_entry->name);
retcode = -RIG_EPOWER;
}
else

3
tests/rigctld.c
Wyświetl plik

@ -262,7 +262,8 @@ int main(int argc, char *argv[])
int twiddle_timeout = 0;
int twiddle_rit = 0;
int uplink = 0;
int rigctld_idle = 0; // if true then rig will close when no clients are connected
int rigctld_idle =
0; // if true then rig will close when no clients are connected
char host[NI_MAXHOST];
char serv[NI_MAXSERV];
char rigstartup[1024];