Wykres commitów

202 Commity (6b9fbf93a2254a2cda759390e1bf416e86748e01)

Autor SHA1 Wiadomość Data
Bill Somerville d9ab62445c
Deal with remote PTT type at the client end
Remote   PTT   must   always    be   either   RIG_PTT_RIG_MICDATA   or
RIG_PTT_NONE. Also take care not to  override any locally set PTT type
as it is feasible  to use a local hardware PTT at  the client end with
remote  CAT control.   Maybe an  odd arrangement  but Hamlib  does not
preclude it.  This is all  done while  preserving the accuracy  of the
ptt_type value in dump_state requests.
2020-06-01 13:51:44 +01:00
Michael Black W9MDB afeb77e6d2 rigctld will now return either PTT_NONE or PTT_RIG_MICDATA to rigctl client
https://github.com/Hamlib/Hamlib/issues/259
2020-05-31 22:33:56 -05:00
Michael Black W9MDB 9ecc14f897 Fix RIG_PTT_NONE detection from rigctl client by adding ptt_type to dumpcaps
https://github.com/Hamlib/Hamlib/issues/270
2020-05-30 16:59:36 -05:00
Michael Black W9MDB ad4033dbfc reduce debug level in rigctl_parse.c 2020-05-29 07:54:30 -05:00
Michael Black W9MDB 986ca4896d Removed unsed var in rigctl_parse.c 2020-05-28 11:26:41 -05:00
Michael Black W9MDB b8e315a526 Fix up rigctl_parse set_vfo_opt
https://github.com/Hamlib/Hamlib/issues/259
2020-05-27 23:44:18 -05:00
Michael Black W9MDB 677ccac4bc astyle files 2020-05-27 12:23:08 -05:00
Michael Black W9MDB 87a83ffbb1 rigctld now works with rigctl in vfo mode
https://github.com/Hamlib/Hamlib/issues/259
set_vfo_opt can now dynamically change vfo mode on rigctld
So this example now works...does some non-vfo stuff then switches to vfo mode
rigctl -m 2 F 14074000 V VFOB F 14076000 V VFOA f V VFOB f set_vfo_opt 1 f VFOA
rigctl commands v,V and S have been changed to not require VFO arguments
New API function rig_set_vfo_opt -- only implemented for Net rigctl as it doesn't apply to any other rigs
2020-05-27 12:21:41 -05:00
Michael Black W9MDB 796d71dddf Change vfo_mode to vfo_opt to distinguish it from rig mode 2020-05-26 12:01:44 -05:00
Michael Black W9MDB 823f97cf12 Some rigctld clients like Log4OM don't like the extra VFO argument being returned from the "f" command so we are removing it for now
https://github.com/Hamlib/Hamlib/issues/255Z
2020-05-20 09:39:43 -05:00
Michael Black W9MDB 545081c8d4 Fix rigctl/rigctld "V VFOA" protocol error
4.0 rigctld now works with 3.3 rigctl client and 4.0 rigctl client
https://github.com/Hamlib/Hamlib/issues/246
2020-05-15 14:17:59 -05:00
Michael Black W9MDB ee5af14b13 Restore backwards compatibility of rigctld
Need to figure out how to make "F" command with VFO backwards compatible probably by dynamic detection of newer rigctld
https://github.com/Hamlib/Hamlib/issues/246
2020-05-13 17:44:17 -05:00
Michael Black W9MDB 0354f8b738 Ensure ptt defaults to 0 for rigctl 2020-05-13 07:22:46 -05:00
Michael Black W9MDB d76de484a7 In rigctl_parse.c change default YAESU to be non-binary for 'w' command
https://github.com/Hamlib/Hamlib/issues/239
2020-05-12 08:33:36 -05:00
Michael Black W9MDB 74cdd96eda Fix merge of icom.c 2020-05-11 18:05:11 -05:00
mdblack98 067f95dda8 Fix rigctl w command with semicolon ending
https://github.com/Hamlib/Hamlib/issues/239
2020-05-06 17:45:02 -05:00
mdblack98 e9ffb2991d Fix rigctl interactive prompt 2020-05-06 08:54:34 -05:00
mdblack98 8ad431a344 Change #warn on get_channel to RIG_ENIMPL errors
This needs to be validated on the rigs to see the individual behavior
It only gives an error when read_only=0, read_only=1 does not give any error
We want the behavior of actually setting the rig display to be based on this flag
https://github.com/Hamlib/Hamlib/issues/227
2020-05-06 08:06:14 -05:00
mdblack98 9b96c24ff1 Add some debug to rigctl_parse.c 2020-05-03 17:07:22 -05:00
mdblack98 9e710156e3 Add ability for rigctld client to turn vfo mode on/off with (,)
https://github.com/Hamlib/Hamlib/issues/232
Add caching of some limited rig information
Can be adjusted or turned off with rig_cache_set_timeout_ms or in rigctl with \set_cache_timeout
https://github.com/Hamlib/Hamlib/issues/228
2020-05-01 12:03:54 -05:00
mdblack98 81c21ee314 Reduce debug info in rigctl_parse.c and rigctld.c 2020-04-30 16:52:11 -05:00
mdblack98 4cac924a3e Remove command not found for space in rigctl_parse.c 2020-04-27 11:29:03 -05:00
mdblack98 5eb5b6f3d8 https://github.com/Hamlib/Hamlib/issues/227
Added read_only flag everywhere
2020-04-26 14:37:03 -05:00
mdblack98 7dcb0ae88e astyle updates 2020-04-25 11:28:38 -05:00
mdblack98 ce2502e2f6 Change rigctl_parse.c debug to only use printable chars 2020-04-23 17:35:50 -05:00
mdblack98 9bf214fee3 Add debug to rigctl_parse.c chasing down Flex problem 2020-04-23 10:25:47 -05:00
mdblack98 3feaddfd73 Still working on Flex problem...
Adding debug to figure out why vfo_mode doesn't work with rigctl/rigctld
2020-04-22 11:47:56 -05:00
mdblack98 cae85c6dbe Improve debugstatement in rigctl_parse.c 2020-04-21 12:52:40 -05:00
mdblack98 1aef1c6285 Let rigctl_parse return when EOF is detected 2020-04-21 10:34:42 -05:00
Michael Black W9MDB 9b040dc0d8 Add debug to rigctld...chasing down Flex bug 2020-04-20 17:26:57 -05:00
Michael Black 32082a14d6 Add debug to rigctl_parse.c chasing down Flex bug 2020-04-19 12:08:08 -05:00
Michael Black 774cb9d25c More testing on Flex problem allow rigctld to continue executing 2020-04-15 12:28:42 -05:00
Michael Black 819be74317 Testing continuation of rigctld when nothing to scan 2020-04-15 11:55:07 -05:00
Michael Black 32a8ba45ae Allow empty line for noninteractive rigctld 2020-04-15 11:33:09 -05:00
Michael Black 9f3fbc07fd Add debug to rigctl_parse.c 2020-04-15 09:57:08 -05:00
Michael Black ba8f56dfbb Change sync_cb to encompass the entire transaction
Testing to see if the fixes the problem with Flex rigs
2020-04-15 09:37:22 -05:00
Michael Black 36ce07639b Fix 32-bit compilation on Raspian 2020-04-05 14:37:19 -05:00
Michael Black 643be3ccbe Fix rigctl_parse.c compile warning 2020-04-05 07:07:18 -05:00
Michael Black c48a28a98d Add comment to rigctl_parse.c 2020-04-04 15:49:26 -05:00
Michael Black 6a2e675216 Added new protocol 1 for dumpcaps with vfo_ops as the first one implemented
Protocol 1 is setting=value.  Order does not matter.  Can be multiline.
And is forward compatible as new values will just generate warnings on older versions
2020-04-04 09:38:50 -05:00
Michael Black ae45740da8 Fix rigctl pause command 2020-04-03 13:01:22 -05:00
Michael Black aa7e822d98 cppcheck-suppress rigctl_parse.c 2020-03-24 10:00:22 -05:00
Michael Black bda5feb1bd More cppcheck changes 2020-03-23 10:13:02 -05:00
Michael Black ea728feb03 Add VFO to rigctl(d) 'f' command
On Icom rigs, for example you will see "currVFO" if no VFO has been set
Eventually we will start showing MainA/MainB SubA/SubB for rigs that have that capability
2020-03-18 17:40:30 -05:00
Michael Black d0f114b178 Add macro_name to caps structures for rig, rot, and amp devices 2020-03-05 23:48:14 -06:00
Michael Black 8b462a0242 Add set_twiddle and get_twiddle functions
Add -W switch to rigctld to set twiddle timeout..don't need switch for rigctl since it can set from there with \set_twiddle
2020-02-24 09:34:02 -06:00
Michael Black ff8ddf018c astyle all C files 2020-02-23 11:26:09 -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 7358cd02f8 Merge branch 'master' of https://github.com/Hamlib/Hamlib 2020-02-11 17:05:51 -06:00
Malcolm Herring e3cef196f7 add g/set_ext_func to API 2020-02-11 09:48:13 +00:00
Michael Black feba5ac89a Change rigctl Y and y commands to be 1-based
Added simulation of 4 antennas to dummy device
Examples testing 4 antennas with option value=ant#
Rig command: y 0
Antenna: 1
Option: 0

