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

Merge branch 'master' of https://github.com/mdblack98/Hamlib

pull/224/head
Michael Black 2020-04-17 23:12:24 -05:00
rodzic 16f1ae8037 8bd1d0c467
commit 8ebecaca51
1 zmienionych plików z 21 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

25
tests/rigctl_parse.c
Wyświetl plik

@ -136,7 +136,7 @@ struct test_table
};
#define CHKSCN1ARG(a) if ((a) != 1) return -RIG_EINVAL; else do {} while(0)
#define CHKSCN1ARG(a) if ((a) != 1) { rig_debug(RIG_DEBUG_ERR,"%s: chkarg err\n", __func__);return -RIG_EINVAL;} else do {} while(0)
#define ACTION(f) rigctl_##f
#define declare_proto_rig(f) static int (ACTION(f))(RIG *rig, \
@ -627,7 +627,9 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
{
if (scanfc(fin, "%c", &cmd) < 1)
{
return -1;
rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#1?\n", __func__);
cmd = 0x0a; // setting 0x0a as though CR/LF was sent
hl_usleep(200*1e6);
}
/* Extended response protocol requested with leading '+' on command
@ -639,6 +641,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
if (scanfc(fin, "%c", &cmd) < 1)
{
rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#2?\n", __func__);
return -1;
}
}
@ -659,6 +662,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
if (scanfc(fin, "%c", &cmd) < 1)
{
rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#3?\n", __func__);
return -1;
}
}
@ -681,6 +685,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
if (scanfc(fin, "%c", pcmd) < 1)
{
rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#4?\n", __func__);
return -1;
}
@ -688,6 +693,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
{
if (scanfc(fin, "%c", ++pcmd) < 1)
{
rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#5?\n", __func__);
return -1;
}
}
@ -724,6 +730,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
{
if (scanfc(fin, "%c", &cmd) < 1)
{
rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#6?\n", __func__);
return -1;
}
}
@ -785,6 +792,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
if (scanfc(fin, "%s", arg1) < 1)
{
rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#7?\n", __func__);
return -1;
}
@ -886,6 +894,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
if (scanfc(fin, "%s", arg1) < 1)
{
rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#8?\n", __func__);
return -1;
}
@ -940,6 +949,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
if (scanfc(fin, "%s", arg2) < 1)
{
rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#9?\n", __func__);
return -1;
}
@ -986,6 +996,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
if (scanfc(fin, "%s", arg3) < 1)
{
rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#10?\n", __func__);
return -1;
}
@ -1600,9 +1611,13 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
p2 ? p2 : "",
p3 ? p3 : "");
if (sync_cb) { sync_cb(0); } /* unlock if necessary */
if (retcode == RIG_EIO) { return retcode; }
if (retcode == RIG_EIO)
{
if (sync_cb) { sync_cb(0); } /* unlock if necessary */
return retcode;
}
if (retcode != RIG_OK)
{
@ -1645,6 +1660,8 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
fflush(fout);
if (sync_cb) { sync_cb(0); } /* unlock if necessary */
if (retcode == -RIG_ENAVAIL)
{
return retcode;