From 2c20b0afdb974ed0c290ea7c04ec2f6f97cd91f6 Mon Sep 17 00:00:00 2001
From: Michael Black W9MDB <mdblack98@yahoo.com>
Date: Fri, 5 Mar 2021 07:32:01 -0600
Subject: [PATCH] After echo check to a get_freq in icom.c Should fix poweron
 for Icom rigs that still echo in standby mode
 https://github.com/Hamlib/Hamlib/issues/583

---
 rigs/icom/icom.c | 8 ++++++++
 rigs/icom/icom.h | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 018466f55..5338d11d6 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -761,6 +761,14 @@ icom_rig_open(RIG *rig)
               rig->caps->version);
     retval = icom_get_usb_echo_off(rig);
 
+    if (retval == RIG_OK) // then echo is on so let's try freq now
+    {
+        // some rigs like the IC7100 still echo when in standby
+        // so asking for freq now should timeout if such a rig
+        freq_t tfreq;
+        retval = rig_get_freq(rig,RIG_VFO_A,&tfreq);
+    }
+
     if (retval != RIG_OK && priv->poweron == 0 && rs->auto_power_on)
     {
         // maybe we need power on?
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index ee41b3c29..1e70be2a2 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210304"
+#define BACKEND_VER "20210305"
 
 /*
  * defines used by comp_cal_str in rig.c