From 81c21ee3141b28185d1a604118c8806be37511cf Mon Sep 17 00:00:00 2001 From: mdblack98 Date: Thu, 30 Apr 2020 16:52:11 -0500 Subject: [PATCH] Reduce debug info in rigctl_parse.c and rigctld.c --- tests/rigctl_parse.c | 33 ++++++++++++++++++++++++++++++++- tests/rigctld.c | 2 +- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c index f0f7de23b..bf3d69507 100644 --- a/tests/rigctl_parse.c +++ b/tests/rigctl_parse.c @@ -224,6 +224,8 @@ declare_proto_rig(recv_dtmf); declare_proto_rig(chk_vfo); declare_proto_rig(set_twiddle); declare_proto_rig(get_twiddle); +declare_proto_rig(set_cache); +declare_proto_rig(get_cache); declare_proto_rig(halt); declare_proto_rig(pause); @@ -303,6 +305,8 @@ static struct test_table test_list[] = { 0x8b, "get_dcd", ACTION(get_dcd), ARG_OUT, "DCD" }, { 0x8d, "set_twiddle", ACTION(set_twiddle), ARG_IN | ARG_NOVFO, "Timeout (secs)" }, { 0x8e, "get_twiddle", ACTION(get_twiddle), ARG_OUT | ARG_NOVFO, "Timeout (secs)" }, + { 0x95, "set_cache", ACTION(set_cache), ARG_IN | ARG_NOVFO, "Timeout (msecs)" }, + { 0x96, "get_cache", ACTION(get_cache), ARG_OUT | ARG_NOVFO, "Timeout (msecs)" }, { '2', "power2mW", ACTION(power2mW), ARG_IN1 | ARG_IN2 | ARG_IN3 | ARG_OUT1 | ARG_NOVFO, "Power [0.0..1.0]", "Frequency", "Mode", "Power mW" }, { '4', "mW2power", ACTION(mW2power), ARG_IN1 | ARG_IN2 | ARG_IN3 | ARG_OUT1 | ARG_NOVFO, "Power mW", "Frequency", "Mode", "Power [0.0..1.0]" }, { '1', "dump_caps", ACTION(dump_caps), ARG_NOVFO }, @@ -1608,7 +1612,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, *resp_sep_ptr); } - rig_debug(RIG_DEBUG_ERR, "%s: vfo_mode=%d\n", __func__, vfo_mode); + rig_debug(RIG_DEBUG_TRACE, "%s: vfo_mode=%d\n", __func__, vfo_mode); retcode = (*cmd_entry->rig_routine)(my_rig, fout, fin, @@ -4504,3 +4508,30 @@ declare_proto_rig(get_twiddle) return status; } + +/* '0x95' */ +declare_proto_rig(set_cache) +{ + int ms; + + CHKSCN1ARG(sscanf(arg1, "%d", &ms)); + return rig_set_cache_timeout_ms(rig, CACHE_ALL, ms); +} + + +/* '0x96' */ +declare_proto_rig(get_cache) +{ + int ms; + + ms = rig_get_cache_timeout_ms(rig, CACHE_ALL); + + if ((interactive && prompt) || (interactive && !prompt && ext_resp)) + { + fprintf(fout, "%s: ", cmd->arg1); + } + + fprintf(fout, "%d\n", ms); + + return RIG_OK; +} diff --git a/tests/rigctld.c b/tests/rigctld.c index 6e40f62c2..294b5ac29 100644 --- a/tests/rigctld.c +++ b/tests/rigctld.c @@ -1023,7 +1023,7 @@ void *handle_socket(void *arg) do { - rig_debug(RIG_DEBUG_ERR, "%s: vfo_mode=%d\n", __func__, + rig_debug(RIG_DEBUG_TRACE, "%s: vfo_mode=%d\n", __func__, handle_data_arg->vfo_mode); retcode = rigctl_parse(handle_data_arg->rig, fsockin, fsockout, NULL, 0, sync_callback,