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

astyle files

pull/290/head
Michael Black W9MDB 2020-06-09 22:37:03 -05:00
rodzic 750857cdbc
commit f71c12da94
11 zmienionych plików z 33 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
dummy/netrigctl.c
Wyświetl plik

@ -535,11 +535,13 @@ static int netrigctl_open(RIG *rig)
if (strcmp(setting, "vfo_ops") == 0)
{
rig->caps->vfo_ops = strtol(value, NULL, 0);
rig_debug(RIG_DEBUG_TRACE, "%s: %s set to %d\n", __func__, setting, rig->caps->vfo_ops);
rig_debug(RIG_DEBUG_TRACE, "%s: %s set to %d\n", __func__, setting,
rig->caps->vfo_ops);
}
else if (strcmp(setting, "ptt_type") == 0)
{
ptt_type_t temp = (ptt_type_t)strtol(value, NULL, 0);
if (RIG_PTT_RIG_MICDATA == rig->state.pttport.type.ptt && RIG_PTT_NONE == temp)
{
/*
@ -548,7 +550,8 @@ static int netrigctl_open(RIG *rig)
* locally overridden it
*/
rig->state.pttport.type.ptt = temp;
rig_debug(RIG_DEBUG_TRACE, "%s: %s set to %d\n", __func__, setting, rig->state.pttport.type.ptt);
rig_debug(RIG_DEBUG_TRACE, "%s: %s set to %d\n", __func__, setting,
rig->state.pttport.type.ptt);
}
}
else

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

