Increase communications timeout for Icom rigs

Icom  users, who  use  the  K9JM CI-V  router  to  protect their  PW-1
amplifiers from  damage due to  Icom's broken CI-V  protocol handling,
require a 1s delay  after opening the serial port. This  is due to the
router  using  an  Arduino  &  Arduino  USB  adapter  that  employs  a
bootloader which  holds the RS-232  interface for 1s after  reset (DTR
releases reset).   Hamlib already  has a  retry and  timeout mechanism
which was  set to 3 and  200ms respectively for most  Icom rigs.  This
change increses that  timeout to 1s. The increaased  timeout will have
little or no impact on clients as  it only comes into play if there is
a problem.
Hamlib-3.0
Bill Somerville 2014-12-08 12:23:06 +00:00
rodzic b2f0062c6b
commit 463bc7ae3b
50 zmienionych plików z 57 dodań i 57 usunięć

Wyświetl plik

@ -79,7 +79,7 @@ const struct rig_caps delta2_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -62,7 +62,7 @@ const struct rig_caps ic1275_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -71,7 +71,7 @@ const struct rig_caps ic271_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -66,7 +66,7 @@ const struct rig_caps ic275_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -70,7 +70,7 @@ const struct rig_caps ic471_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -66,7 +66,7 @@ const struct rig_caps ic475_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -133,7 +133,7 @@ const struct rig_caps ic7000_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC7000_FUNCS,
.has_set_func = IC7000_FUNCS,

Wyświetl plik

@ -102,7 +102,7 @@ const struct rig_caps ic703_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC703_FUNC_ALL,
.has_set_func = IC703_FUNC_ALL,

Wyświetl plik

@ -156,7 +156,7 @@ const struct rig_caps ic706_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,
@ -289,7 +289,7 @@ const struct rig_caps ic706mkii_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,
@ -445,7 +445,7 @@ const struct rig_caps ic706mkiig_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC706IIG_FUNC_ALL,
.has_set_func = IC706IIG_FUNC_ALL,

Wyświetl plik

@ -76,7 +76,7 @@ const struct rig_caps ic707_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -120,7 +120,7 @@ const struct rig_caps ic7100_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC7100_FUNC_ALL,
.has_set_func = IC7100_FUNC_ALL | RIG_FUNC_RESUME,

Wyświetl plik

@ -94,7 +94,7 @@ const struct rig_caps ic718_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC718_FUNC_ALL,
.has_set_func = IC718_FUNC_ALL,

Wyświetl plik

@ -103,7 +103,7 @@ const struct rig_caps ic7200_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC7200_FUNCS,
.has_set_func = IC7200_FUNCS,

Wyświetl plik

@ -74,7 +74,7 @@ const struct rig_caps ic725_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -76,7 +76,7 @@ const struct rig_caps ic726_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -76,7 +76,7 @@ const struct rig_caps ic728_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -73,7 +73,7 @@ const struct rig_caps ic735_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -80,7 +80,7 @@ const struct rig_caps ic736_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -76,7 +76,7 @@ const struct rig_caps ic737_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -80,7 +80,7 @@ const struct rig_caps ic738_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -96,7 +96,7 @@ const struct rig_caps ic7410_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC7410_FUNCS,
.has_set_func = IC7410_FUNCS,

Wyświetl plik

@ -186,7 +186,7 @@ const struct rig_caps ic746_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC746_FUNC_ALL,
.has_set_func = IC746_FUNC_ALL,
@ -393,7 +393,7 @@ const struct rig_caps ic746pro_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC746_FUNC_ALL,
.has_set_func = IC746_FUNC_ALL,

Wyświetl plik

@ -102,7 +102,7 @@ const struct rig_caps ic751_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -137,7 +137,7 @@ const struct rig_caps ic756_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,
@ -278,7 +278,7 @@ const struct rig_caps ic756pro_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC756PRO_FUNC_ALL,
.has_set_func = IC756PRO_FUNC_ALL,
@ -483,7 +483,7 @@ const struct rig_caps ic756pro2_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC756PRO_FUNC_ALL,
.has_set_func = IC756PRO_FUNC_ALL,
@ -815,7 +815,7 @@ const struct rig_caps ic756pro3_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC756PRO_FUNC_ALL,
.has_set_func = IC756PRO_FUNC_ALL,

