[Hamlib-cvs-digest] CVS: hamlib/ft747 ft747.c,1.22,1.23

[Frank S. <jav...@us...>]

Update of /cvsroot/hamlib/hamlib/ft747
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20652

Modified Files:
	ft747.c 
Log Message:
minor update to active VFO handling in _set_vfo



Index: ft747.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/ft747/ft747.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** ft747.c	2000/12/07 02:34:56	1.22
--- ft747.c	2000/12/09 02:01:59	1.23
***************
*** 470,476 ****
    struct rig_state *rig_s;
    struct ft747_priv_data *p;
- 
    static unsigned char cmd[] = { 0x00, 0x00, 0x00, 0x00, 0x05 }; /* select vfo A/B/Current */
!   
    if (!rig)
      return -RIG_EINVAL;
--- 470,475 ----
    struct rig_state *rig_s;
    struct ft747_priv_data *p;
    static unsigned char cmd[] = { 0x00, 0x00, 0x00, 0x00, 0x05 }; /* select vfo A/B/Current */
! 
    if (!rig)
      return -RIG_EINVAL;
***************
*** 484,509 ****
     */
  
    switch(vfo) {
    case RIG_VFO_A:
!     cmd[3] = 0x00;
      write_block(rig_s->fd, cmd, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
      p->current_vfo = vfo;		/* update active VFO */
      return RIG_OK;
    case RIG_VFO_B:
!     cmd[3] = 0x01;
      write_block(rig_s->fd, cmd, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
      p->current_vfo = vfo;		/* update active VFO */
      return RIG_OK;
    case RIG_VFO_CURR:
!     cmd[3] = p->current_vfo;		/* use active VFO */
!     write_block(rig_s->fd, cmd, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
!     return RIG_OK;
! 
    default:
      return -RIG_EINVAL;		/* sorry, wrong VFO */
    }
- 
- 
-   return RIG_OK;		/* good */
  }
  
--- 483,518 ----
     */
  
+ 
    switch(vfo) {
    case RIG_VFO_A:
!     cmd[3] = FT747_VFO_A; 
      write_block(rig_s->fd, cmd, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
      p->current_vfo = vfo;		/* update active VFO */
      return RIG_OK;
    case RIG_VFO_B:
!     cmd[3] = FT747_VFO_B;
      write_block(rig_s->fd, cmd, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
      p->current_vfo = vfo;		/* update active VFO */
      return RIG_OK;
    case RIG_VFO_CURR:
!     switch(p->current_vfo) {	/* what is my active VFO ? */
!     case RIG_VFO_A:
!       cmd[3] = FT747_VFO_A; 
!       write_block(rig_s->fd, cmd, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
!       p->current_vfo = RIG_VFO_A;		/* update active VFO */
!       return RIG_OK;
!     case RIG_VFO_B:
!       cmd[3] = FT747_VFO_B; 
!       write_block(rig_s->fd, cmd, FT747_CMD_LENGTH, rig_s->write_delay, rig_s->post_write_delay);
!       p->current_vfo = RIG_VFO_B;		/* update active VFO */
!       return RIG_OK;
!     default:
!       rig_debug(RIG_DEBUG_VERBOSE,"ft747: Unknown default VFO \n");
!       return -RIG_EINVAL;		/* sorry, wrong VFO */
!     }
!     
    default:
      return -RIG_EINVAL;		/* sorry, wrong VFO */
    }
  }