[Hamlib-cvs-digest] CVS: hamlib/kenwood ts850.c,1.20,1.21

[Joop S. <pa...@us...>]

Update of /cvsroot/hamlib/hamlib/kenwood
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20914

Modified Files:
	ts850.c 
Log Message:
add RIG_LEVEL_STRENGTH to caps, set post write delay to 0 and do some cleanups

Index: ts850.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/kenwood/ts850.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** ts850.c	14 Mar 2006 20:29:41 -0000	1.20
--- ts850.c	16 Mar 2006 19:36:39 -0000	1.21
***************
*** 40,44 ****
  #define TS850_FUNC_ALL (RIG_FUNC_AIP|RIG_FUNC_LOCK)
  
! #define TS850_LEVEL_GET (RIG_LEVEL_SWR|RIG_LEVEL_COMP|RIG_LEVEL_ALC|RIG_LEVEL_CWPITCH|RIG_LEVEL_RAWSTR)
  #define TS850_LEVEL_SET (RIG_LEVEL_CWPITCH)
  
--- 40,44 ----
  #define TS850_FUNC_ALL (RIG_FUNC_AIP|RIG_FUNC_LOCK)
  
! #define TS850_LEVEL_GET (RIG_LEVEL_SWR|RIG_LEVEL_COMP|RIG_LEVEL_ALC|RIG_LEVEL_CWPITCH|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH)
  #define TS850_LEVEL_SET (RIG_LEVEL_CWPITCH)
  
***************
*** 97,101 ****
  .serial_handshake =  RIG_HANDSHAKE_HARDWARE,
  .write_delay =  0,
! .post_write_delay =  500,
  .timeout =  1000,
  .retry =  3,
--- 97,101 ----
  .serial_handshake =  RIG_HANDSHAKE_HARDWARE,
  .write_delay =  0,
! .post_write_delay =  0,
  .timeout =  1000,
  .retry =  3,
***************
*** 311,315 ****
  
                  if (info_len != 38 || infobuf[1] != 'F') {
!                 rig_debug(RIG_DEBUG_ERR,"kenwood_get_mode: wrong answer len=%d\n", info_len);
                  return -RIG_ERJCTED;
                  }
--- 311,315 ----
  
                  if (info_len != 38 || infobuf[1] != 'F') {
!                 rig_debug(RIG_DEBUG_ERR,"ts850_get_mode: wrong answer len=%d\n", info_len);
                  return -RIG_ERJCTED;
                  }
***************
*** 326,330 ****
                          case MD_NONE:   *mode = RIG_MODE_NONE; break;
                          default:
!                                 rig_debug(RIG_DEBUG_ERR,"kenwood_get_mode: unsupported mode '%c'\n", infobuf[29]);
                                  return -RIG_EINVAL;
                  }
--- 326,330 ----
                          case MD_NONE:   *mode = RIG_MODE_NONE; break;
                          default:
!                                 rig_debug(RIG_DEBUG_ERR,"ts850_get_mode: unsupported mode '%c'\n", infobuf[29]);
                                  return -RIG_EINVAL;
                  }
***************
*** 337,341 ****
  
                  if (info_len != 9 || infobuf[1] != 'L') {
!                 	rig_debug(RIG_DEBUG_ERR,"kenwood_get_mode: wrong answer len=%d\n", info_len);
  			return -RIG_ERJCTED;
  		}
--- 337,341 ----
  
                  if (info_len != 9 || infobuf[1] != 'L') {
!                 	rig_debug(RIG_DEBUG_ERR,"ts850_get_mode: wrong answer len=%d\n", info_len);
  			return -RIG_ERJCTED;
  		}
***************
*** 396,400 ****
  		 kmode=mode_to_char(mode);
  		 if(kmode==RIG_MODE_NONE) {
!                                 rig_debug(RIG_DEBUG_ERR,"kenwood_set_mode: " "unsupported mode %d\n", mode);
                                  return -RIG_EINVAL;
                  }
--- 396,400 ----
  		 kmode=mode_to_char(mode);
  		 if(kmode==RIG_MODE_NONE) {
!                                 rig_debug(RIG_DEBUG_ERR,"ts850_set_mode: " "unsupported mode %d\n", mode);
                                  return -RIG_EINVAL;
                  }
***************
*** 623,627 ****
  
                  if (info_len != 38 || infobuf[1] != 'F') {
!                 rig_debug(RIG_DEBUG_ERR,"kenwood_get_mode: wrong answer len=%d\n", info_len);
                  return -RIG_ERJCTED;
                  }
--- 623,627 ----
  
                  if (info_len != 38 || infobuf[1] != 'F') {
!                 rig_debug(RIG_DEBUG_ERR,"ts850_get_mem: wrong answer len=%d\n", info_len);
                  return -RIG_ERJCTED;
                  }
***************
*** 749,752 ****
  		return RIG_OK;
  }
- 
- 
--- 749,750 ----