rigctld will now return either PTT_NONE or PTT_RIG_MICDATA to rigctl client

https://github.com/Hamlib/Hamlib/issues/259
pull/281/head
Michael Black W9MDB 2020-05-31 22:33:56 -05:00
rodzic 1dc461966d
commit afeb77e6d2
2 zmienionych plików z 7 dodań i 7 usunięć

Wyświetl plik

@ -4080,7 +4080,8 @@ declare_proto_rig(dump_state)
// protocol 1 fields can be multi-line -- just write the thing to allow for it
// backward compatible as new values will just generate warnings
fprintf(fout, "vfo_ops=0x%x\n", rig->caps->vfo_ops);
fprintf(fout, "ptt_type=0x%x\n", rig->caps->ptt_type);
fprintf(fout, "ptt_type=0x%x\n",
rig->caps->ptt_type == RIG_PTT_NONE ? RIG_PTT_NONE : RIG_PTT_RIG_MICDATA);
fprintf(fout, "done\n");
#if 0 // why isn't this implemented? Does anybody care?

Wyświetl plik

@ -571,6 +571,11 @@ int main(int argc, char *argv[])
/*
* ex: RIG_PTT_PARALLEL and /dev/parport0
*/
if (ptt_type != RIG_PTT_NONE)
{
my_rig->state.pttport.type.ptt = ptt_type;
}
if (dcd_type != RIG_DCD_NONE)
{
my_rig->state.dcdport.type.dcd = dcd_type;
@ -625,12 +630,6 @@ int main(int argc, char *argv[])
exit(2);
}
if (ptt_type != RIG_PTT_NONE)
{
my_rig->state.pttport.type.ptt = ptt_type;
my_rig->caps->ptt_type = ptt_type;
}
if (verbose > RIG_DEBUG_ERR)
{
printf("Opened rig model %u, '%s'\n",