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

astyle files in preparation for 4.2 release

pull/649/head
Michael Black W9MDB 2021-03-26 14:26:56 -05:00
rodzic 2aec11f5fe
commit dd156f74e2
8 zmienionych plików z 15 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
rigs/dummy/netrigctl.c
Wyświetl plik

@ -871,7 +871,8 @@ static int netrigctl_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
char buf[BUF_MAX]; char buf[BUF_MAX];
char vfostr[16] = ""; char vfostr[16] = "";
rig_debug(RIG_DEBUG_VERBOSE, "%s called vfo=%s, ptt=%d\n", __func__, rig_strvfo(vfo), ptt); rig_debug(RIG_DEBUG_VERBOSE, "%s called vfo=%s, ptt=%d\n", __func__,
rig_strvfo(vfo), ptt);
ret = netrigctl_vfostr(rig, vfostr, sizeof(vfostr), RIG_VFO_A); ret = netrigctl_vfostr(rig, vfostr, sizeof(vfostr), RIG_VFO_A);

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

@ -340,7 +340,7 @@ const struct rig_caps ic7300_caps =
.max_rit = Hz(9999), .max_rit = Hz(9999),
.max_xit = Hz(9999), .max_xit = Hz(9999),
.max_ifshift = Hz(0), .max_ifshift = Hz(0),
.targetable_vfo = RIG_TARGETABLE_FREQ|RIG_TARGETABLE_MODE, .targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE,
.vfo_ops = IC7300_VFO_OPS, .vfo_ops = IC7300_VFO_OPS,
.scan_ops = IC7300_SCAN_OPS, .scan_ops = IC7300_SCAN_OPS,
.transceive = RIG_TRN_RIG, .transceive = RIG_TRN_RIG,
@ -512,7 +512,7 @@ const struct rig_caps ic9700_caps =
.max_rit = Hz(9999), .max_rit = Hz(9999),
.max_xit = Hz(9999), .max_xit = Hz(9999),
.max_ifshift = Hz(0), .max_ifshift = Hz(0),
.targetable_vfo = RIG_TARGETABLE_FREQ|RIG_TARGETABLE_MODE, .targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE,
.vfo_ops = IC9700_VFO_OPS, .vfo_ops = IC9700_VFO_OPS,
.scan_ops = IC9700_SCAN_OPS, .scan_ops = IC9700_SCAN_OPS,
.transceive = RIG_TRN_RIG, .transceive = RIG_TRN_RIG,

2
rigs/icom/ic7610.c
Wyświetl plik

@ -208,7 +208,7 @@ const struct rig_caps ic7610_caps =
.max_rit = Hz(9999), .max_rit = Hz(9999),
.max_xit = Hz(9999), .max_xit = Hz(9999),
.max_ifshift = Hz(0), .max_ifshift = Hz(0),
.targetable_vfo = RIG_TARGETABLE_FREQ|RIG_TARGETABLE_MODE, .targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE,
.vfo_ops = IC7610_VFO_OPS, .vfo_ops = IC7610_VFO_OPS,
.scan_ops = IC7610_SCAN_OPS, .scan_ops = IC7610_SCAN_OPS,
.transceive = RIG_TRN_RIG, .transceive = RIG_TRN_RIG,

2
rigs/icom/ic7800.c
Wyświetl plik

@ -196,7 +196,7 @@ const struct rig_caps ic7800_caps =
.max_rit = Hz(9999), .max_rit = Hz(9999),
.max_xit = Hz(9999), .max_xit = Hz(9999),
.max_ifshift = Hz(0), .max_ifshift = Hz(0),
.targetable_vfo = RIG_TARGETABLE_FREQ|RIG_TARGETABLE_MODE, .targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE,
.vfo_ops = IC7800_VFO_OPS, .vfo_ops = IC7800_VFO_OPS,
.scan_ops = IC7800_SCAN_OPS, .scan_ops = IC7800_SCAN_OPS,
.transceive = RIG_TRN_RIG, .transceive = RIG_TRN_RIG,

2
rigs/icom/ic785x.c
Wyświetl plik

@ -202,7 +202,7 @@ const struct rig_caps ic785x_caps =
.max_rit = Hz(9999), .max_rit = Hz(9999),
.max_xit = Hz(9999), .max_xit = Hz(9999),
.max_ifshift = Hz(0), .max_ifshift = Hz(0),
.targetable_vfo = RIG_TARGETABLE_FREQ|RIG_TARGETABLE_MODE, .targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE,
.vfo_ops = IC785x_VFO_OPS, .vfo_ops = IC785x_VFO_OPS,
.scan_ops = IC785x_SCAN_OPS, .scan_ops = IC785x_SCAN_OPS,
.transceive = RIG_TRN_RIG, .transceive = RIG_TRN_RIG,

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

@ -765,7 +765,7 @@ int ft1000mp_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
memcpy(&p->p_cmd, &ncmd[cmd_index].nseq, YAESU_CMD_LENGTH); memcpy(&p->p_cmd, &ncmd[cmd_index].nseq, YAESU_CMD_LENGTH);
// round freq to 10Hz intervals due to rig restriction // round freq to 10Hz intervals due to rig restriction
freq = round(freq/10.0)*10.0; freq = round(freq / 10.0) * 10.0;
to_bcd(p->p_cmd, freq / 10, 8); /* store bcd format in in p_cmd */ to_bcd(p->p_cmd, freq / 10, 8); /* store bcd format in in p_cmd */

6
tests/rigctl_parse.c
Wyświetl plik

@ -2232,8 +2232,10 @@ declare_proto_rig(get_vfo_info)
rig_debug(RIG_DEBUG_ERR, "%s: vfo=%s\n", __func__, rig_strvfo(vfo)); rig_debug(RIG_DEBUG_ERR, "%s: vfo=%s\n", __func__, rig_strvfo(vfo));
} }
const char * modestr = rig_strrmode(mode); const char *modestr = rig_strrmode(mode);
if (strlen(modestr) == 0) modestr = "None";
if (strlen(modestr) == 0) { modestr = "None"; }
if ((interactive && prompt) || (interactive && !prompt && ext_resp)) if ((interactive && prompt) || (interactive && !prompt && ext_resp))
{ {
fprintf(fout, "%s: %.0f\n", cmd->arg1, freq); fprintf(fout, "%s: %.0f\n", cmd->arg1, freq);

5
tests/testrig.c
Wyświetl plik

@ -488,10 +488,11 @@ int main(int argc, char *argv[])
printf("port %s closed ok \n", SERIAL_PORT); printf("port %s closed ok \n", SERIAL_PORT);
for(unsigned long i=1;i<0x80000000;i=i<<1) for (unsigned long i = 1; i < 0x80000000; i = i << 1)
{ {
const char *vfostr = rig_strvfo(i); const char *vfostr = rig_strvfo(i);
if (strlen(vfostr)>0) printf("0x%08lx=%s\n", i, vfostr);
if (strlen(vfostr) > 0) { printf("0x%08lx=%s\n", i, vfostr); }
} }
return 0; return 0;