Commit Graph

689 Commits

Author SHA1 Message Date
Michael Black
4150f12f36 Suppress unimportant error in rigctld.c 2020-03-15 16:31:19 -05:00
Michael Black
33babeaeff Fix rigctdl multiple connections 2020-03-15 16:19:43 -05:00
Michael Black
35fffc4f38 astyle files 2020-03-15 15:32:46 -05:00
Michael Black
ed4b77726a Add VFO None for available VFOS 2020-03-15 09:52:47 -05:00
Michael Black
39ba535c77 Add Date/Time to rigctl version 2020-03-15 09:50:03 -05:00
Michael Black
e4058156b1 Change rigctld to keep the rig open all the time
When a single client connects/disconnecta/connects it takes a bit too long to open the rig sometimes
2020-03-12 12:06:06 -05:00
Michael Black
98e1316f11 Fix -L printout for rotctl south_zero 2020-03-10 17:00:44 -05:00
Michael Black
f46067977a Fix rotctl set_conf 2020-03-10 08:43:42 -05:00
Michael Black
e704f7783c Fix rotctl state printout to show az_offset and el_offset 2020-03-10 07:07:21 -05:00
Michael Black
57c7f2a19f astyle files 2020-03-05 23:49:22 -06: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
d856248178 Add RIG_MODEL macro and change all rigs to support it 2020-03-05 08:44:18 -06:00
Michael Black
18cc118443 Change -W switch to -X 2020-02-24 22:56:18 -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
657d329ed2 Comment out one line to eliminiate warnings for now 2020-02-23 09:50:23 -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
8f87c22995 Add ANT_UNKNOWN to antenna print 2020-02-17 23:02:25 -06:00
Michael Black
6d3dd3f014 Add dumpcaps for new 5-antenna range settings 2020-02-17 06:43:02 -06:00
Michael Black
48a89e72a7 Change Low Power and High Power in dumpcaps to show resolution of value 2020-02-11 23:39:08 -06:00
Michael Black
35eb5bfa5c Change sprintf_ant to print ant names instead of numbers 2020-02-11 23:32:19 -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
Bill Somerville
376b328ecb
Report unrecognised PTT and DCD types in rigctl and rigctld 2020-01-26 11:31:40 +00:00
Bill Somerville
99e1948cd3
Made PTT and DCD options consistent between rigctl and rigctld 2020-01-26 10:46:57 +00:00
Michael Black
4c9df1624b
Merge branch 'master' of https://github.com/Hamlib/Hamlib 2020-01-23 11:56:35 -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
Michael Black
09df074570
Fix -ldl linking when --disable-winradio is used 2020-01-22 23:39:03 -06:00
Michael Black
2b96ab4907
Remove -ldl from tests/Makefile.am -- need to find another solution 2020-01-21 18:03:50 -06:00
Michael Black
ebc951e05a
Merge branch 'master' of https://github.com/mdblack98/Hamlib 2020-01-21 18:02:11 -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
Michael Black
2ce7721506 Add -ldl to tests/Makefile.am 2020-01-21 11:58:25 -06:00
Davide Gerhard
38d76f33bf
tests/{memcsv.c,memsave.c}: partially revert commit 4072f9f4
this partially revert the commit 4072f9f4
because it introduced duplication of channel_desc
2020-01-21 10:52:48 +01:00
Nate Bargmann
9e88710f0b
Merge branch 'master' of https://github.com/malcolmh/Hamlib into malcolmh-master 2020-01-20 03:44:59 -06: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
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
ccaaa41d83
Merge branch 'master' of https://github.com/mdblack98/Hamlib 2020-01-15 15:58:11 -06:00
Michael Black
5646eb3fe4
Move hist_dir_stat 2020-01-15 15:58:04 -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
Michael Black
c7ace4d7ad
Fix cppcheck warnings in uthash.h 2020-01-14 17:02:36 -06:00
Michael Black
4cc80fa603
Fix up some cppcheck warnings in rotctl_parse.c 2020-01-14 14:18:47 -06:00
Michael Black
0fd7278682
Fix cppcheck warning in rigswr.c 2020-01-14 12:20:06 -06:00
Michael Black
e37b9d9a8b
Fix cppcheck warning in rigsmtr.c 2020-01-14 12:19:16 -06:00
Michael Black
b6cfd63089
Fix cppcheck warning in rigmem.c 2020-01-14 11:44:49 -06:00
Michael Black
7a2dca368a
Fix cppcheck warnings in ampctl_parse.c 2020-01-14 10:04:08 -06:00
Michael Black
745090876b
Fix cppcheck warnings in uthash.h 2020-01-14 10:03:35 -06:00
Michael Black
578cad19bf
Fix cppcheck warnings in ampctld.c 2020-01-13 15:45:31 -06:00
Michael Black
dc19f2820e
Fix cppcheck warning in ampctl_parse.c 2020-01-13 15:41:24 -06:00
Michael Black
d04bc80ab6
Fix cppcheck warning in ampctl_parse.c 2020-01-13 15:33:46 -06:00
Michael Black
0c63e6efd3
Fix cppcheck warning in ampctl.c 2020-01-13 15:31:19 -06:00
Malcolm Herring
a4295a224e Merge remote-tracking branch 'mdblack/master' 2020-01-09 07:54:15 +00:00
Michael Black
7ee3a702f5
Replace all usleep with hl_usleep
Several places where usleep max value could be overflowed
New hl_usleep can take values > 1000000
2020-01-07 23:18:56 -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
c8eaf13a3d
Readding rigctld.c accidental removal 2019-12-25 07:58:19 -06:00
Michael Black
4e5e533248
Fix cppcheck warnings 2019-12-24 15:48:36 -06:00
Michael Black
520066e3e7
Fix cppcheck warnings in rigctlcom.c 2019-12-24 15:41:57 -06:00
Michael Black
4dbe66193c
fix cppcheck warnings in sprintflst.c 2019-12-24 15:24:01 -06:00
Michael Black
2fca5f49b8
Remove hl_sleep.h as no longer needed 2019-12-24 15:21:06 -06:00
Michael Black
57952c5927
Fix cppcheck warnings in rotctl_parse.c 2019-12-24 15:12:05 -06:00
Michael Black
9012049a37
Fix cppcheck warnings in ampctl_parse.c 2019-12-24 15:11:41 -06:00
Michael Black
9b9a6c55f5
Fix cppcheck warning in testrig.c 2019-12-23 23:36:14 -06:00
Michael Black
bd2149bd8a
Fix cppcheck warning in rotctl.c 2019-12-23 23:14:55 -06:00
Michael Black
17fb84044f
Fix cppcheck warning in rigsmtr.c 2019-12-23 23:13:40 -06:00
Michael Black
475012771b
Fix cppcheck warning in rigsmtr.c 2019-12-23 23:11:36 -06:00
Michael Black
a401d3ac78
Fix memory leak in rigctld and cleanup debug 2019-12-20 11:22:09 -06:00
Michael Black
1dbd633d5a
Missed semicolon 2019-12-19 18:05:23 -06:00
Michael Black
2703423b72
Think I got the fd socket leak on windows fixed now 2019-12-19 18:03:02 -06:00
Michael Black
bfe28e8032
Fix fd leak with fsockout 2019-12-19 17:09:18 -06:00
Michael Black
4b442dba94
Fix clang warning in rigctl_parse.c 2019-12-19 14:45:48 -06:00
Michael Black
9882448494
Fix cppcheck warnings in rigctlcom.c 2019-12-19 11:59:12 -06:00
Michael Black
d81d60dfc1
Fix cppcheck warnings in rigctl_parse.c 2019-12-19 11:55:14 -06:00
Michael Black
776e21017b
Add rx_range example 2019-12-19 11:51:28 -06:00
Michael Black
0bae216af3
Fix cppcheck warnings in ampctl_parse.c 2019-12-19 11:50:30 -06:00
Michael Black
00d578074e
Remove Recommend statment from rigctl.c 2019-12-19 09:38:50 -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
011efe0452
Merge branch 'master' of https://github.com/Hamlib/Hamlib 2019-12-11 07:47:24 -06:00
Nate Bargmann
2c884a970a
Change ampctld default TCP port to 4531 2019-12-11 06:28:17 -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
8e0ddf743c
Fix cppcheck warnings in ampctl_parse.c 2019-12-08 23:43:01 -06:00
Michael Black
646900862b
Fix cppcheck warnings in dumpmem.c 2019-12-08 23:42:47 -06:00
Michael Black
ddd5c43a71
Fix cppcheck warnings in rigmem.c 2019-12-08 23:42:32 -06:00