Commit Graph

514 Commits

Author SHA1 Message Date
Michael Black
c8e4e99e97 Reenable icom_get_freq_range now that rigctld stays open after first called 2020-03-12 15:57:05 -05:00
Michael Black
42871be196 Added some places to set default vfo when vfo has not been set yet. We're avoiding setting the default VFO on startup but allowing for clients which don't set the vfo properly.
Commented out icom_get_freq_range as can't have this on every rig_open call...too busy for rigctld
2020-03-12 10:12:59 -05:00
Michael Black
7685613310 Add setting of vfo when client does not set vfo themselves and instead asks to do things with RIG_VFO_CURR 2020-03-11 17:37:23 -05:00
Michael Black
40919d703f Fix icom_get_freq_range index 2020-03-09 23:03:48 -05:00
Michael Black
e6e9d8d8aa Fix acklen in icom_get_freq_range 2020-03-09 22:56:25 -05:00
Michael Black
d5592f43a8 Remove set_vfo from icom_get_split split=0 2020-03-09 15:37:53 -05:00
Michael Black
ced93c5c7c Disabel set_vfo calls in icom_set_split
Needs to be tested with gpredict operations
2020-03-09 12:25:33 -05:00
Michael Black
aaf8a074d9 Force final VFO selection in icom_set_split 2020-03-09 09:16:30 -05:00
Michael Black
7a174df5b7 Bump icom.h version 2020-03-09 09:15:21 -05:00
Michael Black
16fed06ba1 Adding dynamic freq_range for Icoms stage2 2020-03-08 23:18:33 -05:00
Michael Black
df1b7620db Adding dynamic freq_range for Icoms 2020-03-08 10:09:37 -05:00
Michael Black
c21fdf3747 Beginning implementation of dynamic detection of freq_range for Icom rigs 2020-03-08 09:23:11 -05:00
Michael Black
53b1a93431 Fix icom_rig_open return for RIG_OK 2020-03-07 22:00:15 -06:00
Michael Black
1e2a08f65b Bump icom.h version 2020-03-06 22:19:22 -06:00
Michael Black
117379f42e Add VFO_A set to IC9700 type Icom rigs 2020-03-06 22:19:03 -06:00
Michael Black
57c7f2a19f astyle files 2020-03-05 23:49:22 -06:00
Michael Black
30a8a690ca Fix IC9700 return to VFOA when in split instead of Main 2020-03-05 17:22:51 -06:00
Michael Black
59e92ab829 Fix set_split_vfo for IC9700 and similar rigs 2020-03-05 15:31:56 -06:00
Michael Black
6493d71e1b Fix spelling error in icom.c 2020-03-05 14:31:19 -06:00
Michael Black
837006d87b Fix 'S 1 Sub' for icom rigs with A/B only 2020-03-05 10:45:19 -06:00
Michael Black
d856248178 Add RIG_MODEL macro and change all rigs to support it 2020-03-05 08:44:18 -06:00
Michael Black
39ac8e7be2 Fix set_vfo when asking for Main/Sub on rig that doens't have Main/Sub 2020-03-03 15:30:14 -06:00
Michael Black
7609efbe5a Fix cppcheck warnings in icom.c 2020-03-01 23:01:24 -06:00
Michael Black
48833e2263 Update icom.c 2020-03-01 15:51:03 -06:00
Michael Black
7ae2f28862 Add LEVELS to ic9700 to make grep work for finding levels 2020-03-01 10:01:01 -06:00
Michael Black
8096f848fa Add logic to update tx_vfo for ic9700 when satmode is turned on/off 2020-03-01 09:00:16 -06:00
Michael Black
8981201e4b Add ic9700 logic to set_vfo_curr 2020-03-01 08:11:07 -06:00
Michael Black
b0fcd87f7f Add satmode rig logic to set_split_freq 2020-02-29 16:24:31 -06:00
Michael Black
e55e1feb86 Add satmode detection to rig_get_split_vfos 2020-02-29 14:59:24 -06:00
Michael Black
1bc024e73e Add set_vfo to return satmode rigs to original vfo 2020-02-29 14:27:26 -06:00
Michael Black
af09b043ea Change satmode rig split_get_freq to return to starting VFO 2020-02-29 14:09:54 -06:00
Michael Black
d631b2d215 Potential fix for SATMODE rigs to leave VFO on Main 2020-02-29 13:36:50 -06:00
Michael Black
013b0b655e Add Main/Sub split clause for IC9700 and presumably other rigs with satmode 2020-02-28 17:29:49 -06:00
Michael Black
539df1624d Trying to get IC9700 split working with WSJTX
Changed get_split_vfos to recognize priv->split_on
2020-02-28 17:02:12 -06:00
Michael Black
e03dd0af47 Fix cppcheck warning in icom.c 2020-02-24 10:24:34 -06:00
Michael Black
ff8ddf018c astyle all C files 2020-02-23 11:26:09 -06:00
Michael Black
821e046e77 Enable ic9700 SCREENSAVER 2020-02-23 10:36:51 -06:00
Michael Black
0b3aa6d4df Make new PARMS for ic9700 2020-02-23 10:20:24 -06:00
Michael Black
a6e2823c91 Add SCREENSAVER parm to ic9700 2020-02-23 10:09:45 -06:00
Michael Black
f4c1143959 Add SCREENSAVER parm...implemented for 9700 for now 2020-02-23 09:48:21 -06:00
Michael Black
1550a04716 IC-9700 (and any other dual VFO Icom rig) now works with gpredict
Added some future priv items for possible better i/o with the rig handling frequency changes
2020-02-23 07:50:41 -06:00
Michael Black
e4c21c491a Add logic for ic9700 reversing Main/Sub bands 2020-02-21 18:06:24 -06:00
Michael Black
d4d3c2bdf7 Ensure Main/Sub is set for icom_get_split_vfos 2020-02-21 17:10:42 -06:00
Michael Black
777882e3d6 Implement satmode for icom rigs in icom_get_split_vfos 2020-02-21 15:45:05 -06:00
Michael Black
4f55246256 Bump version# in icom.h 2020-02-21 09:59:43 -06:00
Michael Black
0fe080bf26 Add ic706* rigs to mode_731. They are part of the gang that have 8-digit freqencies and can read passband but can't select passband.
According to the CI-V+ manual the IC-781, IC-R9000, and IC-R7000 can select passband.
The other rigs listed apparently cannot...notes added to icom.h on this
1-706
2-706MKII
3-706MKIIG
4-707
5-718
6-746
7-746PRO
8-756
9-756PRO
10-756PROII
11-820H
12-821H
13-910H
14-R10
15-R8500
16-703
17-7800
2020-02-21 09:48:42 -06:00
Michael Black
4c41f8cb04 Fixing icom Main/Sub problem where some software asks for Main/Sub
and the rig does not have Main/Sub.  Now maps Main/Sub to A/B.
May be more places these needs to be done.
2020-02-21 09:46:00 -06:00
Michael Black
bf4108570b Fix icom/frame.c to not give an unsupported mode error when pd==-1 2020-02-21 09:45:31 -06:00
Michael Black
14809b6d43 Remove unneeded code from icom_set_split_ 2020-02-19 23:51:43 -06:00
Michael Black
af039f684e Trying to fix set_split_freq for ic9700 satmode 2020-02-19 23:24:28 -06:00
Michael Black
95c44021e0 Fix freq_range table power in ic7300 2020-02-19 23:23:52 -06:00
Michael Black
1979b99574 Fix VFO_DUAL macro 2020-02-18 23:44:02 -06:00
Michael Black
d7f7e551b4 Bump icom.h version 2020-02-18 23:12:42 -06:00
Michael Black
e315f5e3ac Added skeleton for new get_ant function that will return ant_tx and ant_rx if known
Every rig will need to be reviewed to fill these in as appropriate
2020-02-18 23:10:14 -06:00
Michael Black
5883dbc29e Fix memory channels for ic9700 2020-02-17 08:05:19 -06:00
Michael Black
5f311c1b3f Fix debug statement 2020-02-16 23:32:44 -06:00
Michael Black
3c1f0a870c Update frequency ranges for ic9100 and ft991 using new tagged ranges
ic9100 now has 5 ranges and ft991 just 1
We will need to update all rigs to this new format
All rigs should be converted to hardware-based freq ranges allowing for non-region based radios
This will probably mean getting rid of REGION macros and such
2020-02-16 23:21:39 -06:00
Michael Black
1371e200e1 Add RIG_VFO_CURR to icom_set_split_vfo 2020-02-16 23:11:22 -06:00
Michael Black
8c11893a21 Fix icom_set_split_freq to allow for RIG_VFO_CURR request 2020-02-15 23:20:31 -06:00
Michael Black
28e4311d7f Add error condition in set_split_vfo in icom.c 2020-02-13 23:25:11 -06:00
Michael Black
2d6b5fabd0 Update icom version number 2020-02-13 23:20:28 -06:00
Michael Black
4d3cd7b0ab Add VFO_MAIN capability to set_split_vfo 2020-02-13 23:19:07 -06:00
Malcolm Herring
18153de3b4 additional error checking for extended operations 2020-02-13 16:08:16 +00:00
Michael Black
a85160b1b9 Fix icom get_ant return value 2020-02-12 12:23:55 -06:00
Michael Black
9d4e1c502a Fix rx_range and tx_range lists for ic9700 2020-02-12 08:11:52 -06:00
Michael Black
49aa7d00a7 Fix get_ant RIG_ANT_CURR logic 2020-02-12 07:20:34 -06:00
Michael Black
7358cd02f8 Merge branch 'master' of https://github.com/Hamlib/Hamlib 2020-02-11 17:05:51 -06:00
Michael Black
3afdd14b36 Fix spelling error 2020-02-11 17:04:06 -06:00
Malcolm Herring
e3cef196f7 add g/set_ext_func to API 2020-02-11 09:48:13 +00:00
Michael Black
d6f06db7b9 Add custom get_ant for IC-785x 2020-02-07 17:17:08 -06:00
Malcolm Herring
b675362740 Merge remote-tracking branch 'Hamlib/master' 2020-02-07 04:32:42 +00:00
Michael Black
f565eac0a8 Make icom set_ant do a 2-step process to set rx option first, then set antenna 2020-02-06 06:48:32 -06:00
Michael Black
fdef21f068
Merge pull request #193 from mdblack98/master
2020-02-05 Patches
2020-02-05 23:24:48 -06:00
Dawid Szymanski
7bff9f4a91 typo fix 2020-02-06 01:15:35 +01:00
Dawid Szymanski
c6e06bfb01 ICOM Voice Keyer implemented. 2020-02-06 01:00:34 +01:00
Michael Black
8958e1419b Fix Icom get_ant to use 0x12 without option to ask for specific antenna 2020-02-05 15:57:56 -06:00
Michael Black
864fe6f5c1 Update icom priv_data entries to standardize them 2020-02-03 23:33:49 -06:00
Michael Black
6066b66799 remove ant_count from icom_rig_init..causes segfault 2020-02-03 22:46:15 -06:00
Michael Black
2ff37e44b7 Add some antenna info to Icom README 2020-02-03 16:27:10 -06:00
Michael Black
de637003e9 Removed debug 2020-02-03 16:06:34 -06:00
Michael Black
6d53f7d0fd Standardize Icom version numbers 2020-02-03 16:05:22 -06:00
Michael Black
bf5180d77b Add antack_len and ant_count to all Icom rigs that have get/set_ant 2020-02-03 15:59:36 -06:00
Michael Black
8e63c6a21d Remove get_anant_count as 7851 does not have ability to determine # of antennas 2020-02-03 11:30:49 -06:00
Michael Black
28dad4f15f Bump up priv_cap->ant_count before calling rig_get_ant 2020-02-02 17:05:52 -06:00
Michael Black
7e8938ae65 Changed y command to now use mandatory antenna argument
Put a looplimit on icom_get_ant_count trying to get autodetect to work
Changes to icom_get_ant_count to try and get this working
Added dummy antenna # args to rigs that don't care i.e. only have 1 antenna
2020-02-02 08:38:10 -06:00
Michael Black
12e93dd603
Fix antenna count in icom.c 2020-01-31 12:25:50 -06:00
Michael Black
fd965de5c9
Add ant_count to icom.h 2020-01-31 09:35:57 -06:00
Michael Black
60215785e1
Changes to get antenna calls working in rigctld
Change to ic785x.c to get antenna calls working
Added automatic detection of # of antennas for Icom rigs
Note that rig_get_ant returns a zero-based antenna# and not RIG_ANT1/2/3/4....
rig_set_ant on the other hand takes RIG_ANT1/2/3/4 as the argument for antenna
These RIG_ANT settings are a bit mask
This may have to be converted in the rig back end to whatever the rig expects
2020-01-30 12:12:13 -06:00
Malcolm Herring
0f87f74ff1 Merge remote-tracking branch 'Hamlib/master' 2020-01-29 13:49:29 +00:00
Michael Black
42108f9638
Change icom_get_usb_echo_off to use 0x03 instead of 0x19 since not all rigs provide 0x19 2020-01-28 12:07:11 -06:00
Michael Black
c2820e4ac2
Remove const from priv_caps in icom rig backends
Part of implementing some dynamic caps
Can stil be const in routines that are read-only as in icom.c
2020-01-28 08:32:25 -06:00
Michael Black
d0ebb52593
Removed some debug 2020-01-28 08:24:31 -06:00
Michael Black
2e41b8e030
Change ic785x priv_caps to non-const as we are putting in some dynamic caps now
Will have to change all other icom rigs too
2020-01-28 08:20:41 -06:00
Michael Black
203c94fa4a
Fix get_ant/set_ant commands to work with 1 or 2 byte responses in icom rigs 2020-01-27 17:33:01 -06:00
Michael Black
f143d8abd9
Fix cppcheck warnings 2020-01-23 17:20:41 -06:00
Michael Black
4c9df1624b
Merge branch 'master' of https://github.com/Hamlib/Hamlib 2020-01-23 11:56:35 -06:00
Malcolm Herring
c8489486d7 correct rig_close cap 2020-01-23 17:51:45 +00:00
Michael Black
09f2ca78d1
Merge pull request #184 from malcolmh/master
Implement new Icom custom parms & levels method for rigs that use them
2020-01-23 11:45:11 -06:00
Michael Black
1ea577e505
Merge pull request #182 from ra1nb0w/ic746
ic746.c: fix ic746pro_get_channel() and implement ic746pro_set_channel()
2020-01-23 11:40:19 -06:00
Davide Gerhard
ccd1010e3e
ic746.c: add ic746pro_set_channel() to load memory from csv
tested with IC-7400 (aka IC-746Pro)