Rig command: Y 1 1

Rig command: Y 2 2

Rig command: Y 3 3

Rig command: Y 4 4

Rig command: Y 5 5
set_ant: error = Invalid parameter

Rig command: y 0
Antenna: 4
Option: 4

Rig command: Y 1 1

Rig command: y 0
Antenna: 1
Option: 1

Rig command: y 1
Antenna: 1
Option: 1

Rig command: y 2
Antenna: 2
Option: 2
2020-02-10 12:17:30 -06:00
Michael Black b90d6daca8 Fix rigctl y command argument label 2020-02-10 08:03:19 -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 f9d4755cc0 Fix rig_get_ant to use bit settings 2020-02-04 07:40:24 -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 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 85541cc257 Merge remote-tracking branch 'Hamlib/master' 2020-01-18 05:59:49 +00:00
Michael Black d57cdc1cbf
More mingw32 fixes 2020-01-15 17:21:20 -06:00
Michael Black 16f85be147
More mingw32 fixes 2020-01-15 17:05:31 -06:00
Michael Black c437bbc4d1 Fix mingw32 build 2020-01-15 16:10:35 -06:00
Michael Black 0d304ecf53 Fix mingw32 build 2020-01-15 16:06:56 -06:00
Michael Black e50f552e0f Fix mingw32 build 2020-01-15 15:57:01 -06:00
Michael Black 4be4b7033b
Clean up HAVE_LIBREADLINE mods 2020-01-15 07:04:40 -06:00
Michael Black 297bf9aa6b
Fix cppcheck warnings 2020-01-14 23:36:01 -06:00
Malcolm Herring c4e0696ee1 add token list for ext operations 2020-01-06 19:54:09 +00:00
Malcolm Herring f497f503d7 fix merge conflicts 2020-01-05 08:17:46 +00:00
Michael Black 84f27614be
Remove debug from rigctl_parse.c 2020-01-04 17:08:31 -06:00
Malcolm Herring 4975150611 Merge remote-tracking branch 'Hamlib/master'
merge latest upstream
2020-01-04 06:00:03 +00:00
Malcolm Herring fcde35815b more extended operations 2020-01-04 05:59:44 +00:00
Michael Black fb51f4f902
Fix compile warnings in rigctl.c and rigctl_parse.c 2020-01-03 12:18:27 -06:00
Michael Black 2fca5f49b8
Remove hl_sleep.h as no longer needed 2019-12-24 15:21:06 -06:00
Michael Black a401d3ac78
Fix memory leak in rigctld and cleanup debug 2019-12-20 11:22:09 -06:00
Michael Black 4b442dba94
Fix clang warning in rigctl_parse.c 2019-12-19 14:45:48 -06:00
Michael Black d81d60dfc1
Fix cppcheck warnings in rigctl_parse.c 2019-12-19 11:55:14 -06:00
Michael Black eac8077c60
Fix possible buf overrun in rigctl_parse.c 2019-12-17 08:08:39 -06:00
Michael Black f9bed84d8e
Got the w and W commands working much better
ICOM test via rigctl
Rig command: w \0xfe\0xfe\0x58\0xe0\0x03\0xfd
Reply:\0xFE\0xFE\0x58\0xE0\0x03\0xFD\0xFE\0xFE\0xE0\0x58\0x03\0x00\0x50\0x09\0x14\0x00\0xFD 17
Rig command: W \0xfe\0xfe\0x58\0xe0\0x03\0xfd 17
Reply:\0xFE\0xFE\0x58\0xE0\0x03\0xFD\0xFE\0xFE\0xE0\0x58\0x03\0x00\0x50\0x09\0x14\0x00\0xFD 17

