diff --git a/icom/ic706.c b/icom/ic706.c index d6e6a16d1..3d68ede70 100644 --- a/icom/ic706.c +++ b/icom/ic706.c @@ -7,7 +7,7 @@ * using the "CI-V" interface. * * - * $Id: ic706.c,v 1.18 2001-03-04 13:03:41 f4cfe Exp $ + * $Id: ic706.c,v 1.19 2001-04-22 14:48:57 f4cfe Exp $ * * * @@ -55,6 +55,7 @@ #define IC706_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_SQLSTAT|RIG_LEVEL_STRENGTH) +#define IC706_VFO_ALL (RIG_VFO_A|RIG_VFO_B) #define IC706IIG_STR_CAL { 16, \ { \ @@ -103,7 +104,7 @@ const struct rig_caps ic706_caps = { { 20, RIG_DBLST_END, }, NULL, Hz(0), Hz(0), /* RIT, IF-SHIFT */ - 0, /* FIXME: VFO list */ + IC706_VFO_ALL, /* VFO list */ 0, RIG_TRN_RIG, 101, 0, 0, @@ -111,29 +112,29 @@ const struct rig_caps ic706_caps = { { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ { RIG_FRNG_END, }, - { {kHz(30),199999999,IC706_ALL_RX_MODES,-1,-1},RIG_FRNG_END, }, /* rx range */ - { {kHz(1800),1999999,IC706_OTHER_TX_MODES,5000,100000}, /* 100W class */ - {kHz(1800),1999999,IC706_AM_TX_MODES,2000,40000}, /* 40W class */ - {kHz(3500),3999999,IC706_OTHER_TX_MODES,5000,100000}, - {kHz(3500),3999999,IC706_AM_TX_MODES,2000,40000}, - {MHz(7),kHz(7300),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(7),kHz(7300),IC706_AM_TX_MODES,2000,40000}, - {kHz(10100),kHz(10150),IC706_OTHER_TX_MODES,5000,100000}, - {kHz(10100),kHz(10150),IC706_AM_TX_MODES,2000,40000}, - {MHz(14),kHz(14350),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(14),kHz(14350),IC706_AM_TX_MODES,2000,40000}, - {kHz(18068),kHz(18168),IC706_OTHER_TX_MODES,5000,100000}, - {kHz(18068),kHz(18168),IC706_AM_TX_MODES,2000,40000}, - {MHz(21),kHz(21450),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(21),kHz(21450),IC706_AM_TX_MODES,2000,40000}, - {kHz(24890),kHz(24990),IC706_OTHER_TX_MODES,5000,100000}, - {kHz(24890),kHz(24990),IC706_AM_TX_MODES,2000,40000}, - {MHz(28),kHz(29700),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(28),kHz(29700),IC706_AM_TX_MODES,2000,40000}, - {MHz(50),MHz(54),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(50),MHz(54),IC706_AM_TX_MODES,2000,40000}, - {MHz(144),MHz(148),IC706_OTHER_TX_MODES,5000,20000}, /* not sure.. */ - {MHz(144),MHz(148),IC706_AM_TX_MODES,2000,8000}, /* anyone? */ + { {kHz(30),199999999,IC706_ALL_RX_MODES,-1,-1,IC706_VFO_ALL},RIG_FRNG_END, }, /* rx range */ + { {kHz(1800),1999999,IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, /* 100W class */ + {kHz(1800),1999999,IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, /* 40W class */ + {kHz(3500),3999999,IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {kHz(3500),3999999,IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(7),kHz(7300),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(7),kHz(7300),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {kHz(10100),kHz(10150),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {kHz(10100),kHz(10150),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(14),kHz(14350),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(14),kHz(14350),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {kHz(18068),kHz(18168),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {kHz(18068),kHz(18168),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(21),kHz(21450),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(21),kHz(21450),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {kHz(24890),kHz(24990),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {kHz(24890),kHz(24990),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(28),kHz(29700),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(28),kHz(29700),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(50),MHz(54),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(50),MHz(54),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(144),MHz(148),IC706_OTHER_TX_MODES,5000,20000,IC706_VFO_ALL}, /* not sure.. */ + {MHz(144),MHz(148),IC706_AM_TX_MODES,2000,8000,IC706_VFO_ALL}, /* anyone? */ RIG_FRNG_END, }, {{IC706_1HZ_TS_MODES,1}, @@ -189,7 +190,7 @@ const struct rig_caps ic706mkii_caps = { { 20, RIG_DBLST_END, }, NULL, Hz(0), Hz(0), /* RIT, IF-SHIFT */ - 0, /* FIXME: VFO list */ + IC706_VFO_ALL, /* VFO list */ 0, RIG_TRN_RIG, 101, 0, 0, @@ -197,29 +198,29 @@ const struct rig_caps ic706mkii_caps = { { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ { RIG_FRNG_END, }, - { {kHz(30),199999999,IC706_ALL_RX_MODES,-1,-1},RIG_FRNG_END, }, /* rx range */ - { {kHz(1800),1999999,IC706_OTHER_TX_MODES,5000,100000}, /* 100W class */ - {kHz(1800),1999999,IC706_AM_TX_MODES,2000,40000}, /* 40W class */ - {kHz(3500),3999999,IC706_OTHER_TX_MODES,5000,100000}, - {kHz(3500),3999999,IC706_AM_TX_MODES,2000,40000}, - {MHz(7),kHz(7300),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(7),kHz(7300),IC706_AM_TX_MODES,2000,40000}, - {kHz(10100),kHz(10150),IC706_OTHER_TX_MODES,5000,100000}, - {kHz(10100),kHz(10150),IC706_AM_TX_MODES,2000,40000}, - {MHz(14),kHz(14350),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(14),kHz(14350),IC706_AM_TX_MODES,2000,40000}, - {kHz(18068),kHz(18168),IC706_OTHER_TX_MODES,5000,100000}, - {kHz(18068),kHz(18168),IC706_AM_TX_MODES,2000,40000}, - {MHz(21),kHz(21450),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(21),kHz(21450),IC706_AM_TX_MODES,2000,40000}, - {kHz(24890),kHz(24990),IC706_OTHER_TX_MODES,5000,100000}, - {kHz(24890),kHz(24990),IC706_AM_TX_MODES,2000,40000}, - {MHz(28),kHz(29700),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(28),kHz(29700),IC706_AM_TX_MODES,2000,40000}, - {MHz(50),MHz(54),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(50),MHz(54),IC706_AM_TX_MODES,2000,40000}, - {MHz(144),MHz(148),IC706_OTHER_TX_MODES,5000,20000}, /* not sure.. */ - {MHz(144),MHz(148),IC706_AM_TX_MODES,2000,8000}, /* anyone? */ + { {kHz(30),199999999,IC706_ALL_RX_MODES,-1,-1,IC706_VFO_ALL},RIG_FRNG_END, }, /* rx range */ + { {kHz(1800),1999999,IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, /* 100W class */ + {kHz(1800),1999999,IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, /* 40W class */ + {kHz(3500),3999999,IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {kHz(3500),3999999,IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(7),kHz(7300),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(7),kHz(7300),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {kHz(10100),kHz(10150),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {kHz(10100),kHz(10150),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(14),kHz(14350),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(14),kHz(14350),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {kHz(18068),kHz(18168),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {kHz(18068),kHz(18168),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(21),kHz(21450),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(21),kHz(21450),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {kHz(24890),kHz(24990),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {kHz(24890),kHz(24990),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(28),kHz(29700),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(28),kHz(29700),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(50),MHz(54),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(50),MHz(54),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(144),MHz(148),IC706_OTHER_TX_MODES,5000,20000,IC706_VFO_ALL}, /* not sure.. */ + {MHz(144),MHz(148),IC706_AM_TX_MODES,2000,8000,IC706_VFO_ALL}, /* anyone? */ RIG_FRNG_END, }, {{IC706_1HZ_TS_MODES,1}, @@ -278,7 +279,7 @@ const struct rig_caps ic706mkiig_caps = { { 20, RIG_DBLST_END, }, NULL, Hz(0), Hz(0), /* RIT, IF-SHIFT */ - 0, /* FIXME: VFO list */ + IC706_VFO_ALL, /* VFO list */ 0, RIG_TRN_RIG, 105, 0, 0, @@ -291,33 +292,33 @@ const struct rig_caps ic706mkiig_caps = { { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ { RIG_FRNG_END, }, - { {kHz(30),MHz(200)-1,IC706_ALL_RX_MODES,-1,-1}, /* this trx also has UHF */ - {MHz(400),MHz(470),IC706_ALL_RX_MODES,-1,-1}, + { {kHz(30),MHz(200)-1,IC706_ALL_RX_MODES,-1,-1,IC706_VFO_ALL}, /* this trx also has UHF */ + {MHz(400),MHz(470),IC706_ALL_RX_MODES,-1,-1,IC706_VFO_ALL}, RIG_FRNG_END, }, - { {kHz(1800),MHz(2)-1,IC706_OTHER_TX_MODES,5000,100000}, /* 100W class */ - {kHz(1800),MHz(2)-1,IC706_AM_TX_MODES,2000,40000}, /* 40W class */ - {kHz(3500),MHz(4)-1,IC706_OTHER_TX_MODES,5000,100000}, - {kHz(3500),MHz(4)-1,IC706_AM_TX_MODES,2000,40000}, - {MHz(7),kHz(7300),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(7),kHz(7300),IC706_AM_TX_MODES,2000,40000}, - {kHz(10100),kHz(10150),IC706_OTHER_TX_MODES,5000,100000}, - {kHz(10100),kHz(10150),IC706_AM_TX_MODES,2000,40000}, - {MHz(14),kHz(14350),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(14),kHz(14350),IC706_AM_TX_MODES,2000,40000}, - {kHz(18068),kHz(18168),IC706_OTHER_TX_MODES,5000,100000}, - {kHz(18068),kHz(18168),IC706_AM_TX_MODES,2000,40000}, - {MHz(21),kHz(21450),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(21),kHz(21450),IC706_AM_TX_MODES,2000,40000}, - {kHz(24890),kHz(24990),IC706_OTHER_TX_MODES,5000,100000}, - {kHz(24890),kHz(24990),IC706_AM_TX_MODES,2000,40000}, - {MHz(28),kHz(29700),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(28),kHz(29700),IC706_AM_TX_MODES,2000,40000}, - {MHz(50),MHz(54),IC706_OTHER_TX_MODES,5000,100000}, - {MHz(50),MHz(54),IC706_AM_TX_MODES,2000,40000}, - {MHz(144),MHz(148),IC706_OTHER_TX_MODES,5000,50000}, /* 50W */ - {MHz(144),MHz(148),IC706_AM_TX_MODES,2000,20000}, /* AM VHF is 20W */ - {MHz(430),MHz(450),IC706_OTHER_TX_MODES,5000,20000}, - {MHz(430),MHz(450),IC706_AM_TX_MODES,2000,8000}, + { {kHz(1800),MHz(2)-1,IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, /* 100W class */ + {kHz(1800),MHz(2)-1,IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, /* 40W class */ + {kHz(3500),MHz(4)-1,IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {kHz(3500),MHz(4)-1,IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(7),kHz(7300),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(7),kHz(7300),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {kHz(10100),kHz(10150),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {kHz(10100),kHz(10150),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(14),kHz(14350),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(14),kHz(14350),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {kHz(18068),kHz(18168),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {kHz(18068),kHz(18168),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(21),kHz(21450),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(21),kHz(21450),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {kHz(24890),kHz(24990),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {kHz(24890),kHz(24990),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(28),kHz(29700),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(28),kHz(29700),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(50),MHz(54),IC706_OTHER_TX_MODES,5000,100000,IC706_VFO_ALL}, + {MHz(50),MHz(54),IC706_AM_TX_MODES,2000,40000,IC706_VFO_ALL}, + {MHz(144),MHz(148),IC706_OTHER_TX_MODES,5000,50000,IC706_VFO_ALL}, /* 50W */ + {MHz(144),MHz(148),IC706_AM_TX_MODES,2000,20000,IC706_VFO_ALL}, /* AM VHF is 20W */ + {MHz(430),MHz(450),IC706_OTHER_TX_MODES,5000,20000,IC706_VFO_ALL}, + {MHz(430),MHz(450),IC706_AM_TX_MODES,2000,8000,IC706_VFO_ALL}, RIG_FRNG_END, }, {{IC706_1HZ_TS_MODES,1}, {IC706_ALL_RX_MODES,10},