mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
9 787 Commity
53 Gałęzie
28 Tagi
33 MiB
Wykres commitów

402 Commity (8e24746a3e14d0e3ed78e42d37a5132b99573b1e)

Autor SHA1 Wiadomość Data
Michael Black W9MDB 35001b12c0 astyle icom.c 2020-06-21 14:47:38 -05:00
Michael Black W9MDB 362fa77cfd Move poweron set outside of check to ensure only once whether started power off or on 
https://github.com/Hamlib/Hamlib/issues/297
 2020-06-14 17:20:31 -05:00
Michael Black W9MDB 8fd58e211d Rigs will only power up once if needed 
https://github.com/Hamlib/Hamlib/issues/297
 2020-06-14 17:14:24 -05:00
Michael Black W9MDB 71b867e141 Add some debug to icom.c 2020-06-14 09:43:42 -05:00
Michael Black W9MDB c5388b9f37 In icom.c remove priv->curr_vfo and change to rig->state.current_vfo 
https://github.com/Hamlib/Hamlib/issues/299
 2020-06-13 15:53:37 -05:00
Michael Black W9MDB 723f3f0773 Add some more rig cases for MainA/B and Sub A/B priv setting in icom_get_freq 
Add VFO_CURR as a valid VFO
https://github.com/Hamlib/Hamlib/issues/299
 2020-06-13 07:51:35 -05:00
Michael Black W9MDB 2db0da54ea Add VFO_CURR MAINA/B SUBA/B as valid vfos in icom.c 2020-06-12 17:54:41 -05:00
Michael Black W9MDB b15c73d2d2 Fix segmentation fault/endless loop for Icom rigs 2020-06-12 16:34:48 -05:00
Michael Black W9MDB 7cdaa0efd1 Change icom.c VFO_TX VFO_RX adjustment to use vfo_fixup function 
vfo_fixup should be able to handle all rigs variations
https://github.com/Hamlib/Hamlib/issues/299
 2020-06-12 07:57:13 -05:00
Michael Black W9MDB f6112a0d93 Remove block preventing IC910 from reading VFOB during split and returning VFOA 2020-06-11 22:27:38 -05:00
Michael Black W9MDB b910fa0c58 When get_split_freq_mode is called with RIG_VFO_CURR and split is not enabled 
we will assume the TX vfo is VFOB or Sub as appropriate
This hopefully makes WSJT-X happy with Icom rigs now.
https://github.com/Hamlib/Hamlib/issues/288
 2020-06-11 08:15:52 -05:00
Michael Black W9MDB 9e18b234c2 Change icom_get_split_freq to reset to rx_vfo when done 
Just like icom_set_split_freq
https://github.com/Hamlib/Hamlib/issues/291
 2020-06-10 17:16:52 -05:00
Michael Black W9MDB 876c7bd59f Fix RIG_VFO_TX clause in icom.c 2020-06-10 08:10:35 -05:00
Michael Black W9MDB f71c12da94 astyle files 2020-06-09 22:37:03 -05:00
Michael Black W9MDB 750857cdbc Update comment in icom.c 2020-06-09 22:28:13 -05:00
Michael Black W9MDB ee8dde16ea When rig_set_split_freq_mode is called and RIG_VFO_CURR is requested use default tx_vfo 
https://github.com/Hamlib/Hamlib/issues/288
 2020-06-09 12:16:45 -05:00
Michael Black W9MDB 718fcdf0c1 icom.c put one more satmode call in a RIG_FUNC_SATMODE clause 
https://github.com/Hamlib/Hamlib/issues/288
 2020-06-08 23:09:21 -05:00
Michael Black W9MDB c5732d542e Fix icom.c so most all satmode requests are restricted to rigs with RIG_FUNC_SATMODE 
https://github.com/Hamlib/Hamlib/issues/288
 2020-06-08 23:04:04 -05:00
Bill Somerville cc9dfd3b0e
Fixing an operator precedence defect 2020-06-06 02:24:04 +01:00
Michael Black W9MDB d9d1074f24 Fix IC-910 behavior with gpredict 
Now allows switching between full duplex, split, and non-split mode
https://github.com/Hamlib/Hamlib/issues/237
 2020-06-04 10:37:20 -05:00
Michael Black W9MDB a8e5a66ffd Add FT_DX101D as another rig that can't get freq during PTT 
https://github.com/Hamlib/Hamlib/issues/279
 2020-06-03 16:58:42 -05:00
Michael Black 00031994c6 Remove block setting VFO_A -- does not work with rigs that don't have 
VFO_A
https://github.com/Hamlib/Hamlib/issues/274
 2020-06-01 17:38:03 -05:00
Michael Black W9MDB 5df9f81bef Fix RIG_VFO_NONE problem in icom.c 
https://github.com/Hamlib/Hamlib/issues/270
 2020-05-30 16:59:18 -05:00
Michael Black W9MDB 353066a232 Fix rigctl/rigctld split ops/queries 
Add vfo_fixup function.  We should be able to do all vfo corrections in rig.c instead of backends.  So we're migrating that way....
https://github.com/Hamlib/Hamlib/issues/269
 2020-05-30 09:34:13 -05:00