Rig command: w FA;
send_cmd: error = Invalid parameter
Rig command: W FA; 14
send_cmd_rx: error = Invalid parameter

ICOM test via rigctld
Rig command: w \0xfe\0xfe\0x58\0xe0\0x03\0xfd
Reply:\0xFE\0xFE\0x58\0xE0\0x03\0xFD\0xFE\0xFE\0xE0\0x58\0x03\0x00\0x50\0x09\0x14\0x00\0xFD 17
Rig command: W \0xfe\0xfe\0x58\0xe0\0x03\0xfd 17
Reply:\0xFE\0xFE\0x58\0xE0\0x03\0xFD\0xFE\0xFE\0xE0\0x58\0x03\0x00\0x50\0x09\0x14\0x00\0xFD 17

Rig command: w FA;
Reply:RPRT -1
Rig command: W FA; 14
Reply:RPRT -1

Kenwood test via rigctl
Rig command: w FA;
Reply:FA00014074000;
Rig command: W FA; 14
Reply:FA00014074000;

Rig command: w \0x46\0x41\0x3b
Reply:FA00014074000;
Rig command: W \0x46\0x41\0x3b 14
Reply:FA00014074000;

Kenwood test via rigctld
Rig command: w FA;
Reply:FA00014074000;
Rig command: W FA; 14
Reply:FA00014074000;

