From aeaa96bc3b471c8c09e86a1e436e14be92c49019 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Sat, 12 Sep 2020 21:37:10 -0700 Subject: [PATCH] Fix icom_get_parm to eliminate collisions --- rigs/icom/icom.c | 4 ++-- rigs/icom/icom.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index b25576ab0..6fcd4f100 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -2217,7 +2217,7 @@ int icom_set_cmd(RIG *rig, vfo_t vfo, struct cmdparams *par, value_t val) to_bcd_be(&cmdbuf[cmdlen], (int)(val.f * 255.0), (cmdlen * 2)); break; - case CMD_DAT_TIM: + case CMD_DAT_TIM: // returned as seconds since midnight to_bcd_be(&cmdbuf[cmdlen], ((((int)val.f / 3600) * 100) + (((int)val.f / 60) % 60)), (par->datlen * 2)); break; @@ -5628,7 +5628,7 @@ int icom_get_parm(RIG *rig, setting_t parm, value_t *val) for (i = 0; cmd && cmd[i].id.s != 0; i++) { - if (cmd[i].id.s == parm) + if (cmd[i].cmdparamtype == CMD_PARAM_TYPE_PARM && cmd[i].id.s == parm) { return icom_get_cmd(rig, RIG_VFO_NONE, (struct cmdparams *)&cmd[i], val); } diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h index a1e1903c5..9c23d6512 100644 --- a/rigs/icom/icom.h +++ b/rigs/icom/icom.h @@ -31,7 +31,7 @@ #include #endif -#define BACKEND_VER "20200911" +#define BACKEND_VER "20200912" /* * defines used by comp_cal_str in rig.c