Wyświetl plik

@ -112,7 +112,7 @@ const struct rig_caps ic7600_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC7600_FUNCS,
.has_set_func = IC7600_FUNCS,

Wyświetl plik

@ -74,7 +74,7 @@ const struct rig_caps ic761_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -76,7 +76,7 @@ const struct rig_caps ic765_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -96,7 +96,7 @@ const struct rig_caps ic7700_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC7700_FUNCS,
.has_set_func = IC7700_FUNCS,

Wyświetl plik

@ -73,7 +73,7 @@ const struct rig_caps ic775_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -86,7 +86,7 @@ const struct rig_caps ic78_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC78_FUNC_ALL,
.has_set_func = IC78_FUNC_ALL,

Wyświetl plik

@ -102,7 +102,7 @@ const struct rig_caps ic7800_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC7800_FUNCS,
.has_set_func = IC7800_FUNCS,

Wyświetl plik

@ -77,7 +77,7 @@ const struct rig_caps ic781_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -72,7 +72,7 @@ const struct rig_caps ic820h_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -72,7 +72,7 @@ const struct rig_caps ic821h_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -269,7 +269,7 @@ const struct rig_caps ic910_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC910_FUNC_ALL,
.has_set_func = IC910_FUNC_ALL | RIG_FUNC_RESUME,

Wyświetl plik

@ -120,7 +120,7 @@ const struct rig_caps ic9100_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC9100_FUNC_ALL,
.has_set_func = IC9100_FUNC_ALL | RIG_FUNC_RESUME,

Wyświetl plik

@ -113,7 +113,7 @@ const struct rig_caps ic92d_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = IC92D_FUNC_ALL,
.has_set_func = IC92D_FUNC_ALL,

Wyświetl plik

@ -67,7 +67,7 @@ const struct rig_caps ic970_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -71,7 +71,7 @@ const struct rig_caps icr10_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = ICR10_FUNC_ALL,
.has_set_func = ICR10_FUNC_ALL,

Wyświetl plik

@ -75,7 +75,7 @@ const struct rig_caps icr20_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = ICR20_FUNC_ALL,
.has_set_func = ICR20_FUNC_ALL,

Wyświetl plik

@ -77,7 +77,7 @@ const struct rig_caps icr7000_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
@ -187,7 +187,7 @@ const struct rig_caps icr7100_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = ICR7100_FUNCS,

Wyświetl plik

@ -66,7 +66,7 @@ const struct rig_caps icr71_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = ICR71_FUNC_ALL,
.has_set_func = ICR71_FUNC_ALL,

Wyświetl plik

@ -67,7 +67,7 @@ const struct rig_caps icr72_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = ICR72_FUNC_ALL,
.has_set_func = ICR72_FUNC_ALL,

Wyświetl plik

@ -120,7 +120,7 @@ const struct rig_caps icr75_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 1,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = ICR75_FUNC_ALL,
.has_set_func = ICR75_FUNC_ALL,

Wyświetl plik

@ -90,7 +90,7 @@ const struct rig_caps icr8500_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,

Wyświetl plik

@ -71,7 +71,7 @@ const struct rig_caps icrx7_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = ICRX7_FUNC_ALL,
.has_set_func = ICRX7_FUNC_ALL,

Wyświetl plik

@ -89,7 +89,7 @@ const struct rig_caps id1_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = ID1_FUNC_ALL,
.has_set_func = ID1_FUNC_ALL,

Wyświetl plik

@ -81,7 +81,7 @@ const struct rig_caps omnivip_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -91,7 +91,7 @@ const struct rig_caps os456_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,

Wyświetl plik

@ -83,7 +83,7 @@ const struct rig_caps os535_caps = {
.serial_handshake = RIG_HANDSHAKE_NONE,
.write_delay = 0,
.post_write_delay = 0,
.timeout = 200,
.timeout = 1000,
.retry = 3,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_NONE,