@ -4522,9 +4522,11 @@ int icom_set_split_freq_mode(RIG *rig, vfo_t vfo, freq_t tx_freq,
rig_strvfo(priv->rx_vfo), rig_strvfo(priv->tx_vfo));
// if not asking for RIG_VFO_CURR we'll use the requested VFO in the function call as tx_vfo
if (!priv->split_on && vfo != RIG_VFO_CURR) {
if (!priv->split_on && vfo != RIG_VFO_CURR)
{
tx_vfo = vfo;
rig_debug(RIG_DEBUG_TRACE, "%s: split not on so using requested vfo=%s\n", __func__, rig_strvfo(tx_vfo));
rig_debug(RIG_DEBUG_TRACE, "%s: split not on so using requested vfo=%s\n",
__func__, rig_strvfo(tx_vfo));
}
if (RIG_OK != (retval = icom_set_vfo(rig, tx_vfo)))

4
rigs/kenwood/flex.c
Wyświetl plik

@ -70,7 +70,8 @@ int verify_flexradio_id(RIG *rig, char *id)
if (strcmp("900", idptr) == 0)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (PowerSDR compatible)\n", __func__, id);
rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s (PowerSDR compatible)\n",
__func__, id);
}
else if (strcmp("904", idptr) == 0)
{
@ -134,6 +135,7 @@ int flexradio_open(RIG *rig)
{
case RIG_MODEL_F6K:
break;
case RIG_MODEL_POWERSDR:
break;

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

@ -1375,7 +1375,9 @@ int kenwood_get_vfo_if(RIG *rig, vfo_t *vfo)
{
case '0':
*vfo = priv->tx_vfo = split_and_transmitting ? RIG_VFO_B : RIG_VFO_A;
if (priv->info[32] == '1') priv->tx_vfo = RIG_VFO_B;
if (priv->info[32] == '1') { priv->tx_vfo = RIG_VFO_B; }
break;
case '1':

2
rigs/tentec/rx340.c
Wyświetl plik

@ -580,7 +580,7 @@ int rx340_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
const char *rx340_get_info(RIG *rig)
{
static char buf[BUFSZ]; /* FIXME: reentrancy */
int firmware_len=0, retval;
int firmware_len = 0, retval;
#define REPORT_FIRM "V"EOM
retval = rx340_transaction(rig, REPORT_FIRM, strlen(REPORT_FIRM), buf,

3
rotators/gs232a/gs232b.c
Wyświetl plik

@ -188,12 +188,13 @@ gs232b_rot_set_position(ROT *rot, azimuth_t az, elevation_t el)
#if 0 // do any GS232B models need a reply to the W command?
retval = gs232b_transaction(rot, cmdstr, buf, sizeof(buf), 0);
#else
retval = gs232b_transaction(rot, cmdstr, NULL, 0 , 0);
retval = gs232b_transaction(rot, cmdstr, NULL, 0, 0);
if (retval != RIG_OK)
{
return retval;
}
#endif
return RIG_OK;

1
rotators/meade/meade.c
Wyświetl plik

@ -234,6 +234,7 @@ static int meade_open(ROT *rot)
{
retval = meade_transaction(rot, ":AL#:So00#:Sh90#", NULL, 0, 0);
}
{
// Audiostar elevation is in arcminutes
retval = meade_transaction(rot, ":So00#:Sh5400#", NULL, 0, 0);

4
src/rig.c
Wyświetl plik

@ -1533,6 +1533,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
else
{
int rc2;
if (!caps->set_vfo)
{
return -RIG_ENAVAIL;
@ -1997,7 +1998,8 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
{
rig->state.current_vfo = vfo;
rig->state.cache.vfo = vfo;
rig_debug(RIG_DEBUG_TRACE, "%s: rig->state.current_vfo=%s\n", __func__, rig_strvfo(vfo));
rig_debug(RIG_DEBUG_TRACE, "%s: rig->state.current_vfo=%s\n", __func__,
rig_strvfo(vfo));
}
else
{

9
tests/cachetest.c
Wyświetl plik

@ -117,14 +117,16 @@ int main(int argc, char *argv[])
if (retcode != RIG_OK) { printf("Get vfo failed?? Err=%s\n", rigerror(retcode)); }
printf("%4dms: VFO = %s\n", (int)elapsed_ms(&start, ELAPSED_GET), rig_strvfo(vfo));
printf("%4dms: VFO = %s\n", (int)elapsed_ms(&start, ELAPSED_GET),
rig_strvfo(vfo));
elapsed_ms(&start, ELAPSED_SET);
retcode = rig_get_freq(my_rig, RIG_VFO_CURR, &freq);
if (retcode != RIG_OK) { printf("Get freq failed?? Err=%s\n", rigerror(retcode)); }
printf("%4dms: VFO freq. = %.1f Hz\n", (int)elapsed_ms(&start, ELAPSED_GET), freq);
printf("%4dms: VFO freq. = %.1f Hz\n", (int)elapsed_ms(&start, ELAPSED_GET),
freq);
elapsed_ms(&start, ELAPSED_SET);
retcode = rig_get_mode(my_rig, RIG_VFO_CURR, &mode, &width);
@ -147,7 +149,8 @@ int main(int argc, char *argv[])
if (retcode != RIG_OK) { printf("Get split_vfo failed?? Err=%s\n", rigerror(retcode)); }
printf("%4dms: split=%d, tx_vfo=%s\n", (int)elapsed_ms(&start, ELAPSED_GET), split,
printf("%4dms: split=%d, tx_vfo=%s\n", (int)elapsed_ms(&start, ELAPSED_GET),
split,
rig_strvfo(vfo));
#endif
}

3
tests/rigctlcom.c
Wyświetl plik

@ -704,7 +704,8 @@ static int write_block2(void *func,
*/
static int handle_ts2000(void *arg)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd=%s\n", __func__, (char*)arg);
rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd=%s\n", __func__, (char *)arg);
// Handle all the queries
if (strcmp(arg, "ID;") == 0)
{

3
tests/rotctl_parse.c
Wyświetl plik

@ -2155,7 +2155,8 @@ declare_proto_rot(d_mm2dec)
CHKSCN1ARG(sscanf(arg2, "%lf", &min));
CHKSCN1ARG(sscanf(arg3, "%d", &sw));
dec_deg = dmmm2dec(deg, min, sw, 0.0); // we'll add real seconds when somebody asks for it
dec_deg = dmmm2dec(deg, min, sw,
0.0); // we'll add real seconds when somebody asks for it
if ((interactive && prompt) || (interactive && !prompt && ext_resp))
{