hamlib-cvs-digest Mailing List for Ham Radio Control Libraries (Page 28)
Library to control radio transceivers and receivers
Brought to you by:
n0nb
You can subscribe to this list here.
2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(57) |
Nov
(27) |
Dec
(25) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2001 |
Jan
(41) |
Feb
(101) |
Mar
(60) |
Apr
(32) |
May
(32) |
Jun
(198) |
Jul
(95) |
Aug
(60) |
Sep
(48) |
Oct
(96) |
Nov
(27) |
Dec
(222) |
2002 |
Jan
(180) |
Feb
(46) |
Mar
(68) |
Apr
(11) |
May
(36) |
Jun
(34) |
Jul
(113) |
Aug
(42) |
Sep
(71) |
Oct
(65) |
Nov
(116) |
Dec
(40) |
2003 |
Jan
(32) |
Feb
(92) |
Mar
(29) |
Apr
(102) |
May
(21) |
Jun
(34) |
Jul
(3) |
Aug
(60) |
Sep
(30) |
Oct
(62) |
Nov
(57) |
Dec
(33) |
2004 |
Jan
(28) |
Feb
(46) |
Mar
(16) |
Apr
(14) |
May
(31) |
Jun
(21) |
Jul
(10) |
Aug
(80) |
Sep
(42) |
Oct
(11) |
Nov
(28) |
Dec
(13) |
2005 |
Jan
(35) |
Feb
(26) |
Mar
(20) |
Apr
(118) |
May
(2) |
Jun
(5) |
Jul
|
Aug
|
Sep
(5) |
Oct
(1) |
Nov
(13) |
Dec
(1) |
2006 |
Jan
(9) |
Feb
(25) |
Mar
(22) |
Apr
(6) |
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
(3) |
Oct
(46) |
Nov
(13) |
Dec
(7) |
2007 |
Jan
(9) |
Feb
(14) |
Mar
(3) |
Apr
|
May
(6) |
Jun
(1) |
Jul
|
Aug
(11) |
Sep
(7) |
Oct
(8) |
Nov
(41) |
Dec
(3) |
2008 |
Jan
(27) |
Feb
(16) |
Mar
(13) |
Apr
(23) |
May
(39) |
Jun
(4) |
Jul
(7) |
Aug
(1) |
Sep
(13) |
Oct
(52) |
Nov
(44) |
Dec
(55) |
2009 |
Jan
(72) |
Feb
(69) |
Mar
|
Apr
|
May
|
Jun
(13) |
Jul
(1) |
Aug
(6) |
Sep
(15) |
Oct
(11) |
Nov
(31) |
Dec
(20) |
2010 |
Jan
(24) |
Feb
(21) |
Mar
(22) |
Apr
(40) |
May
(38) |
Jun
(4) |
Jul
(2) |
Aug
(22) |
Sep
(19) |
Oct
(14) |
Nov
(5) |
Dec
(8) |
2011 |
Jan
(14) |
Feb
(36) |
Mar
(6) |
Apr
|
May
|
Jun
(23) |
Jul
(13) |
Aug
(8) |
Sep
(7) |
Oct
|
Nov
(3) |
Dec
(9) |
2012 |
Jan
(17) |
Feb
(13) |
Mar
(10) |
Apr
|
May
(1) |
Jun
(14) |
Jul
(4) |
Aug
(12) |
Sep
(2) |
Oct
(24) |
Nov
(14) |
Dec
(2) |
2013 |
Jan
(4) |
Feb
(3) |
Mar
(3) |
Apr
(3) |
May
(10) |
Jun
(4) |
Jul
(7) |
Aug
|
Sep
(15) |
Oct
(5) |
Nov
(1) |
Dec
(2) |
2014 |
Jan
|
Feb
(8) |
Mar
(1) |
Apr
(3) |
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
(3) |
Oct
(7) |
Nov
(6) |
Dec
(3) |
2015 |
Jan
(4) |
Feb
(5) |
Mar
(8) |
Apr
(8) |
May
(2) |
Jun
|
Jul
(4) |
Aug
(7) |
Sep
(8) |
Oct
|
Nov
(6) |
Dec
(4) |
2016 |
Jan
(6) |
Feb
(26) |
Mar
(3) |
Apr
(10) |
May
(6) |
Jun
(5) |
Jul
(1) |
Aug
(4) |
Sep
(3) |
Oct
(4) |
Nov
(3) |
Dec
(10) |
2017 |
Jan
(11) |
Feb
(11) |
Mar
(2) |
Apr
(1) |
May
(7) |
Jun
(2) |
Jul
(11) |
Aug
(9) |
Sep
(5) |
Oct
(5) |
Nov
(1) |
Dec
(2) |
2018 |
Jan
(5) |
Feb
(2) |
Mar
(19) |
Apr
(7) |
May
(11) |
Jun
(3) |
Jul
(4) |
Aug
(10) |
Sep
(2) |
Oct
(8) |
Nov
(6) |
Dec
(9) |
2019 |
Jan
(9) |
Feb
(6) |
Mar
(2) |
Apr
(4) |
May
(6) |
Jun
(9) |
Jul
(6) |
Aug
(3) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(9) |
2020 |
Jan
(15) |
Feb
(1) |
Mar
(18) |
Apr
(33) |
May
(43) |
Jun
(87) |
Jul
(45) |
Aug
(8) |
Sep
(43) |
Oct
(3) |
Nov
(5) |
Dec
(42) |
2021 |
Jan
(116) |
Feb
(40) |
Mar
(58) |
Apr
(48) |
May
(29) |
Jun
(2) |
Jul
|
Aug
(22) |
Sep
(18) |
Oct
(1) |
Nov
|
Dec
(3) |
2022 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
(1) |
May
(2) |
Jun
(1) |
Jul
|
Aug
(1) |
Sep
|
Oct
(6) |
Nov
(2) |
Dec
(9) |
2023 |
Jan
(10) |
Feb
|
Mar
|
Apr
(10) |
May
(3) |
Jun
(1) |
Jul
(2) |
Aug
(4) |
Sep
(1) |
Oct
|
Nov
(2) |
Dec
(3) |
2024 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(5) |
Jun
(3) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
(2) |
Nov
(3) |
Dec
(9) |
2025 |
Jan
(5) |
Feb
(5) |
Mar
|
Apr
(10) |
May
(20) |
Jun
(43) |
Jul
(24) |
Aug
(21) |
Sep
|
Oct
|
Nov
|
Dec
|
From: Michael B. <mdb...@us...> - 2020-07-14 16:31:48
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 17112c308e91169363e1698d6f267ed7b4245d28 (commit) from f986be28a8ea8e8cd4462a244ad7c87a30b0f015 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 17112c308e91169363e1698d6f267ed7b4245d28 Author: Michael Black W9MDB <mdb...@ya...> Date: Tue Jul 14 11:26:14 2020 -0500 Fix kenwood_get_rit to utilize the +/- sign https://github.com/Hamlib/Hamlib/issues/342 diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index 7783cb2e..196826e5 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -1678,9 +1678,9 @@ int kenwood_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit) return retval; } - memcpy(buf, &priv->info[18], 5); + memcpy(buf, &priv->info[17], 6); - buf[5] = '\0'; + buf[6] = '\0'; *rit = atoi(buf); return RIG_OK; diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h index 5c800c1d..16fb01c7 100644 --- a/rigs/kenwood/kenwood.h +++ b/rigs/kenwood/kenwood.h @@ -27,7 +27,7 @@ #include <string.h> #include "token.h" -#define BACKEND_VER "20200712" +#define BACKEND_VER "20200714" #define EOM_KEN ';' #define EOM_TH '\r' ----------------------------------------------------------------------- Summary of changes: rigs/kenwood/kenwood.c | 4 ++-- rigs/kenwood/kenwood.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-12 16:33:53
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via f986be28a8ea8e8cd4462a244ad7c87a30b0f015 (commit) via 39670273c1ca3ebf59dc6f37c3eb810e9f2eb160 (commit) from 9c8561680f00a577ea64a91683ae26a4e3e02c8d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f986be28a8ea8e8cd4462a244ad7c87a30b0f015 Author: Michael Black W9MDB <mdb...@ya...> Date: Sun Jul 12 11:29:31 2020 -0500 Fix kenwood RD command to use abs value instead of negative sign https://github.com/Hamlib/Hamlib/issues/341 diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index 7455e2d0..7783cb2e 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -1711,7 +1711,7 @@ int kenwood_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit) if (priv->has_rit2) // if backend shows it has the Set 2 command { char cmd[10]; - snprintf(cmd, sizeof(cmd) - 1, "R%c%05d", rit > 0 ? 'U' : 'D', (int)rit); + snprintf(cmd, sizeof(cmd) - 1, "R%c%05d", rit > 0 ? 'U' : 'D', abs((int)rit)); retval = kenwood_transaction(rig, cmd, NULL, 0); } else diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h index 07f93656..5c800c1d 100644 --- a/rigs/kenwood/kenwood.h +++ b/rigs/kenwood/kenwood.h @@ -27,7 +27,7 @@ #include <string.h> #include "token.h" -#define BACKEND_VER "20200707" +#define BACKEND_VER "20200712" #define EOM_KEN ';' #define EOM_TH '\r' commit 39670273c1ca3ebf59dc6f37c3eb810e9f2eb160 Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 10 17:02:16 2020 -0500 FT-817/818 doing dual reads causes vfo tuning to return -RIG_EIO So we will ignore the retry errors as the read normally works but we need to allow for VFO tuning https://github.com/Hamlib/Hamlib/issues/340 diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c index ced515e3..2f950c1c 100644 --- a/rigs/yaesu/ft817.c +++ b/rigs/yaesu/ft817.c @@ -164,7 +164,7 @@ const struct rig_caps ft817_caps = RIG_MODEL(RIG_MODEL_FT817), .model_name = "FT-817", .mfg_name = "Yaesu", - .version = "20200629.0", + .version = "20200710.0", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -302,7 +302,7 @@ const struct rig_caps ft818_caps = RIG_MODEL(RIG_MODEL_FT818), .model_name = "FT-818", .mfg_name = "Yaesu", - .version = "20200629.0", + .version = "20200710.0", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -650,6 +650,12 @@ int ft817_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) dump_hex(p->fm_status, 5); } +#if 1 // user must be twiddling the VFO + // usually get_freq is OK but we have to allow that f1 != f2 when knob is moving + *freq = f2 * 10; + return RIG_OK; +#else // remove this if no complaints + if (retries >= 0) { *freq = f1 * 10; @@ -660,6 +666,8 @@ int ft817_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) return -RIG_EIO; } +#endif + } int ft817_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) ----------------------------------------------------------------------- Summary of changes: rigs/kenwood/kenwood.c | 2 +- rigs/kenwood/kenwood.h | 2 +- rigs/yaesu/ft817.c | 12 ++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-10 04:37:41
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 9c8561680f00a577ea64a91683ae26a4e3e02c8d (commit) from e652276e8763ca4a3e8bd3ffe25e00b0b21ba9d3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9c8561680f00a577ea64a91683ae26a4e3e02c8d Author: Michael Black W9MDB <mdb...@ya...> Date: Thu Jul 9 23:37:22 2020 -0500 Update ITU3 bandplan diff --git a/include/bandplan.h b/include/bandplan.h index 49908570..4b43271d 100644 --- a/include/bandplan.h +++ b/include/bandplan.h @@ -156,11 +156,12 @@ /* * ITU Region 3: South Pacific and Southern Asia + * https://web.archive.org/web/20171216012537/http://www.iaru-r3.org/wp-content/files/R3-004%20Band%20Plans%20IARU%20Region%203.docx */ /* MF: 300 kHz - 3 MHz */ #define FRQ_RNG_160m_REGION3(md,lp,hp,v,a) \ - { kHz(1810),MHz(2), (md), (lp), (hp), (v), (a), "ITU3" } + { kHz(1800),MHz(2), (md), (lp), (hp), (v), (a), "ITU3" } /* HF: 3 MHz - 30 MHz */ #define FRQ_RNG_80m_REGION3(md,lp,hp,v,a) \ @@ -170,7 +171,7 @@ { kHz(5351.5),kHz(5366.5), (md), (lp), (hp), (v), (a), "ITU3" } #define FRQ_RNG_40m_REGION3(md,lp,hp,v,a) \ - { MHz(7),kHz(7100), (md), (lp), (hp), (v), (a), "ITU3" } + { MHz(7),kHz(7300), (md), (lp), (hp), (v), (a), "ITU3" } #define FRQ_RNG_30m_REGION3(md,lp,hp,v,a) \ { kHz(10100),kHz(10150), (md), (lp), (hp), (v), (a), "ITU3" } @@ -199,7 +200,7 @@ /* UHF: 300 MHz - 3 GHz */ #define FRQ_RNG_70cm_REGION3(md,lp,hp,v,a) \ - { MHz(430),MHz(440), (md), (lp), (hp), (v), (a), "ITU3" } + { MHz(430),MHz(450), (md), (lp), (hp), (v), (a), "ITU3" } #define FRQ_RNG_23cm_REGION3(md,lp,hp,v,a) \ { MHz(1240),MHz(1300), (md), (lp), (hp), (v), (a), "ITU3" } ----------------------------------------------------------------------- Summary of changes: include/bandplan.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-09 17:40:31
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via e652276e8763ca4a3e8bd3ffe25e00b0b21ba9d3 (commit) from 33ce152d35b8d71199b340d4beb9b3323baffa32 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e652276e8763ca4a3e8bd3ffe25e00b0b21ba9d3 Author: Michael Black W9MDB <mdb...@ya...> Date: Thu Jul 9 12:36:42 2020 -0500 Add 6m to ft857 and ft897 ranges diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c index c58beb99..38811e46 100644 --- a/rigs/yaesu/ft857.c +++ b/rigs/yaesu/ft857.c @@ -202,8 +202,10 @@ const struct rig_caps ft857_caps = }, .tx_range_list1 = { FRQ_RNG_HF(1, FT857_OTHER_TX_MODES, W(10), W(100), FT857_VFO_ALL, FT857_ANTS), + FRQ_RNG_6m(1, FT857_OTHER_TX_MODES, W(10), W(100), FT857_VFO_ALL, FT857_ANTS), /* AM class */ FRQ_RNG_HF(1, FT857_AM_TX_MODES, W(2.5), W(25), FT857_VFO_ALL, FT857_ANTS), + FRQ_RNG_6m(1, FT857_AM_TX_MODES, W(2.5), W(25), FT857_VFO_ALL, FT857_ANTS), FRQ_RNG_2m(1, FT857_OTHER_TX_MODES, W(5), W(50), FT857_VFO_ALL, FT857_ANTS), /* AM class */ FRQ_RNG_2m(1, FT857_AM_TX_MODES, W(2.5), W(25), FT857_VFO_ALL, FT857_ANTS), diff --git a/rigs/yaesu/ft897.c b/rigs/yaesu/ft897.c index 60600d8d..beae23da 100644 --- a/rigs/yaesu/ft897.c +++ b/rigs/yaesu/ft897.c @@ -239,8 +239,11 @@ const struct rig_caps ft897_caps = }, .tx_range_list1 = { FRQ_RNG_HF(1, FT897_OTHER_TX_MODES, W(10), W(100), FT897_VFO_ALL, FT897_ANTS), + FRQ_RNG_6m(1, FT897_OTHER_TX_MODES, W(10), W(100), FT897_VFO_ALL, FT897_ANTS), + /* AM class */ FRQ_RNG_HF(1, FT897_AM_TX_MODES, W(2.5), W(25), FT897_VFO_ALL, FT897_ANTS), + FRQ_RNG_6m(1, FT897_AM_TX_MODES, W(2.5), W(25), FT897_VFO_ALL, FT897_ANTS), FRQ_RNG_2m(1, FT897_OTHER_TX_MODES, W(5), W(50), FT897_VFO_ALL, FT897_ANTS), /* AM class */ FRQ_RNG_2m(1, FT897_AM_TX_MODES, W(2.5), W(25), FT897_VFO_ALL, FT897_ANTS), ----------------------------------------------------------------------- Summary of changes: rigs/yaesu/ft857.c | 2 ++ rigs/yaesu/ft897.c | 3 +++ 2 files changed, 5 insertions(+) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-09 14:28:23
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 33ce152d35b8d71199b340d4beb9b3323baffa32 (commit) from 6f8100ffc0ba555b8dae96a56d61fefbb7624c06 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 33ce152d35b8d71199b340d4beb9b3323baffa32 Author: Michael Black W9MDB <mdb...@ya...> Date: Thu Jul 9 06:47:45 2020 -0500 Add debug to ft857.c diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c index 518f7ba8..c58beb99 100644 --- a/rigs/yaesu/ft857.c +++ b/rigs/yaesu/ft857.c @@ -913,6 +913,9 @@ int ft857_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) if (vfo != RIG_VFO_CURR) { + rig_debug(RIG_DEBUG_ERR, "%s: must have RIG_VFO_CURR, got %s\n", + rig_strvfo(RIG_VFO_CURR), rig_strvfo(vfo)); + return -RIG_ENTARGET; } ----------------------------------------------------------------------- Summary of changes: rigs/yaesu/ft857.c | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-08 16:53:09
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The annotated tag, v4.0rc1 has been created at 88eb1cedb943f7d21c1d23d647833cba43b3827b (tag) tagging 6f8100ffc0ba555b8dae96a56d61fefbb7624c06 (commit) tagged by Michael Black W9MDB on Wed Jul 8 11:50:58 2020 -0500 - Log ----------------------------------------------------------------- 4.0rc1 release (no author) (1): New repository initialized by cvs2svn. Adrian Chadd (1): Upgrade TS-711 and TS-811 to work. Agis Zisimatos (1): easycomm: Return the correct value of pointer val Alessandro Zummo, IZ1PRB (36): Remove const from priv_caps to allow kenwood_init to initialize default values if they're missing Call kenwood_init in each and every driver Use an appropriate debug level Support get/set_powerstat on pcr100 Add kenwood_simple_cmd Make set_ptt behave as before, fix set_ant for ts570.c ts450: remove RIG_FUNC_TONE from has_xx_func if tone unit is not detected ts450,ts690,ts850: use FL command to get/set filters in get/set_mode. (code from ts850.c) ts450: indentation fixes remove fixed command terminator (;) from generic code ts140,ts2000,ts480,ts570,ts680,ts850,ts870s: remove usage of fixed ; and EOM fix tabs thg71,tmv7,ts450s,ts690: verify rig id at rig_open ts450: implement set_channel remove unused parameter from get_kenwood_func ts570,ts850,ts870s,ts140,ts480,ts680: use kenwood_simple_cmd where possible Replace __FUNCTION__, which is gcc specific and was deprecated a long time ago, with __func__, which is at least defined in C99. generic, ts850: implemented CTCSS TN command (reported not working for ts850, should now be fixed) Add description for the kenwood mode n. 8 implemented set/get_ext_param (voice, fine, xit, rit). enabled on ts450 and ts850 Added my call sign removed comment about switch optimizatons. the compiler will generate the assembly code in a different order which is usually based on the case value. other compiler optimizations might also affect it, so it's useless to optimize the order. check ptt status before set_ptt. enabled on ts850. style fixes band up/down was inverted Try to compensate for leftover characters Try to cope withe the PCR100 and PCR1000 at the same time Bumped out to beta, solved a few bugs. Tested with PCR100/1000/1500. kenwood: send the whole buffer at once, added kenwood_cmd - removed EOM, it's handled by kenwood_transaction - fixed tabs and spaces - added generic routine for vfo errors - set_mem: do not switch vfo if already in mem mode - simplified invocation of some commands - buffer optimizations - added PARM_BEEP and PARM_APO - fixed getting of LEVEL_RFPOWER - fixed get_ant tmv7: removed EOM thg71: removed EOM thf7: - wrong rfpower level granularity - added .reset - call kenwood_open - use generic th_set_vfo th: fixed formatting issue th: fixed stack corruption th: fixed a missing newline Alex V Flinsch, KC2IVL (8): Initial changes for ft100 Initial release initial release fixed various command options new file, list of tones/codes and sequence used by various yaesu rigs added get frequency to ft100 code added getinfo func hdr *** empty log message *** Alexander Sack (1): Get firmware revision level from K3/KX3. Alexander Schultze (3): easycomm: include a new EasyComm3 to support move speed and infostring update EasyComm3 to include setting and getting of config and status easycomm: implement get/set config, easycom include status and error bytes, fix get_info Alexandru Csete OZ9AEC (34): Added new stylesheet to make API docs look better. Modified to use new stylesheet. Added doxygen comments. Added rotator.h and rotlist.h to the input list. Applied Tommi's improvements from the FT-857 backend with the following changes and additions: Full RF power scale corresponds to 10 bars, not 15. Added RIT, XIT and IF shift ranges to dummy backend. Cast constant caps to variable caps in order to avoid compiler warnings. Cast from const to variable in order to avoid compiler warnings. - Cast unsigned char to char in order to avoid compiler warnings. - Ensure that all variables have a value before they are used (ft920). - Disable unused functions and variables (frg100). - Incremented backend version numbers. Use tone_t for pcr1_ctcss_list. Changed arg 4 of pcr_transaction to unsigned. Cast the other mismatches to (char *). Cast unsigned char to char in order to avoid compiler warnings. Incremented backend version number. - Cast unsigned char to char in order to avoid compiler warnings. - Ensure that all variables have a value before they are used (tentec.c). - Cast unsigned char to char in order to avoid compiler warnings. - Incremented backend version number. - Cast/change unsigned char to char in order to fix compile warnings. - Incremented backend version number. - Cast/change unsigned char to char in order to fix compile warnings. - Incremented backend version numbers. - Cast/change unsigned char to char in order to fix compile warnings. - Incremented backend version numbers. - Cast/change unsigned char to char in order to fix compile warnings. - Incremented backend version number. - Cast/change unsigned char to char in order to fix compile warnings. - Incremented backend version numbers. - Cast unsigned char to char in order to avoid compiler warnings. - Handle all enum values in switch statements. Fixed type mismatches that caused compile warnings. Fixed type mismatches that caused compile warnings. Initialise icom_val to avoid compiler warning. Fixed type mismatches between signed and unsigned char. There are a few very suspicious 'if' statements in icom.c and frame.c - Fixed type mismatches and unhandled switch cases. - Incremented backend version numbers. Cast constant caps to variable caps in order to avoid compiler warnings. Updated. Added infor about w (send_cmd). Max serial rate is 9600. Changed backend status to stable. Escape the backslash character. The 765 can do RIG_SCAN_PROG and RIG_SCAN_MEM. Fixed S-meter reading to use calibration table since frontend always uses RAWSTR. Fixed RF power reading and added power2mw and mw2power. Fixed RIG_LEVEL_STRENGTH reading. Andrew Errington (1): Initial support for CM108 GPIO contorl of PTT Ben Coleman, NJ8J (6): Fixed bug in rpcrig_set_parm (using RIG_LEVEL_IS_FLOAT instead of RIG_PARM_FLOAT) Fixed same bug in rigctl_get_parm. Added checking of return string from rig on set (non-retrieval) commands. Added code for COMP function. Added alinco_set_parm & tweaked dx77 capabilities. Handle setting Keyer speed and CW Pitch Added NJ8J's email address. Change email address for NJ8J Berndt Josef Wulf, VK5ABN (11): Implemented rig_set_channel() Implemented set_parm() for BACKLIGHT operation Commented out RIG_MODE_PKTFM overlooked at the submission of previous code Implemented RIG_MODE_PKTFM and RIG_MODE_PKTLSB modes Changed debug message format for freq_t from long long to double ft990_get_ptt() now uses the FT990_SF_XMIT instead of FT990_SF_PTT. FT990_SF_PTT only returns status of PTT activated by CAT commands, whereas FT990_SF_XMIT reports the actual status of the ptt line. ft990_get_mem(): Fixed bug that prevented the reporting of current channel number when vfo != RIG_VFO_MEM Fixed erroneous return value Fixed mispelled name for VK5ABN Added missing modes to RX/TX caps Fixed bug in ft990_set_mode that caused RTTY interchanged modes USB/LSB Fixed bugs in ft990_get_channel Bill Barker (1): Add test for Flex 6300 ID Bill Somerville (197): Patch submission for IC-756 Patch to allow same serial port for PTT and CAT. Patch to fix broken Yaesu backend with FT-2000(D) Fix rig_open not failing when PTT/DCD port is unavailable. Fix Icom IC-756 filter handling. Fix Yaesu newcat backend set_tx_vfo issue. Add support for Data Modes on Icom "Pro" models. Fix Icom IC-726 mode handling. Fix Kenwood TS-2000 split operation. Fix Kenwood Split Operation for TS50 & TS480. Fix Kenwood TS-870s split and bandwidth set/get. Correct receive buffer length for IS; comamnd. Fix Kenwood CAT transaction busy retry mechanism. Fix Kenwood get split VFO function. Add data sub-mode support for TS590s. Correct order of MD and DA commands for TS590s. Get firmware revision for TS590s in rig_open. Fix TS590s firmware defect. Fix Kenwood get_vfo function returning wrong VFO in split TX. Make Kenwood TS590s firmware defect fixup revision specific. Extend TS590s firmware defect fixup to both VFOs. Fix Icom IC-756 Pro III get data mode. Add spilt mode get and set for Elecraft K3. Fix data sub-modes on Elecraft K3. Fix Elecraft Data Mode Translation. Fix Elecraft K3 Data Sub-Mode Setting. Fix Yaesu FT1000MP and FT1000MP Mk V modes. Fix configure.ac Fix a warning message. Added option to not use VFO XCHG command when setting split parameters. Fix a buffer overflow in the Windows termios emulation. Fix pkg-config generation. Fix Icom IC-756Pro mode get/set. Facility for rigctl to read commands from standard input. Add a pause command to the rigctl command set. Prefix action function names so as not to clash with system names. Prefix action function names so as not to clash with system names. Corrected typos in rigctl.1 manpage. Add read commands from stdin and pause command features to rotctl. Merge branch 'rigctl-stdin' of ssh://git.code.sf.net/u/bsomervi/hamlib into rigctl-stdin Fix manpage errors. Remove redundant RIG_PTT_SERIAL_CAT enum from ptt_t Only check for serial control line conflicts if PTT shares CAT port Fix Ten-Tec Orion get/set split functions Icom IC-7410 has VFO A/B not MAIN/SUB Added IC-7410 data modes Add retry mechanism for Yaesu "newcat" backend Implement retries for Yaesu "newcat" rigs Disable auto information mode on open Add retry mechanism for Yaesu "newcat" backend Implement retries for Yaesu "newcat" rigs Disable auto information mode on open Merge branch 'yaesu-retries' of ssh://git.code.sf.net/u/bsomervi/hamlib into yaesu-retries RIG_OK is zero and need not be negated and this will not change Fix response length expected error in K3 back end Data mode support for the Icom IC-7700 Data mode support for the Icom IC-9100 Data mode support for the Icom IC-7200 Add support for the Kenwood TS-590SG Kenwood TS-590SG Always clear serial control lines when used for PTT Disable AI mode on open for Kenwood/Elecraft rigs Add more diagnostics and error checks to serial line control Move serial line control error checks to lower level routines Merge branch 'master' into kenwood-ai-off-at-start Merge branch 'master' into ptt-control-on-cat-port Fix serial i/o on Windows. Yaesu newcat style command response reading improvements Increase communications timeout for Icom rigs Kenwood AIn; command has no reply Revert read_string() to partial results are a success status Remove gratuitous sleeps before function exits Error checks on simulated direct VFO addressing Elecraft K2 RTTY modes are not FSK Kenwood and Elecraft rigs sometimes ignore commands Removed kenwood_cmd function and replaced uses of it Allow for failed test command on the K2 Elecraft K3 has 1 stop bit Kenwood TS-570 series IF returns current frequency Switch to "ID;" command for verification as no "AI;" on TS-840s Increase Elecraft K2 comms timeout and retries Switch Kenwood TS940 to generic kenwood CAT functions Improve command verification for Kenwood & Elecraft Use local buffer in kenwood transaction funciton Clarify the handling of Kenwood CAT message terminators Further clarification in the implementation of kenwood_transaction() Removed redundant precondition test Remove kenwood_simple_cmd as kenwood_transaction has that functionality Call kenwood_open() for TS-2000 to ensure AI mode is disabled Allow for bad ID from DDUtil in TS-2000 mode Allow one extra byte in read_string() length to accomodate terminator Enable data modes for the Icom IC-7100 Allow for PowerSDR ID in Kenwood TS2000 emulation mode Fix TenTec Argonaut message lengths and timeout Fix TenTec set split command Implement get PTT status for the TenTec Argonaut Fix error with width in set mode for the TT argonaut Yaesu FT540 can only change the frequency of the current VFO Fix defect in Kenwood TS-940 IF command response parsing Fix response lengths for the TT Jupiter 538 Do not attempt CAT PTT commands on the Icom IC-706mkIIG Use correct argument type for serial control line functions Initial back end implementation for the Kenwood TS-990s Mode set is not VFO targetable on the Kenwood TS990s The Kenwood TS990s only does split Tx on SUB VFO The doesn't appear to be a way of getting PTT/SEND on the TS990s Lower both RTS and DTR on alternate PTT serial port Honour any error status from serial port calls Dummy get_ptt function needs to read RTS/DTR/PARALLEL Make autogen.sh agnostic to whitespace in paths Increase the number or retries for most Kenwood rigs Command validation for Yaesu set commands Remove unecessary delays from TS-940S backend Proper IPv6 and dual stack networking Fix compiler warnings Proper IPv6 and dual stack networking for rotator net daemon Attempt to restore AI status on exit Allow for poor emulations of Kenwood rigs that have no ID command Use correct function to execute set type commands with no response Add a new command line option '--no-restore-ai' ('-n') to rigctl Fix FT-817/857/897 issues and add some missing functionality Fix missing PKTUSB mode setting code for FT-817 & FT-897 Fix a logic error in band detection during IC-910 set frequency Add missing configuration getters Detect C-IV NAK returns as rejected commands Elecraft rigs do not switch VFO in IF command responses during split Tx. Redundant split mode directives on Elecraft rigs cause Tx failures Only use IPv6 features on Windows versions that support it (>=XP) Improve IPv6 portability and consistency Add 23cms to IC-910(H) backend Implement combined split VFO frequency and mode setting. Initial implementation of rig_{set,get}_split_freq_mode() for FT-857. Implement rig_{set,get}_split_freq_mode() for IC-756 series. Add {get,set}_splitfrequency_mode for the IC-910(H) Elide unnecessary CAT commands when setting split frequency and mode Do not swap VFO unnecessarily Better set frequency semantics for the IC-910(h) VFO targetable get frequency operation for the Icom IC-910(h) Make sure right band is used when setting frequency on IC-910(H) Use rig state rig port retry option rather than from capabilities Use a sensible port timeout value for the Kenwood TS-850 Further attempts to simplify and improve Icom CAT for split operating Add RIG_PASSBAND_NOCHANGE as possible set_{split_,split_freq_,}mode argument Switch to POSIXLY_CORRECT mode for getopt_long() Fix a regression introduced in 222ad74 Do not crash if expected CTCSS tones not sepcified Do not attempt to query AI state on the TS-450s as it is not supported Some more Kenwood rigs with no AI query Adjust rig_list_foreach to allow use for unregistering Fix an issue presenting on the Yaesu FT-450(D) Release the serial port used for PTT when possible Change the IC7600 & IC7800 set/get mode to versions that support DATA modes Add rig_{open,close} functions to TS-790 backend Revised kenwood rig busy response handling Add get and set split functions for the TS450S Simplify and fix defects in the FT991 back end Fix some endian issues in the si570/AVR SDR back ends Fix a state machine defect with repeated PTT reset calls Do not pass --no-cpp_precomp to compilers on Mac OS X Allow RIG_LEVEL_STRENGTH queries over the network link Stop rigctld and rotctld crashing when service threads cannot write to clients Use snprintf throughout kenwood/kenwood.c for buffer safety Fix off-by-one issue in reading memory mode from IF command response Fix some issues with commands not supported by TS-2000 CAT emulations Add best guess transmit status to rig state structure Take out unecessary delays in K(X)3(S) back end. FT-817 status queries honour retries and timeout Make rig_open() call in rigctld lazy and add graceful termination Simplify SWIG interface definition and hide 64-bit values from Lua binding Remove unnecessary delays from TS-990 and TS-2000 back ends Change frequency setting for the FT-747GX to something more basic Fix an incorrect error return value from win32_serial_select() Fix timeout issues with the Ten-Tec Orion/Eagle Ensure compilation works with a pre C11 compiler Make code C90 compliant again Move unnecessary global and file static variables to the stack Simplify unnecessary persistence of extended response state Fix misunderstanding of netrigctl_transaction() return value Made PTT and DCD options consistent between rigctl and rigctld Report unrecognised PTT and DCD types in rigctl and rigctld Update i/o functions to support GPIO(N) port closure Fixed erroneous messages in rig_close with GPIO(N) PTT or DCD types Remove duplication across GPIO and GPION handling of PTT and DCD Improved get PTT state handling in dummy backend Simplify closing of device files Repair a regression with the dummy get PTT functionality Revert "Add debug to serial.c" Repair a regression with the dummy get PTT functionality Revert "Add debug to serial.c" Fix regression with slow responses from SmartSDR causing errors Deal with remote PTT type at the client end Avoid 'echo -n' as macOS sh doesn't support it Fixing an operator precedence defect Updates to the TH-D7A/E back end Less ambiguous variable name and repair merge issue in prior commit Add missing config parameters for rig power on/off and screen-saver New power on option rather than power on/off Blaine Kubesh (8): added Icom803 to icmarine added Icom803 to icmarine added Icom803 to icmarine Update ic-m803 remote-id to 20 Update icm803.c Update AUTHORS undo author changes Update icm803.c Bob Freeman (1): New CNCTRK rotor backend Brian G. Lucas (10): Pretty much a complete re-write of thd72.c, since the old one didn't work at all. Many commands have been tested with real hardware. But more work remains to be done. WIP: thd72 driver. More level, func, and parm stuff works. WIP: thd72 driver. Try to simplify the menu based interface. WIP: thd72 driver. First cut at get_channel(). Other cleanup. WIP: thd72 driver. More interfaces implemented. Other cleanup. Implement some more interfaces. Comment out get_chan_all_cb because the block read routine doesn't work. Fix a format so that it works with Windows. Can't test it because I have no Windows machines. Fix RFPOWER level for FT-450D. It uses 5-100, rather than 0-255 that the FT-450 does. In newcat_open(), initialize rig_id in case any subsequent commands need it. Some calls to thd72_get_menu_item where passing wrong values for range check. C-Elegans (1): Add ability to have rigctld display transverter frequency Charles Suprin (7): Add file for TM-D710 support. Merge branch 'master' of ssh://hamlib.git.sourceforge.net/gitroot/hamlib/hamlib Add D710 to riglist. Add D710 code to kenwood library. Register D710 interface. Initial D710 Implementation. Register D710 interface. Charles Suprin, AA1VS (3): extend th_get_vfo_char to support D700 Changed th_set_freq to round and select step size to use. Allows 6.25kHz and 5kHz channelization. Use new th_set_freq for TM-D700 Chris Karpinsky, AA1VL (7): add serial_flush() method to clean rx buffer initial stab at this for the Yaesu FT-817 add ft817.* add ft817 bump the backend status to ALPHA Initial entry of cgirig giving ability to use hamlib from a web browser. increased post write delay to 300 Chris Ruvolo (4): TS-690: deal with optional tone board using TS-450 logic TS-690 does not implement the PC command to get/set output power level TS-690 does not implement the GT command to get/set AGC rate TS-690: bump version Chuck Hemker, N2POR (1): Use RIG_TARGETABLE_MODE in rig_set_mode and rig_get_mode Dale E. Edmons, KD7ENI (19): Added comments to commandline in rigctl (second time) --Dale Started TS-2000 update/overhaul --Dale Copied too much stuff, backed out what I broke. Bring ts2k.c more in line with current CVS. Changed ts2000.c to ts2000.h. Start of rig menuing functions. New file. Renamed ts2000.c.new ts2000.h Bring code more in line with CVS code. Changes often, so added status. Will delete when things stabilize. Corrected status to CVS branch. Renamed new ts2000.c to ts2000.h Wouldn't compile. Removed ts2k.c. Haven't got all new rig.h stuff removed. Temp kludge to make ts2k.c compile (keeps Hamlib from compiling!). Updated status. Added working TS-2000 files. There are some changes left out but this is the minimum I could commit and have a functional rig. The cost is that I've broken kylix and others that duplicate rig.h. I'm in the process of repairing the damage. Please be patient. I hope a day or so, but am asking for up to a week. E-mail me about *anything* you find broken. Kylix (and similar) is (are) known to not work. Changed name back to original. Had to re-run automake kenwood/Makefile. 1) Updated branch_ts2k with respect to HEAD. 2) Working ts2k_menu. (only in RIG_MODEL_TS2K) 3) Split TS-2000 into experimental and standard versions: RIG_MODEL_TS2000 = standard, RIG_MODEL_TS2K = experimental. 4) Basic command parser in tests/rc. Will open/close rig or copy a freq from one rig/vfo to another rig/vfo. Very cool. Very basic. Very experimental. 5) Added test programs. a) testcmd - calls parser (no command prompt yet!) b) testts2k - replacement for testrig (with trivial modification) c) testptt - testts2k/testrig should not transmit. TX stuff in testptt. 6) Used crowbar to merge HEAD into branch_ts2k. Working on clean-up. 7) I'm sure I've forgotten or neglected to mention some other stuff. Daniel Estévez (2): Fix DIG MODE for FT817-ND Fix DIG MODE for FT817-ND Daniele Forsi (1): Set the executable bits on py3test.py Dario Ventura (3): New Prosistel rotor backend from IZ7CRX Add elevation code to Prosistel backend TS2000 Satellite mode and Gpredict Dariusz Bismor, SQ9KEJ (1): rigmem: implement CSV file loading David Fannin (1): Submission for new backend model (134) for Yaesu FT-DX1200 Davide Gerhard (3): tests/{memcsv.c,memsave.c}: partially revert commit 4072f9f4 ic746.c: correct chanbuf length, fix channel structure and support split ic746.c: add ic746pro_set_channel() to load memory from csv Dawid Szymanski (2): ICOM Voice Keyer implemented. typo fix Diane Bruce, VA3DB (5): - first cut at fixing configure to recognise --without-tcl-binding and --without-python-binding options - gt_HEADER_INTTYPES_H is definitely bogus here, leftover from what? - document debian/FreeBSD needs for AUTOMAKE etc. - add in libtoolize which should be there - These should have been commented out. - Extra comma on RIG_STATUS_BUGGY can cause a compiler error. Dieter Röver (1): Fix bug in vfo_comp calculation in Hamlib Ekki Plicht (DF4OR) (2): New model Icom IC-R8600 Patch for Icom DCS code handling Elliott Liggett (1): Added functionality for the IC-7300 auto antenna tuner Eriks Dobelis (2): ft817: adding delay before next retry after returning from tx to rx ft817: Moving delay value into #define section of the header Ervin Hegedus (8): RIG_PASSBAND_NORMAL wasn't handled correctly when rig_set_mode() was called - fixed Fixed SWIG `Setting a const char * variable may leak memory' error Fixed Kenwood filter cmd when passband is set to 500Hz Merged from upstream Merge branch 'master' of http://git.code.sf.net/p/hamlib/code Added Lua binding and demo script Added new example to Python demo script (set/get float type level) Change variable length argument handling in affected functions Ervin Hegedüs (1): rig.swg: New properly formatted macro Francois Retief (21): Added read_serial function to read strings from a port. Corrected some comments Added code to hexdump to right align ASCII dump column added private caps for rig termination character add private caps and more commands. Changed to a new transaction function and adde quite a few commands. add private caps to store the termination character of Kenwood rigs commands. added a kenwood_init and _cleanup routine for priv caps & priv data. Added a new function: LCD Lamp ON/OFF (for Kenwood TH-7DA) check trn state of rig in rig_open. Initial commit of Kylix binding New backend for rotators New RPC backend for rotators Added rot_move function Fix macro name Added rot_move function Added easycomm and rpcrot backends Fixed circular dependency for rpc.rigd and rpc.rotd regenerated Added IC-910 rig. Added constants for the IC-910 rig. Frank Goenninger (3): Add ADAT ADT-200A backend adat updates from Frank, DG1SBG ADAT fixes on Windows Frank Singleton, VK3FCS (165): Initial revision Initial revision *** empty log message *** *** empty log message *** *** empty log message *** Initial revision Initial revision *** empty log message *** *** empty log message *** added build_all ,cleanall and verify targets *** empty log message *** initial top level makefile add some things initial import initial import initial import fixed some typos use rig_open and rig_close added rig_open and rig_close fixed cmd_sat_on / off added sat-on and sat_off to test changed cmd_get_rx_status, must do tx also updated test() all reads use while (1) and break added ../common as object path added rig_open and rig_close using rig_open and rig_close and serial.h use common dir for serial stuff use ft747 on serial port /dev/ttyS0 read uses while(1) and break use while(1) and break added read_sleep use read_sleep now from serial.h using read_sleep from serial.h had rx and tx status swapped (document error?) removed cmd_get_update using CVS instead of RCS directories use MODE_xx defines cannot use const int in case statements ?? so use #define instead use #defines for MODE_XXX used in case statements working out freq conversion, unfinished playing with test routines long int cmd_get_freq_mode_status_main_vfo(int fd, unsigned char *mode); long int cmd_get_freq_mode_status_main_vfo(int fd, unsigned char *mode) frq = cmd_get_freq_mode_status_main_vfo(fd, &mode); starting with the cmd_set commands now starting on cmd_set commands now starting on cmd_set_freq commands now add scanning todo now set sat rx and tx freq and mode also fix typo dump raw hex data when writing and reading trying some cms_set_freq_xxx commands added routines for dec <-> packed decimal conversion minor added generic hex dump routine, static void dump_hex(unsigned char *ptr, int size, int width); removed unwanted debug printf's removed dump_hex from here.. calc_freq_from_packed4 is about to be replaced calc_packed_from_char and calc_char_from_packed now here cleanup cleanup void dump_hex(unsigned char *ptr, int size, int width); adding dcs tables and repeater offset in Hz describe faulty yaesu documentation added README.license for GPL added GPL license info included full GPL license Updated docs to point to http://sourceforge.net/projects/hamlib/ and added a C code snippet on how to use the API. added -I$(COMMON_DIR) to find rig.h added -I$(COMMON_DIR) to find rig.h adding capabilities initial capabilities stuff starting to add rig_caps stuff starting to add rig_caps stuff starting to add rig_caps stuff. added GPL stuff and comments adding rig_caps stuff adding rig_cap stuff adding rig_caps stuff add capabilities and preferences adding rig_caps functionality adding rig_caps stuff frontend reduction on backend function namespace - phew !! frontend API clarification removed old open_port2() using old rig_caps fixed some typos, added 3 more candidates for API missing ; in some enums converting to frontend/backend structure compiles ok removed open_port() and write_block() removed open_port() and write_block() fixed typos, added &ft747_caps in rig_caps changing to frontend/backend style converting to frontend/backend style added 3 more cmd_* for API examples Example of setting rig Main VFO to 439.700 Mhz FM cleanup comments added extern const struct rig_caps ft747_caps; still thinking about set/get strategy minor updates added extra rig caps added some set/get examples with return code checking added testrig to Makefile, no linking yet added usleep to read_sleep() updated rig_caps structure *** empty log message *** test making a shared lib (at last) for the frontend - more todo test making a shared lib for the frontend - make hamlib describe frontend/backend structure updated code snippet example started ft747_set_ptt and ft747_set_vfo starting to implement set/get pairs added typedef enum ptt_type_e ptt_type_t; added VFO types to enum starting on libhamlib Makefile, added ./lib and ./include under common make, make install, and make clean work ok, using ./lib and ./include directories also. make, make install, and make clean work ok, using ./lib and ./include directories also. removed "make verify". Added reference to common/Makefile added printf("testrig:main() has been called \n"); for testing linking makefile for testing testrig linking alternative rig_base declaration removes references to rig_caps at compile time. should populate it another way -- FS added printf's to confirm rig.c (hamlib) is being called ok better libhamlib.so version :-) added ft847_open and ft847_close to enable CAT ON/OFF added ft747_open and ft747_close updated lib names for backend to libhamlib-xxxxx.so API updates - added set/get_mode merge with TRN stuff and add some set/get_mode and vfo stuff added post_write_delay cvs mails to hamlib-cvs-digest cvs mail update works ok :-) minor fixes updated ptt/mode/vfo added set/get freq to use generic bcd etc more set_freq() examples 1. Added VFO as target for some set/get cmds. 2. ./testrig still runs ok using RIG_VFO_CURR. minor update to active VFO handling in _set_vfo some new defines for FT747_VFO_A/B minor updates to active vfo handling added ptt handling example, stand back ! trying different approach to storing cmd sequence. _set_ptt is being converted. Needs tidying up though. Some sequences are complete, and can be read from static data. Incomplete sequences will eventually be copied form static declaration, and completed in priv data. Removed static stuff from functions. Also, begin to implement table driven command translation from API to rig native. priv now contains a cmd table that is used for backend commands towards rig. Added some new freq/mode combinations. converting ft847 to table driven, similar to ft747. more table driven stuff for ft847. cat/ptt/freq being converted. Added ft847_send_priv_cmd(), converted some part of API to use this. Added _set_mode to work now. TODO: put _send_priv_cmd into yaesu.[ch] so ft747 can use also. Turned on PTT also (stand back).. rig_cleanup and rig_close not calling backend removed unused calc_ functions. removed old API functions, general cleanup tested rig_close and rig_cleanup Initial release, common yaesu declareations etc. add version tag nseq uses YAESU_CMD_LENGTH Initial yaesu Makefile Moved from ft747 and ft847 dirs common yaesu handling common yaesu dir Begin to use common yaesu code general cleanup, added _send_priv_cmd added targetable_vfo value to caps minor cleanup ChangeLog history started Initial import for ChangeLog handling starting to convert rig struct to readable form more of convert rig struct to readable form Changelog update for HAMLIB-1.1.1 Gerardo Richarte (1): gs232b.c: Improve get_position string parsing Gisle Vanem (1): Enable verbose mode in bindings/pytest.py Greg Troxel (1): Warning about dodgy code in drake.c HB9EIK (4): Initial release ELAD FDM DUO Update ELAD files Update build system for ELAD backend Update copyright for fdm_duo.c Hans Van Ingelgom (1): Added Peaberry V1 and V2 models Hegedüs Ervin (4): Merge branch 'master' of http://git.code.sf.net/p/hamlib/code Check SWIG string functions for some languages Leave off multiply 'typedef const char * const_char_string' definition (in rig.swg and rotator.swg) Fixed int[10] type variable error in bindings Jae Stutzman (5): Added HPSDR backend Clears potential garbage data in read buffer prior to command being sent Updated PiHPSDR backend defaults Use Windows ioctlsocket to avoid buffer overrun Added new AGC control for PiHPSDR James Watson, HZ1JW (2): Added ic7200 to icom Corrected modes in ic7200.c Jaroslav Skarvada (2): Fix hardcoded pcconfig libdir Fix serial_port DCD squelch Jeroen Vreeken (9): Add support for GPIO PTT. Add missing breaks and improve error messages Add Dorji DRA818 modules (VHF and UHF variants) Also works with NiceRF SA818 modules Merge branch 'master' of git://git.code.sf.net/p/hamlib/code Small fixes to DRA818 volume handling Add GPIO and GPION options for DCD. Also bump abi version since the config params struct needed resizing. Merge branch 'master' of github.com:Hamlib/Hamlib GPIO working after debugging Merge branch 'master' of github.com:Hamlib/Hamlib Johan Ström (1): Backup serial options on open, restore on close Jonathan Bastien-Filiatrault (3): Correct FT; command that does not exist on the FT-891. Allow setting split mode without smashing the VFOB frequency. Scale power values correctly for Yaesu FT-891. Jonny public (1): ether6: New rotor backend from Jonny, DG9OAA Joop Stakenborg, PG4I (116): update (kenwood is not a WIP anymore) first implementation of kenwood_get_ptt enable get_ptt for this rig add get_ptt for this rig additional protocol checks and cleanups fix signal strength add RIG_LEVEL_RFPOWER fix_compilation add rit capabilities bring comands in sync with other kenwood rigs add rit capabilities send_morse added explain set_rit fix get_ctcss_tone by using IF command typo add xit capabilities add set_level and get_level bring rig in sync with other kenwood rigs bump version numbers nothing returned by the rig for these commands fix get_level_agc fix set_level_agc getting in sync with the debian 1.1.2 package remove template files initial checkin make this NMU for now correct the path for copying files in the apropriate package do not install the old changelog versioning not used move .la, .a, .so files to the correct package include rpc.rigd and rpc.rotd include pkgconfig support don't create shlibs file for drake, jrc and easycomm libraries move hamlib1 to the top so the documentations gets installed correctly make building easier, call autogen.sh INSTALL file not used build the documentation package we don't have to call configure twice cleanup remove some build dependencies and don't call autogen.sh ts450s uses IF command for get_vfo, get_freq and get_mode minor bugfix, bump to beta add CWR and RTTYR this rig does not have a command for reading IF bandwidth retrieve passband with FW command passband should be calculated after mode is set use rig_passband_normal here various lintian fixes one last lintian fix use FW command to set bandpass cw filters for normal, narrow and wide more filters get_mode and set_mode for this rig filters some comments correct rit add get_level cleanups more modes set_level for this rig should use kenwood_get_freq minor bug add rpm support need hamlib.spec for 'make rpm' make rpm will fail with a '-' in the version number a working spec file update debian build for rotorez and fodtrack, minor fixes unofficial fix the debian build script, new maintainer update the debian build tree to the latest correct baudrate for the ts-950, use the information field IF for get_vfo by default (supported by most kenwood rigs), ts870s will use the much shorter FR command for get_vfo correct baudrate for some rigs and add ts-950 to the id_list ts-850 returns ID 009 according to martin, OK1RR fix 'make rpm' build for hamlib-1.1.5 not needed sync with latest debian package and add tcl, c++, python and perl bindings correct spelling s-meter calibration by Matt Dawson basic functionality by Matt Dawson, tested with grig and xlog lifetime e-mail address :-) sync with latest debian release more functionality, mode and frequency get by Matt Dawson only switch tx vfo is split is on set attenuator level export convenience function get_kenwood_level, so they can be use by other backends add RIG_LEVEL_SWR, copied from ts850 add RIG_LEVEL_COMP, RIG_LEVEL_AGC, copied from ts850 bump version, no preamp really add ALC read this time, only change meter if needed, cleanups split has_get_level and has_set_level fix coding, python2.4 compatibility fix compilation warnings more compilation warnings nuked, use tone_t for ctcss_list use size_t fix more compilation warnings, int->size_t, unsigned char->char more unsigned char->char and int->size_t transitions set functions should have ack_len zero, also need to check other rigs make sure we use ack_len=0 for functions that return nothing (set functions) more unsigned char->char and int->size_t transitions extend rig capabilities, patch by Tom, DL1JBE add RIG_LEVEL_STRENGTH to caps, set post write delay to 0 and do some cleanups re-establish post-write delay remove rpath backdoor long long really needed here? updates by matt, GW0VNR long long really needed here? - patch by diane Bruce distribute footer.html correct set/get power try better s-meter readings packages renamed obsolete sync with latest debian release no need to link to python sync with latest, python changes another debian update: use 'make distclean' in the rules file Juergen Rinas, DC3BW (4): added antenna switching... added a few get_level/set_level get_function/set_functions. * fixed set_func (concerns most kenwood rigs) * added 115200 to the list of baudrates in probeallrigs_kenwood() * fixed ptt * expanded frequency range (available after firmware update) according to http://www.kenwood.com/i/products/info/amateur/ts_480/firmware/pop_ts480_e.htm * added tuning steps * added filter list * increased version info Julian Cable (3): WinRadio G313: Updates from Julian Campbell wrg313api.c: Fix Win32 (MinGW) build issue Use Automake conditionals for G313 build Kamal Mostafa (3): Fix mingw32 cross-compilation procedure and config Do not let macros/ac_python_devel.m4 trash CPPFLAGS and LIBS Fix spelling errors Kamal Mostafa, KA6MAL (19): Hard-code length of hamlib_version and hamlib_copyright strings to stay compliant with hamlib 1.2 ABI and avoid spurious "consider relinking" warnings from dynamic loader. Removed stale debian/ dir from the hamlib source (it is maintained in the Debian diff and isn't useful in this tree). Update bundled libltdl (libtool) to version 2.2.6b to address CVE-2009-3736. - autogen.sh: never downgrade our bundled libltdl/ (only run libtoolize if system version is newer than our bundled version). - autofixer.sh: script removed as libtool 1.x is no longer allowed. - configure.ac: (not enabled) optional setting to deprecate embedded libltdl/. Added Kamal Mostafa and Jaime Robles as maintainers for Debian packaging. Fix build --with-python-binding breakage introduced by Python 2.6: Do not reference LOCALMODLIBS, else it will add libraries to our link line (e.g -lssl) which are not necessarily installed. Elektor 507 frequency selection resolution improvements, contributed by John Nogatch AC6SL. Move backend libraries into /usr/lib/hamlib directory. Force automake to invoke the C (not C++) linker in kit/ when no C++ is in use. python: fix --with-python-binding configure macro fix configure.ac paths for FreeBSD Remove bundled libltdl (libtool) README.developer: restore libtool prerequisite text Fix segfault on improper -C syntax configure: add check and advice for missing ltdl.h configure: refine advice for missing ltdl.h source warnings cleanup: rpcgen-generated code source warnings cleanup: #if-0 out a few unused routines source warnings cleanup: #ifdef out unused FT-840 routines source warnings cleanup: rotorez_rot_reset wrapper for stop Kosta Arvanitis (1): Allow IC-7410 to send cw messages Kārlis Millers (1): Merge pull request #1 from Hamlib/master Ladislav Vaiz (3): Add Android build support Android build updates for monolithic build Initial support for FUNcube Dongle Pro Larry Gadallah (1): AR7030+: Error reading signal strength for low signal levels. Larry Gadallah, VE6VQ (20): Added Larry Gadallah as maintainer of AOR AR7030+ Added AOR AR7030 Plus Added caps for AR7030+ Added caps for AR7030+ Added AR7030+ Alpha version of AR7030+ backend Alpha version of AR7030+ backend Rationalized naming convention, ran everything through lint. Rationalized naming convention, ran everything through lint. Fixed SVN tags Fixed SVN tags Added AR7030P utilities in ar7030p_utils.c Initial version of utility functions for AR7030 Plus receiver Removed utility/helper functions, added/updated Rig API functions Added new I/O helper functions, IR code definitions Added private data to support channel information Added init/cleanup functions, started implementation of mem/channel access functions Added prototypes for pbsToHz() and hzToPBS() helper functions. Added comments to denote mey_sq, mey_pb, and mey_id labels Added implementation for pbsToHz() and hzToPBS() helper functions. Added various memory/VFO functions. Magne Mæhre (1): Enable set_powerstat (turning radio on/off) for IC-7100. Malcolm Herring (62): init branch init branch New model: Icom IC-R6 Icom IC-R10 & 20 testing complete. Move to Beta ignore build Complete R6 commands Add IC-R30 daily fix tones Merge remote-tracking branch 'Hamlib/master' update Merge branch 'master' into icr6 ICR6 new functions merge update Merge remote-tracking branch 'Hamlib/master' commands 00-15 Merge branch 'master' into icr30 icr30 updates Automatically detect CI-V echo state Icom R8600 to Alpha Update contributors Merge branch 'master' into origin/master Fix Icom DCS SQL funnctions Merge remote-tracking branch 'Hamlib/master' Merge remote-tracking branch 'Hamlib/master' Prepare for D-STAR implementation Merge remote-tracking branch 'Hamlib/master' Initial implementation of icom extended operations more extended operations Merge remote-tracking branch 'Hamlib/master' more ext functions fix merge conflicts more ext_cmd updates ic7100 ext functions Merge remote-tracking branch 'mdblack/master' Merge branch 'master' of https://github.com/malcolmh/Hamlib add token list for ext operations Merge remote-tracking branch 'mdblack/master' more ext operations Merge remote-tracking branch 'mdblack/master' custom ops using ext ops scheme custom level ops Merge remote-tracking branch 'mdblack/master' Merge remote-tracking branch 'Hamlib/master' add scope functions update IC7100 update rigs for new functions Merge remote-tracking branch 'Hamlib/master' new directory structure Merge remote-tracking branch 'Hamlib/master' correct powerstat caps Merge remote-tracking branch 'Hamlib/master' New custom parm implementations restore get_powerstat correct rig_close cap Merge remote-tracking branch 'Hamlib/master' Merge remote-tracking branch 'Hamlib/master' Merge remote-tracking branch 'Hamlib/master' add g/set_ext_func to API additional error checking for extended operations Add Macports to README.osx Mark J. Fine (25): Fixed post-write-delay timing Added support for ECSS/FAX and meter strength Added support for meter strength Added ECSS support to R8B and reconfigured default filter modes Reconfigured default filter modes Updated to reflect recent changes within v1.2.2cvs-2 Fixed CWPITCH function on IC-R75 to use 'set mode data' command. Added level granularity steps included other rig_ prefixes fixed get_powerstat to read correctly when memory channel is blank Added memory switching function in set_vfo Added set memory channel# in radio in set_mem Added set_vfo command for vfo/mem switching Corrected handling of "vacant" memory channels Correctly detect if in memory mode in get_vfo() Reduced large decision trees with bitwise math Added set/get channel functions Updated set/get channel functions Made get_channel aware of untunable blank memory channel accounted for dual preamp (10 & 20db) Fixed passband width return for IC-756PROII Added FM narrow to passband spec Added a provisional define for a variable bandwidth control Added a provisional variable bandwidth control to the RIG_LEVEL enumeration Added provisions for a variable bandwidth control Added provisions for a tone control Corrected problems with Squelch (SQL) and Notch (NOTCHF) controls Added provisions for a variable bandwidth control (BWC) Fixed low-end of freq range from 100kHz to 10kHz. Fixed several differences in 535/545 commands Added missing manual notch switch for the NRD-545 Martin Cooper (2): Don't expect a response when none is required. Don't send EasyComm I commands to EasyComm II rotators. Martin Ewing (7): Add test for valid set frequency, esp. for VFOA (ham band only) Expand valid range_lists for full hardware ranges Fix tt565_transaction to allow Morse commands. Orion.c: remove spurious debug statement. implement level settting and misc fixes remove debug stmt Increment Jupiter version Trim TS950 commands that are not provided by CAT jupiter.c: Updates from Martin, AA6E Martin Ewing, AA6E (69): specified buffer lengths, added default vfo A setting Fix SWR & S-meter, set ATT, set AGC, add rough STR_CAL func. Fix timeout, add retry, better S-mtr scale various bug fixes Added RIG_LEVEL_CWPITCH, RIG_LEVEL_KEYSPD, send_morse() Added RIG_FUNC_TUNER, RIG_FUNC_LOCK and RIG_FUNC_VOX, fixed MEM_CAP. Added VFO_OPS, promote to Beta Support LEVEL_VOX, VOXGAIN, ANTIVOX Support LEVEL_NR as Orion NB setting (firmware bug), FUNC_NB -> NB=0,4 Add get_, set_ant (ignores rx only ant) Added Orion, Orion 2 info Squashed warnings about signedness Orion S-meter cal minor - add doxygen info for enums minor - doxygen parameters doxygen formatting add comments info on generating docs doc improvements add comment documentation documentation allow atten = 0 dB patch from SM6PPS fix enum documentation documentation page documentation documentation split orion.c and add doc info documentation SM6PPS mods for AOR 5000a further rx-320 mods by Ken Prox use binary mode VFO requests correct CHANNEL_CAPS sytax Dead simple sample Hamlib program Correct float vs int interpolation options Add autodetect version 1 or 2 firmware (using rig_get_info). Correct V1 calibration. Make V2 calibration the default. Signal RIG_LEVEL_STRENGTH supported. Moved firmware detection to new tt565_open routine, where it is done every time the rig is opened. Add more functions to example program. Ensure printable get_info string Fix bug that seg faulted when get_info returned null. (No reward points!) Add S meter operations to sample program. Adjust retry & timeout values to help in case of no response from rig, i.e., if rig power happens to be off. Prettify some code indents. Better error handling, reliability for serial I/O. Misc prettification. TT Omni VI / Plus improvements Fix typo Fix Omni VI PTT function Update Icom info Declutter Omni VI memories, rit/xit Fix serial I/O error checking Add author. (credits info added to web page, also) Switch back to ASCII freq. setting because of hardware(?) bug. Add AF, RF gain and squelch level capability. Add thanks to W1RFI & ARRL minor changes RIG_STATUS_ALPHA reflecting initial tests. fix missing comma use rawstrength.i which matters in PPC compile fix string handling in LEVEL_RAWSTR Orion - implement RIG_LEVEL_STRENGTH Example updates Orion: Allow frontend to handle RIG_LEVEL_STRENGTH Minor comment re rit/xit Downgrade ERR to WARN (i/o retry) Init revision - tnx Stephane Autofixer sets up for libtool v1 or v2 autofixer.sh supportin libtool v1 and v2 minor update repair echo cmd Max Lock (1): Addition of support for CM108B PTT Michael Black (1257): TenTec Omni VII update from W9MDB New XG3 backend Fixes to termios.c on W32 targets xg3 patch Check TS-590S for EU or US firmware New backend for FT-991 Flush the debug stream Omni VII to set VFO_CURR correctly Omni VII patch for WSJT-X FT-991 patch Small FT-991 patch for WSJT support Omni VII patch FT-857 and FT-991 patches Fix possible frequency overflow on Kenwood and Yaesu Add get_freq to FRG-100 Clean up clang warnings on adat.c Clear up a clang compiler warning in kenwood/elecraft.h Clean up clang warnings in tentec Fix port->pathname checks Quell clang warnings in tests directory Various Yaesu updates Simply define TRUE to 1 in omnivii.c Allow the ft757gx to work with WSJT-X. Remove input redirects in autogen.sh Initial support for the IC-7300 Add send_morse to icom rigs tmd710 patch Icom frame patch Exposed constants via function calls Remove define Merge branch 'master' of https://github.com/N0NB/hamlib Changed some modules to LGPL in lieu of GPL Fixed buffer overflow in rigctl_parse and rotctl_parse Merge branch 'master' of https://github.com/N0NB/hamlib Move K3 DT0 before mode switch, add version info to electraft rig open, WSJT-X VOX rig split now works Merge branch 'master' of https://github.com/N0NB/hamlib Added IC-7850/51 -- works with WSJT-X Merge branch 'master' of https://github.com/N0NB/hamlib Add ic7850 ic7851 -- works with wsjtx Add ic7850 ic7851 -- works with wsjtx Merger 7850/51 into 785x Fix ft991_get_mode Added ft891 backend Fix ic785x default addr to 0x8e Fix FT-891 recognition IC-M710 now working with WSJST-X Add icm710.h to icmarine Makefile.am Merge pull request #1 from Hamlib/master Fix FT857 to return the SMeter-based value Reduce debug info in flrig.c Change RIG_MODE and RIG_FUNC to 64-bit values Merge hamlib head Add PRXll macro for 64-bit use Fixup for 64-bit in memcsv.c 64 bit mods to netrigctl.c testrig.c Add TS-890S as derivative of TS-480 plus new modes Add XHCG to ic706.c Change rmode_t to uint64_t and remove unneeded casts Fix RIG_MODE structure in src/msic.c Fix some 64bit items and add RIG_FUNC_NB2 for TS-890S Suppress GCC unused-return warning Fix rig_idx2settings for 64-bit sprintf_list functions Fix flrig when WSJT-X startup causes rig mode change Increase flrig timeout value Add USB mode to flrig Fix flrig memory leak Fix bug where constant value was being trashed Add PKT modes to ts590.c Add BC2 and NB2 functions for newer kenwoods Change RIG_SETTING_MAX for 64-bit compatibility All kenwoods to have 3-char commands for functions and return whatever value the rig returns instead of 0/1 Changes to add more ts890 capabilities, e.g. NB2, BC2 Fix kenwoood BC BC2 returns Fix kenwood BC BC2 return merge master New utility to allow non-hamlib-aware programs to use hamlib rigs via COM ports Virtual com ports providing a TS-2000 Emulator Example connecting N1MM or such to FLRig via COM5/COM6 virtual COM pair rigctlcom -m 4 -R COM5 -S 115200 N1MM connects to COM6 TS-2000 115200 8N1 Add TUNER on/off fnction for Yaesu rigs Fix segfault in rigctlcom with no args and improve usage Add rigctlcom to install scripts Add FT847UNI for early serial number units that are one-way comm Add rigctlcom to gitignore Reduce verbosity in FLRig Ensure buf is zeroed in kenwood_safe_transaction to avoid return random data Reduce verbosity of rig_strrmode and read_string Improve error handling in network_flush when disconnect happens Reduce verbosity of rig_strvfo netrigctl can now do vfo mode -- has automatic detection of rigctld vfo mode rigctl automatically detects vfo mode of rigctld rigctli and rigctld recommend vfo mode if not selected Merge branch 'master' of https://github.com/Hamlib/Hamlib Fix memset in kenwood.c Fix network_flush as it was not actually flushing before This was causing an infinite loop and WSJT-X to lock up using flex6xxx backend network.c astyle applied Add ability for rigctlcom to work with Ham Radio Deluxe astyle format of rigctlcom.c Relax chk_vfo requirement for backward compatibility astyle for netrigctl.c Merge branch 'master' of https://github.com/Hamlib/Hamlib Fix ts590 RIG_LEVEL_AF astyle ts590.c Update TS590 version and make it STABLE Add set/get powerstat for ic785x.c Have kenwood set_powerstat ON wait for get_powerstat Fix set_powerstat wait loop Bump version for kenwood.c Add wait for set_powerstat in icom.c Change powerstat to wait for get_freq as this is generic to all cache timeout when swapping vfos on ft817 and ft897 Add flush to serial open Add set/get vfo to ft857 Improved set_powerstat for icom & kenwood Add IC-9700 to ic7300.c Add priv_caps for IC9700 Add icom get_vfo introduced on IC-9700 Add DD mode for IC-9700 Numerous IC-9700 updates Implement new get_freq for IC9700 with TARGETABLE_FREQ now Fix ic9700 get_freq frame len Fix get_freq for IC9700 Undo get_vfo attempt for ic9700 Implement icom Main/Sub get_freq -- broken for IC9700 firmware 1.05 Prototype for ic9700 set_freq to allow band change when Main band wil equal Sub band...but disabled for now until firmware is fixed Merge branch 'master' of https://github.com/mdblack98/Hamlib Improve vfo err msgs in kenwood.c Fix thd72 current_vfo problem Improved debug in th.c astyle for th.c and thd72.c Change TS790 handhsake to none and promote to stable. Works with WSJT-X Merge branch 'master' of https://github.com/Hamlib/Hamlib Add 60m exception for set_freq for FT-DX3000 and FT-DX5000 Add debug for 60M DX3000/5000 exception Undo ts790 change Fix compile warnings in parallel.c astyle parallel.c Fix uninitialized in tmd710.c Fix duplicate set_vfo in ic7300.c Fix compiler warning in debug.c astyle debug.c Fix compile warning in rigctl_parse.c Fix vfonum warning in tmd710.c Fix compile warning in rotctl_parse.c Fix CM108 ptt_bitnum for pttport Add USB_echo_check to ic9700 Add icom_rig_open to IC9700 Improve thd72 ops Add some levels to TS590 Fix termios debug statement Add first cut at amplifier control Fix rig.h for merge Fix rig.h for merge Fix dumpcaps.c prntbuf warning Fix termios to return timeout value when timeout occurs Adding README.elecraft Merge branch 'master' of https://github.com/Hamlib/Hamlib Fixup some amplifier code Fix Makefile.am Fix segfault in flrig.c Fix mode set in flrig.c Add timeouts to ft1000d and promot to beta..work with WSJT-X but rig split does not work yet Add flush to flrig.c Remove old comment in k3.c Merge branch 'master' of https://github.com/Hamlib/Hamlib ... [truncated message content] |
From: Michael B. <mdb...@us...> - 2020-07-08 16:51:22
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 6f8100ffc0ba555b8dae96a56d61fefbb7624c06 (commit) from 5e801fd2b504c77b59d99c079858b30be09ba922 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6f8100ffc0ba555b8dae96a56d61fefbb7624c06 Author: Michael Black W9MDB <mdb...@ya...> Date: Wed Jul 8 11:48:48 2020 -0500 Fix cppcheck warnings diff --git a/src/mem.c b/src/mem.c index c698c7ab..7c3b96c0 100644 --- a/src/mem.c +++ b/src/mem.c @@ -1606,6 +1606,7 @@ const chan_t *HAMLIB_API rig_lookup_mem_caps(RIG *rig, int ch) */ for (j = 0; j < sizeof(channel_cap_t); j++) { + // cppcheck-suppress * p1[j] |= p2[j]; } diff --git a/tests/ampctld.c b/tests/ampctld.c index e5244eae..6f99b525 100644 --- a/tests/ampctld.c +++ b/tests/ampctld.c @@ -598,6 +598,7 @@ int main(int argc, char *argv[]) handle_socket(arg); #endif } + // cppcheck-suppress * while (retcode == 0); amp_close(my_amp); /* close port */ diff --git a/tests/memcsv.c b/tests/memcsv.c index ab997939..ddd149b2 100644 --- a/tests/memcsv.c +++ b/tests/memcsv.c @@ -311,6 +311,7 @@ static char *mystrtok(char *s, char delim) } } + // cppcheck-suppress * return str + ent_pos; } diff --git a/tests/rotctl_parse.c b/tests/rotctl_parse.c index a0dce570..876ce271 100644 --- a/tests/rotctl_parse.c +++ b/tests/rotctl_parse.c @@ -306,7 +306,7 @@ void hash_sort_by_model_id() /* Delete hash */ void hash_delete_all() { - struct mod_lst *current_model, *tmp; + struct mod_lst *current_model, *tmp=NULL; HASH_ITER(hh, models, current_model, tmp) { diff --git a/tests/rotctld.c b/tests/rotctld.c index ffc33bbc..065a6ea7 100644 --- a/tests/rotctld.c +++ b/tests/rotctld.c @@ -611,6 +611,7 @@ int main(int argc, char *argv[]) handle_socket(arg); #endif } + // cppcheck-suppress * while (retcode == 0); rot_close(my_rot); /* close port */ ----------------------------------------------------------------------- Summary of changes: src/mem.c | 1 + tests/ampctld.c | 1 + tests/memcsv.c | 1 + tests/rotctl_parse.c | 2 +- tests/rotctld.c | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-07 16:39:44
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 5e801fd2b504c77b59d99c079858b30be09ba922 (commit) via 4177dde4e02e4d366e81ef40ee161b2eed5e1875 (commit) via a19169a6b0dc84fef3e04f17150a886f227f8e91 (commit) from 0db3eafe6670c578733138b3f33e3e4028eb774a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5e801fd2b504c77b59d99c079858b30be09ba922 Author: Michael Black W9MDB <mdb...@ya...> Date: Tue Jul 7 11:39:26 2020 -0500 astyle files diff --git a/dummy/dummy.c b/dummy/dummy.c index 62b2b033..6e748861 100644 --- a/dummy/dummy.c +++ b/dummy/dummy.c @@ -410,12 +410,14 @@ static int dummy_set_freq(RIG *rig, vfo_t vfo, freq_t freq) if (vfo == RIG_VFO_A) { priv->curr->freq = freq; } else if (vfo == RIG_VFO_B) { priv->curr->tx_freq = freq; } + if (!priv->split) { priv->curr->tx_freq = freq; } - rig_debug(RIG_DEBUG_TRACE, "%s: curr->freq=%.0f, curr->tx_freq=%.0f\n", __func__, + rig_debug(RIG_DEBUG_TRACE, "%s: curr->freq=%.0f, curr->tx_freq=%.0f\n", + __func__, priv->curr->freq, priv->curr->tx_freq); return RIG_OK; } diff --git a/dummy/flrig.c b/dummy/flrig.c index c26b00d3..e1b166e7 100644 --- a/dummy/flrig.c +++ b/dummy/flrig.c @@ -376,7 +376,7 @@ static char *xml_parse(char *xml, char *value, int value_len) xml_parse2(next, value, value_len); } - if ( value && strstr(value, "faultString")) + if (value && strstr(value, "faultString")) { rig_debug(RIG_DEBUG_ERR, "%s error:\n%s\n", __func__, value); value[0] = 0; /* truncate to give empty response */ diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index 5f3ec087..5c42dfbc 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -1575,7 +1575,7 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode, switch (mode) { - case RIG_MODE_PKTUSB: + case RIG_MODE_PKTUSB: // xFE xFE x6E xE0 x1A x06 x01 xFD switchs mod input from MIC to ACC // This apparently works for IC-756ProIII but nobody has asked for it yet icom_mode = RIG_MODE_USB; diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index b9045418..7455e2d0 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -327,7 +327,8 @@ transaction_write: // Seems some rigs (like TS-480) return "?" when RX is done while PTT=OFF // So we'll skip the checks just on this one command for now // The TS-480 PC Control says RX; should return RX0; but it doesn't - if (retval == RIG_OK && strncmp(cmdstr, "RX", 2) == 0) goto transaction_quit; + // We may eventually want to verify PTT with rig_get_ptt instead + if (retval == RIG_OK && strncmp(cmdstr, "RX", 2) == 0) { goto transaction_quit; } if (!datasize) { @@ -668,18 +669,20 @@ int kenwood_init(RIG *rig) priv = rig->state.priv; memset(priv, 0x00, sizeof(struct kenwood_priv_data)); + if (RIG_IS_XG3) { priv->verify_cmd[0] = caps->cmdtrm; - priv->verify_cmd[1] ='\0'; + priv->verify_cmd[1] = '\0'; } else { - priv->verify_cmd[0] ='I'; - priv->verify_cmd[1] ='D'; + priv->verify_cmd[0] = 'I'; + priv->verify_cmd[1] = 'D'; priv->verify_cmd[2] = caps->cmdtrm; - priv->verify_cmd[3] ='\0'; + priv->verify_cmd[3] = '\0'; } + priv->split = RIG_SPLIT_OFF; priv->trn_state = -1; priv->curr_mode = 0; @@ -731,7 +734,8 @@ int kenwood_open(RIG *rig) rig_debug(RIG_DEBUG_TRACE, "%s: got ID so try PS\n", __func__); err = rig_get_powerstat(rig, &powerstat); - if (err == RIG_OK && powerstat == 0 && priv->poweron == 0 && rig->state.auto_power_on) + if (err == RIG_OK && powerstat == 0 && priv->poweron == 0 + && rig->state.auto_power_on) { rig_debug(RIG_DEBUG_TRACE, "%s: got PS0 so powerup\n", __func__); rig_set_powerstat(rig, 1); @@ -741,6 +745,7 @@ int kenwood_open(RIG *rig) err = RIG_OK; // reset our err back to OK for later checks } + if (err == -RIG_ETIMEOUT && rig->state.auto_power_on) { // Ensure rig is on @@ -748,6 +753,7 @@ int kenwood_open(RIG *rig) /* Try get id again */ err = kenwood_get_id(rig, id); } + if (RIG_OK != err) { rig_debug(RIG_DEBUG_ERR, @@ -879,6 +885,7 @@ int kenwood_open(RIG *rig) vfo_t tx_vfo; /* get current AI state so it can be restored */ kenwood_get_trn(rig, &priv->trn_state); /* ignore errors */ + /* Currently we cannot cope with AI mode so turn it off in case last client left it on */ if (priv->trn_state != RIG_TRN_OFF) @@ -891,10 +898,12 @@ int kenwood_open(RIG *rig) { // call get_split to fill in current split and tx_vfo status retval = kenwood_get_split_vfo_if(rig, RIG_VFO_A, &split, &tx_vfo); + if (retval != RIG_OK) { rig_debug(RIG_DEBUG_ERR, "%s: %s\n", __func__, rigerror(retval)); } + priv->tx_vfo = tx_vfo; rig_debug(RIG_DEBUG_VERBOSE, "%s: priv->tx_vfo=%s\n", __func__, rig_strvfo(priv->tx_vfo)); @@ -3438,7 +3447,8 @@ int kenwood_set_trn(RIG *rig, int trn) case RIG_MODEL_THD7A: case RIG_MODEL_THD74: - return kenwood_transaction(rig, (trn == RIG_TRN_RIG) ? "AI 1" : "AI 0", buf, sizeof buf); + return kenwood_transaction(rig, (trn == RIG_TRN_RIG) ? "AI 1" : "AI 0", buf, + sizeof buf); break; default: diff --git a/rigs/kenwood/th.c b/rigs/kenwood/th.c index a7750adb..942018df 100644 --- a/rigs/kenwood/th.c +++ b/rigs/kenwood/th.c @@ -435,12 +435,12 @@ th_set_vfo(RIG *rig, vfo_t vfo) case RIG_VFO_A: case RIG_VFO_VFO: case RIG_VFO_MAIN: - strncpy (cmd, "BC 0", sizeof cmd); + strncpy(cmd, "BC 0", sizeof cmd); break; case RIG_VFO_B: case RIG_VFO_SUB: - strncpy (cmd, "BC 1", sizeof cmd); + strncpy(cmd, "BC 1", sizeof cmd); break; default: @@ -463,29 +463,31 @@ th_set_vfo(RIG *rig, vfo_t vfo) case RIG_VFO_A: case RIG_VFO_VFO: case RIG_VFO_MAIN: - strncpy (cmd, "VMC 0,0", sizeof cmd); + strncpy(cmd, "VMC 0,0", sizeof cmd); break; case RIG_VFO_B: case RIG_VFO_SUB: - strncpy (cmd, "VMC 1,0", sizeof cmd); + strncpy(cmd, "VMC 1,0", sizeof cmd); break; case RIG_VFO_MEM: - strncpy (cmd, "BC", sizeof cmd); - retval = kenwood_transaction (rig, cmd, cmd, sizeof cmd); + strncpy(cmd, "BC", sizeof cmd); + retval = kenwood_transaction(rig, cmd, cmd, sizeof cmd); + if (retval != RIG_OK) { return retval; } + if (rig->caps->rig_model == RIG_MODEL_THF7E || rig->caps->rig_model == RIG_MODEL_THF6A) { - snprintf (cmd, sizeof cmd, "VMC %c,1", cmd[3]); + snprintf(cmd, sizeof cmd, "VMC %c,1", cmd[3]); } else { - snprintf (cmd, sizeof cmd, "VMC %c,2", cmd[3]); + snprintf(cmd, sizeof cmd, "VMC %c,2", cmd[3]); } break; @@ -737,7 +739,7 @@ int th_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo) } /* Set VFO mode. To be done for TX vfo also? */ - snprintf (vfobuf, sizeof vfobuf, "VMC %d,0", vfonum); + snprintf(vfobuf, sizeof vfobuf, "VMC %d,0", vfonum); retval = kenwood_transaction(rig, vfobuf, vfobuf, sizeof vfobuf); if (retval != RIG_OK) @@ -745,7 +747,7 @@ int th_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo) return retval; } - snprintf (vfobuf, sizeof vfobuf, "BC %d,%d", vfonum, txvfonum); + snprintf(vfobuf, sizeof vfobuf, "BC %d,%d", vfonum, txvfonum); retval = kenwood_transaction(rig, vfobuf, NULL, 0); if (retval != RIG_OK) @@ -804,8 +806,8 @@ int th_set_trn(RIG *rig, int trn) { char buf[5]; - snprintf (buf, sizeof buf, "AI %c", RIG_TRN_RIG == trn ? '1' : '0'); - return kenwood_transaction (rig, buf, buf, sizeof buf); + snprintf(buf, sizeof buf, "AI %c", RIG_TRN_RIG == trn ? '1' : '0'); + return kenwood_transaction(rig, buf, buf, sizeof buf); } /* @@ -1417,8 +1419,8 @@ th_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone) } i += (i == 0) ? 1 : 2; /* Correct for TH-D7A index anomally */ - snprintf (tonebuf, sizeof tonebuf, "TN %02d", i); - return kenwood_transaction (rig, tonebuf, tonebuf, sizeof tonebuf); + snprintf(tonebuf, sizeof tonebuf, "TN %02d", i); + return kenwood_transaction(rig, tonebuf, tonebuf, sizeof tonebuf); } /* @@ -1495,8 +1497,8 @@ th_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone) } i += (i == 0) ? 1 : 2; /* Correct for TH-D7A index anomally */ - snprintf (tonebuf, sizeof tonebuf, "CTN %02d", i); - return kenwood_transaction (rig, tonebuf, tonebuf, sizeof tonebuf); + snprintf(tonebuf, sizeof tonebuf, "CTN %02d", i); + return kenwood_transaction(rig, tonebuf, tonebuf, sizeof tonebuf); } /* @@ -1565,7 +1567,7 @@ th_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code) if (code == 0) { - snprintf (codebuf, sizeof codebuf, "DCS 0"); + snprintf(codebuf, sizeof codebuf, "DCS 0"); return kenwood_transaction(rig, codebuf, codebuf, sizeof codebuf); } @@ -1582,14 +1584,16 @@ th_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code) return -RIG_EINVAL; } - snprintf (codebuf, sizeof codebuf, "DCS 1"); - if ((retval = kenwood_transaction(rig, codebuf, codebuf, sizeof codebuf)) != RIG_OK) + snprintf(codebuf, sizeof codebuf, "DCS 1"); + + if ((retval = kenwood_transaction(rig, codebuf, codebuf, + sizeof codebuf)) != RIG_OK) { return retval; } snprintf(codebuf, sizeof codebuf, "DCSN %04d", (i + 1) * 10); - return kenwood_transaction (rig, codebuf, codebuf, sizeof codebuf); + return kenwood_transaction(rig, codebuf, codebuf, sizeof codebuf); } /* @@ -1724,8 +1728,8 @@ th_set_mem(RIG *rig, vfo_t vfo, int ch) return retval; } - snprintf (membuf, sizeof membuf, "MC %c,%03i", vsel, ch); - return kenwood_transaction (rig, membuf, membuf, sizeof membuf); + snprintf(membuf, sizeof membuf, "MC %c,%03i", vsel, ch); + return kenwood_transaction(rig, membuf, membuf, sizeof membuf); } /* Get mem works only when the display is @@ -1801,7 +1805,8 @@ th_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) { char buf[3]; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__); - return kenwood_transaction(rig, (ptt == RIG_PTT_ON) ? "TX" : "RX", buf, sizeof buf); + return kenwood_transaction(rig, (ptt == RIG_PTT_ON) ? "TX" : "RX", buf, + sizeof buf); } int th_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) @@ -2497,15 +2502,15 @@ int th_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option) switch (ant) { case RIG_ANT_1: - strncpy (cmd, "ANT 0", sizeof cmd); + strncpy(cmd, "ANT 0", sizeof cmd); break; case RIG_ANT_2: - strncpy (cmd, "ANT 1", sizeof cmd); + strncpy(cmd, "ANT 1", sizeof cmd); break; case RIG_ANT_3: - strncpy (cmd, "ANT 2", sizeof cmd); + strncpy(cmd, "ANT 2", sizeof cmd); break; default: diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c index f1dead25..7e7e66a9 100644 --- a/rigs/yaesu/ft1000mp.c +++ b/rigs/yaesu/ft1000mp.c @@ -850,52 +850,72 @@ int ft1000mp_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) { case RIG_MODE_AM: cmd_index = FT1000MP_NATIVE_MODE_SET_AM; - if (vfo == RIG_VFO_B) cmd_index = FT1000MP_NATIVE_MODE_SET_AM_B; + + if (vfo == RIG_VFO_B) { cmd_index = FT1000MP_NATIVE_MODE_SET_AM_B; } + break; case RIG_MODE_CW: cmd_index = FT1000MP_NATIVE_MODE_SET_CWR; - if (vfo == RIG_VFO_B) cmd_index = FT1000MP_NATIVE_MODE_SET_CWR_B; + + if (vfo == RIG_VFO_B) { cmd_index = FT1000MP_NATIVE_MODE_SET_CWR_B; } + break; case RIG_MODE_CWR: cmd_index = FT1000MP_NATIVE_MODE_SET_CW; - if (vfo == RIG_VFO_B) cmd_index = FT1000MP_NATIVE_MODE_SET_CW_B; + + if (vfo == RIG_VFO_B) { cmd_index = FT1000MP_NATIVE_MODE_SET_CW_B; } + break; case RIG_MODE_USB: cmd_index = FT1000MP_NATIVE_MODE_SET_USB; - if (vfo == RIG_VFO_B) cmd_index = FT1000MP_NATIVE_MODE_SET_USB_B; + + if (vfo == RIG_VFO_B) { cmd_index = FT1000MP_NATIVE_MODE_SET_USB_B; } + break; case RIG_MODE_LSB: cmd_index = FT1000MP_NATIVE_MODE_SET_LSB; - if (vfo == RIG_VFO_B) cmd_index = FT1000MP_NATIVE_MODE_SET_LSB_B; + + if (vfo == RIG_VFO_B) { cmd_index = FT1000MP_NATIVE_MODE_SET_LSB_B; } + break; case RIG_MODE_FM: cmd_index = FT1000MP_NATIVE_MODE_SET_FM; - if (vfo == RIG_VFO_B) cmd_index = FT1000MP_NATIVE_MODE_SET_FM_B; + + if (vfo == RIG_VFO_B) { cmd_index = FT1000MP_NATIVE_MODE_SET_FM_B; } + break; case RIG_MODE_RTTY: cmd_index = FT1000MP_NATIVE_MODE_SET_RTTY_LSB; - if (vfo == RIG_VFO_B) cmd_index = FT1000MP_NATIVE_MODE_SET_RTTY_LSB_B; + + if (vfo == RIG_VFO_B) { cmd_index = FT1000MP_NATIVE_MODE_SET_RTTY_LSB_B; } + break; case RIG_MODE_RTTYR: cmd_index = FT1000MP_NATIVE_MODE_SET_RTTY_USB; - if (vfo == RIG_VFO_B) cmd_index = FT1000MP_NATIVE_MODE_SET_RTTY_USB_B; + + if (vfo == RIG_VFO_B) { cmd_index = FT1000MP_NATIVE_MODE_SET_RTTY_USB_B; } + break; case RIG_MODE_PKTLSB: cmd_index = FT1000MP_NATIVE_MODE_SET_DATA_LSB; - if (vfo == RIG_VFO_B) cmd_index = FT1000MP_NATIVE_MODE_SET_DATA_LSB_B; + + if (vfo == RIG_VFO_B) { cmd_index = FT1000MP_NATIVE_MODE_SET_DATA_LSB_B; } + break; case RIG_MODE_PKTFM: cmd_index = FT1000MP_NATIVE_MODE_SET_DATA_FM; - if (vfo == RIG_VFO_B) cmd_index = FT1000MP_NATIVE_MODE_SET_FM_B; + + if (vfo == RIG_VFO_B) { cmd_index = FT1000MP_NATIVE_MODE_SET_FM_B; } + break; default: @@ -1558,14 +1578,14 @@ int ft1000mp_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo) return -RIG_EINVAL; /* sorry, wrong VFO */ } - rig_get_freq(rig,RIG_VFO_B,&tx_freq); + rig_get_freq(rig, RIG_VFO_B, &tx_freq); // manual says VFO_A=Tx and VFO_B=Rx but testing shows otherwise rig->state.current_vfo = RIG_VFO_A; rig->state.tx_vfo = RIG_VFO_B; ft1000mp_send_priv_cmd(rig, FT1000MP_NATIVE_AB); // Copy A to B ft1000mp_send_priv_cmd(rig, FT1000MP_NATIVE_VFO_A); // make A active ft1000mp_send_priv_cmd(rig, cmd_index); - rig_set_freq(rig,RIG_VFO_B,tx_freq); // restore orig frequency + rig_set_freq(rig, RIG_VFO_B, tx_freq); // restore orig frequency return RIG_OK; } diff --git a/rotators/gs232a/gs232b.c b/rotators/gs232a/gs232b.c index eebaad67..97e51ad6 100644 --- a/rotators/gs232a/gs232b.c +++ b/rotators/gs232a/gs232b.c @@ -227,8 +227,10 @@ gs232b_rot_get_position(ROT *rot, azimuth_t *az, elevation_t *el) */ // There's a 12PR1A rotor that only returns AZ so we may only get AZ=xxx if (sscanf(posbuf, "AZ=%d EL=%d", &int_az, &int_el) == 0) - { // only give error if we didn't parse anything - rig_debug(RIG_DEBUG_ERR, "%s: wrong reply '%s', expected AZ=xxx EL=xxx\n", __func__, + { + // only give error if we didn't parse anything + rig_debug(RIG_DEBUG_ERR, "%s: wrong reply '%s', expected AZ=xxx EL=xxx\n", + __func__, posbuf); return -RIG_EPROTO; } diff --git a/src/conf.c b/src/conf.c index dd7a9572..e9e85910 100644 --- a/src/conf.c +++ b/src/conf.c @@ -567,6 +567,7 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val) { return -RIG_EINVAL; //value format error } + rs->auto_power_on = val_i ? 1 : 0; break; @@ -575,6 +576,7 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val) { return -RIG_EINVAL; //value format error } + rs->auto_disable_screensaver = val_i ? 1 : 0; break; diff --git a/src/misc.c b/src/misc.c index 327a1149..564277d0 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1313,7 +1313,8 @@ int HAMLIB_API rig_get_cache_timeout_ms(RIG *rig, hamlib_cache_t selection) return rig->state.cache.timeout_ms; } -int HAMLIB_API rig_set_cache_timeout_ms(RIG *rig, hamlib_cache_t selection, int ms) +int HAMLIB_API rig_set_cache_timeout_ms(RIG *rig, hamlib_cache_t selection, + int ms) { rig_debug(RIG_DEBUG_TRACE, "%s: called selection=%d, ms=%d\n", __func__, selection, ms); @@ -1393,7 +1394,7 @@ int HAMLIB_API parse_hoststr(char *hoststr, char host[256], char port[6]) if (strncasecmp(hoststr, "com", 3) == 0) { return -1; } // escaped COM port like \\.\COM3 - if (strstr(hoststr,"\\\\.\\")) { return -1; } + if (strstr(hoststr, "\\\\.\\")) { return -1; } // bracketed IPV6 with optional port int n = sscanf(hoststr, "[%255[^]]]:%5s", host, port); diff --git a/tests/memcsv.c b/tests/memcsv.c index ce53b7ac..ab997939 100644 --- a/tests/memcsv.c +++ b/tests/memcsv.c @@ -1054,5 +1054,6 @@ int find_on_list(char **list, char *what) i++; } } + return i; } commit 4177dde4e02e4d366e81ef40ee161b2eed5e1875 Author: Michael Black W9MDB <mdb...@ya...> Date: Tue Jul 7 11:36:50 2020 -0500 For all kenwoods remove the ID; check of the RX; command TS-480 is not returning RX0; as the manual says May want to consider validating PTT instead https://github.com/Hamlib/Hamlib/issues/338 diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index 42852947..b9045418 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -323,6 +323,12 @@ transaction_write: } } + // we're not going to do the verify on RX cmd + // Seems some rigs (like TS-480) return "?" when RX is done while PTT=OFF + // So we'll skip the checks just on this one command for now + // The TS-480 PC Control says RX; should return RX0; but it doesn't + if (retval == RIG_OK && strncmp(cmdstr, "RX", 2) == 0) goto transaction_quit; + if (!datasize) { rig->state.hold_decode = 0; commit a19169a6b0dc84fef3e04f17150a886f227f8e91 Author: Michael Black W9MDB <mdb...@ya...> Date: Tue Jul 7 07:10:22 2020 -0500 Update kenwood_transaction to improve cache invalidation diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index c5fbc473..42852947 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -275,7 +275,7 @@ int kenwood_transaction(RIG *rig, const char *cmdstr, char *data, } if (strlen(cmdstr) > 2 || strcmp(cmdstr, "RX") == 0 - || strcmp(cmdstr, "TX") == 0 || strcmp(cmdstr, "ZZTX") == 0) + || strncmp(cmdstr, "TX", 2) == 0 || strncmp(cmdstr, "ZZTX", 4) == 0) { // then we must be setting something so we'll invalidate the cache rig_debug(RIG_DEBUG_TRACE, "%s: cache invalidated\n", __func__); diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h index 8030f9de..07f93656 100644 --- a/rigs/kenwood/kenwood.h +++ b/rigs/kenwood/kenwood.h @@ -27,7 +27,7 @@ #include <string.h> #include "token.h" -#define BACKEND_VER "20200624" +#define BACKEND_VER "20200707" #define EOM_KEN ';' #define EOM_TH '\r' ----------------------------------------------------------------------- Summary of changes: dummy/dummy.c | 4 +++- dummy/flrig.c | 2 +- rigs/icom/icom.c | 2 +- rigs/kenwood/kenwood.c | 30 +++++++++++++++++++------ rigs/kenwood/kenwood.h | 2 +- rigs/kenwood/th.c | 57 ++++++++++++++++++++++++++---------------------- rigs/yaesu/ft1000mp.c | 44 +++++++++++++++++++++++++++---------- rotators/gs232a/gs232b.c | 6 +++-- src/conf.c | 2 ++ src/misc.c | 5 +++-- tests/memcsv.c | 1 + 11 files changed, 102 insertions(+), 53 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-06 15:17:22
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 0db3eafe6670c578733138b3f33e3e4028eb774a (commit) from 281febec6221ba8eeaff8da4cc5740c3baecdb2d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0db3eafe6670c578733138b3f33e3e4028eb774a Author: Michael Black W9MDB <mdb...@ya...> Date: Mon Jul 6 10:15:57 2020 -0500 Fix rigctl argument prompt for non-readline capable system https://github.com/Hamlib/Hamlib/issues/339 diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c index a6b75b60..f3b791e9 100644 --- a/tests/rigctl_parse.c +++ b/tests/rigctl_parse.c @@ -736,6 +736,8 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, break; } + rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd==0x%02x\n", __func__, cmd); + if (cmd == 0x0a || cmd == 0x0d) { if (last_was_ret) @@ -935,12 +937,17 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc, if (interactive) { - rig_debug(RIG_DEBUG_TRACE, "%s: debug4\n", __func__); + int c = fgetc(fin); + rig_debug(RIG_DEBUG_TRACE, "%s: debug4 c=%02x\n", __func__, c); - if (prompt) + if (prompt && c == 0x0a) { fprintf_flush(fout, "%s: ", cmd_entry->arg1); } + else + { + ungetc(c, fin); + } if (scanfc(fin, "%s", arg1) < 1) { ----------------------------------------------------------------------- Summary of changes: tests/rigctl_parse.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-04 22:30:15
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 281febec6221ba8eeaff8da4cc5740c3baecdb2d (commit) via 3f4002972039459e0f39f6d68d739161d7bb50ed (commit) from 5007765d102694ebaf79a964056bb04ec4d88cbf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 281febec6221ba8eeaff8da4cc5740c3baecdb2d Author: Bill Somerville <bi...@cl...> Date: Sat Jul 4 23:23:39 2020 +0100 New power on option rather than power on/off Also fixes incorrect token name usage in token definition diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 2a7adc02..b6d1a8d8 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -2028,8 +2028,8 @@ struct rig_state { int twiddle_timeout; /*!< timeout to resume from twiddling */ struct rig_cache cache; int vfo_opt; /*!< Is -o switch turned on? */ - int auto_pwr_on_off; /*!< Allow Hamlib to power rig on and - off automatically if supported */ + int auto_power_on; /*!< Allow Hamlib to power rig + automatically if supported */ int auto_disable_screensaver; /*!< Allow Hamlib to disable the rig's screen saver automatically if supported */ diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index 5f8b39a1..5f3ec087 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -727,7 +727,7 @@ icom_rig_open(RIG *rig) rig->caps->version); retval = icom_get_usb_echo_off(rig); - if (retval != RIG_OK && priv->poweron == 0 && rs->auto_pwr_on_off) + if (retval != RIG_OK && priv->poweron == 0 && rs->auto_power_on) { // maybe we need power on? rig_debug(RIG_DEBUG_VERBOSE, "%s trying power on\n", __func__); diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index 40669d86..c5fbc473 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -725,7 +725,7 @@ int kenwood_open(RIG *rig) rig_debug(RIG_DEBUG_TRACE, "%s: got ID so try PS\n", __func__); err = rig_get_powerstat(rig, &powerstat); - if (err == RIG_OK && powerstat == 0 && priv->poweron == 0 && rig->state.auto_pwr_on_off) + if (err == RIG_OK && powerstat == 0 && priv->poweron == 0 && rig->state.auto_power_on) { rig_debug(RIG_DEBUG_TRACE, "%s: got PS0 so powerup\n", __func__); rig_set_powerstat(rig, 1); @@ -735,7 +735,7 @@ int kenwood_open(RIG *rig) err = RIG_OK; // reset our err back to OK for later checks } - if (err == -RIG_ETIMEOUT && rig->state.auto_pwr_on_off) + if (err == -RIG_ETIMEOUT && rig->state.auto_power_on) { // Ensure rig is on rig_set_powerstat(rig, 1); diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 08a00f42..cd133703 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -366,7 +366,7 @@ int newcat_open(RIG *rig) __func__, rig_s->rigport.post_write_delay); /* Ensure rig is powered on */ - if (priv->poweron == 0 && rig_s->auto_pwr_on_off) + if (priv->poweron == 0 && rig_s->auto_power_on) { rig_set_powerstat(rig, 1); priv->poweron = 1; diff --git a/src/conf.c b/src/conf.c index c650ba2a..dd7a9572 100644 --- a/src/conf.c +++ b/src/conf.c @@ -129,12 +129,12 @@ static const struct confparams frontend_cfg_params[] = "500", RIG_CONF_NUMERIC, { .n = {0, 5000, 1}} }, { - TOK_AUTO_PWR_ON_OFF, "auto_pwr_on_off", "Auto power on/off", + TOK_AUTO_POWER_ON, "auto_power_on", "Auto power on", "True enables compatible rigs to be powered up on open", "0", RIG_CONF_CHECKBUTTON, { } }, { - TOK_AUTO_PWR_ON_OFF, "auto_disable_screensaver", "Auto disable screen saver", + TOK_AUTO_DISABLE_SCREENSAVER, "auto_disable_screensaver", "Auto disable screen saver", "True enables compatible rigs to have their screen saver disabled on open", "0", RIG_CONF_CHECKBUTTON, { } }, @@ -562,12 +562,12 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val) rig_set_cache_timeout_ms(rig, HAMLIB_CACHE_ALL, atol(val)); break; - case TOK_AUTO_PWR_ON_OFF: + case TOK_AUTO_POWER_ON: if (1 != sscanf(val, "%d", &val_i)) { return -RIG_EINVAL; //value format error } - rs->auto_pwr_on_off = val_i ? 1 : 0; + rs->auto_power_on = val_i ? 1 : 0; break; case TOK_AUTO_DISABLE_SCREENSAVER: @@ -890,8 +890,8 @@ static int frontend_get_conf(RIG *rig, token_t token, char *val) sprintf(val, "%d", rig_get_cache_timeout_ms(rig, HAMLIB_CACHE_ALL)); break; - case TOK_AUTO_PWR_ON_OFF: - sprintf(val, "%d", rs->auto_pwr_on_off); + case TOK_AUTO_POWER_ON: + sprintf(val, "%d", rs->auto_power_on); break; case TOK_AUTO_DISABLE_SCREENSAVER: diff --git a/src/token.h b/src/token.h index cfcc5ae1..8e5fdd9b 100644 --- a/src/token.h +++ b/src/token.h @@ -104,8 +104,8 @@ #define TOK_RANGE_NAME TOKEN_FRONTEND(122) /** \brief rig: Cache timeout */ #define TOK_CACHE_TIMEOUT TOKEN_FRONTEND(123) -/** \brief rig: Auto power on/off */ -#define TOK_AUTO_PWR_ON_OFF TOKEN_FRONTEND(124) +/** \brief rig: Auto power on rig_open when supported */ +#define TOK_AUTO_POWER_ON TOKEN_FRONTEND(124) /** \brief rig: Auto disable screensaver */ #define TOK_AUTO_DISABLE_SCREENSAVER TOKEN_FRONTEND(125) /* commit 3f4002972039459e0f39f6d68d739161d7bb50ed Author: Bill Somerville <bi...@cl...> Date: Sat Jul 4 17:26:54 2020 +0100 Add missing config parameters for rig power on/off and screen-saver Defaults set to by compatible with prior released versions to avoid regressive behaviour. diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index ef9c4627..2a7adc02 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -2028,6 +2028,11 @@ struct rig_state { int twiddle_timeout; /*!< timeout to resume from twiddling */ struct rig_cache cache; int vfo_opt; /*!< Is -o switch turned on? */ + int auto_pwr_on_off; /*!< Allow Hamlib to power rig on and + off automatically if supported */ + int auto_disable_screensaver; /*!< Allow Hamlib to disable the + rig's screen saver automatically if + supported */ }; //! @cond Doxygen_Suppress diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index 5b7c4117..5f8b39a1 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -727,7 +727,7 @@ icom_rig_open(RIG *rig) rig->caps->version); retval = icom_get_usb_echo_off(rig); - if (retval != RIG_OK && priv->poweron == 0) + if (retval != RIG_OK && priv->poweron == 0 && rs->auto_pwr_on_off) { // maybe we need power on? rig_debug(RIG_DEBUG_VERBOSE, "%s trying power on\n", __func__); diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index 001c5f3b..40669d86 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -725,7 +725,7 @@ int kenwood_open(RIG *rig) rig_debug(RIG_DEBUG_TRACE, "%s: got ID so try PS\n", __func__); err = rig_get_powerstat(rig, &powerstat); - if (err == RIG_OK && powerstat == 0 && priv->poweron == 0) + if (err == RIG_OK && powerstat == 0 && priv->poweron == 0 && rig->state.auto_pwr_on_off) { rig_debug(RIG_DEBUG_TRACE, "%s: got PS0 so powerup\n", __func__); rig_set_powerstat(rig, 1); @@ -735,19 +735,17 @@ int kenwood_open(RIG *rig) err = RIG_OK; // reset our err back to OK for later checks } - - if (err == -RIG_ETIMEOUT) + if (err == -RIG_ETIMEOUT && rig->state.auto_pwr_on_off) { // Ensure rig is on rig_set_powerstat(rig, 1); /* Try get id again */ err = kenwood_get_id(rig, id); - - if (RIG_OK != err) - { - rig_debug(RIG_DEBUG_ERR, - "%s: no response to get_id from rig...contintuing anyways.\n", __func__); - } + } + if (RIG_OK != err) + { + rig_debug(RIG_DEBUG_ERR, + "%s: no response to get_id from rig...contintuing anyways.\n", __func__); } if (RIG_IS_TS2000 diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 550dc55a..08a00f42 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -366,10 +366,10 @@ int newcat_open(RIG *rig) __func__, rig_s->rigport.post_write_delay); /* Ensure rig is powered on */ - if (priv->poweron == 0) + if (priv->poweron == 0 && rig_s->auto_pwr_on_off) { - priv->poweron = 1; rig_set_powerstat(rig, 1); + priv->poweron = 1; } /* get current AI state so it can be restored */ diff --git a/src/conf.c b/src/conf.c index 43c8bed7..c650ba2a 100644 --- a/src/conf.c +++ b/src/conf.c @@ -128,6 +128,16 @@ static const struct confparams frontend_cfg_params[] = "Cache timeout, value of 0 disables caching", "500", RIG_CONF_NUMERIC, { .n = {0, 5000, 1}} }, + { + TOK_AUTO_PWR_ON_OFF, "auto_pwr_on_off", "Auto power on/off", + "True enables compatible rigs to be powered up on open", + "0", RIG_CONF_CHECKBUTTON, { } + }, + { + TOK_AUTO_PWR_ON_OFF, "auto_disable_screensaver", "Auto disable screen saver", + "True enables compatible rigs to have their screen saver disabled on open", + "0", RIG_CONF_CHECKBUTTON, { } + }, { RIG_CONF_END, NULL, } }; @@ -552,6 +562,22 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val) rig_set_cache_timeout_ms(rig, HAMLIB_CACHE_ALL, atol(val)); break; + case TOK_AUTO_PWR_ON_OFF: + if (1 != sscanf(val, "%d", &val_i)) + { + return -RIG_EINVAL; //value format error + } + rs->auto_pwr_on_off = val_i ? 1 : 0; + break; + + case TOK_AUTO_DISABLE_SCREENSAVER: + if (1 != sscanf(val, "%d", &val_i)) + { + return -RIG_EINVAL; //value format error + } + rs->auto_disable_screensaver = val_i ? 1 : 0; + break; + default: return -RIG_EINVAL; } @@ -864,6 +890,14 @@ static int frontend_get_conf(RIG *rig, token_t token, char *val) sprintf(val, "%d", rig_get_cache_timeout_ms(rig, HAMLIB_CACHE_ALL)); break; + case TOK_AUTO_PWR_ON_OFF: + sprintf(val, "%d", rs->auto_pwr_on_off); + break; + + case TOK_AUTO_DISABLE_SCREENSAVER: + sprintf(val, "%d", rs->auto_disable_screensaver); + break; + default: return -RIG_EINVAL; } diff --git a/src/rig.c b/src/rig.c index 46d524a1..274d1a65 100644 --- a/src/rig.c +++ b/src/rig.c @@ -925,10 +925,13 @@ int HAMLIB_API rig_open(RIG *rig) } } - // try to turn off the screensaver if possible - // don't care about the return here...it's just a nice-to-have - parm_value.i = 0; - rig_set_parm(rig, RIG_PARM_SCREENSAVER, parm_value); + if (rs->auto_disable_screensaver) + { + // try to turn off the screensaver if possible + // don't care about the return here...it's just a nice-to-have + parm_value.i = 0; + rig_set_parm(rig, RIG_PARM_SCREENSAVER, parm_value); + } #if 0 diff --git a/src/token.h b/src/token.h index 0ffa13b0..cfcc5ae1 100644 --- a/src/token.h +++ b/src/token.h @@ -104,6 +104,10 @@ #define TOK_RANGE_NAME TOKEN_FRONTEND(122) /** \brief rig: Cache timeout */ #define TOK_CACHE_TIMEOUT TOKEN_FRONTEND(123) +/** \brief rig: Auto power on/off */ +#define TOK_AUTO_PWR_ON_OFF TOKEN_FRONTEND(124) +/** \brief rig: Auto disable screensaver */ +#define TOK_AUTO_DISABLE_SCREENSAVER TOKEN_FRONTEND(125) /* * rotator specific tokens * (strictly, should be documented as rotator_internal) ----------------------------------------------------------------------- Summary of changes: include/hamlib/rig.h | 5 +++++ rigs/icom/icom.c | 2 +- rigs/kenwood/kenwood.c | 16 +++++++--------- rigs/yaesu/newcat.c | 4 ++-- src/conf.c | 34 ++++++++++++++++++++++++++++++++++ src/rig.c | 11 +++++++---- src/token.h | 4 ++++ 7 files changed, 60 insertions(+), 16 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-04 17:44:31
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 5007765d102694ebaf79a964056bb04ec4d88cbf (commit) from 65eab6c4304c1d5fedc2d7e22426ffa17f9ee84d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5007765d102694ebaf79a964056bb04ec4d88cbf Author: Michael Black W9MDB <mdb...@ya...> Date: Sat Jul 4 12:43:46 2020 -0500 Make the escaped com port really work https://github.com/Hamlib/Hamlib/issues/337 diff --git a/src/misc.c b/src/misc.c index 4c08ad82..327a1149 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1393,7 +1393,7 @@ int HAMLIB_API parse_hoststr(char *hoststr, char host[256], char port[6]) if (strncasecmp(hoststr, "com", 3) == 0) { return -1; } // escaped COM port like \\.\COM3 - if (strstr(hoststr,"\\")) { return -1; } + if (strstr(hoststr,"\\\\.\\")) { return -1; } // bracketed IPV6 with optional port int n = sscanf(hoststr, "[%255[^]]]:%5s", host, port); ----------------------------------------------------------------------- Summary of changes: src/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-04 17:38:19
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 65eab6c4304c1d5fedc2d7e22426ffa17f9ee84d (commit) from 41230fabc2a45b96948109e88607cf2e08310141 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 65eab6c4304c1d5fedc2d7e22426ffa17f9ee84d Author: Michael Black W9MDB <mdb...@ya...> Date: Sat Jul 4 12:37:26 2020 -0500 Allow for escaped COM ports like \\.\COM3 https://github.com/Hamlib/Hamlib/issues/337 diff --git a/src/misc.c b/src/misc.c index a2ef2246..4c08ad82 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1392,6 +1392,9 @@ int HAMLIB_API parse_hoststr(char *hoststr, char host[256], char port[6]) if (strncasecmp(hoststr, "com", 3) == 0) { return -1; } + // escaped COM port like \\.\COM3 + if (strstr(hoststr,"\\")) { return -1; } + // bracketed IPV6 with optional port int n = sscanf(hoststr, "[%255[^]]]:%5s", host, port); ----------------------------------------------------------------------- Summary of changes: src/misc.c | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-04 17:05:32
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 41230fabc2a45b96948109e88607cf2e08310141 (commit) from 0fb7148172726be826d9eef08cc008a65201f98c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 41230fabc2a45b96948109e88607cf2e08310141 Author: Michael Black W9MDB <mdb...@ya...> Date: Sat Jul 4 12:05:17 2020 -0500 Fix sleep.c #endif diff --git a/src/sleep.c b/src/sleep.c index f8fba17c..ffcb3273 100644 --- a/src/sleep.c +++ b/src/sleep.c @@ -85,7 +85,6 @@ unsigned int sleep(unsigned int secs) return 0; } #endif -#endif #if 0 ----------------------------------------------------------------------- Summary of changes: src/sleep.c | 1 - 1 file changed, 1 deletion(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-04 16:41:58
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 0fb7148172726be826d9eef08cc008a65201f98c (commit) from 8e79561b735a41e3f4acd2f86972f68c2da6c85f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0fb7148172726be826d9eef08cc008a65201f98c Author: Michael Black W9MDB <mdb...@ya...> Date: Sat Jul 4 11:41:42 2020 -0500 Fix compilation warning in cachetest.c diff --git a/tests/cachetest.c b/tests/cachetest.c index 466bf776..07eb1c9b 100644 --- a/tests/cachetest.c +++ b/tests/cachetest.c @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) int model; int baud; int loops; - int cache_timeout; + int cache_timeout = 500; int i; struct timespec start, startall; ----------------------------------------------------------------------- Summary of changes: tests/cachetest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-04 16:33:54
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 8e79561b735a41e3f4acd2f86972f68c2da6c85f (commit) from d361a111e2ce371e97db29da89b5939688172737 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8e79561b735a41e3f4acd2f86972f68c2da6c85f Author: Michael Black W9MDB <mdb...@ya...> Date: Sat Jul 4 11:33:11 2020 -0500 Compile sleep replacement only when HAVE_SLEEP is not defined https://github.com/Hamlib/Hamlib/issues/336 diff --git a/src/sleep.c b/src/sleep.c index d8624ed4..f8fba17c 100644 --- a/src/sleep.c +++ b/src/sleep.c @@ -66,6 +66,7 @@ int hl_usleep(rig_useconds_t usec) } #ifdef HAVE_NANOSLEEP +#ifndef HAVE_SLEEP /** * \brief sleep * \param secs is seconds to sleep @@ -83,6 +84,8 @@ unsigned int sleep(unsigned int secs) return 0; } +#endif +#endif #if 0 ----------------------------------------------------------------------- Summary of changes: src/sleep.c | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-04 16:24:19
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via d361a111e2ce371e97db29da89b5939688172737 (commit) via 3d852c433e9a7d911ad60e48384be430de7ecdf0 (commit) via 06d130371c3a8f89ccfac16d58eb2d9b64ecb72f (commit) from 699927b3e7d7424c9e18e504689f24ebe61f6aca (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d361a111e2ce371e97db29da89b5939688172737 Merge: 699927b3 3d852c43 Author: Michael Black W9MDB <mdb...@ya...> Date: Sat Jul 4 11:23:49 2020 -0500 Merge branch 'th7d-updates' of git://git.code.sf.net/u/bsomervi/hamlib commit 3d852c433e9a7d911ad60e48384be430de7ecdf0 Author: Bill Somerville <bi...@cl...> Date: Sat Jul 4 15:27:07 2020 +0100 Less ambiguous variable name and repair merge issue in prior commit diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index d37f7421..001c5f3b 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -232,7 +232,7 @@ int kenwood_transaction(RIG *rig, const char *cmdstr, char *data, char buffer[KENWOOD_MAX_BUF_LEN]; /* use our own buffer since verification may need a longer buffer than the user supplied one */ - char cmdtrm[2]; /* Default Command/Reply termination char */ + char cmdtrm_str[2]; /* Default Command/Reply termination char */ int retval; char *cmd; int len; @@ -282,8 +282,8 @@ int kenwood_transaction(RIG *rig, const char *cmdstr, char *data, priv->cache_start.tv_sec = 0; } - cmdtrm[0] = caps->cmdtrm; - cmdtrm[1] = '\0'; + cmdtrm_str[0] = caps->cmdtrm; + cmdtrm_str[1] = '\0'; transaction_write: @@ -306,7 +306,7 @@ transaction_write: /* XXX the if is temporary, until all invocations are fixed */ if (cmdstr[len - 1] != ';' && cmdstr[len - 1] != '\r') { - cmd[len] = caps->cmdtrm[0]; + cmd[len] = caps->cmdtrm; len++; } @@ -341,7 +341,7 @@ transaction_read: /* allow room for most any response */ len = min(datasize ? datasize + 1 : strlen(priv->verify_cmd) + 32, KENWOOD_MAX_BUF_LEN); - retval = read_string(&rs->rigport, buffer, len, cmdtrm, strlen(cmdtrm)); + retval = read_string(&rs->rigport, buffer, len, cmdtrm_str, strlen(cmdtrm_str)); rig_debug(RIG_DEBUG_TRACE, "%s: read_string(len=%d)='%s'\n", __func__, (int)strlen(buffer), buffer); @@ -368,7 +368,7 @@ transaction_read: } /* Check that command termination is correct */ - if (strchr(cmdtrm, buffer[strlen(buffer) - 1]) == NULL) + if (strchr(cmdtrm_str, buffer[strlen(buffer) - 1]) == NULL) { rig_debug(RIG_DEBUG_ERR, "%s: Command is not correctly terminated '%s'\n", __func__, buffer); @@ -664,14 +664,14 @@ int kenwood_init(RIG *rig) memset(priv, 0x00, sizeof(struct kenwood_priv_data)); if (RIG_IS_XG3) { - priv->verify_cmd[0] = caps->cmdtrm[0]; + priv->verify_cmd[0] = caps->cmdtrm; priv->verify_cmd[1] ='\0'; } else { priv->verify_cmd[0] ='I'; priv->verify_cmd[1] ='D'; - priv->verify_cmd[2] = caps->cmdtrm[0]; + priv->verify_cmd[2] = caps->cmdtrm; priv->verify_cmd[3] ='\0'; } priv->split = RIG_SPLIT_OFF; @@ -811,10 +811,10 @@ int kenwood_open(RIG *rig) /* here we know there is something that responds to FA but not to ID so use FA as the command verification command */ - priv->verify_cmd[0] = F'; - priv->verify_cmd[1] = A'; - priv->verify_cmd[2] = caps->cmdtrm ; - priv->verify_cmd[3] = \0; + priv->verify_cmd[0] = 'F'; + priv->verify_cmd[1] = 'A'; + priv->verify_cmd[2] = caps->cmdtrm; + priv->verify_cmd[3] = '\0'; strcpy(id, "ID019"); /* fake a TS-2000 */ } else commit 06d130371c3a8f89ccfac16d58eb2d9b64ecb72f Author: Bill Somerville <bi...@cl...> Date: Sat Jul 4 13:00:31 2020 +0100 Updates to the TH-D7A/E back end Allow for these rigs echo of successful set commands, no command verification is requires nor necessary with TH style rigs. Change rig_open to not use teh IF command with TH style rigs as it is not supported and breaks communications for the next command. Send the correct command to disable auto-information mode on TH style rigs. Ensure the correct command terminator is sent with all commands to TH style rigs. Fix an issue with MEM mode selection in the TH-D7. Use the correct DCD detection command for the TH-D7. diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index 3d113757..d37f7421 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -306,7 +306,7 @@ transaction_write: /* XXX the if is temporary, until all invocations are fixed */ if (cmdstr[len - 1] != ';' && cmdstr[len - 1] != '\r') { - cmd[len] = caps->cmdtrm; + cmd[len] = caps->cmdtrm[0]; len++; } @@ -662,7 +662,18 @@ int kenwood_init(RIG *rig) priv = rig->state.priv; memset(priv, 0x00, sizeof(struct kenwood_priv_data)); - strcpy(priv->verify_cmd, RIG_IS_XG3 ? ";" : "ID;"); + if (RIG_IS_XG3) + { + priv->verify_cmd[0] = caps->cmdtrm[0]; + priv->verify_cmd[1] ='\0'; + } + else + { + priv->verify_cmd[0] ='I'; + priv->verify_cmd[1] ='D'; + priv->verify_cmd[2] = caps->cmdtrm[0]; + priv->verify_cmd[3] ='\0'; + } priv->split = RIG_SPLIT_OFF; priv->trn_state = -1; priv->curr_mode = 0; @@ -697,6 +708,7 @@ int kenwood_cleanup(RIG *rig) int kenwood_open(RIG *rig) { struct kenwood_priv_data *priv = rig->state.priv; + struct kenwood_priv_caps *caps = kenwood_caps(rig); int err, i; char *idptr; char id[KENWOOD_MAX_BUF_LEN]; @@ -799,7 +811,10 @@ int kenwood_open(RIG *rig) /* here we know there is something that responds to FA but not to ID so use FA as the command verification command */ - strcpy(priv->verify_cmd, "FA;"); + priv->verify_cmd[0] = F'; + priv->verify_cmd[1] = A'; + priv->verify_cmd[2] = caps->cmdtrm ; + priv->verify_cmd[3] = \0; strcpy(id, "ID019"); /* fake a TS-2000 */ } else @@ -862,19 +877,25 @@ int kenwood_open(RIG *rig) kenwood_get_trn(rig, &priv->trn_state); /* ignore errors */ /* Currently we cannot cope with AI mode so turn it off in case last client left it on */ - kenwood_set_trn(rig, RIG_TRN_OFF); /* ignore status in case - it's not supported */ - // call get_split to fill in current split and tx_vfo status - retval = kenwood_get_split_vfo_if(rig, RIG_VFO_A, &split, &tx_vfo); + if (priv->trn_state != RIG_TRN_OFF) + { + kenwood_set_trn(rig, RIG_TRN_OFF); /* ignore status in case + it's not supported */ + } - if (retval != RIG_OK) + if (!RIG_IS_THD74 && !RIG_IS_THD7A) { - rig_debug(RIG_DEBUG_ERR, "%s: %s\n", __func__, rigerror(retval)); + // call get_split to fill in current split and tx_vfo status + retval = kenwood_get_split_vfo_if(rig, RIG_VFO_A, &split, &tx_vfo); + if (retval != RIG_OK) + { + rig_debug(RIG_DEBUG_ERR, "%s: %s\n", __func__, rigerror(retval)); + } + priv->tx_vfo = tx_vfo; + rig_debug(RIG_DEBUG_VERBOSE, "%s: priv->tx_vfo=%s\n", __func__, + rig_strvfo(priv->tx_vfo)); } - priv->tx_vfo = tx_vfo; - rig_debug(RIG_DEBUG_VERBOSE, "%s: priv->tx_vfo=%s\n", __func__, - rig_strvfo(priv->tx_vfo)); return RIG_OK; } @@ -3402,6 +3423,7 @@ int kenwood_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) */ int kenwood_set_trn(RIG *rig, int trn) { + char buf[5]; rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); switch (rig->caps->rig_model) @@ -3410,9 +3432,9 @@ int kenwood_set_trn(RIG *rig, int trn) return kenwood_transaction(rig, (trn == RIG_TRN_RIG) ? "AI2" : "AI0", NULL, 0); break; + case RIG_MODEL_THD7A: case RIG_MODEL_THD74: - return kenwood_transaction(rig, (trn == RIG_TRN_RIG) ? "AI 1" : "AI 0", NULL, - 4); + return kenwood_transaction(rig, (trn == RIG_TRN_RIG) ? "AI 1" : "AI 0", buf, sizeof buf); break; default: @@ -3443,7 +3465,7 @@ int kenwood_get_trn(RIG *rig, int *trn) return -RIG_ENAVAIL; } - if (RIG_IS_THD74) + if (RIG_IS_THD74 || RIG_IS_THD7A) { retval = kenwood_safe_transaction(rig, "AI", trnbuf, 6, 4); } @@ -3457,7 +3479,7 @@ int kenwood_get_trn(RIG *rig, int *trn) return retval; } - if (RIG_IS_THD74) + if (RIG_IS_THD74 || RIG_IS_THD7A) { *trn = trnbuf[3] != '0' ? RIG_TRN_RIG : RIG_TRN_OFF; } diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h index ec48b6ab..8030f9de 100644 --- a/rigs/kenwood/kenwood.h +++ b/rigs/kenwood/kenwood.h @@ -80,6 +80,7 @@ extern const struct confparams kenwood_cfg_params[]; #define RIG_IS_HPSDR (rig->caps->rig_model == RIG_MODEL_HPSDR) #define RIG_IS_K2 (rig->caps->rig_model == RIG_MODEL_K2) #define RIG_IS_K3 (rig->caps->rig_model == RIG_MODEL_K3) +#define RIG_IS_THD7A (rig->caps->rig_model == RIG_MODEL_THD7A) #define RIG_IS_THD74 (rig->caps->rig_model == RIG_MODEL_THD74) #define RIG_IS_TS2000 (rig->caps->rig_model == RIG_MODEL_TS2000) #define RIG_IS_TS50 (rig->caps->rig_model == RIG_MODEL_TS50) diff --git a/rigs/kenwood/th.c b/rigs/kenwood/th.c index a6e6e1ac..a7750adb 100644 --- a/rigs/kenwood/th.c +++ b/rigs/kenwood/th.c @@ -245,7 +245,7 @@ th_set_freq(RIG *rig, vfo_t vfo, freq_t freq) // cppcheck-suppress * sprintf(buf, "FQ %011"PRIll",%X", (int64_t) freq_sent, step); - return kenwood_transaction(rig, buf, NULL, 0); + return kenwood_transaction(rig, buf, buf, sizeof buf); } /* @@ -293,7 +293,6 @@ int th_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) { char kmode, mdbuf[8]; - int retval; const struct kenwood_priv_caps *priv = (const struct kenwood_priv_caps *) rig->caps->priv; @@ -338,14 +337,7 @@ th_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) sprintf(mdbuf, "MD %c", kmode); - retval = kenwood_transaction(rig, mdbuf, NULL, 0); - - if (retval != RIG_OK) - { - return retval; - } - - return RIG_OK; + return kenwood_transaction(rig, mdbuf, mdbuf, sizeof mdbuf); } /* @@ -422,7 +414,8 @@ th_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) int th_set_vfo(RIG *rig, vfo_t vfo) { - const char *cmd; + int retval; + char cmd[8]; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__); @@ -437,31 +430,24 @@ th_set_vfo(RIG *rig, vfo_t vfo) /* set band */ if (vfo != RIG_VFO_MEM) { - int retval; - switch (vfo) { case RIG_VFO_A: case RIG_VFO_VFO: case RIG_VFO_MAIN: - cmd = "BC 0"; + strncpy (cmd, "BC 0", sizeof cmd); break; case RIG_VFO_B: case RIG_VFO_SUB: - cmd = "BC 1"; + strncpy (cmd, "BC 1", sizeof cmd); break; default: return kenwood_wrong_vfo(__func__, vfo); } - retval = kenwood_simple_transaction(rig, cmd, 5); - - if (retval != RIG_OK) - { - return retval; - } + return kenwood_transaction(rig, cmd, cmd, sizeof cmd); } /* No "VMC" cmd on THD72A/THD74 */ @@ -477,23 +463,29 @@ th_set_vfo(RIG *rig, vfo_t vfo) case RIG_VFO_A: case RIG_VFO_VFO: case RIG_VFO_MAIN: - cmd = "VMC 0,0"; + strncpy (cmd, "VMC 0,0", sizeof cmd); break; case RIG_VFO_B: case RIG_VFO_SUB: - cmd = "VMC 1,0"; + strncpy (cmd, "VMC 1,0", sizeof cmd); break; case RIG_VFO_MEM: + strncpy (cmd, "BC", sizeof cmd); + retval = kenwood_transaction (rig, cmd, cmd, sizeof cmd); + if (retval != RIG_OK) + { + return retval; + } if (rig->caps->rig_model == RIG_MODEL_THF7E || rig->caps->rig_model == RIG_MODEL_THF6A) { - cmd = "VMC 0,1"; + snprintf (cmd, sizeof cmd, "VMC %c,1", cmd[3]); } else { - cmd = "VMC 0,2"; + snprintf (cmd, sizeof cmd, "VMC %c,2", cmd[3]); } break; @@ -502,7 +494,7 @@ th_set_vfo(RIG *rig, vfo_t vfo) return kenwood_wrong_vfo(__func__, vfo); } - return kenwood_transaction(rig, cmd, NULL, 0); + return kenwood_transaction(rig, cmd, cmd, sizeof cmd); } int @@ -636,7 +628,7 @@ th_get_vfo(RIG *rig, vfo_t *vfo) int tm_set_vfo_bc2(RIG *rig, vfo_t vfo) { struct kenwood_priv_data *priv = rig->state.priv; - char vfobuf[16], ackbuf[16]; + char cmd[16]; int vfonum, txvfonum, vfomode = 0; int retval; @@ -661,15 +653,15 @@ int tm_set_vfo_bc2(RIG *rig, vfo_t vfo) case RIG_VFO_MEM: /* get current band */ - sprintf(vfobuf, "BC"); - retval = kenwood_transaction(rig, vfobuf, ackbuf, sizeof(ackbuf)); + snprintf(cmd, sizeof cmd, "BC"); + retval = kenwood_transaction(rig, cmd, cmd, sizeof cmd); if (retval != RIG_OK) { return retval; } - txvfonum = vfonum = ackbuf[3] - '0'; + txvfonum = vfonum = cmd[3] - '0'; vfomode = 2; break; @@ -678,8 +670,8 @@ int tm_set_vfo_bc2(RIG *rig, vfo_t vfo) return -RIG_EVFO; } - sprintf(vfobuf, "VMC %d,%d", vfonum, vfomode); - retval = kenwood_transaction(rig, vfobuf, NULL, 0); + snprintf(cmd, sizeof cmd, "VMC %d,%d", vfonum, vfomode); + retval = kenwood_transaction(rig, cmd, cmd, sizeof cmd); if (retval != RIG_OK) { @@ -691,15 +683,8 @@ int tm_set_vfo_bc2(RIG *rig, vfo_t vfo) return RIG_OK; } - sprintf(vfobuf, "BC %d,%d", vfonum, txvfonum); - retval = kenwood_transaction(rig, vfobuf, NULL, 0); - - if (retval != RIG_OK) - { - return retval; - } - - return RIG_OK; + snprintf(cmd, sizeof cmd, "BC %d,%d", vfonum, txvfonum); + return kenwood_transaction(rig, cmd, cmd, sizeof cmd); } @@ -752,15 +737,15 @@ int th_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo) } /* Set VFO mode. To be done for TX vfo also? */ - sprintf(vfobuf, "VMC %d,0", vfonum); - retval = kenwood_transaction(rig, vfobuf, NULL, 0); + snprintf (vfobuf, sizeof vfobuf, "VMC %d,0", vfonum); + retval = kenwood_transaction(rig, vfobuf, vfobuf, sizeof vfobuf); if (retval != RIG_OK) { return retval; } - sprintf(vfobuf, "BC %d,%d", vfonum, txvfonum); + snprintf (vfobuf, sizeof vfobuf, "BC %d,%d", vfonum, txvfonum); retval = kenwood_transaction(rig, vfobuf, NULL, 0); if (retval != RIG_OK) @@ -818,8 +803,9 @@ int th_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *txvfo) int th_set_trn(RIG *rig, int trn) { - return kenwood_transaction(rig, (trn == RIG_TRN_RIG) ? "AI 1" : "AI 0", NULL, - 0); + char buf[5]; + snprintf (buf, sizeof buf, "AI %c", RIG_TRN_RIG == trn ? '1' : '0'); + return kenwood_transaction (rig, buf, buf, sizeof buf); } /* @@ -1411,7 +1397,7 @@ th_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone) { const struct rig_caps *caps; char tonebuf[16]; - int i, retval; + int i; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__); @@ -1431,15 +1417,8 @@ th_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone) } i += (i == 0) ? 1 : 2; /* Correct for TH-D7A index anomally */ - sprintf(tonebuf, "TN %02d", i); - retval = kenwood_transaction(rig, tonebuf, NULL, 0); - - if (retval != RIG_OK) - { - return retval; - } - - return RIG_OK; + snprintf (tonebuf, sizeof tonebuf, "TN %02d", i); + return kenwood_transaction (rig, tonebuf, tonebuf, sizeof tonebuf); } /* @@ -1496,7 +1475,7 @@ th_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone) { const struct rig_caps *caps; char tonebuf[16]; - int i, retval; + int i; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__); @@ -1516,15 +1495,8 @@ th_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone) } i += (i == 0) ? 1 : 2; /* Correct for TH-D7A index anomally */ - sprintf(tonebuf, "CTN %02d", i); - retval = kenwood_transaction(rig, tonebuf, NULL, 0); - - if (retval != RIG_OK) - { - return retval; - } - - return RIG_OK; + snprintf (tonebuf, sizeof tonebuf, "CTN %02d", i); + return kenwood_transaction (rig, tonebuf, tonebuf, sizeof tonebuf); } /* @@ -1593,7 +1565,8 @@ th_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code) if (code == 0) { - return kenwood_transaction(rig, "DCS 0", NULL, 0); + snprintf (codebuf, sizeof codebuf, "DCS 0"); + return kenwood_transaction(rig, codebuf, codebuf, sizeof codebuf); } for (i = 0; caps->dcs_list[i] != 0; i++) @@ -1609,22 +1582,14 @@ th_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code) return -RIG_EINVAL; } - retval = kenwood_transaction(rig, "DCS 1", NULL, 0); - - if (retval != RIG_OK) - { - return retval; - } - - sprintf(codebuf, "DCSN %04d", (i + 1) * 10); - retval = kenwood_transaction(rig, codebuf, NULL, 0); - - if (retval != RIG_OK) + snprintf (codebuf, sizeof codebuf, "DCS 1"); + if ((retval = kenwood_transaction(rig, codebuf, codebuf, sizeof codebuf)) != RIG_OK) { return retval; } - return RIG_OK; + snprintf(codebuf, sizeof codebuf, "DCSN %04d", (i + 1) * 10); + return kenwood_transaction (rig, codebuf, codebuf, sizeof codebuf); } /* @@ -1730,7 +1695,7 @@ int th_set_mem(RIG *rig, vfo_t vfo, int ch) { unsigned char vsel; - char membuf[10], ackbuf[10]; + char membuf[10]; int retval; vfo_t tvfo; @@ -1754,23 +1719,13 @@ th_set_mem(RIG *rig, vfo_t vfo, int ch) return kenwood_wrong_vfo(__func__, vfo); } - retval = rig_set_vfo(rig, RIG_VFO_MEM); - - if (retval != RIG_OK) + if ((retval = rig_set_vfo(rig, RIG_VFO_MEM)) != RIG_OK) { return retval; } - sprintf(membuf, "MC %c,%03i", vsel, ch); - - retval = kenwood_safe_transaction(rig, membuf, ackbuf, 10, 8); - - if (retval != RIG_OK) - { - return retval; - } - - return RIG_OK; + snprintf (membuf, sizeof membuf, "MC %c,%03i", vsel, ch); + return kenwood_transaction (rig, membuf, membuf, sizeof membuf); } /* Get mem works only when the display is @@ -1844,9 +1799,9 @@ th_get_mem(RIG *rig, vfo_t vfo, int *ch) int th_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) { + char buf[3]; rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__); - - return kenwood_transaction(rig, (ptt == RIG_PTT_ON) ? "TX" : "RX", NULL, 0); + return kenwood_transaction(rig, (ptt == RIG_PTT_ON) ? "TX" : "RX", buf, sizeof buf); } int th_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) @@ -2482,7 +2437,7 @@ int th_set_channel(RIG *rig, const channel_t *chan) ); } - retval = kenwood_transaction(rig, membuf, NULL, 0); + retval = kenwood_transaction(rig, membuf, membuf, sizeof membuf); if (retval != RIG_OK) { @@ -2498,7 +2453,7 @@ int th_set_channel(RIG *rig, const channel_t *chan) req[3 + strlen(mr_extra)] = '1'; sprintf(membuf, "%s,%011"PRIll",%X", req, (int64_t)chan->tx_freq, step); - retval = kenwood_transaction(rig, membuf, NULL, 0); + retval = kenwood_transaction(rig, membuf, membuf, sizeof membuf); if (retval != RIG_OK) { @@ -2519,7 +2474,7 @@ int th_set_channel(RIG *rig, const channel_t *chan) sprintf(membuf, "MNA %s%03d,%s", mr_extra, channel_num, channel_desc); } - retval = kenwood_transaction(rig, membuf, NULL, 0); + retval = kenwood_transaction(rig, membuf, membuf, sizeof membuf); if (retval != RIG_OK) { @@ -2535,29 +2490,29 @@ int th_set_channel(RIG *rig, const channel_t *chan) */ int th_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option) { - const char *cmd; + char cmd[6]; rig_debug(RIG_DEBUG_TRACE, "%s: ant = %d\n", __func__, ant); switch (ant) { case RIG_ANT_1: - cmd = "ANT 0"; + strncpy (cmd, "ANT 0", sizeof cmd); break; case RIG_ANT_2: - cmd = "ANT 1"; + strncpy (cmd, "ANT 1", sizeof cmd); break; case RIG_ANT_3: - cmd = "ANT 2"; + strncpy (cmd, "ANT 2", sizeof cmd); break; default: return -RIG_EINVAL; } - return kenwood_transaction(rig, cmd, NULL, 0); + return kenwood_transaction(rig, cmd, cmd, sizeof cmd); } diff --git a/rigs/kenwood/th.h b/rigs/kenwood/th.h index a8346cf1..62161ac7 100644 --- a/rigs/kenwood/th.h +++ b/rigs/kenwood/th.h @@ -23,7 +23,7 @@ #include "idx_builtin.h" -#define TH_VER "20200212" +#define TH_VER "20200701" extern int th_transaction (RIG *rig, const char *cmdstr, char *data, size_t datasize); extern int th_get_vfo_char(RIG *rig, vfo_t *vfo, char *vfoch); diff --git a/rigs/kenwood/thd7.c b/rigs/kenwood/thd7.c index 7305aba7..205afe27 100644 --- a/rigs/kenwood/thd7.c +++ b/rigs/kenwood/thd7.c @@ -88,7 +88,7 @@ const struct rig_caps thd7a_caps = .mfg_name = "Kenwood", .version = TH_VER ".0", .copyright = "LGPL", - .status = RIG_STATUS_ALPHA, + .status = RIG_STATUS_BETA, .rig_type = RIG_TYPE_HANDHELD | RIG_FLAG_APRS | RIG_FLAG_TNC | RIG_FLAG_DXCLUSTER, .ptt_type = RIG_PTT_RIG, .dcd_type = RIG_DCD_RIG, @@ -195,7 +195,7 @@ const struct rig_caps thd7a_caps = .get_parm = th_get_parm, .get_info = th_get_info, - .get_dcd = kenwood_get_dcd, + .get_dcd = th_get_dcd, .decode_event = th_decode_event, }; ----------------------------------------------------------------------- Summary of changes: rigs/kenwood/kenwood.c | 62 +++++++++++++------ rigs/kenwood/kenwood.h | 1 + rigs/kenwood/th.c | 161 ++++++++++++++++++------------------------------- rigs/kenwood/th.h | 2 +- rigs/kenwood/thd7.c | 4 +- 5 files changed, 104 insertions(+), 126 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-04 16:22:32
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 699927b3e7d7424c9e18e504689f24ebe61f6aca (commit) via 5ebb95bb43bc025a0a3e81a8c534f6e3e2da6e63 (commit) via ed3a26296dc34913dab7ca21426930cbcb436c84 (commit) from b2dce86e91f0a75fb1ac5448a77409d8fc3af16e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 699927b3e7d7424c9e18e504689f24ebe61f6aca Author: Michael Black W9MDB <mdb...@ya...> Date: Sat Jul 4 11:20:38 2020 -0500 Add additional get_freq if freq > 100MHz to update cache This covers rigs that round VHF/UHF freqs to different intervals https://github.com/Hamlib/Hamlib/issues/334 diff --git a/src/rig.c b/src/rig.c index 6cf1cd80..46d524a1 100644 --- a/src/rig.c +++ b/src/rig.c @@ -1362,6 +1362,7 @@ int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq) // we'll try this all the time and if it works out OK eliminate the #else if ((unsigned long long)freq % 100 != 0 // only need to do if < 100Hz interval + || freq > 100e6 // or if we are in the VHF and up range #if 0 // do we need to only do this when cache is turned on? 2020-07-02 W9MDB && rig->state.cache.timeout_ms > 0 commit 5ebb95bb43bc025a0a3e81a8c534f6e3e2da6e63 Author: Michael Black W9MDB <mdb...@ya...> Date: Sat Jul 4 07:21:02 2020 -0500 Add testnet.c for testing IPV4/IPV6 address/port combinations diff --git a/tests/testnet.c b/tests/testnet.c new file mode 100644 index 00000000..ab11f0dd --- /dev/null +++ b/tests/testnet.c @@ -0,0 +1,154 @@ +/* Test network address variations in hamlib */ +#include <stdlib.h> +#include <stdio.h> /* Standard input/output definitions */ +#include <string.h> /* String function definitions */ +#include <unistd.h> /* UNIX standard function definitions */ +#include <fcntl.h> /* File control definitions */ +#include <errno.h> /* Error number definitions */ +#include <sys/time.h> +#include <sys/types.h> +#include <signal.h> + +#define HAVE_NETINET_IN_H +#define HAVE_NETDB_H +#define HAVE_ARPA_INET_H + +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif + +#ifdef HAVE_NETDB_H +# include <netdb.h> +#endif + +#ifdef HAVE_ARPA_INET_H +# include <arpa/inet.h> +#endif + +int rig_network_addr(char *hoststr, char *portstr) +{ + + struct in6_addr serveraddr; + struct addrinfo hints, *res; + int status; + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_CANONNAME; + + + status = getaddrinfo(hoststr, portstr, &hints, &res); + + if (status == 0 && res->ai_family == AF_INET6) + { + printf("Using IPV6 for %s:%s\n", hoststr, portstr); + } + else if (status == 0) + { + printf("Using IPV4 for %s:%s\n", hoststr, portstr); + } + + if (status != 0) + { + printf("%s: cannot get host \"%s\": %s\n", + __func__, + hoststr, + gai_strerror(errno)); + return 1; + } + + status = inet_pton(AF_INET, hoststr, &serveraddr); + + if (status != 1) /* not valid IPv4 address, maybe IPV6? */ + { + status = inet_pton(AF_INET6, hoststr, &serveraddr); + + if (status != 1) /* nope */ + { + return 1; + } + } + + return 0; +} + +int test_host(char *hoststr, char host[256], char port[6]) +{ + int status; + char host2[256], port2[6]; + status = parse_hoststr(hoststr, host2, port2); + + printf("---------------------\n"); + + if (status == 0) + { + if (strcmp(host, host2) || strcmp(port, port2)) + { + printf("%s: Mismatch, expected host=%s, port=%s, got host=%s, port=%s\n", + __func__, + host, port, host2, port2); + return -1; + } + else + { + rig_network_addr(host, port); + } + + printf("%s: %s, host=%s, port=%s\n", __func__, hoststr, host, port); + return 0; + } + else + { + printf("%s: ERROR!! %s, host=%s, port=%s\n", __func__, hoststr, host, port); + return -1; + } +} + +int +main(int argc, char *argv[]) +{ + // IPV4 + test_host("127.0.0.1", "127.0.0.1", ""); + test_host("127.0.0.1:4532", "127.0.0.1", "4532"); + test_host("192.168.1.1", "192.168.1.1", ""); + test_host("192.168.1.1:4532", "192.168.1.1", "4532"); + test_host("mdblack-VirtualBox", "mdblack-VirtualBox", ""); + test_host("mdblack-VirtualBox:4532", "mdblack-VirtualBox", "4532"); + test_host("localhost", "localhost", ""); + test_host("localhost:4532", "localhost", "4532"); + // IPV6 with brackets + test_host("[fe80::e034:55ef:ce2a:dc83]", "fe80::e034:55ef:ce2a:dc83", ""); + test_host("[fe80::e034:55ef:ce2a:dc83]:4532", "fe80::e034:55ef:ce2a:dc83", + "4532"); + + test_host("fe80::e034:55ef:ce2a:dc83", "fe80::e034:55ef:ce2a:dc83", ""); + test_host("fe80::e034:55ef:ce2a:dc83:4532", "fe80::e034:55ef:ce2a:dc83", + "4532"); + test_host("fe80:e034:55ef:ce2a:dc83:1234:5678:9abc", + "fe80:e034:55ef:ce2a:dc83:1234:5678:9abc", ""); + test_host("fe80:e034:55ef:ce2a:dc83:1234:5678:9abc:4532", + "fe80:e034:55ef:ce2a:dc83:1234:5678:9abc", + "4532"); + test_host("::1", "::1", ""); + test_host("::1:4532", "::1", "4532"); + +#if 1 // server side addresses with IPV6 + test_host("fe80::e034:55ef:ce2a:dc83%eth0", "fe80::e034:55ef:ce2a:dc83%eth0", + ""); + test_host("[fe80::e034:55ef:ce2a:dc83%1]", "fe80::e034:55ef:ce2a:dc83%1", ""); + test_host("[fe80::e034:55ef:ce2a:dc83%1]:4532", "fe80::e034:55ef:ce2a:dc83%1", + "4532"); + test_host("fe80::e034:55ef:ce2a:dc83%eth0:4532", + "fe80::e034:55ef:ce2a:dc83%eth0", "4532"); + test_host("fe80::e034:55ef:ce2a:dc83%1", "fe80::e034:55ef:ce2a:dc83%1", ""); + test_host("fe80::e034:55ef:ce2a:dc83%1:4532", "fe80::e034:55ef:ce2a:dc83%1", + "4532"); + test_host("[fe80::e034:55ef:ce2a:dc83%eth0]", + "fe80::e034:55ef:ce2a:dc83%eth0", ""); + test_host("[fe80::e034:55ef:ce2a:dc83%eth0]:4532", + "fe80::e034:55ef:ce2a:dc83%eth0", "4532"); +#endif + + return 0; +} commit ed3a26296dc34913dab7ca21426930cbcb436c84 Author: Michael Black W9MDB <mdb...@ya...> Date: Sat Jul 4 07:17:45 2020 -0500 Fix cppcheck warnings diff --git a/tests/memcsv.c b/tests/memcsv.c index fe14ddd1..ce53b7ac 100644 --- a/tests/memcsv.c +++ b/tests/memcsv.c @@ -290,7 +290,7 @@ static char *mystrtok(char *s, char delim) { } - if (str[ pos + 1 ] == '\0') + if (str && str[ pos + 1 ] == '\0') { return NULL; } @@ -1038,6 +1038,11 @@ int find_on_list(char **list, char *what) return -1; } + if (!list[i]) + { + return -1; + } + while (list[i] != NULL) { if (strcmp(list[i], what) == 0) @@ -1049,13 +1054,5 @@ int find_on_list(char **list, char *what) i++; } } - - if (!list[i]) - { - return -1; - } - else - { - return i; - } + return i; } ----------------------------------------------------------------------- Summary of changes: src/rig.c | 1 + tests/memcsv.c | 17 +++---- tests/testnet.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+), 10 deletions(-) create mode 100644 tests/testnet.c hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-04 04:40:41
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via b2dce86e91f0a75fb1ac5448a77409d8fc3af16e (commit) from dee097366dfb7b3cbd95f847225b9e1cf0e9c15a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b2dce86e91f0a75fb1ac5448a77409d8fc3af16e Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 3 23:40:20 2020 -0500 Add comment about IC-756 data mode diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index 3b6e2f72..5b7c4117 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -1575,7 +1575,9 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode, switch (mode) { - case RIG_MODE_PKTUSB: + case RIG_MODE_PKTUSB: + // xFE xFE x6E xE0 x1A x06 x01 xFD switchs mod input from MIC to ACC + // This apparently works for IC-756ProIII but nobody has asked for it yet icom_mode = RIG_MODE_USB; break; ----------------------------------------------------------------------- Summary of changes: rigs/icom/icom.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-04 04:06:36
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via dee097366dfb7b3cbd95f847225b9e1cf0e9c15a (commit) from 3d7ddc7e034d636b99afb5efec51f586117aed0a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit dee097366dfb7b3cbd95f847225b9e1cf0e9c15a Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 3 22:32:14 2020 -0500 Fix cppcheck warnings diff --git a/dummy/netampctl.c b/dummy/netampctl.c index cca93ac1..7d1a66c0 100644 --- a/dummy/netampctl.c +++ b/dummy/netampctl.c @@ -106,15 +106,19 @@ static int netampctl_open(AMP *amp) { ret = read_string(&->state.ampport, buf, BUF_MAX, "\n", sizeof("\n")); - if (ret <= 0) + if (ret > 0) { - return (ret < 0) ? ret : -RIG_EPROTO; + rig_debug(RIG_DEBUG_VERBOSE, "%s called, string=%s\n", __func__, buf); } - - rig_debug(RIG_DEBUG_VERBOSE, "%s called, string=%s\n", __func__, buf); } while (ret > 0); + if (ret < 0) + { + return -RIG_EPROTO; + } + + return RIG_OK; } ----------------------------------------------------------------------- Summary of changes: dummy/netampctl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-03 22:25:30
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 3d7ddc7e034d636b99afb5efec51f586117aed0a (commit) via 57c76ed3c4ae8d022b3c42f4c1b7c72a63dae24a (commit) via 557eff4f65784d1f0bffa16f9e342fe0018aa0c0 (commit) via 045c0cff2124de134cc20c0fdb3525cb7e46af62 (commit) via 0ecf32f2a72f5d6dc29c72f0f22ed4c6dfb9d971 (commit) via 2e0c5f568767bccbf6fb6fcf87e12296f528b932 (commit) via a3bb987e23479c7aca3f719336fe5c0c63bb2399 (commit) from 0c2b39c2e08d5b549058715785d5a837d83de15e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3d7ddc7e034d636b99afb5efec51f586117aed0a Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 3 17:14:09 2020 -0500 Fix cppcheck warnings diff --git a/src/register.c b/src/register.c index 0515fe87..659b91fa 100644 --- a/src/register.c +++ b/src/register.c @@ -299,7 +299,7 @@ int HAMLIB_API rig_check_backend(rig_model_t rig_model) if (be_idx == -1) { rig_debug(RIG_DEBUG_VERBOSE, - "rig_check_backend: unsupported backend %d for model %u\n", + "rig_check_backend: unsupported backend %u for model %u\n", RIG_BACKEND_NUM(rig_model), rig_model); return -RIG_ENAVAIL; commit 57c76ed3c4ae8d022b3c42f4c1b7c72a63dae24a Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 3 17:10:25 2020 -0500 Fix cppcheck warnings diff --git a/rotators/rotorez/rotorez.c b/rotators/rotorez/rotorez.c index 015c2165..36d684c3 100644 --- a/rotators/rotorez/rotorez.c +++ b/rotators/rotorez/rotorez.c @@ -552,7 +552,7 @@ static int rotorez_rot_get_position(ROT *rot, azimuth_t *azimuth, err = -RIG_EINVAL; } } - else if (err == AZ_READ_LEN && az[0] == ';') + else if (err == AZ_READ_LEN) { /* Check if remaining chars are digits if az[0] == ';' */ for (p = az + 1; p < az + 4; p++) commit 557eff4f65784d1f0bffa16f9e342fe0018aa0c0 Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 3 17:01:49 2020 -0500 Fix cppcheck warnings diff --git a/rigs/adat/adat.c b/rigs/adat/adat.c index f71b2d11..098f47c1 100644 --- a/rigs/adat/adat.c +++ b/rigs/adat/adat.c @@ -1488,7 +1488,7 @@ int adat_get_single_cmd_result(RIG *pRig) pcPos = acBuf; - if ((nRC == RIG_OK) && (pcPos != NULL)) + if ((nRC == RIG_OK)) { int nBufLength = 0; commit 045c0cff2124de134cc20c0fdb3525cb7e46af62 Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 3 16:59:52 2020 -0500 Fix cppcheck warnings diff --git a/dummy/netrigctl.c b/dummy/netrigctl.c index d8b5a116..89a5dd32 100644 --- a/dummy/netrigctl.c +++ b/dummy/netrigctl.c @@ -718,7 +718,7 @@ static int netrigctl_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, return (ret < 0) ? ret : -RIG_EPROTO; } - if (ret > 0 && buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */ + if (buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */ *mode = rig_parse_mode(buf); @@ -790,7 +790,7 @@ static int netrigctl_get_vfo(RIG *rig, vfo_t *vfo) return (ret < 0) ? ret : -RIG_EPROTO; } - if (ret > 0 && buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */ + if (buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */ *vfo = rig_parse_vfo(buf); @@ -935,7 +935,7 @@ static int netrigctl_get_rptr_shift(RIG *rig, vfo_t vfo, return (ret < 0) ? ret : -RIG_EPROTO; } - if (ret > 0 && buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */ + if (buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */ *rptr_shift = rig_parse_rptr_shift(buf); @@ -1329,7 +1329,7 @@ static int netrigctl_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode, return (ret < 0) ? ret : -RIG_EPROTO; } - if (ret > 0 && buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */ + if (buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */ *tx_mode = rig_parse_mode(buf); @@ -1407,7 +1407,7 @@ static int netrigctl_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, } - if (ret > 0 && buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */ + if (buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */ *tx_vfo = rig_parse_vfo(buf); commit 0ecf32f2a72f5d6dc29c72f0f22ed4c6dfb9d971 Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 3 16:56:59 2020 -0500 Fix cppcheck warning diff --git a/dummy/flrig.c b/dummy/flrig.c index 2fecbdb9..c26b00d3 100644 --- a/dummy/flrig.c +++ b/dummy/flrig.c @@ -376,7 +376,7 @@ static char *xml_parse(char *xml, char *value, int value_len) xml_parse2(next, value, value_len); } - if (strstr(value, "faultString")) + if ( value && strstr(value, "faultString")) { rig_debug(RIG_DEBUG_ERR, "%s error:\n%s\n", __func__, value); value[0] = 0; /* truncate to give empty response */ commit 2e0c5f568767bccbf6fb6fcf87e12296f528b932 Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 3 16:20:23 2020 -0500 Fix cppcheck warnings diff --git a/src/misc.c b/src/misc.c index a4efb69e..a2ef2246 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1382,7 +1382,7 @@ vfo_t HAMLIB_API vfo_fixup(RIG *rig, vfo_t vfo) int HAMLIB_API parse_hoststr(char *hoststr, char host[256], char port[6]) { unsigned int net1, net2, net3, net4, net5, net6, net7, net8; - char dummy[2], link[32], *p; + char dummy[6], link[32], *p; host[0] = 0; port[0] = 0; dummy[0] = 0; @@ -1471,7 +1471,7 @@ int HAMLIB_API parse_hoststr(char *hoststr, char host[256], char port[6]) return RIG_OK; } - if (sscanf(hoststr, ":%5[0-9]%s", port, + if (sscanf(hoststr, ":%5[0-9]%1s", port, dummy) == 1) // just a port if you please { sprintf(hoststr, "%s:%s\n", "localhost", port); commit a3bb987e23479c7aca3f719336fe5c0c63bb2399 Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 3 16:17:59 2020 -0500 Fix cppcheck warnings diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c index 027ad8ca..ced515e3 100644 --- a/rigs/yaesu/ft817.c +++ b/rigs/yaesu/ft817.c @@ -629,7 +629,6 @@ static int ft817_get_status(RIG *rig, int status) int ft817_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) { struct ft817_priv_data *p = (struct ft817_priv_data *) rig->state.priv; - int n; freq_t f1 = 0, f2 = 0; int retries = rig->state.rigport.retry + 1; // +1 because, because 2 steps are needed even in best scenario @@ -638,6 +637,7 @@ int ft817_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) while ((f1 == 0 || f1 != f2) && retries-- > 0) { + int n; rig_debug(RIG_DEBUG_TRACE, "%s: retries=%d\n", __func__, retries); if ((n = ft817_get_status(rig, FT817_NATIVE_CAT_GET_FREQ_MODE_STATUS)) < 0) @@ -955,13 +955,11 @@ int ft817_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) int ft817_read_ack(RIG *rig) { char dummy; - int n; - rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__); if (rig->state.rigport.post_write_delay == 0) { - if ((n = read_block(&rig->state.rigport, &dummy, 1)) < 0) + if (read_block(&rig->state.rigport, &dummy, 1) < 0) { rig_debug(RIG_DEBUG_ERR, "%s: error reading ack\n", __func__); rig_debug(RIG_DEBUG_ERR, "%s: adjusting post_write_delay to avoid ack\n", ----------------------------------------------------------------------- Summary of changes: dummy/flrig.c | 2 +- dummy/netrigctl.c | 10 +++++----- rigs/adat/adat.c | 2 +- rigs/yaesu/ft817.c | 6 ++---- rotators/rotorez/rotorez.c | 2 +- src/misc.c | 4 ++-- src/register.c | 2 +- 7 files changed, 13 insertions(+), 15 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-03 13:38:52
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 0c2b39c2e08d5b549058715785d5a837d83de15e (commit) from b181c1720cdea86b66b1dc98f08581405b9eecb9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0c2b39c2e08d5b549058715785d5a837d83de15e Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 3 08:38:33 2020 -0500 small change to debug statement diff --git a/src/misc.c b/src/misc.c index ca9b48bd..a4efb69e 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1300,7 +1300,7 @@ double HAMLIB_API elapsed_ms(struct timespec *start, int option) elapsed_msec = ((stop.tv_sec - start->tv_sec) + (stop.tv_nsec / 1e9 - start->tv_nsec / 1e9)) * 1e3; - rig_debug(RIG_DEBUG_TRACE, "%s: elapsed_msecs=%g\n", __func__, elapsed_msec); + rig_debug(RIG_DEBUG_TRACE, "%s: elapsed_msecs=%.0f\n", __func__, elapsed_msec); if (elapsed_msec < 0 || option == HAMLIB_ELAPSED_INVALIDATE) { return 1000000; } ----------------------------------------------------------------------- Summary of changes: src/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-03 13:37:37
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via b181c1720cdea86b66b1dc98f08581405b9eecb9 (commit) from 88cf2f6da62be50a26f76fce0aa8785ab0a3ae90 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b181c1720cdea86b66b1dc98f08581405b9eecb9 Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 3 08:37:17 2020 -0500 Fix compile error on cachetest2.c diff --git a/tests/cachetest2.c b/tests/cachetest2.c index 1ead2ef8..db427cbb 100644 --- a/tests/cachetest2.c +++ b/tests/cachetest2.c @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) return 1; } - rig_set_cache_timeout_ms(my_rig, CACHE_ALL, cache_timeout); + rig_set_cache_timeout_ms(my_rig, HAMLIB_CACHE_ALL, cache_timeout); /* Give me ID info, e.g., firmware version. */ info_buf = (char *)rig_get_info(my_rig); ----------------------------------------------------------------------- Summary of changes: tests/cachetest2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-03 13:35:58
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 88cf2f6da62be50a26f76fce0aa8785ab0a3ae90 (commit) from 4bd024c2388d2c9c0693bfdd94a73c0369535161 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 88cf2f6da62be50a26f76fce0aa8785ab0a3ae90 Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 3 08:35:39 2020 -0500 Fix compile error on cachetest.c diff --git a/tests/cachetest.c b/tests/cachetest.c index 54342fd5..466bf776 100644 --- a/tests/cachetest.c +++ b/tests/cachetest.c @@ -91,7 +91,7 @@ int main(int argc, char *argv[]) return 1; } - rig_set_cache_timeout_ms(my_rig, CACHE_ALL, cache_timeout); + rig_set_cache_timeout_ms(my_rig, HAMLIB_CACHE_ALL, cache_timeout); /* Give me ID info, e.g., firmware version. */ info_buf = (char *)rig_get_info(my_rig); ----------------------------------------------------------------------- Summary of changes: tests/cachetest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-03 13:05:31
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via 4bd024c2388d2c9c0693bfdd94a73c0369535161 (commit) from e31500842cedc1188908439dc1b999a2444e8a99 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4bd024c2388d2c9c0693bfdd94a73c0369535161 Author: Michael Black W9MDB <mdb...@ya...> Date: Fri Jul 3 08:05:13 2020 -0500 Fix come valgrind errors diff --git a/dummy/netrigctl.c b/dummy/netrigctl.c index dad7d075..d8b5a116 100644 --- a/dummy/netrigctl.c +++ b/dummy/netrigctl.c @@ -629,8 +629,8 @@ static int netrigctl_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) char vfotmp[16]; #endif - rig_debug(RIG_DEBUG_VERBOSE, "%s called, vfo=%s, freq=%.0f\n", __func__, - rig_strvfo(vfo), *freq); + rig_debug(RIG_DEBUG_VERBOSE, "%s called, vfo=%s\n", __func__, + rig_strvfo(vfo)); ret = netrigctl_vfostr(rig, vfostr, sizeof(vfostr), vfo); diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c index 3510dd12..bb91b2f9 100644 --- a/rigs/icom/frame.c +++ b/rigs/icom/frame.c @@ -115,6 +115,7 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd, int frm_len, retval; int ctrl_id; + sendbuf[0] = buf[0] = 0; rs = &rig->state; priv = (struct icom_priv_data *)rs->priv; priv_caps = (struct icom_priv_caps *)rig->caps->priv; @@ -232,6 +233,7 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd, * FIXME: handle pading/collisions * ACKFRMLEN is the smallest frame we can expect from the rig */ + buf[0] = 0; frm_len = read_icom_frame(&rs->rigport, buf, sizeof(buf)); if (memcmp(buf, sendbuf, frm_len) == 0 && priv->serial_USB_echo_off) diff --git a/src/misc.c b/src/misc.c index b715a998..ca9b48bd 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1292,7 +1292,8 @@ double HAMLIB_API elapsed_ms(struct timespec *start, int option) case HAMLIB_ELAPSED_INVALIDATE: clock_gettime(CLOCK_REALTIME, start); - start->tv_sec -= 3600; + stop = *start; + start->tv_sec -= 10; // ten seconds should be more than enough break; } ----------------------------------------------------------------------- Summary of changes: dummy/netrigctl.c | 4 ++-- rigs/icom/frame.c | 2 ++ src/misc.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |
From: Michael B. <mdb...@us...> - 2020-07-02 20:54:43
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via e31500842cedc1188908439dc1b999a2444e8a99 (commit) from df3285de60a3400cba0712fc4a35955b420fa962 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e31500842cedc1188908439dc1b999a2444e8a99 Author: Michael Black W9MDB <mdb...@ya...> Date: Thu Jul 2 15:54:26 2020 -0500 Ensure cache invalidated before re-reading freq in set_freq diff --git a/src/rig.c b/src/rig.c index f4282f62..6cf1cd80 100644 --- a/src/rig.c +++ b/src/rig.c @@ -1368,6 +1368,7 @@ int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq) #endif ) { + elapsed_ms(&rig->state.cache.time_freq, HAMLIB_ELAPSED_INVALIDATE); retcode = rig_get_freq(rig, vfo, &freq_new); if (retcode != RIG_OK) { return retcode; } ----------------------------------------------------------------------- Summary of changes: src/rig.c | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- Hamlib -- Ham radio control libraries |