note:
if the csv line is without frequency or mode the memory channel
will be cleared

Closes: https://github.com/Hamlib/Hamlib/issues/125
2020-01-22 08:20:34 +01:00
Davide Gerhard
999bc11b74
ic746.c: correct chanbuf length, fix channel structure and support split
on channel_str_t
- enable pol to align the structure with membuf
  needed by ic746pro_get_channel() to save the description name

on ic746pro_get_channel()
- fix chanbuf length
- add split configuration
2020-01-22 08:09:30 +01:00
Michael Black
d853c36fb3
Change get_ant to add another option for icom rigs (and others if needed) 2020-01-21 17:53:12 -06:00
Malcolm Herring
0b75c87df2 restore get_powerstat 2020-01-21 14:45:35 +00:00
Malcolm Herring
a656ff580a New custom parm implementations 2020-01-21 10:44:40 +00:00
Malcolm Herring
86ac360e92 Merge remote-tracking branch 'Hamlib/master' 2020-01-21 06:58:59 +00:00
Nate Bargmann
49ec88ce84
Remove duplicate initializer
Quell the following clang warning:

  CC       id51.lo
../../../hamlib/rigs/icom/id51.c:195:22: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
    .set_powerstat = icom_set_powerstat,
                     ^~~~~~~~~~~~~~~~~~
../../../hamlib/rigs/icom/id51.c:181:22: note: previous initialization is here
    .set_powerstat = icom_set_powerstat,
                     ^~~~~~~~~~~~~~~~~~
1 warning generated.
2020-01-20 18:26:32 -06:00
Malcolm Herring
e972bd8657 correct powerstat caps 2020-01-20 16:15:05 +00:00
Nate Bargmann
9e88710f0b
Merge branch 'master' of https://github.com/malcolmh/Hamlib into malcolmh-master 2020-01-20 03:44:59 -06:00
Malcolm Herring
9bff33896e new directory structure 2020-01-18 15:31:23 +00:00
Michael Black
4072f9f4a5
Fix ic746pro_get_channel and buffer overflow
Add channel_desc to dump_csv and dump_xml
2020-01-18 08:53:18 -06:00
Michael Black
8d6e2fc781
Directory migration to new layout 2020-01-17 09:22:44 -06:00
Michael Black
347e351ea6
Add icom_rig_open/close to all icom rigs 2020-01-17 09:22:01 -06:00
Michael Black
78464751fd
Bump ICR9500 version 2020-01-16 23:34:44 -06:00
Michael Black
977b739ff0
Add ICR9500_STR_CAL 2020-01-16 23:34:03 -06:00