Michael Black W9MDB 677ccac4bc astyle files 2020-05-27 12:23:08 -05:00
Michael Black W9MDB 281022447c Update some more items in icom.c where appropriate 2020-05-25 09:11:32 -05:00
Michael Black W9MDB 1add89bd71 Add rules for setting VFO_RX and VFO_TX for different rig types 
https://github.com/Hamlib/Hamlib/issues/261
 2020-05-24 23:42:35 -05:00
Michael Black W9MDB a77a57ff38 Disallow requesting a vfo that the rig doesn't have. 
This could be changed to automatically selecting a valid VFO so
VFOA=Main or Main=VFOA for example but not sure if we want to do this.
This is already being done for the IC-9700 for example since satmode
only has Main/Sub where non-satmode has MainA/MainB/SubA/SubB
So the question is do we emulate VFOA/B and Main/Sub for all rigs?
 2020-05-21 15:51:41 +02:00
Michael Black W9MDB 9c902dd03b IC-9700 in satmode requesting "S 1 Sub" will now return RIG_OK without 
taking any action
Since satmode is Sub split anyways this makes sense
https://github.com/Hamlib/Hamlib/issues/254
 2020-05-20 06:42:06 +02:00
Michael Black W9MDB 5a631b2f54 Fix icom detection of split mode setting vfos 
https://github.com/Hamlib/Hamlib/issues/250
 2020-05-18 00:39:08 +02:00
Michael Black W9MDB 2e3678d1a7 Fix main/sub frequency saved values 2020-05-17 17:27:28 -05:00
Michael Black W9MDB ba703787d9 Merge branch 'master' of https://github.com/mdblack98/Hamlib 2020-05-16 15:22:48 -05:00
Michael Black W9MDB 1af1650716 Fix IC_9700 type rigs when client asks for Sub VFO but split or satmode 
is not in use
https://github.com/Hamlib/Hamlib/issues/250
 2020-05-16 21:34:26 +02:00
Michael Black W9MDB 87b25d0c43 If icom rig is asked for VFOA/B but only has Main/Sub 
then we map VFOA=Main VFOB=Sub
https://github.com/Hamlib/Hamlib/issues/250
 2020-05-16 08:31:34 -05:00
Michael Black W9MDB 906a369e00 Change icom behavior for IC-9700 type rig with Main/A/B && Sub A/B setup 
If Sub is asked for but neither split nor satmode is on it will get changed
to VFOB instead which should avoid doing a VFO swap
https://github.com/Hamlib/Hamlib/issues/250
 2020-05-16 07:55:59 -05:00
Michael Black W9MDB 156db580f8 IC-910 (and hopefully IC-9700) now working with gpredict in both simplex non-satmode and full duplex satmode 
As of 20200514 switching to satmode will automically switch rig to satmode
But switching back to simple requires manually going back to split mode until gpredict provide the correct split mode request of "S 1 VFOB" or "S 1 VFOA"
https://github.com/Hamlib/Hamlib/issues/237
 2020-05-14 12:15:37 -04:00
Michael Black W9MDB 9c4dfbc34c Fix IC910 satellite mode operations 
https://github.com/Hamlib/Hamlib/issues/237
 2020-05-14 10:21:47 -04:00
Michael Black W9MDB ad7fe1253b Fix merge 2020-05-12 12:28:19 -05:00
Michael Black W9MDB 6a199559fa Fix merge 2020-05-12 12:22:51 -05:00
Michael Black W9MDB fca384dcd6 Fix debug statement in icom.c 2020-05-12 12:16:12 -04:00
Michael Black W9MDB 2813f0ef63 astyle files 2020-05-11 22:39:10 -05:00
Michael Black W9MDB 74cdd96eda Fix merge of icom.c 2020-05-11 18:05:11 -05:00
Michael Black W9MDB 3b2225e489 Fix IC-910 split mode operation with gpredict 
https://github.com/Hamlib/Hamlib/issues/237
 2020-05-11 19:00:52 -04:00
Michael Black W9MDB 0ffddf779d Change icom.c set_freq to detect error on bad freq set and swap VFOs back and not update anything 
Add some more debug
https://github.com/Hamlib/Hamlib/issues/237
 2020-05-10 07:40:06 -05:00
Michael Black W9MDB 1a4e61b2dd Fix several strerror that should be rigerror 2020-05-09 11:52:27 -05:00
mdblack98 0b3605597f Fix cppcheck warning in icom.c 2020-05-05 22:20:33 -05:00
mdblack98 fa711bb550 Remove unused variable set in icom.c 2020-05-05 22:18:18 -05:00
mdblack98 a3b1b055b3 Fix cppcheck warnings 2020-05-05 11:32:09 -05:00
mdblack98 05ad81bd2c Update comment in icom.c 2020-05-05 09:50:57 -05:00
mdblack98 baa3787bc5 Add ELAPSED_INVALIDATE for caching use 
Change rig_get_vfo to use ELAPSED_INVALIDATE
Change elapsed_ms code to make a little more sense
https://github.com/Hamlib/Hamlib/issues/231
 2020-05-02 11:19:44 -05:00
