diff --git a/NEWS b/NEWS index 37ec46881..df5ce61f5 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,16 @@ Version 5.x -- future * rot_get_conf deprecated and replaced by rot_get_conf2 * Change FT1000MP Mark V model names to align with FT1000MP +Version 4.6.1 + * Fix C++ builds failing on rig_list_foreach function + * Fix IC9100 rigctld startup to end up on VFOA + * Fix grig build by removing sys/socket.h -- apparently not needed + * Add new QMX entry to fix incompability with QDX + * Fix IC746/PROT to not use data byte + * FLRig to add DATA-U DATA-L modes + * Fix TS570 RIG_LEVEL_STRENGTH with cal table + * Remove get_powerstat from IC785X -- not supported + Version 4.6 * send_raw can now take hex digits as colon-separated -- e.g. send_raw icom xfe:xfe:x94:xe0:03:xfd * Add IC7760 diff --git a/rigs/kenwood/ts2000.c b/rigs/kenwood/ts2000.c index 44d3e9b04..7e24a20ef 100644 --- a/rigs/kenwood/ts2000.c +++ b/rigs/kenwood/ts2000.c @@ -39,10 +39,15 @@ RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_NR|RIG_LEVEL_PREAMP|RIG_LEVEL_COMP|RIG_LEVEL_ATT|RIG_LEVEL_VOXDELAY|RIG_LEVEL_VOXGAIN|RIG_LEVEL_BKIN_DLYMS| \ RIG_LEVEL_METER|RIG_LEVEL_SWR|RIG_LEVEL_COMP_METER|RIG_LEVEL_ALC|RIG_LEVEL_RFPOWER_METER|RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW) + #define TS2000_LEVEL_SET (RIG_LEVEL_RFPOWER|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_AGC|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_CWPITCH| \ RIG_LEVEL_MONITOR_GAIN|RIG_LEVEL_NB|RIG_LEVEL_NR|RIG_LEVEL_PREAMP|RIG_LEVEL_COMP|RIG_LEVEL_ATT|RIG_LEVEL_VOXDELAY|RIG_LEVEL_VOXGAIN|RIG_LEVEL_BKIN_DLYMS| \ RIG_LEVEL_METER|RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW) +#define SDRCONSOLE_LEVEL_GET (|RIG_LEVEL_AGC|RIG_LEVEL_STRENGTH|RIG_LEVEL_METER|RIG_LEVEL_SLOPE_HIGH|RIG_LEVEL_SLOPE_LOW) +#define SDRCONSOLE_LEVEL_SET (RIG_LEVEL_NONE) + + #define TS2000_FUNC_ALL (RIG_FUNC_NB|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_NR|RIG_FUNC_NR|RIG_FUNC_BC|RIG_FUNC_BC2|RIG_FUNC_RIT|RIG_FUNC_XIT| \ RIG_FUNC_TUNER|RIG_FUNC_MON|RIG_FUNC_FBKIN|RIG_FUNC_LOCK|RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_ANF) @@ -1939,7 +1944,7 @@ struct rig_caps sdrconsole_caps = RIG_MODEL(RIG_MODEL_SDRCONSOLE), .model_name = "SDRConsole", .mfg_name = "SDR Radio", - .version = BACKEND_VER ".2", + .version = BACKEND_VER ".3", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -2142,46 +2147,46 @@ struct rig_caps sdrconsole_caps = .rig_cleanup = kenwood_cleanup, .set_freq = kenwood_set_freq, .get_freq = kenwood_get_freq, - .set_rit = ts2000_set_rit, - .get_rit = ts2000_get_rit, - .set_xit = ts2000_set_rit, - .get_xit = ts2000_get_rit, + //.set_rit = ts2000_set_rit, + //.get_rit = ts2000_get_rit, + //.set_xit = ts2000_set_rit, + //.get_xit = ts2000_get_rit, .set_mode = kenwood_set_mode, .get_mode = kenwood_get_mode, .set_vfo = kenwood_set_vfo, .get_vfo = kenwood_get_vfo_if, .set_split_vfo = kenwood_set_split_vfo, .get_split_vfo = kenwood_get_split_vfo_if, - .set_ctcss_tone = kenwood_set_ctcss_tone_tn, - .get_ctcss_tone = kenwood_get_ctcss_tone, - .set_ctcss_sql = kenwood_set_ctcss_sql, - .get_ctcss_sql = kenwood_get_ctcss_sql, + //.set_ctcss_tone = kenwood_set_ctcss_tone_tn, + //.get_ctcss_tone = kenwood_get_ctcss_tone, + //.set_ctcss_sql = kenwood_set_ctcss_sql, + //.get_ctcss_sql = kenwood_get_ctcss_sql, .get_ptt = kenwood_get_ptt, .set_ptt = kenwood_set_ptt, - .get_dcd = kenwood_get_dcd, - .set_func = ts2000_set_func, - .get_func = ts2000_get_func, + //.get_dcd = kenwood_get_dcd, + //.set_func = ts2000_set_func, + //.get_func = ts2000_get_func, .set_level = ts2000_set_level, .get_level = ts2000_get_level, - .set_ext_func = ts2000_set_ext_func, - .get_ext_func = ts2000_get_ext_func, - .set_ext_level = ts2000_set_ext_level, - .get_ext_level = ts2000_get_ext_level, - .set_ant = kenwood_set_ant, - .get_ant = kenwood_get_ant, - .send_morse = kenwood_send_morse, - .wait_morse = rig_wait_morse, - .send_voice_mem = kenwood_send_voice_mem, - .stop_voice_mem = kenwood_stop_voice_mem, - .vfo_op = kenwood_vfo_op, - .scan = kenwood_scan, - .set_mem = kenwood_set_mem, - .get_mem = kenwood_get_mem, - .get_channel = ts2000_get_channel, - .set_channel = ts2000_set_channel, - .set_trn = kenwood_set_trn, - .get_trn = kenwood_get_trn, - .set_powerstat = kenwood_set_powerstat, + //.set_ext_func = ts2000_set_ext_func, + //.get_ext_func = ts2000_get_ext_func, + //.set_ext_level = ts2000_set_ext_level, + //.get_ext_level = ts2000_get_ext_level, + //.set_ant = kenwood_set_ant, + //.get_ant = kenwood_get_ant, + //.send_morse = kenwood_send_morse, + //.wait_morse = rig_wait_morse, + //.send_voice_mem = kenwood_send_voice_mem, + //.stop_voice_mem = kenwood_stop_voice_mem, + //.vfo_op = kenwood_vfo_op, + //.scan = kenwood_scan, + //.set_mem = kenwood_set_mem, + //.get_mem = kenwood_get_mem, + //.get_channel = ts2000_get_channel, + //.set_channel = ts2000_set_channel, + //.set_trn = kenwood_set_trn, + //.get_trn = kenwood_get_trn, + //.set_powerstat = kenwood_set_powerstat, .get_powerstat = kenwood_get_powerstat, .get_info = kenwood_get_info, .reset = kenwood_reset,