[Hamlib-cvs-digest] CVS: hamlib/icom ic706.c,1.5,1.6

[Stephane F. <f4...@us...>]

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

Modified Files:
	ic706.c 
Log Message:
* Reworked the RIG_MODE_* defines. see rig.h
* Added has_level caps fields


Index: ic706.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/ic706.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ic706.c	2000/10/09 01:17:19	1.5
--- ic706.c	2000/10/16 22:32:36	1.6
***************
*** 42,57 ****
  
  
! #define IC706_ALL_RX_MODES (RIG_MODE_AM| RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB| RIG_MODE_RTTY| RIG_MODE_FM| RIG_MODE_WFM| RIG_MODE_NFM| RIG_MODE_NAM| RIG_MODE_CWR)
! #define IC706_1MHZ_TS_MODES (RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_WFM|RIG_MODE_NFM|RIG_MODE_NAM)
! #define IC706_1HZ_TS_MODES (RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY|RIG_MODE_CWR)
  
  /* tx doesn't have WFM.
   * 100W in all modes but AM (40W)
   */ 
! #define IC706_OTHER_TX_MODES (RIG_MODE_AM| RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB| RIG_MODE_RTTY| RIG_MODE_FM| RIG_MODE_NFM| RIG_MODE_NAM| RIG_MODE_CWR)
! #define IC706_AM_TX_MODES (RIG_MODE_AM| RIG_MODE_NAM)
  
  #define IC706_FUNC_ALL (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_SBKIN|RIG_FUNC_FBKIN)
  
  /*
   * ic706 rigs capabilities.
--- 42,59 ----
  
  
! #define IC706_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY|RIG_MODE_FM)
! #define IC706_1MHZ_TS_MODES (RIG_MODE_AM|RIG_MODE_FM)
! #define IC706_1HZ_TS_MODES (RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY)
  
  /* tx doesn't have WFM.
   * 100W in all modes but AM (40W)
   */ 
! #define IC706_OTHER_TX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY|RIG_MODE_FM)
! #define IC706_AM_TX_MODES (RIG_MODE_AM)
  
  #define IC706_FUNC_ALL (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_SBKIN|RIG_FUNC_FBKIN)
  
+ #define IC706_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_SQL|RIG_LEVEL_SQLSTAT|RIG_LEVEL_STRENGTH)
+ 
  /*
   * ic706 rigs capabilities.
***************
*** 62,66 ****
    RIG_MODEL_IC706, "IC-706", "Icom", "0.2", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, 101, RIG_TRN_ON,
    { {KHz(30),199999999,IC706_ALL_RX_MODES,-1,-1},{0,0,0,0,0}, }, /* rx range */
    { {KHz(1800),1999999,IC706_OTHER_TX_MODES,5000,100000},	/* 100W class */
--- 64,69 ----
    RIG_MODEL_IC706, "IC-706", "Icom", "0.2", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL,
!   IC706_LEVEL_ALL, 101, RIG_TRN_ON,
    { {KHz(30),199999999,IC706_ALL_RX_MODES,-1,-1},{0,0,0,0,0}, }, /* rx range */
    { {KHz(1800),1999999,IC706_OTHER_TX_MODES,5000,100000},	/* 100W class */
***************
*** 108,112 ****
    RIG_MODEL_IC706MKII, "IC-706MKII", "Icom", "0.2", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, 101, RIG_TRN_ON,
    { {30000,199999999,IC706_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, }, /* rx range */
    { {1800000,1999999,IC706_OTHER_TX_MODES,5000,100000},	/* 100W class */
--- 111,116 ----
    RIG_MODEL_IC706MKII, "IC-706MKII", "Icom", "0.2", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL,
!   IC706_LEVEL_ALL, 101, RIG_TRN_ON,
    { {30000,199999999,IC706_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, }, /* rx range */
    { {1800000,1999999,IC706_OTHER_TX_MODES,5000,100000},	/* 100W class */
***************
*** 159,163 ****
    RIG_MODEL_IC706MKIIG, "IC-706MKIIG", "Icom", "0.2", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL|RIG_FUNC_NR|RIG_FUNC_ANF, 101, RIG_TRN_ON,
    { {30000,199999999,IC706_ALL_RX_MODES,-1,-1},	/* this trx also has UHF */
   	{400000000,470000000,IC706_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, },
--- 163,168 ----
    RIG_MODEL_IC706MKIIG, "IC-706MKIIG", "Icom", "0.2", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL|RIG_FUNC_NR|RIG_FUNC_ANF,
!   IC706_LEVEL_ALL, IC706_LEVEL_ALL, 101, RIG_TRN_ON,
    { {30000,199999999,IC706_ALL_RX_MODES,-1,-1},	/* this trx also has UHF */
   	{400000000,470000000,IC706_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, },
***************
*** 203,209 ****
    icom_init, icom_cleanup, NULL, NULL, NULL /* probe not supported yet */,
    icom_set_freq, icom_get_freq, icom_set_mode, icom_get_mode, icom_set_vfo,
- get_strength: icom_get_strength,
- decode_event: icom_decode_event,
    NULL, 
  };
  
--- 208,217 ----
    icom_init, icom_cleanup, NULL, NULL, NULL /* probe not supported yet */,
    icom_set_freq, icom_get_freq, icom_set_mode, icom_get_mode, icom_set_vfo,
    NULL, 
+ decode_event: icom_decode_event,
+ set_level: icom_set_level,
+ get_level: icom_get_level,
+ set_channel: icom_set_channel,
+ get_channel: icom_get_channel,
  };