mdblack98 48b0234caf icom.c if VFOA/B is requested for rig without VFOA/A maps to Main/Sub 
https://github.com/Hamlib/Hamlib/issues/231
 2020-05-01 17:51:20 -05:00
mdblack98 2991d43e26 If icom.c rig_get_freq is called and VFO is None then VFO gets set to the requexted VFO 
https://github.com/Hamlib/Hamlib/issues/231
 2020-05-01 10:35:16 -05:00
mdblack98 acc468fcfd Fix channel reading for civ_731 icom rigs 
I assume this is true on all such rigs that they return 5 bytes
Writing and reading a channel should confirm it by returning the correct freq
https://github.com/Hamlib/Hamlib/issues/217
 2020-04-26 08:45:16 -05:00
mdblack98 7a075ae9fd https://github.com/Hamlib/Hamlib/issues/222 
Fix order of calls in icom_get_split_vfos
Need to set split before getting vfos
 2020-04-23 22:50:34 -05:00
mdblack98 a9a604758d https://github.com/Hamlib/Hamlib/issues/222 
Fix icom_get_split_vfo filling in rx_vfo and tx_vfo
icom_get_split_vfo: vfo=currVFO rx_vfo=None tx_vfo=None split=0
 2020-04-23 15:35:29 -05:00
Michael Black c489f97624 More cppcheck changes 2020-03-20 07:51:32 -05:00
Michael Black f90046516e Fix cppcheck item in icom.c 2020-03-16 11:56:34 -05:00
Michael Black de624c0b8e Remove get_freq_range from icom_open 2020-03-16 11:17:16 -05:00
Michael Black 35fffc4f38 astyle files 2020-03-15 15:32:46 -05:00
Michael Black 4d06d195e5 Fix ackbuf and add vfo set default in rig_set_split_freq 2020-03-15 15:21:24 -05:00
Michael Black 9ab1130d09 Remove setting default vfo in icom_get_freq. 
Fix 0x1c0x03 command frequency
 2020-03-15 15:03:27 -05:00
Michael Black 4b31563ffb Change all rc names to retval for consistency 2020-03-14 23:29:07 -05:00
Michael Black 33c1adb158 Add 0x1c 0x03 command to icom_get_freq to eliminate vfo swapping when asking for VFO_TX 2020-03-14 23:25:27 -05:00
Michael Black d61719ef3b Add 0x1c 0x03 command to get tx freq in icom_get_split_freq 2020-03-14 22:57:29 -05:00
Michael Black 1e658578ec Reset x25cmdfails when SATMODE is called 2020-03-14 15:21:56 -05:00
Michael Black 92c6f3924e Only do x25 command if not in satellite mode for icom rigs 2020-03-14 15:07:49 -05:00
Michael Black 79661711f1 Change 0x25 to constant in icom.c 2020-03-14 14:55:46 -05:00
Michael Black 40ebea303c astyle icom.c 2020-03-14 14:51:35 -05:00
Michael Black b1185fb5ff Set x25cmdfails so it won'r get repeated if not available 2020-03-14 14:51:23 -05:00
Michael Black f0506f3ab4 Add 0x25 command testing icoms that can set vfos without swapping 2020-03-14 13:00:46 -05:00
Michael Black e8673161fd Change icom satmode rigs to return to rx_vfo after set_split_freq 2020-03-13 10:09:32 -05:00
Michael Black e9ba470d65 Ensure priv->curr_vfo is set to Main for SATMODE rigs as default when no VFO has been set before asking get_* functions 2020-03-13 08:44:01 -05:00
Michael Black b5680c108d Working on get_freq_range 2020-03-12 17:53:49 -05:00
Michael Black 6e61069df5 Working on get_freq_range 2020-03-12 17:42:23 -05:00
Michael Black 6983bdd3b0 Working on get_freq_range 2020-03-12 17:32:17 -05:00
Michael Black 793f73475b Working on get_freq_range 2020-03-12 17:19:20 -05:00
Michael Black d26006122f Working on get_freq_range 2020-03-12 17:11:08 -05:00
Michael Black 66b3190fa9 Improve comment in icom.c 2020-03-12 17:01:59 -05:00
Michael Black e197b90d81 Working on get_freq_range 2020-03-12 16:58:55 -05:00
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 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 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 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 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 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 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 1979b99574 Fix VFO_DUAL macro 2020-02-18 23:44:02 -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 5f311c1b3f Fix debug statement 2020-02-16 23:32:44 -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 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 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
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 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 6066b66799 remove ant_count from icom_rig_init..causes segfault 2020-02-03 22:46:15 -06:00
Michael Black de637003e9 Removed debug 2020-02-03 16:06:34 -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 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
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 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 4c9df1624b
Merge branch 'master' of https://github.com/Hamlib/Hamlib 2020-01-23 11:56:35 -06: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 a656ff580a New custom parm implementations 2020-01-21 10:44:40 +00:00
Malcolm Herring 9bff33896e new directory structure 2020-01-18 15:31:23 +00:00