diff --git a/NEWS b/NEWS index 579c527c1..d43385bb5 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,8 @@ Version 5.x * Rig state poll routine to serve commonly used data like frequency and mode from cache. Mikael, OH3BHX Version 4.5 + * deprecated hamlib_port_t at front of rig_state structure -- new one at end of structure + * New RIG_LEVEL_BAND_SELECT for Yaesu rigs * 202?-??-?? * New rig_get_conf2 to replace rig_get_conf buffer overflow potential * New rot_get_conf2 to reaplce rot_get_conf buffer overflow potential diff --git a/rigs/yaesu/frg100.c b/rigs/yaesu/frg100.c index 59f0e81e5..4795eef61 100644 --- a/rigs/yaesu/frg100.c +++ b/rigs/yaesu/frg100.c @@ -178,7 +178,7 @@ const struct rig_caps frg100_caps = .has_get_func = RIG_FUNC_LOCK, .has_set_func = RIG_FUNC_LOCK, .has_get_level = RIG_LEVEL_RAWSTR, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_BACKLIGHT, .vfo_ops = RIG_OP_FROM_VFO | RIG_OP_TO_VFO | RIG_OP_UP | RIG_OP_DOWN, diff --git a/rigs/yaesu/frg8800.c b/rigs/yaesu/frg8800.c index ae8695651..b2fbb402f 100644 --- a/rigs/yaesu/frg8800.c +++ b/rigs/yaesu/frg8800.c @@ -81,8 +81,8 @@ const struct rig_caps frg8800_caps = .retry = 0, .has_get_func = RIG_FUNC_NONE, .has_set_func = RIG_FUNC_NONE, - .has_get_level = RIG_LEVEL_NONE, - .has_set_level = RIG_LEVEL_NONE, + .has_get_level = RIG_LEVEL_BAND_SELECT, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .vfo_ops = RIG_OP_NONE, diff --git a/rigs/yaesu/frg9600.c b/rigs/yaesu/frg9600.c index 2e4d1f7a3..2311969bf 100644 --- a/rigs/yaesu/frg9600.c +++ b/rigs/yaesu/frg9600.c @@ -76,8 +76,8 @@ const struct rig_caps frg9600_caps = .retry = 0, .has_get_func = RIG_FUNC_NONE, .has_set_func = RIG_FUNC_NONE, - .has_get_level = RIG_LEVEL_NONE, - .has_set_level = RIG_LEVEL_NONE, + .has_get_level = RIG_LEVEL_BAND_SELECT, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .vfo_ops = RIG_OP_NONE, diff --git a/rigs/yaesu/ft100.c b/rigs/yaesu/ft100.c index a0bba9fc6..c97828548 100644 --- a/rigs/yaesu/ft100.c +++ b/rigs/yaesu/ft100.c @@ -339,7 +339,7 @@ const struct rig_caps ft100_caps = .has_get_func = RIG_FUNC_NONE, .has_set_func = FT100_FUNC_ALL, .has_get_level = FT100_GET_RIG_LEVELS, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, /* FIXME: parms */ .level_gran = {}, /* granularity */ diff --git a/rigs/yaesu/ft1000d.c b/rigs/yaesu/ft1000d.c index ad167a9c1..49777dbff 100644 --- a/rigs/yaesu/ft1000d.c +++ b/rigs/yaesu/ft1000d.c @@ -294,7 +294,7 @@ const struct rig_caps ft1000d_caps = .has_set_func = RIG_FUNC_LOCK | RIG_FUNC_TUNER, .has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_SWR | RIG_LEVEL_ALC | \ RIG_LEVEL_RFPOWER | RIG_LEVEL_COMP, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_BACKLIGHT, .ctcss_list = NULL, diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c index c95aa1f61..25ffe3066 100644 --- a/rigs/yaesu/ft1000mp.c +++ b/rigs/yaesu/ft1000mp.c @@ -334,7 +334,7 @@ const struct rig_caps ft1000mp_caps = .has_get_func = FT1000MP_FUNC_ALL, .has_set_func = FT1000MP_FUNC_ALL, .has_get_level = FT1000MP_LEVEL_GET, - .has_set_level = RIG_LEVEL_NONE, /* as strange as it could be */ + .has_set_level = RIG_LEVEL_BAND_SELECT, /* as strange as it could be */ .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .ctcss_list = ft1000mp_ctcss_list, @@ -470,7 +470,7 @@ const struct rig_caps ft1000mpmkv_caps = .has_get_func = FT1000MP_FUNC_ALL, .has_set_func = FT1000MP_FUNC_ALL, .has_get_level = FT1000MP_LEVEL_GET, - .has_set_level = RIG_LEVEL_NONE, /* as strange as it could be */ + .has_set_level = RIG_LEVEL_BAND_SELECT, /* as strange as it could be */ .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .ctcss_list = ft1000mp_ctcss_list, @@ -605,7 +605,7 @@ const struct rig_caps ft1000mpmkvfld_caps = .has_get_func = FT1000MP_FUNC_ALL, .has_set_func = FT1000MP_FUNC_ALL, .has_get_level = FT1000MP_LEVEL_GET, - .has_set_level = RIG_LEVEL_NONE, /* as strange as it could be */ + .has_set_level = RIG_LEVEL_BAND_SELECT, /* as strange as it could be */ .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .ctcss_list = ft1000mp_ctcss_list, diff --git a/rigs/yaesu/ft1200.h b/rigs/yaesu/ft1200.h index 75683026f..0c66dc333 100644 --- a/rigs/yaesu/ft1200.h +++ b/rigs/yaesu/ft1200.h @@ -60,7 +60,8 @@ RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\ RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|\ RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|\ - RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER) + RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|\ + RIG_LEVEL_BAND_SELECT) /* TBC */ #define FTDX1200_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\ diff --git a/rigs/yaesu/ft2000.h b/rigs/yaesu/ft2000.h index 607360ae8..93df3e856 100644 --- a/rigs/yaesu/ft2000.h +++ b/rigs/yaesu/ft2000.h @@ -58,7 +58,8 @@ RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\ RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|\ RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|\ - RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER) + RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|\ + RIG_LEVEL_BAND_SELECT) #define FT2000_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\ RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\ diff --git a/rigs/yaesu/ft450.h b/rigs/yaesu/ft450.h index 356a71c0a..d77df8a20 100644 --- a/rigs/yaesu/ft450.h +++ b/rigs/yaesu/ft450.h @@ -63,7 +63,8 @@ RIG_LEVEL_MICGAIN|RIG_LEVEL_IF|RIG_LEVEL_CWPITCH|\ RIG_LEVEL_KEYSPD|RIG_LEVEL_AF|RIG_LEVEL_AGC|\ RIG_LEVEL_METER|RIG_LEVEL_BKINDL|RIG_LEVEL_SQL|\ - RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY) + RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|\ + RIG_LEVEL_BAND_SELECT) #define FT450_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\ RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\ diff --git a/rigs/yaesu/ft5000.h b/rigs/yaesu/ft5000.h index 0a1809931..8a1f1a712 100644 --- a/rigs/yaesu/ft5000.h +++ b/rigs/yaesu/ft5000.h @@ -59,7 +59,8 @@ RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\ RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|\ RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|\ - RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER) + RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|\ + RIG_LEVEL_BAND_SELECT) /* TBC */ #define FTDX5000_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\ diff --git a/rigs/yaesu/ft600.c b/rigs/yaesu/ft600.c index 3491db22d..5c74effd5 100644 --- a/rigs/yaesu/ft600.c +++ b/rigs/yaesu/ft600.c @@ -260,7 +260,7 @@ const struct rig_caps ft600_caps = .has_get_func = RIG_FUNC_NONE, .has_set_func = RIG_FUNC_NONE, .has_get_level = FT600_GET_RIG_LEVELS, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, /* FIXME: parms */ .level_gran = {}, /* granularity */ diff --git a/rigs/yaesu/ft736.c b/rigs/yaesu/ft736.c index 3d7d7dfb0..40fda7b25 100644 --- a/rigs/yaesu/ft736.c +++ b/rigs/yaesu/ft736.c @@ -122,7 +122,7 @@ const struct rig_caps ft736_caps = .has_get_func = RIG_FUNC_NONE, .has_set_func = RIG_FUNC_TONE | RIG_FUNC_TSQL, .has_get_level = RIG_LEVEL_RAWSTR, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .vfo_ops = RIG_OP_NONE, diff --git a/rigs/yaesu/ft747.c b/rigs/yaesu/ft747.c index 3041f24b9..efa5adfd5 100644 --- a/rigs/yaesu/ft747.c +++ b/rigs/yaesu/ft747.c @@ -325,8 +325,8 @@ const struct rig_caps ft747_caps = .retry = 0, .has_get_func = FT747_FUNC_ALL, .has_set_func = FT747_FUNC_ALL, - .has_get_level = RIG_LEVEL_NONE, - .has_set_level = RIG_LEVEL_NONE, + .has_get_level = RIG_LEVEL_BAND_SELECT, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .ctcss_list = NULL, diff --git a/rigs/yaesu/ft757gx.c b/rigs/yaesu/ft757gx.c index bf5e493b4..25c100834 100644 --- a/rigs/yaesu/ft757gx.c +++ b/rigs/yaesu/ft757gx.c @@ -136,8 +136,8 @@ const struct rig_caps ft757gx_caps = .retry = 10, .has_get_func = RIG_FUNC_NONE, .has_set_func = RIG_FUNC_NONE, - .has_get_level = RIG_LEVEL_NONE, - .has_set_level = RIG_LEVEL_NONE, + .has_get_level = RIG_LEVEL_BAND_SELECT, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .ctcss_list = NULL, @@ -249,7 +249,7 @@ const struct rig_caps ft757gx2_caps = .has_get_func = RIG_FUNC_LOCK, .has_set_func = RIG_FUNC_LOCK, .has_get_level = RIG_LEVEL_RAWSTR, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .vfo_ops = RIG_OP_CPY | RIG_OP_FROM_VFO | RIG_OP_TO_VFO | diff --git a/rigs/yaesu/ft767gx.c b/rigs/yaesu/ft767gx.c index 7a66b0b0a..37b28b95b 100644 --- a/rigs/yaesu/ft767gx.c +++ b/rigs/yaesu/ft767gx.c @@ -283,8 +283,8 @@ const struct rig_caps ft767gx_caps = .retry = 0, .has_get_func = RIG_FUNC_NONE, .has_set_func = RIG_FUNC_NONE, - .has_get_level = RIG_LEVEL_NONE, - .has_set_level = RIG_LEVEL_NONE, + .has_get_level = RIG_LEVEL_BAND_SELECT, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .ctcss_list = static_767gx_ctcss_list, diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c index 1b7a36696..6485fdbcd 100644 --- a/rigs/yaesu/ft817.c +++ b/rigs/yaesu/ft817.c @@ -322,7 +322,7 @@ const struct rig_caps ft817_caps = .has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_RAWSTR | RIG_LEVEL_RFPOWER | RIG_LEVEL_ALC | RIG_LEVEL_SWR, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .level_gran = {}, /* granularity */ @@ -468,7 +468,7 @@ const struct rig_caps ft818_caps = .has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_RAWSTR | RIG_LEVEL_RFPOWER | RIG_LEVEL_ALC | RIG_LEVEL_SWR, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .level_gran = {}, /* granularity */ diff --git a/rigs/yaesu/ft840.c b/rigs/yaesu/ft840.c index 079a78fb9..9fe7bfe8b 100644 --- a/rigs/yaesu/ft840.c +++ b/rigs/yaesu/ft840.c @@ -269,7 +269,7 @@ const struct rig_caps ft840_caps = .has_get_func = RIG_FUNC_TUNER, .has_set_func = RIG_FUNC_TUNER, .has_get_level = RIG_LEVEL_STRENGTH, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .ctcss_list = NULL, diff --git a/rigs/yaesu/ft847.c b/rigs/yaesu/ft847.c index a606bda9d..a9d88de9a 100644 --- a/rigs/yaesu/ft847.c +++ b/rigs/yaesu/ft847.c @@ -401,7 +401,7 @@ const struct rig_caps ft847_caps = .has_get_func = RIG_FUNC_NONE, .has_set_func = FT847_FUNC_ALL, .has_get_level = FT847_LEVEL_ALL, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .level_gran = {}, /* granularity */ @@ -551,7 +551,7 @@ const struct rig_caps mchfqrp_caps = .has_get_func = RIG_FUNC_NONE, .has_set_func = FT847_FUNC_ALL, .has_get_level = FT847_LEVEL_ALL, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .level_gran = {}, /* granularity */ @@ -707,7 +707,7 @@ const struct rig_caps ft847uni_caps = .has_get_func = RIG_FUNC_NONE, .has_set_func = FT847_FUNC_ALL, .has_get_level = FT847_LEVEL_ALL, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .level_gran = {}, /* granularity */ diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c index 2f1b02666..e64b6a64a 100644 --- a/rigs/yaesu/ft857.c +++ b/rigs/yaesu/ft857.c @@ -273,7 +273,7 @@ const struct rig_caps ft857_caps = .has_get_func = RIG_FUNC_NONE, .has_set_func = RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL, .has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .level_gran = {}, /* granularity */ diff --git a/rigs/yaesu/ft890.c b/rigs/yaesu/ft890.c index d22e9cc73..595a5cb9d 100644 --- a/rigs/yaesu/ft890.c +++ b/rigs/yaesu/ft890.c @@ -421,7 +421,7 @@ const struct rig_caps ft890_caps = .has_get_func = RIG_FUNC_TUNER, .has_set_func = RIG_FUNC_TUNER, .has_get_level = RIG_LEVEL_STRENGTH, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .ctcss_list = NULL, diff --git a/rigs/yaesu/ft891.h b/rigs/yaesu/ft891.h index 7f3909ea8..e53d4bf1e 100644 --- a/rigs/yaesu/ft891.h +++ b/rigs/yaesu/ft891.h @@ -57,7 +57,8 @@ RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\ RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|\ RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|\ - RIG_LEVEL_COMP_METER|RIG_LEVEL_ID_METER) + RIG_LEVEL_COMP_METER|RIG_LEVEL_ID_METER|\ + RIG_LEVEL_BAND_SELECT) #define FT891_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\ RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\ diff --git a/rigs/yaesu/ft897.c b/rigs/yaesu/ft897.c index 3083f3748..36a232865 100644 --- a/rigs/yaesu/ft897.c +++ b/rigs/yaesu/ft897.c @@ -276,7 +276,7 @@ const struct rig_caps ft897_caps = .has_get_func = RIG_FUNC_NONE, .has_set_func = RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL, .has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER | RIG_LEVEL_SWR | RIG_LEVEL_RAWSTR | RIG_LEVEL_ALC, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .level_gran = {}, /* granularity */ @@ -419,7 +419,7 @@ const struct rig_caps ft897d_caps = .has_get_func = RIG_FUNC_NONE, .has_set_func = RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL, .has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER | RIG_LEVEL_SWR | RIG_LEVEL_RAWSTR | RIG_LEVEL_ALC, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .level_gran = {}, /* granularity */ diff --git a/rigs/yaesu/ft900.c b/rigs/yaesu/ft900.c index b3651a000..1c0bceaa0 100644 --- a/rigs/yaesu/ft900.c +++ b/rigs/yaesu/ft900.c @@ -443,7 +443,7 @@ const struct rig_caps ft900_caps = .has_get_func = RIG_FUNC_TUNER, .has_set_func = RIG_FUNC_TUNER, .has_get_level = RIG_LEVEL_STRENGTH, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .ctcss_list = NULL, diff --git a/rigs/yaesu/ft9000.h b/rigs/yaesu/ft9000.h index 5d8f13ee6..e02c103c2 100644 --- a/rigs/yaesu/ft9000.h +++ b/rigs/yaesu/ft9000.h @@ -68,7 +68,8 @@ RIG_LEVEL_KEYSPD|RIG_LEVEL_AF|RIG_LEVEL_AGC|\ RIG_LEVEL_METER|RIG_LEVEL_BKINDL|RIG_LEVEL_SQL|\ RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\ - RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|RIG_LEVEL_MONITOR_GAIN) + RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|RIG_LEVEL_MONITOR_GAIN|\ + RIG_LEVEL_BAND_SELECT) /* TBC */ #define FT9000_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\ diff --git a/rigs/yaesu/ft920.c b/rigs/yaesu/ft920.c index 8a8c4c532..2318d7aed 100644 --- a/rigs/yaesu/ft920.c +++ b/rigs/yaesu/ft920.c @@ -431,8 +431,8 @@ const struct rig_caps ft920_caps = .retry = 0, .has_get_func = FT920_FUNC_ALL, .has_set_func = RIG_FUNC_TUNER, - .has_get_level = RIG_LEVEL_NONE, - .has_set_level = RIG_LEVEL_NONE, + .has_get_level = RIG_LEVEL_BAND_SELECT, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .ctcss_list = NULL, diff --git a/rigs/yaesu/ft950.h b/rigs/yaesu/ft950.h index cc5eebbe1..391195b6f 100644 --- a/rigs/yaesu/ft950.h +++ b/rigs/yaesu/ft950.h @@ -60,7 +60,8 @@ RIG_LEVEL_KEYSPD|RIG_LEVEL_AF|RIG_LEVEL_AGC|\ RIG_LEVEL_METER|RIG_LEVEL_BKINDL|RIG_LEVEL_SQL|\ RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\ - RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF) + RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|\ + RIG_LEVEL_BAND_SELECT) #define FT950_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\ RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\ diff --git a/rigs/yaesu/ft990.c b/rigs/yaesu/ft990.c index 6833410a7..7da4f9264 100644 --- a/rigs/yaesu/ft990.c +++ b/rigs/yaesu/ft990.c @@ -262,7 +262,7 @@ const struct rig_caps ft990_caps = .has_set_func = RIG_FUNC_LOCK | RIG_FUNC_TUNER, .has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_SWR | RIG_LEVEL_ALC | \ RIG_LEVEL_RFPOWER | RIG_LEVEL_COMP, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_BACKLIGHT, .ctcss_list = NULL, diff --git a/rigs/yaesu/ft991.h b/rigs/yaesu/ft991.h index 3a0438a18..891341108 100644 --- a/rigs/yaesu/ft991.h +++ b/rigs/yaesu/ft991.h @@ -59,7 +59,8 @@ RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\ RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|\ RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|\ - RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER) + RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|\ + RIG_LEVEL_BAND_SELECT) #define FT991_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\ RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\ diff --git a/rigs/yaesu/ftdx10.h b/rigs/yaesu/ftdx10.h index 3db0bd4ba..e687e77e0 100644 --- a/rigs/yaesu/ftdx10.h +++ b/rigs/yaesu/ftdx10.h @@ -60,7 +60,8 @@ RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\ RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|\ RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|\ - RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER) + RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|\ + RIG_LEVEL_BAND_SELECT) #define FTDX10_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\ RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\ diff --git a/rigs/yaesu/ftdx101.h b/rigs/yaesu/ftdx101.h index fa59a13f4..a6d8089f1 100644 --- a/rigs/yaesu/ftdx101.h +++ b/rigs/yaesu/ftdx101.h @@ -59,7 +59,8 @@ RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_COMP|\ RIG_LEVEL_ANTIVOX|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|\ RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_RFPOWER_METER_WATTS|\ - RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_TEMP_METER) + RIG_LEVEL_COMP_METER|RIG_LEVEL_VD_METER|RIG_LEVEL_ID_METER|RIG_LEVEL_TEMP_METER|\ + RIG_LEVEL_BAND_SELECT) #define FTDX101_FUNCS (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_LOCK|\ RIG_FUNC_MON|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_VOX|\ diff --git a/rigs/yaesu/vr5000.c b/rigs/yaesu/vr5000.c index 83bd62454..7b3c051f1 100644 --- a/rigs/yaesu/vr5000.c +++ b/rigs/yaesu/vr5000.c @@ -155,7 +155,7 @@ const struct rig_caps vr5000_caps = .has_get_func = RIG_FUNC_NONE, .has_set_func = RIG_FUNC_NONE, .has_get_level = RIG_LEVEL_RAWSTR, - .has_set_level = RIG_LEVEL_NONE, + .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, .vfo_ops = RIG_OP_NONE, diff --git a/rigs/yaesu/vx1700.c b/rigs/yaesu/vx1700.c index c6fe0f97c..7b370cff0 100644 --- a/rigs/yaesu/vx1700.c +++ b/rigs/yaesu/vx1700.c @@ -239,7 +239,7 @@ const struct rig_caps vx1700_caps = .has_get_func = (RIG_FUNC_LOCK | RIG_FUNC_TUNER), .has_set_func = RIG_FUNC_NONE, - .has_get_level = RIG_LEVEL_NONE, + .has_get_level = RIG_LEVEL_BAND_SELECT, .has_set_level = RIG_LEVEL_RFPOWER, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, diff --git a/src/misc.c b/src/misc.c index e46b6741a..5eb7dab67 100644 --- a/src/misc.c +++ b/src/misc.c @@ -924,6 +924,7 @@ static const struct { RIG_LEVEL_SPECTRUM_AVG, "SPECTRUM_AVG" }, { RIG_LEVEL_SPECTRUM_ATT, "SPECTRUM_ATT" }, { RIG_LEVEL_TEMP_METER, "TEMP_METER" }, + { RIG_LEVEL_BAND_SELECT, "BAND_SELECT" }, { RIG_LEVEL_NONE, "" }, };