Rig command: w \0x46\0x41\0x3b
Reply:FA00014074000;

Rig command: W \0x46\0x41\0x3b 14
Reply:FA00014074000;
2019-12-12 22:29:13 -06:00
Michael Black 9eae761579
Added 'W' command for reading a fixed number of bytes
So we can now do this...write once to see how many bytes you get back
Rig command: w \0xfe\0xfe\0x58\0xe0\0x03\0xfd
Cmd:\0xFE\0xFE\0x58\0xE0\0x03\0xFD\0xFE\0xFE\0xE0\0x58\0x03\0x00\0x00\0x09\0x14\0x00\0xFD 17

Then use 'W' to write the command with the # of bytes to expect -- no timeout this way
Rig command: W \0xfe\0xfe\0x58\0xe0\0x03\0xfd 17
Cmd:\0xFE\0xFE\0x58\0xE0\0x03\0xFD\0xFE\0xFE\0xE0\0x58\0x03\0x00\0x00\0x09\0x14\0x00\0xFD 17
2019-12-09 23:37:14 -06:00
Michael Black fb73e5abd7
Fix some cppcheck warnings
Fix declarations after statements
Remove some !rig checks...we either don't need them or need them everywhere with a new error code
If you pass a NULL rig you get what you deserve :-)
2019-12-09 17:12:13 -06:00
Michael Black 2d94431848
Fix cppcheck warnings in rigctl_parse.c 2019-12-08 23:37:46 -06:00
Michael Black c9ace18daa
Fix hash sort comparison for models 2019-12-06 12:13:38 -06:00
Michael Black 1e889006b4
Minor change to rigctl_parse.c for ASCII print 2019-12-06 08:34:31 -06:00
Michael Black 9531f730b1
Change behavior of 'w' command in rigctld for binary commands
Now responds with hex string just like the input and the # of bytes
Will get hex string response for any binary data from rig from any command
Next step is to implement W command for known # of bytes in response to avoid the timeout
2019-12-06 07:58:19 -06:00
Michael Black 6bf3b00c4f
astyle all files 2019-11-30 10:19:08 -06:00
Michael Black 2f4d62709e
Added a dummy snprintf to rig_debug to allow gcc to check format strings
This found tons of errors in rig_debug statements
So this patch cleans up all the files that were producing warnings or errors
This should fix a few segfaults when running with debug turned on
2019-11-30 10:04:31 -06:00
Michael Black ca034f4c93
Fix rigctl_parse to allow NULL in binary data the right way 2019-10-21 16:00:41 -05:00
Michael Black 99945e87cf
Fix rigctl_parse to allow NULL in binary data 2019-10-21 15:41:38 -05:00
Michael Black 44a20c6a1e
Fix chk_vfo response 2019-09-09 22:45:55 -05:00
Bill Somerville d931bd4e18
Move unnecessary global and file static variables to the stack 2019-08-29 00:39:39 +01:00
Michael Black 5d16de90ee
Fix start/end names 2019-08-23 22:53:25 -05:00
Michael Black 73c1ecd165
Change freq & chan struct start/end to avoid colliding with LUA SWIG start/end 2019-08-17 23:20:48 -05:00
Michael Black 3dce8b01d1
Make rigctld thread safe for vfo_mode and ext_resp and change other globals to thread_local for future reference 2019-07-31 16:03:46 -05:00
Michael Black a8b6ceebb5 Fix compile warning in rigctl_parse.c 2019-05-22 09:27:01 -05:00
Michael Black 7123bb4403 Change rmode_t to uint64_t and remove unneeded casts 2018-12-22 23:56:30 -05:00
Michael Black 64b35ccbee Add PRXll macro for 64-bit use 2018-12-21 16:46:48 -05:00
Michael Black 422b266b9b Change RIG_MODE and RIG_FUNC to 64-bit values 2018-12-21 12:39:20 -05:00
Michael Black W9MDB a91e85e9fa Allow rigctld to continue operating after tcp or serial rig disappears 2018-05-08 22:37:32 -05:00
Michael Black W9MDB 9ba1f1a972 Fix compile warning on strings in tests 2018-04-22 18:38:16 -05:00
Nate Bargmann b0485aa475 Merge branch 'lazy-rigctld' of git://git.code.sf.net/u/bsomervi/hamlib into g4wjs-lazy-rigctld 2018-03-16 13:58:46 -05:00
Michael Black W9MDB c1c5639c00 Fix morse send of a single space 2018-03-13 09:05:03 -04:00