[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 76405a1a9ae41c33db847
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 76405a1a9ae41c33db847bdf270876cad8680843
|
From: Nate B. <n0...@us...> - 2022-05-31 12:49: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 76405a1a9ae41c33db847bdf270876cad8680843 (commit)
via a9eeb70f218c1a3eb2a2ada449da4d16383c2047 (commit)
via ab0e3f3d2b2c924408bf55695c8fb40ccf683691 (commit)
via 2cfc02a10cc5a845d9c1e6f1d5eb2b6ddd94bb04 (commit)
via 01ddc8860882536fdeca2a9ac29ced0a43a3191d (commit)
via 901cea8944f86c65cf5319555747f6d14192ffd6 (commit)
via f19d354ede1de0d2f3a910854aba9174a7e55125 (commit)
via fc26aa545fa41261b8a5d6c0209a24dae6576a88 (commit)
via ae67384dafe21bc2bc2fc0f65635ed9f10970732 (commit)
via 3eab223a472f38bfc1cd8e816bf94a4d622bd628 (commit)
via 83508b5e38d56596797beea5a5204ad6738c310a (commit)
via 5400b6d1ee779f3127a78f25d97302b6f42b2711 (commit)
via b50fe3b7b2007b64767b6d3a57be777845b6a45a (commit)
via 56260bb416536ef5ea5a6d5265310b2338bde444 (commit)
via 3f5bf2bb2389df7c03f6ec5dba6713b988b6f829 (commit)
via 4544214c3a831258ada5d3e4f87408d7fcc2dadb (commit)
via d529881cdb2cb24cb0d9883b967524f45dc189f4 (commit)
via d42e75bac65898900cb59b2d8e5671a212eb52b6 (commit)
via 0d46e5b92ec03c3ffcd7fcb04e01b4115d353120 (commit)
via 8cc4d59cbb06871838c0c41e2491de9f85449a82 (commit)
via 0b73daa4d80ea6ec03b0c5483512899604d9623f (commit)
via 7ce07c09ad7151fc925ed2a18141ffbe7947b304 (commit)
via 76103ec19956554973c1759657046ae5c9ef75d0 (commit)
via fe7c465624b7dc1e3c47c0892cf97562000d7469 (commit)
via 6b76701efca61afbaebabed100ceda2b4c333dc1 (commit)
via 52736df8b8820929d39e4397db979e48493388bc (commit)
via c8b2322018d0d5d6e69164ec613b5de3f26e73b1 (commit)
via 19f00558e4886c2ee6b05db05a3cce8ba4e29805 (commit)
via 1c379e793a066c30d35fed99e5fb1a77f7a882f8 (commit)
via febeb40722764f342ebdfb05e72829f1ac32a808 (commit)
via 21276336787410d972d4c58bdc13d1f23fec829b (commit)
via f44fe0ed31c56ecf89c81b1d94c3c4863888e0c6 (commit)
via fa9adb0c85160b92935dd7c0238af00b7fb89211 (commit)
via b1a4bb06ce11674ca7abf81b35e76790f31c430f (commit)
via f09a62b7f4b45a9dbe0b03f24121607606baa912 (commit)
via 7e451446a7d07c4210af9590d439122d1b18e6ad (commit)
via 11bcf032290a876afd33ebb892821684f7669639 (commit)
via a823e5d3431c349bdd3e79e9a78da9e13866dec1 (commit)
via c9d31337b97787db9d5477cb7de542a6cd21477f (commit)
via f6d5b7e3c6b3d8cf7f41924136319515c35f47f5 (commit)
via 921d4d43ef14caada6e48151250b1353fb9dea61 (commit)
via 85dfb1bed8c6296b29c62ff23c10ddc795db1a8f (commit)
from 468dd151102ef94d71c071b1acf736b65cc727ff (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 76405a1a9ae41c33db847bdf270876cad8680843
Merge: ab0e3f3d a9eeb70f
Author: Michael Black <mdb...@ya...>
Date: Tue May 31 06:56:28 2022 -0500
Merge pull request #1045 from PianetaRadio/master
Dummy rotator max_az = 450
commit a9eeb70f218c1a3eb2a2ada449da4d16383c2047
Author: PianetaRadio <789...@us...>
Date: Tue May 31 12:38:30 2022 +0200
Dummy rotator max_az = 450
diff --git a/rigs/dummy/rot_dummy.c b/rigs/dummy/rot_dummy.c
index 5b60f056..f2e3cf75 100644
--- a/rigs/dummy/rot_dummy.c
+++ b/rigs/dummy/rot_dummy.c
@@ -929,14 +929,14 @@ struct rot_caps dummy_rot_caps =
ROT_MODEL(ROT_MODEL_DUMMY),
.model_name = "Dummy",
.mfg_name = "Hamlib",
- .version = "20220519.0",
+ .version = "20220531.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rot_type = ROT_TYPE_AZEL,
.port_type = RIG_PORT_NONE,
.min_az = -180.,
- .max_az = 180.,
+ .max_az = 450.,
.min_el = 0.,
.max_el = 90.,
commit ab0e3f3d2b2c924408bf55695c8fb40ccf683691
Author: Mike Black W9MDB <mdb...@ya...>
Date: Mon May 30 22:26:38 2022 -0500
Update rigctl and rigctld man pages to add set_lock_mode and get_lock_mode
diff --git a/doc/man1/rigctl.1 b/doc/man1/rigctl.1
index a3c581d0..3747b1cb 100644
--- a/doc/man1/rigctl.1
+++ b/doc/man1/rigctl.1
@@ -1217,6 +1217,16 @@ before sending the next command to the radio.
.BR password " \(aq" \fIPassword\fP \(aq
Sends password to rigctld when rigctld has been secured with -A. Must use the 32-char shared secret from rigctld.
.
+.TP
+.BR set_lock_mode " \(aq" \fILocked\fP \(aq
+Turns mode lock on(1) or off(0). Turning on will prevent all clients from changing the rig mode.
+For example this is useful when running CW Skimmer in FM mode on an IC-7300. Clicking spots
+in a spotting program will not change the VFOA mode when lock is on. So "set_lock_mode 1" when
+CW Skimmer is started and "set_lock_mode 0" when CW Skimmer is stopped.
+.
+.TP
+.BR get_lock_mode
+Returns current lock mode status 1=On, 2=Off
.
.SH READLINE
.
diff --git a/doc/man1/rigctld.1 b/doc/man1/rigctld.1
index 0f2eec3e..a01ea92e 100644
--- a/doc/man1/rigctld.1
+++ b/doc/man1/rigctld.1
@@ -1140,6 +1140,17 @@ Set vfo option Status 1=on or 0=off
This is the same as using the -o switch for rigctl and ritctld.
This can be dyamically changed while running.
.
+.TP
+.BR set_lock_mode " \(aq" \fILocked\fP \(aq
+Turns mode lock on(1) or off(0). Turning on will prevent all clients from changing the rig mode.
+For example this is useful when running CW Skimmer in FM mode on an IC-7300. Clicking spots
+in a spotting program will not change the VFOA mode when lock is on. So "set_lock_mode 1" when
+CW Skimmer is started and "set_lock_mode 0" when CW Skimmer is stopped.
+.
+.TP
+.BR get_lock_mode
+Returns current lock mode status 1=On, 2=Off
+.
.
.SH PROTOCOL
.
commit 2cfc02a10cc5a845d9c1e6f1d5eb2b6ddd94bb04
Author: Mike Black W9MDB <mdb...@ya...>
Date: Mon May 30 07:45:47 2022 -0500
Update rigctl.1 man page to add stop_morse and wait_morse
diff --git a/doc/man1/rigctl.1 b/doc/man1/rigctl.1
index 5211174c..a3c581d0 100644
--- a/doc/man1/rigctl.1
+++ b/doc/man1/rigctl.1
@@ -704,6 +704,14 @@ Send
symbols. For Yaesu rigs use memory#.
.
.TP
+.BR 0xbb ", " stop_morse "
+Stop sending the current morse code.
+.
+.TP
+.BR 0xbc ", " wait_morse "
+Wait for morse to finish -- only works on full break-in
+.
+.TP
.BR 0x8b ", " get_dcd
Get
.RI \(aq DCD \(aq
commit 01ddc8860882536fdeca2a9ac29ced0a43a3191d
Author: Mike Black W9MDB <mdb...@ya...>
Date: Sun May 29 23:04:50 2022 -0500
Update rigctld.1 man page
diff --git a/doc/man1/rigctld.1 b/doc/man1/rigctld.1
index b8b18b35..0f2eec3e 100644
--- a/doc/man1/rigctld.1
+++ b/doc/man1/rigctld.1
@@ -205,7 +205,7 @@ in which case it is hexadecimal.
.BR \-S ", " \-\-separator = \fIchar\fP
Use char as separator instead of line feed
.IP
-The default is \n
+The default is \n. Recommend using $ or @ as they work on both Unix and Windows
.IP
.
.TP
commit 901cea8944f86c65cf5319555747f6d14192ffd6
Author: Mike Black W9MDB <mdb...@ya...>
Date: Sun May 29 22:53:30 2022 -0500
Add wait_morse to rigs that had send_morse but missing wait_morse
wait_morse only works on full break-in
https://github.com/Hamlib/Hamlib/issues/1043
diff --git a/rigs/icom/ic7600.c b/rigs/icom/ic7600.c
index cd461c0b..3dbc2488 100644
--- a/rigs/icom/ic7600.c
+++ b/rigs/icom/ic7600.c
@@ -270,7 +270,7 @@ const struct rig_caps ic7600_caps =
RIG_MODEL(RIG_MODEL_IC7600),
.model_name = "IC-7600",
.mfg_name = "Icom",
- .version = BACKEND_VER ".2",
+ .version = BACKEND_VER ".3",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -446,6 +446,7 @@ const struct rig_caps ic7600_caps =
.set_powerstat = icom_set_powerstat,
.get_powerstat = icom_get_powerstat,
.send_morse = icom_send_morse,
+ .wait_morse = rig_wait_morse,
.set_clock = ic7600_set_clock,
.get_clock = ic7600_get_clock,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c
index edbaa553..cfa38fae 100644
--- a/rigs/kenwood/ts480.c
+++ b/rigs/kenwood/ts480.c
@@ -1256,7 +1256,7 @@ const struct rig_caps ts480_caps =
RIG_MODEL(RIG_MODEL_TS480),
.model_name = "TS-480",
.mfg_name = "Kenwood",
- .version = BACKEND_VER ".1",
+ .version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -1435,6 +1435,7 @@ const struct rig_caps ts480_caps =
.set_ext_func = ts480_set_ext_func,
.get_ext_func = ts480_get_ext_func,
.send_morse = kenwood_send_morse,
+ .wait_morse = rig_wait_morse,
.vfo_op = kenwood_vfo_op,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
@@ -1608,7 +1609,7 @@ const struct rig_caps sdruno_caps =
RIG_MODEL(RIG_MODEL_SDRUNO),
.model_name = "SDRUno",
.mfg_name = "SDRPlay",
- .version = BACKEND_VER ".1",
+ .version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -1788,6 +1789,7 @@ const struct rig_caps sdruno_caps =
.set_ext_func = ts480_set_ext_func,
.get_ext_func = ts480_get_ext_func,
.send_morse = kenwood_send_morse,
+ .wait_morse = rig_wait_morse,
.vfo_op = kenwood_vfo_op,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
diff --git a/rigs/kenwood/ts890s.c b/rigs/kenwood/ts890s.c
index c73066ff..c41217d8 100644
--- a/rigs/kenwood/ts890s.c
+++ b/rigs/kenwood/ts890s.c
@@ -376,6 +376,7 @@ const struct rig_caps ts890s_caps =
.set_ant = kenwood_set_ant,
.get_ant = kenwood_get_ant,
.send_morse = kenwood_send_morse,
+ .wait_morse = rig_wait_morse,
.scan = kenwood_scan, /* not working, invalid arguments using rigctl; kenwood_scan does only support on/off and not tone and CTCSS scan */
.has_set_level = TS890_LEVEL_ALL,
.has_get_level = TS890_LEVEL_ALL,
diff --git a/rigs/tentec/orion.h b/rigs/tentec/orion.h
index baa7dc5e..cbe242e8 100644
--- a/rigs/tentec/orion.h
+++ b/rigs/tentec/orion.h
@@ -196,7 +196,7 @@ const struct rig_caps tt565_caps = {
RIG_MODEL(RIG_MODEL_TT565),
.model_name = "TT-565 Orion",
.mfg_name = "Ten-Tec",
-.version = BACKEND_VER ".0",
+.version = BACKEND_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -358,6 +358,7 @@ RIG_MODEL(RIG_MODEL_TT565),
.reset = tt565_reset,
.get_info = tt565_get_info,
.send_morse = tt565_send_morse,
+.wait_morse = rig_wait_morse,
.get_func = tt565_get_func,
.set_func = tt565_set_func,
.get_ant = tt565_get_ant,
diff --git a/rigs/yaesu/ft1200.c b/rigs/yaesu/ft1200.c
index 36505854..9ba50b22 100644
--- a/rigs/yaesu/ft1200.c
+++ b/rigs/yaesu/ft1200.c
@@ -320,6 +320,7 @@ const struct rig_caps ftdx1200_caps =
.set_ext_level = newcat_set_ext_level,
.get_ext_level = newcat_get_ext_level,
.send_morse = newcat_send_morse,
+ .wait_morse = rig_wait_morse,
.set_clock = newcat_set_clock,
.get_clock = newcat_get_clock,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
diff --git a/rigs/yaesu/ft2000.c b/rigs/yaesu/ft2000.c
index afc02286..268586b5 100644
--- a/rigs/yaesu/ft2000.c
+++ b/rigs/yaesu/ft2000.c
@@ -307,5 +307,6 @@ const struct rig_caps ft2000_caps =
.set_ext_level = newcat_set_ext_level,
.get_ext_level = newcat_get_ext_level,
.send_morse = newcat_send_morse,
+ .wait_morse = rig_wait_morse,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
diff --git a/rigs/yaesu/ft3000.c b/rigs/yaesu/ft3000.c
index a338605f..dd359b68 100644
--- a/rigs/yaesu/ft3000.c
+++ b/rigs/yaesu/ft3000.c
@@ -413,6 +413,7 @@ const struct rig_caps ftdx3000_caps =
.set_ext_level = newcat_set_ext_level,
.get_ext_level = newcat_get_ext_level,
.send_morse = newcat_send_morse,
+ .wait_morse = rig_wait_morse,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
diff --git a/rigs/yaesu/ft450.c b/rigs/yaesu/ft450.c
index dc6932c8..f157b24f 100644
--- a/rigs/yaesu/ft450.c
+++ b/rigs/yaesu/ft450.c
@@ -42,7 +42,7 @@ const struct rig_caps ft450_caps =
RIG_MODEL(RIG_MODEL_FT450),
.model_name = "FT-450",
.mfg_name = "Yaesu",
- .version = NEWCAT_VER ".1",
+ .version = NEWCAT_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -202,6 +202,7 @@ const struct rig_caps ft450_caps =
.set_channel = newcat_set_channel,
.get_channel = newcat_get_channel,
.send_morse = newcat_send_morse,
+ .wait_morse = rig_wait_morse,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
diff --git a/rigs/yaesu/ft5000.c b/rigs/yaesu/ft5000.c
index 22dc60d6..6e51b73c 100644
--- a/rigs/yaesu/ft5000.c
+++ b/rigs/yaesu/ft5000.c
@@ -140,7 +140,7 @@ const struct rig_caps ftdx5000_caps =
RIG_MODEL(RIG_MODEL_FTDX5000),
.model_name = "FTDX-5000",
.mfg_name = "Yaesu",
- .version = NEWCAT_VER ".2",
+ .version = NEWCAT_VER ".3",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -309,5 +309,6 @@ const struct rig_caps ftdx5000_caps =
.set_ext_level = newcat_set_ext_level,
.get_ext_level = newcat_get_ext_level,
.send_morse = newcat_send_morse,
+ .wait_morse = rig_wait_morse,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
diff --git a/rigs/yaesu/ft891.c b/rigs/yaesu/ft891.c
index 8124d6c2..b8247080 100644
--- a/rigs/yaesu/ft891.c
+++ b/rigs/yaesu/ft891.c
@@ -133,7 +133,7 @@ const struct rig_caps ft891_caps =
RIG_MODEL(RIG_MODEL_FT891),
.model_name = "FT-891",
.mfg_name = "Yaesu",
- .version = NEWCAT_VER ".6",
+ .version = NEWCAT_VER ".7",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -320,6 +320,7 @@ const struct rig_caps ft891_caps =
.set_ext_level = newcat_set_ext_level,
.get_ext_level = newcat_get_ext_level,
.send_morse = newcat_send_morse,
+ .wait_morse = rig_wait_morse,
.set_clock = newcat_set_clock,
.get_clock = newcat_get_clock,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
diff --git a/rigs/yaesu/ft9000.c b/rigs/yaesu/ft9000.c
index 78ca77ec..43fe7f4d 100644
--- a/rigs/yaesu/ft9000.c
+++ b/rigs/yaesu/ft9000.c
@@ -49,7 +49,7 @@ const struct rig_caps ft9000_caps =
RIG_MODEL(RIG_MODEL_FT9000),
.model_name = "FTDX-9000",
.mfg_name = "Yaesu",
- .version = NEWCAT_VER ".1",
+ .version = NEWCAT_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -212,5 +212,6 @@ const struct rig_caps ft9000_caps =
.set_channel = newcat_set_channel,
.get_channel = newcat_get_channel,
.send_morse = newcat_send_morse,
+ .wait_morse = rig_wait_morse,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
diff --git a/rigs/yaesu/ft920.c b/rigs/yaesu/ft920.c
index a4327c85..e0ca52e2 100644
--- a/rigs/yaesu/ft920.c
+++ b/rigs/yaesu/ft920.c
@@ -410,7 +410,7 @@ const struct rig_caps ft920_caps =
RIG_MODEL(RIG_MODEL_FT920),
.model_name = "FT-920",
.mfg_name = "Yaesu",
- .version = "20210221.0", /* YYYYMMDD */
+ .version = "20220529.0", /* YYYYMMDD */
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
diff --git a/rigs/yaesu/ft950.c b/rigs/yaesu/ft950.c
index b06a0b32..b9b46ea0 100644
--- a/rigs/yaesu/ft950.c
+++ b/rigs/yaesu/ft950.c
@@ -87,7 +87,7 @@ const struct rig_caps ft950_caps =
RIG_MODEL(RIG_MODEL_FT950),
.model_name = "FT-950",
.mfg_name = "Yaesu",
- .version = NEWCAT_VER ".2",
+ .version = NEWCAT_VER ".3",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -284,5 +284,6 @@ const struct rig_caps ft950_caps =
.set_ext_level = newcat_set_ext_level,
.get_ext_level = newcat_get_ext_level,
.send_morse = newcat_send_morse,
+ .wait_morse = rig_wait_morse,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c
index 8ab22880..433569f9 100644
--- a/rigs/yaesu/ft991.c
+++ b/rigs/yaesu/ft991.c
@@ -141,7 +141,7 @@ const struct rig_caps ft991_caps =
RIG_MODEL(RIG_MODEL_FT991),
.model_name = "FT-991",
.mfg_name = "Yaesu",
- .version = NEWCAT_VER ".10",
+ .version = NEWCAT_VER ".11",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -353,6 +353,7 @@ const struct rig_caps ft991_caps =
.set_ext_level = newcat_set_ext_level,
.get_ext_level = newcat_get_ext_level,
.send_morse = newcat_send_morse,
+ .wait_morse = rig_wait_morse,
.send_voice_mem = newcat_send_voice_mem,
.set_clock = newcat_set_clock,
.get_clock = newcat_get_clock,
diff --git a/rigs/yaesu/ftdx10.c b/rigs/yaesu/ftdx10.c
index 83bd296e..3ef3876d 100644
--- a/rigs/yaesu/ftdx10.c
+++ b/rigs/yaesu/ftdx10.c
@@ -137,7 +137,7 @@ const struct rig_caps ftdx10_caps =
RIG_MODEL(RIG_MODEL_FTDX10),
.model_name = "FTDX-10",
.mfg_name = "Yaesu",
- .version = NEWCAT_VER ".2",
+ .version = NEWCAT_VER ".3",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -308,6 +308,7 @@ const struct rig_caps ftdx10_caps =
.set_ext_level = newcat_set_ext_level,
.get_ext_level = newcat_get_ext_level,
.send_morse = newcat_send_morse,
+ .wait_morse = rig_wait_morse,
.set_clock = newcat_set_clock,
.get_clock = newcat_get_clock,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
diff --git a/rigs/yaesu/ftdx101.c b/rigs/yaesu/ftdx101.c
index 3d8d049f..76b97e7c 100644
--- a/rigs/yaesu/ftdx101.c
+++ b/rigs/yaesu/ftdx101.c
@@ -137,7 +137,7 @@ const struct rig_caps ftdx101d_caps =
RIG_MODEL(RIG_MODEL_FTDX101D),
.model_name = "FTDX-101D",
.mfg_name = "Yaesu",
- .version = NEWCAT_VER ".15",
+ .version = NEWCAT_VER ".16",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -309,6 +309,7 @@ const struct rig_caps ftdx101d_caps =
.set_ext_level = newcat_set_ext_level,
.get_ext_level = newcat_get_ext_level,
.send_morse = newcat_send_morse,
+ .wait_morse = rig_wait_morse,
.set_clock = newcat_set_clock,
.get_clock = newcat_get_clock,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
diff --git a/rigs/yaesu/ftdx101mp.c b/rigs/yaesu/ftdx101mp.c
index cf8ea3f7..349bda87 100644
--- a/rigs/yaesu/ftdx101mp.c
+++ b/rigs/yaesu/ftdx101mp.c
@@ -75,7 +75,7 @@ const struct rig_caps ftdx101mp_caps =
RIG_MODEL(RIG_MODEL_FTDX101MP),
.model_name = "FTDX-101MP",
.mfg_name = "Yaesu",
- .version = NEWCAT_VER ".6",
+ .version = NEWCAT_VER ".7",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -246,6 +246,7 @@ const struct rig_caps ftdx101mp_caps =
.set_ext_level = newcat_set_ext_level,
.get_ext_level = newcat_get_ext_level,
.send_morse = newcat_send_morse,
+ .wait_morse = rig_wait_morse,
.set_clock = newcat_set_clock,
.get_clock = newcat_get_clock,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
commit f19d354ede1de0d2f3a910854aba9174a7e55125
Author: Mike Black W9MDB <mdb...@ya...>
Date: Sun May 29 12:06:44 2022 -0500
Astyle files
diff --git a/rigs/yaesu/ft847.c b/rigs/yaesu/ft847.c
index b21d147c..3c7ef3e1 100644
--- a/rigs/yaesu/ft847.c
+++ b/rigs/yaesu/ft847.c
@@ -612,12 +612,12 @@ const struct rig_caps ft650_caps =
}, /* rx range end */
.tx_range_list2 = {
- {kHz(24500),kHz(25000), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
- {kHz(24500),kHz(25000), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
- {kHz(28000),kHz(29700), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
- {kHz(28000),kHz(29700), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
- {kHz(50000),kHz(54000), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
- {kHz(50000),kHz(54000), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
+ {kHz(24500), kHz(25000), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
+ {kHz(24500), kHz(25000), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
+ {kHz(28000), kHz(29700), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
+ {kHz(28000), kHz(29700), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
+ {kHz(50000), kHz(54000), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
+ {kHz(50000), kHz(54000), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
RIG_FRNG_END,
}, /* tx range end */
diff --git a/simulators/simicom.c b/simulators/simicom.c
index 6b6a9a4f..5536be42 100644
--- a/simulators/simicom.c
+++ b/simulators/simicom.c
@@ -253,9 +253,10 @@ void frameParse(int fd, unsigned char *frame, int len)
}
break;
+
case 0x1c:
- switch(frame[5])
- {
+ switch (frame[5])
+ {
case 0:
if (frame[6] == 0xfd)
{
@@ -263,16 +264,19 @@ void frameParse(int fd, unsigned char *frame, int len)
frame[7] = 0xfd;
write(fd, frame, 8);
}
- else {
+ else
+ {
ptt = frame[6];
frame[7] = 0xfb;
frame[8] = 0xfd;
write(fd, frame, 9);
}
+
break;
- }
- break;
+ }
+
+ break;
#ifdef X25
diff --git a/src/rig.c b/src/rig.c
index ed3aacaa..482ab0c0 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -328,7 +328,7 @@ void add2debugmsgsave(const char *s)
char *p;
char stmp[DEBUGMSGSAVE_SIZE];
int i, nlines;
- int maxmsg = DEBUGMSGSAVE_SIZE/2;
+ int maxmsg = DEBUGMSGSAVE_SIZE / 2;
MUTEX_LOCK(debugmsgsave);
memset(stmp, 0, sizeof(stmp));
p = debugmsgsave;
@@ -361,7 +361,8 @@ void add2debugmsgsave(const char *s)
}
--nlines;
- if (nlines == 0 && strlen(debugmsgsave) > maxmsg) strcpy(debugmsgsave,"!!!!debugmsgsave too long\n");
+
+ if (nlines == 0 && strlen(debugmsgsave) > maxmsg) { strcpy(debugmsgsave, "!!!!debugmsgsave too long\n"); }
}
if (strlen(stmp) + strlen(s) + 1 < DEBUGMSGSAVE_SIZE)
@@ -374,6 +375,7 @@ void add2debugmsgsave(const char *s)
"%s: debugmsgsave overflow!! len of debugmsgsave=%d, len of add=%d\n", __func__,
(int)strlen(debugmsgsave), (int)strlen(s));
}
+
MUTEX_UNLOCK(debugmsgsave);
}
diff --git a/src/sprintflst.c b/src/sprintflst.c
index 549af7ad..e591d558 100644
--- a/src/sprintflst.c
+++ b/src/sprintflst.c
@@ -41,7 +41,8 @@ int check_buffer_overflow(char *str, int len, int nlen)
{
if (len + 32 >= nlen) // make sure at least 32 bytes are available
{
- rig_debug(RIG_DEBUG_ERR, "%s: buffer overflow, len=%u, nlen=%d, str='%s', len+32 must be >= nlen\n",
+ rig_debug(RIG_DEBUG_ERR,
+ "%s: buffer overflow, len=%u, nlen=%d, str='%s', len+32 must be >= nlen\n",
__func__, len, nlen, str);
}
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 272cfb80..97d5f5c6 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -364,8 +364,8 @@ static struct test_table test_list[] =
{ 0xf7, "get_mode_bandwidths", ACTION(get_mode_bandwidths), ARG_IN | ARG_NOVFO, "Mode" },
{ 0xa0, "set_separator", ACTION(set_separator), ARG_IN | ARG_NOVFO, "Separator" },
{ 0xa1, "get_separator", ACTION(get_separator), ARG_NOVFO, "Separator" },
- { 0xa2, "set_lock_mode", ACTION(set_lock_mode), ARG_IN | ARG_NOVFO, "Locked" },
- { 0xa3, "get_lock_mode", ACTION(get_lock_mode), ARG_NOVFO, "Locked" },
+ { 0xa2, "set_lock_mode", ACTION(set_lock_mode), ARG_IN | ARG_NOVFO, "Locked" },
+ { 0xa3, "get_lock_mode", ACTION(get_lock_mode), ARG_NOVFO, "Locked" },
{ 0x00, "", NULL },
};
@@ -2176,7 +2176,9 @@ declare_proto_rig(set_mode)
mode = rig_parse_mode(arg1);
CHKSCN1ARG(sscanf(arg2, "%ld", &width));
- if (rig->state.lock_mode) RETURNFUNC(RIG_OK);
+
+ if (rig->state.lock_mode) { RETURNFUNC(RIG_OK); }
+
RETURNFUNC(rig_set_mode(rig, vfo, mode, width));
}
@@ -2337,7 +2339,8 @@ declare_proto_rig(get_vfo_info)
}
else
{
- fprintf(fout, "%.0f%c%s%c%d%c%d%c%d\n", freq, resp_sep, modestr, resp_sep, (int)width, resp_sep, (int)split, resp_sep,
+ fprintf(fout, "%.0f%c%s%c%d%c%d%c%d\n", freq, resp_sep, modestr, resp_sep,
+ (int)width, resp_sep, (int)split, resp_sep,
(int)satmode);
}
@@ -5206,8 +5209,9 @@ declare_proto_rig(get_separator)
if ((interactive && prompt) || (interactive && !prompt && ext_resp))
{
- fprintf(fout, "%s: ", cmd->arg1);
+ fprintf(fout, "%s: ", cmd->arg1);
}
+
sprintf(buf, "0x%x", rig_resp_sep);
fprintf(fout, "%s\n", buf);
@@ -5227,7 +5231,7 @@ declare_proto_rig(get_lock_mode)
{
if ((interactive && prompt) || (interactive && !prompt && ext_resp))
{
- fprintf(fout, "%s: ", cmd->arg1);
+ fprintf(fout, "%s: ", cmd->arg1);
}
fprintf(fout, "%d\n", rig->state.lock_mode);
commit fc26aa545fa41261b8a5d6c0209a24dae6576a88
Author: Mike Black W9MDB <mdb...@ya...>
Date: Sun May 29 12:06:03 2022 -0500
Fix get_separator rigctl output
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 6a551de6..272cfb80 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -5204,11 +5204,11 @@ declare_proto_rig(get_separator)
{
char buf[32];
- if (isprint(rig_resp_sep))
+ if ((interactive && prompt) || (interactive && !prompt && ext_resp))
{
- sprintf(buf, "%c", rig_resp_sep);
+ fprintf(fout, "%s: ", cmd->arg1);
}
- else { sprintf(buf, "0x%x %p", rig_resp_sep, &rig_resp_sep); }
+ sprintf(buf, "0x%x", rig_resp_sep);
fprintf(fout, "%s\n", buf);
return RIG_OK;
commit ae67384dafe21bc2bc2fc0f65635ed9f10970732
Author: Mike Black W9MDB <mdb...@ya...>
Date: Sun May 29 12:00:03 2022 -0500
https://github.com/Hamlib/Hamlib/issues/1044
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 8354ec80..d4e39ed1 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -2572,6 +2572,7 @@ struct rig_state {
int use_cached_mode; /*<! flag instructing rig_get_mode to use cached values when asyncio is in use */
int use_cached_ptt; /*<! flag instructing rig_get_ptt to use cached values when asyncio is in use */
int depth; /*<! a depth counter to use for debug indentation and such */
+ int lock_mode; /*<! flag that prevents mode changes if ~= 0 -- see set/get_lock_mode */
};
//! @cond Doxygen_Suppress
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index f79e58b5..6a551de6 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -252,6 +252,8 @@ declare_proto_rig(set_clock);
declare_proto_rig(get_clock);
declare_proto_rig(set_separator);
declare_proto_rig(get_separator);
+declare_proto_rig(set_lock_mode);
+declare_proto_rig(get_lock_mode);
/*
@@ -361,7 +363,9 @@ static struct test_table test_list[] =
// { 0x99, "set_password", ACTION(set_password), ARG_IN | ARG_NOVFO, "Password" },
{ 0xf7, "get_mode_bandwidths", ACTION(get_mode_bandwidths), ARG_IN | ARG_NOVFO, "Mode" },
{ 0xa0, "set_separator", ACTION(set_separator), ARG_IN | ARG_NOVFO, "Separator" },
- { 0xa1, "get_separator", ACTION(get_separator), ARG_OUT | ARG_NOVFO, "Separator" },
+ { 0xa1, "get_separator", ACTION(get_separator), ARG_NOVFO, "Separator" },
+ { 0xa2, "set_lock_mode", ACTION(set_lock_mode), ARG_IN | ARG_NOVFO, "Locked" },
+ { 0xa3, "get_lock_mode", ACTION(get_lock_mode), ARG_NOVFO, "Locked" },
{ 0x00, "", NULL },
};
@@ -2172,6 +2176,7 @@ declare_proto_rig(set_mode)
mode = rig_parse_mode(arg1);
CHKSCN1ARG(sscanf(arg2, "%ld", &width));
+ if (rig->state.lock_mode) RETURNFUNC(RIG_OK);
RETURNFUNC(rig_set_mode(rig, vfo, mode, width));
}
@@ -5208,3 +5213,23 @@ declare_proto_rig(get_separator)
fprintf(fout, "%s\n", buf);
return RIG_OK;
}
+
+/* '0xa2' */
+declare_proto_rig(set_lock_mode)
+{
+ int lock;
+ CHKSCN1ARG(sscanf(arg1, "%d", &lock));
+ rig->state.lock_mode = lock != 0;
+ return RIG_OK;
+}
+/* '0xa3' */
+declare_proto_rig(get_lock_mode)
+{
+ if ((interactive && prompt) || (interactive && !prompt && ext_resp))
+ {
+ fprintf(fout, "%s: ", cmd->arg1);
+ }
+
+ fprintf(fout, "%d\n", rig->state.lock_mode);
+ return RIG_OK;
+}
commit 3eab223a472f38bfc1cd8e816bf94a4d622bd628
Merge: 83508b5e 5400b6d1
Author: Mike Black W9MDB <mdb...@ya...>
Date: Sat May 28 15:22:02 2022 -0500
Merge branch 'master' of https://github.com/Hamlib/Hamlib
commit 83508b5e38d56596797beea5a5204ad6738c310a
Author: Mike Black W9MDB <mdb...@ya...>
Date: Sat May 28 15:21:22 2022 -0500
Add send_morse to TS-890S
https://github.com/Hamlib/Hamlib/issues/1043
diff --git a/rigs/kenwood/ts890s.c b/rigs/kenwood/ts890s.c
index f92fa4aa..c73066ff 100644
--- a/rigs/kenwood/ts890s.c
+++ b/rigs/kenwood/ts890s.c
@@ -241,7 +241,7 @@ const struct rig_caps ts890s_caps =
RIG_MODEL(RIG_MODEL_TS890S),
.model_name = "TS-890S",
.mfg_name = "Kenwood",
- .version = BACKEND_VER ".1",
+ .version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -375,6 +375,7 @@ const struct rig_caps ts890s_caps =
.reset = kenwood_reset,
.set_ant = kenwood_set_ant,
.get_ant = kenwood_get_ant,
+ .send_morse = kenwood_send_morse,
.scan = kenwood_scan, /* not working, invalid arguments using rigctl; kenwood_scan does only support on/off and not tone and CTCSS scan */
.has_set_level = TS890_LEVEL_ALL,
.has_get_level = TS890_LEVEL_ALL,
commit 5400b6d1ee779f3127a78f25d97302b6f42b2711
Author: Mike Black W9MDB <mdb...@ya...>
Date: Sat May 28 15:21:22 2022 -0500
Add send_morse to TS-890S
diff --git a/rigs/kenwood/ts890s.c b/rigs/kenwood/ts890s.c
index f92fa4aa..c73066ff 100644
--- a/rigs/kenwood/ts890s.c
+++ b/rigs/kenwood/ts890s.c
@@ -241,7 +241,7 @@ const struct rig_caps ts890s_caps =
RIG_MODEL(RIG_MODEL_TS890S),
.model_name = "TS-890S",
.mfg_name = "Kenwood",
- .version = BACKEND_VER ".1",
+ .version = BACKEND_VER ".2",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -375,6 +375,7 @@ const struct rig_caps ts890s_caps =
.reset = kenwood_reset,
.set_ant = kenwood_set_ant,
.get_ant = kenwood_get_ant,
+ .send_morse = kenwood_send_morse,
.scan = kenwood_scan, /* not working, invalid arguments using rigctl; kenwood_scan does only support on/off and not tone and CTCSS scan */
.has_set_level = TS890_LEVEL_ALL,
.has_get_level = TS890_LEVEL_ALL,
commit b50fe3b7b2007b64767b6d3a57be777845b6a45a
Author: Mike Black W9MDB <mdb...@ya...>
Date: Sat May 28 15:21:10 2022 -0500
Improved debug msg in sprintflst.c
diff --git a/src/sprintflst.c b/src/sprintflst.c
index bac0831e..549af7ad 100644
--- a/src/sprintflst.c
+++ b/src/sprintflst.c
@@ -41,7 +41,7 @@ int check_buffer_overflow(char *str, int len, int nlen)
{
if (len + 32 >= nlen) // make sure at least 32 bytes are available
{
- rig_debug(RIG_DEBUG_ERR, "%s: buffer overflow, len=%u, nlen=%d, str='%s'\n",
+ rig_debug(RIG_DEBUG_ERR, "%s: buffer overflow, len=%u, nlen=%d, str='%s', len+32 must be >= nlen\n",
__func__, len, nlen, str);
}
commit 56260bb416536ef5ea5a6d5265310b2338bde444
Merge: d42e75ba 3f5bf2bb
Author: Michael Black <mdb...@ya...>
Date: Fri May 27 09:51:17 2022 -0500
Merge pull request #1042 from PianetaRadio/master
Rotator GS23 Azimuth
commit 3f5bf2bb2389df7c03f6ec5dba6713b988b6f829
Author: PianetaRadio <789...@us...>
Date: Fri May 27 09:18:13 2022 +0200
GS23 Azimuth
diff --git a/include/hamlib/rotlist.h b/include/hamlib/rotlist.h
index 2bca4607..f3f3ce92 100644
--- a/include/hamlib/rotlist.h
+++ b/include/hamlib/rotlist.h
@@ -314,6 +314,7 @@
#define ROT_MODEL_GS232A_EL ROT_MAKE_MODEL(ROT_GS232A, 10)
#define ROT_MODEL_GS232B_AZ ROT_MAKE_MODEL(ROT_GS232A, 11)
#define ROT_MODEL_GS232B_EL ROT_MAKE_MODEL(ROT_GS232A, 12)
+#define ROT_MODEL_GS23_AZ ROT_MAKE_MODEL(ROT_GS232A, 13)
/**
commit 4544214c3a831258ada5d3e4f87408d7fcc2dadb
Author: PianetaRadio <789...@us...>
Date: Fri May 27 09:13:18 2022 +0200
GS23 Azimuth
diff --git a/rotators/gs232a/gs232a.c b/rotators/gs232a/gs232a.c
index 4aa2c7fd..6bdaf008 100644
--- a/rotators/gs232a/gs232a.c
+++ b/rotators/gs232a/gs232a.c
@@ -422,6 +422,51 @@ const struct rot_caps gs23_rot_caps =
.set_level = gs232a_rot_set_level,
};
+
+/* ************************************************************************* */
+/*
+ * Generic GS23 azimuth rotator capabilities.
+ */
+
+const struct rot_caps gs23_az_rot_caps =
+{
+ ROT_MODEL(ROT_MODEL_GS23_AZ),
+ .model_name = "GS-23 azimuth",
+ .mfg_name = "Yaesu/Kenpro",
+ .version = "20220527.0",
+ .copyright = "LGPL",
+ .status = RIG_STATUS_STABLE,
+ .rot_type = ROT_TYPE_AZIMUTH,
+ .port_type = RIG_PORT_SERIAL,
+ .serial_rate_min = 150,
+ .serial_rate_max = 9600,
+ .serial_data_bits = 8,
+ .serial_stop_bits = 1,
+ .serial_parity = RIG_PARITY_NONE,
+ .serial_handshake = RIG_HANDSHAKE_NONE,
+ .write_delay = 0,
+ .post_write_delay = 50,
+ .timeout = 400,
+ .retry = 3,
+
+ .min_az = -180.0,
+ .max_az = 450.0, /* vary according to rotator type */
+ .min_el = 0.0,
+ .max_el = 0.0,
+
+ .has_get_level = GS232A_LEVELS,
+ .has_set_level = ROT_LEVEL_SET(GS232A_LEVELS),
+
+ .level_gran = { [ROT_LVL_SPEED] = { .min = { .i = 1 }, .max = { .i = 4 }, .step = { .i = 1 } } },
+
+ .rot_init = gs232a_rot_init,
+ .get_position = gs232a_rot_get_position,
+ .set_position = gs232a_rot_set_position,
+ .stop = gs232a_rot_stop,
+ .get_level = gs232a_rot_get_level,
+ .set_level = gs232a_rot_set_level,
+};
+
/* ************************************************************************* */
/*
* Generic GS232 rotator capabilities.
commit d529881cdb2cb24cb0d9883b967524f45dc189f4
Author: PianetaRadio <789...@us...>
Date: Fri May 27 09:08:28 2022 +0200
GS23 Azimuth only
diff --git a/rotators/gs232a/gs232a.h b/rotators/gs232a/gs232a.h
index 681fbc85..47f1d2d9 100644
--- a/rotators/gs232a/gs232a.h
+++ b/rotators/gs232a/gs232a.h
@@ -31,6 +31,7 @@ extern const struct rot_caps gs232b_az_rot_caps;
extern const struct rot_caps gs232b_el_rot_caps;
extern const struct rot_caps f1tetracker_rot_caps;
extern const struct rot_caps gs23_rot_caps;
+extern const struct rot_caps gs23_az_rot_caps;
extern const struct rot_caps gs232_rot_caps;
extern const struct rot_caps amsat_lvb_rot_caps;
extern const struct rot_caps st2_rot_caps;
commit d42e75bac65898900cb59b2d8e5671a212eb52b6
Author: Mike Black W9MDB <mdb...@ya...>
Date: Thu May 26 08:25:39 2022 -0500
Avoid deadlock in add2debugmsgsave
diff --git a/src/rig.c b/src/rig.c
index 43e218da..ed3aacaa 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -328,6 +328,7 @@ void add2debugmsgsave(const char *s)
char *p;
char stmp[DEBUGMSGSAVE_SIZE];
int i, nlines;
+ int maxmsg = DEBUGMSGSAVE_SIZE/2;
MUTEX_LOCK(debugmsgsave);
memset(stmp, 0, sizeof(stmp));
p = debugmsgsave;
@@ -342,7 +343,7 @@ void add2debugmsgsave(const char *s)
// strip the last 19 lines
p = debugmsgsave;
- while ((nlines > 19 || strlen(debugmsgsave) > 2048) && p != NULL)
+ while ((nlines > 19 || strlen(debugmsgsave) > maxmsg) && p != NULL)
{
p = strchr(debugmsgsave, '\n');
@@ -360,6 +361,7 @@ void add2debugmsgsave(const char *s)
}
--nlines;
+ if (nlines == 0 && strlen(debugmsgsave) > maxmsg) strcpy(debugmsgsave,"!!!!debugmsgsave too long\n");
}
if (strlen(stmp) + strlen(s) + 1 < DEBUGMSGSAVE_SIZE)
commit 0d46e5b92ec03c3ffcd7fcb04e01b4115d353120
Author: Mike Black W9MDB <mdb...@ya...>
Date: Wed May 25 11:55:14 2022 -0500
Fix check_buffer_overlow for rig_set_ant
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 7e75fbaa..f79e58b5 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -4487,7 +4487,7 @@ declare_proto_rig(get_ant)
int status;
ant_t ant, ant_curr, ant_tx, ant_rx;
value_t option;
- char antbuf[32];
+ char antbuf[64];
ENTERFUNC;
commit 8cc4d59cbb06871838c0c41e2491de9f85449a82
Author: Mike Black W9MDB <mdb...@ya...>
Date: Wed May 25 10:48:16 2022 -0500
Change rig->caps-retry to rig->state.rigport.retry
https://github.com/Hamlib/Hamlib/issues/1037
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 01451981..b87f5d98 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -5387,11 +5387,11 @@ int icom_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
subcmd = 0x00;
}
- retry_save = rig->caps->retry;
- rig->caps->retry = 1;
+ retry_save = rig->state.rigport.retry;
+ rig->state.rigport.retry = 1;
retval = icom_transaction(rig, cmd, subcmd, freqbuf, freq_len, ackbuf,
&ack_len);
- rig->caps->retry = retry_save;
+ rig->state.rigport.retry = retry_save;
if (retval == RIG_OK) // then we're done!!
{
diff --git a/rigs/kenwood/ic10.c b/rigs/kenwood/ic10.c
index 0fd0f6ef..9285f793 100644
--- a/rigs/kenwood/ic10.c
+++ b/rigs/kenwood/ic10.c
@@ -155,7 +155,7 @@ static int get_ic10_if(RIG *rig, char *data)
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
- for (i = 0; retval != RIG_OK && i < rig->caps->retry; i++)
+ for (i = 0; retval != RIG_OK && i < rig->state.rigport.retry; i++)
{
data_len = 37;
retval = ic10_transaction(rig, "IF;", 3, data, &data_len);
commit 0b73daa4d80ea6ec03b0c5483512899604d9623f
Author: Mike Black W9MDB <mdb...@ya...>
Date: Wed May 25 07:59:43 2022 -0500
Fix FT650 detection in ft847.c
diff --git a/rigs/yaesu/ft847.c b/rigs/yaesu/ft847.c
index 8786efb7..b21d147c 100644
--- a/rigs/yaesu/ft847.c
+++ b/rigs/yaesu/ft847.c
@@ -324,7 +324,7 @@ static const yaesu_cmd_set_t ncmd[] =
* Receiver caps
*/
-
+#define UNIDIRECTIONAL (rig->caps->rig_model == RIG_MODEL_FT847UNI || rig->caps->rig_model == RIG_MODEL_FT650)
#define FT847_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_FM)
#define FT847_SSB_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB)
#define FT847_AM_FM_RX_MODES (RIG_MODE_AM|RIG_MODE_FM)
@@ -365,6 +365,16 @@ static tone_t ft847_ctcss_list[] =
1862, 1928, 2035, 2107, 2181, 2257, 2336, 2418, 2503,
0
};
+#if 0
+static tone_t ft650_ctcss_list[] =
+{
+ 670, 719, 744, 770, 797, 825, 854, 885, 915,
+ 948, 974, 1000, 1035, 1072, 1109, 1148, 1188, 1230, 1273,
+ 1318, 1365, 1413, 1462, 1514, 1567, 1622, 1679, 1738, 1799,
+ 1862, 1928, 2035, 2107, 2181, 2257, 2336, 2418, 2503,
+ 0
+};
+#endif
/*
@@ -377,7 +387,7 @@ const struct rig_caps ft847_caps =
RIG_MODEL(RIG_MODEL_FT847),
.model_name = "FT-847",
.mfg_name = "Yaesu",
- .version = "20210221.0",
+ .version = "20220525.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -532,7 +542,7 @@ const struct rig_caps ft650_caps =
RIG_MODEL(RIG_MODEL_FT650),
.model_name = "FT-650",
.mfg_name = "Yaesu",
- .version = "20220524.0",
+ .version = "20220525.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -558,7 +568,7 @@ const struct rig_caps ft650_caps =
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
.parm_gran = {},
- .ctcss_list = ft847_ctcss_list,
+ //.ctcss_list = ft847_ctcss_list,
.preamp = { RIG_DBLST_END, }, /* no preamp/att in CAT */
.attenuator = { RIG_DBLST_END, },
.max_rit = Hz(0),
@@ -662,7 +672,7 @@ const struct rig_caps mchfqrp_caps =
RIG_MODEL(RIG_MODEL_MCHFQRP),
.model_name = "mcHF QRP",
.mfg_name = "M0NKA",
- .version = "20211103.0",
+ .version = "20220525.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@@ -1173,7 +1183,7 @@ static int ft847_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
rig_debug(RIG_DEBUG_VERBOSE, fmt, __func__,
(int64_t)from_bcd_be(p_cmd, 8) * 10);
- if (rig->caps->rig_model == RIG_MODEL_FT847UNI)
+ if (UNIDIRECTIONAL)
{
struct ft847_priv_data *priv = (struct ft847_priv_data *)rig->state.priv;
@@ -1216,7 +1226,7 @@ static int get_freq_and_mode(RIG *rig, vfo_t vfo, freq_t *freq, rmode_t *mode,
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo =%s \n",
__func__, rig_strvfo(vfo));
- if (rig->caps->rig_model == RIG_MODEL_FT847UNI || rig->caps->rig_model == RIG_MODEL_FT650)
+ if (UNIDIRECTIONAL)
{
if (vfo == RIG_VFO_MAIN)
{
@@ -1345,7 +1355,7 @@ static int ft847_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
rig_debug(RIG_DEBUG_VERBOSE, "%s: generic mode = %s\n", __func__,
rig_strrmode(mode));
- if (rig->caps->rig_model == RIG_MODEL_FT847UNI)
+ if (UNIDIRECTIONAL)
{
struct ft847_priv_data *priv = (struct ft847_priv_data *)rig->state.priv;
priv->mode = mode;
@@ -1540,7 +1550,7 @@ static int ft847_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__);
- if (rig->caps->rig_model == RIG_MODEL_FT847UNI)
+ if (UNIDIRECTIONAL)
{
struct ft847_priv_data *priv = (struct ft847_priv_data *)rig->state.priv;
priv->ptt = ptt;
@@ -1575,7 +1585,7 @@ static int ft847_get_status(RIG *rig, int status_ci)
int len;
int n;
- if (rig->caps->rig_model == RIG_MODEL_FT847UNI)
+ if (UNIDIRECTIONAL)
{
return -RIG_ENIMPL;
}
@@ -1628,7 +1638,7 @@ static int ft847_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
struct ft847_priv_data *p = (struct ft847_priv_data *) rig->state.priv;
int n;
- if (rig->caps->rig_model == RIG_MODEL_FT847UNI)
+ if (UNIDIRECTIONAL)
{
struct ft847_priv_data *priv = (struct ft847_priv_data *)rig->state.priv;
*ptt = priv->ptt;
@@ -1662,7 +1672,7 @@ static int ft847_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
struct ft847_priv_data *p = (struct ft847_priv_data *) rig->state.priv;
int n;
- if (rig->caps->rig_model == RIG_MODEL_FT847UNI)
+ if (UNIDIRECTIONAL)
{
return -RIG_ENIMPL;
}
@@ -1691,7 +1701,7 @@ static int ft847_get_rawstr_level(RIG *rig, value_t *val)
struct ft847_priv_data *p = (struct ft847_priv_data *) rig->state.priv;
int n;
- if (rig->caps->rig_model == RIG_MODEL_FT847UNI)
+ if (UNIDIRECTIONAL)
{
return -RIG_ENIMPL;
}
@@ -1718,7 +1728,7 @@ static int ft847_get_smeter_level(RIG *rig, value_t *val)
{
int n;
- if (rig->caps->rig_model == RIG_MODEL_FT847UNI)
+ if (UNIDIRECTIONAL)
{
return -RIG_ENIMPL;
}
@@ -1763,7 +1773,7 @@ static int ft847_get_alc_level(RIG *rig, value_t *val)
struct ft847_priv_data *p = (struct ft847_priv_data *) rig->state.priv;
int n;
- if (rig->caps->rig_model == RIG_MODEL_FT847UNI)
+ if (UNIDIRECTIONAL)
{
return -RIG_ENIMPL;
}
@@ -1791,7 +1801,7 @@ static int ft847_get_alc_level(RIG *rig, value_t *val)
*/
static int ft847_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
- if (rig->caps->rig_model == RIG_MODEL_FT847UNI)
+ if (UNIDIRECTIONAL)
{
return -RIG_ENIMPL;
}
@@ -1953,7 +1963,7 @@ static int ft847_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t rptr_offs)
{
unsigned char p_cmd[YAESU_CMD_LENGTH]; /* sequence to send */
- if (rig->caps->rig_model == RIG_MODEL_FT847UNI)
+ if (UNIDIRECTIONAL)
{
return -RIG_ENIMPL;
}
commit 7ce07c09ad7151fc925ed2a18141ffbe7947b304
Author: Mike Black W9MDB <mdb...@ya...>
Date: Tue May 24 08:17:55 2022 -0500
Update NEWS
diff --git a/NEWS b/NEWS
index 9369dadf..4ff04807 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ Version 4.6
Version 4.5
* 2022-05-XX
+ * Add FT-650
* Add get_separator and set_separator and -S option for rigctld -- node-red applicability
* Add GRBLTRK rotor project -- two axis rotor
* enum meter_level_e is deprecated and will be removed in 4.6
commit 76103ec19956554973c1759657046ae5c9ef75d0
Author: Mike Black W9MDB <mdb...@ya...>
Date: Tue May 24 07:59:35 2022 -0500
Update some FT-650 capabilities
diff --git a/rigs/yaesu/ft847.c b/rigs/yaesu/ft847.c
index f9383e0b..8786efb7 100644
--- a/rigs/yaesu/ft847.c
+++ b/rigs/yaesu/ft847.c
@@ -552,8 +552,8 @@ const struct rig_caps ft650_caps =
.has_get_func = RIG_FUNC_NONE,
.has_set_func = FT847_FUNC_ALL,
- .has_get_level = FT847_LEVEL_ALL,
- .has_set_level = RIG_LEVEL_BAND_SELECT,
+ //.has_get_level = FT847_LEVEL_ALL,
+ //.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
.level_gran = {}, /* granularity */
@@ -564,7 +564,7 @@ const struct rig_caps ft650_caps =
.max_rit = Hz(0),
.max_xit = Hz(0),
.max_ifshift = Hz(0),
- .targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_TONE | RIG_TARGETABLE_FUNC,
+ //.targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_TONE | RIG_TARGETABLE_FUNC,
.transceive = RIG_TRN_OFF,
.bank_qty = 0,
.chan_desc_sz = 0,
@@ -613,8 +613,13 @@ const struct rig_caps ft650_caps =
/* mode/filter list, .remember = order matters! */
.filters = {
- {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_CWR, kHz(2.2)},
- {RIG_MODE_CW | RIG_MODE_CWR, Hz(500)},
+ {RIG_MODE_SSB | RIG_MODE_CW, kHz(2.4)},
+ {RIG_MODE_SSB, kHz(2.2)},
+ {RIG_MODE_SSB, kHz(2.0)},
+ {RIG_MODE_SSB, kHz(1.8)},
+ {RIG_MODE_CW, Hz(1200)},
+ {RIG_MODE_CW, Hz(600)},
+ {RIG_MODE_CW, Hz(300)},
{RIG_MODE_AM, kHz(9)},
{RIG_MODE_AM, kHz(2.2)},
{RIG_MODE_FM, kHz(15)},
@@ -632,23 +637,23 @@ const struct rig_caps ft650_caps =
.get_freq = ft847_get_freq, /* get freq */
.set_mode = ft847_set_mode, /* set mode */
.get_mode = ft847_get_mode, /* get mode */
- .set_split_vfo = ft847_set_split_vfo,
- .get_split_vfo = ft847_get_split_vfo,
- .set_split_freq = ft847_set_split_freq,
- .get_split_freq = ft847_get_split_freq,
- .set_split_mode = ft847_set_split_mode,
- .get_split_mode = ft847_get_split_mode,
+// .set_split_vfo = ft847_set_split_vfo,
+// .get_split_vfo = ft847_get_split_vfo,
+// .set_split_freq = ft847_set_split_freq,
+// .get_split_freq = ft847_get_split_freq,
+// .set_split_mode = ft847_set_split_mode,
+// .get_split_mode = ft847_get_split_mode,
.set_ptt = ft847_set_ptt, /* set ptt */
.get_ptt = ft847_get_ptt, /* get ptt */
- .get_dcd = ft847_get_dcd, /* get dcd */
- .get_level = ft847_get_level, /* get level */
+// .get_dcd = ft847_get_dcd, /* get dcd */
+// .get_level = ft847_get_level, /* get level */
.set_func = ft847_set_func,
.set_ctcss_tone = ft847_set_ctcss_tone,
- .set_ctcss_sql = ft847_set_ctcss_sql,
- .set_dcs_sql = ft847_set_dcs_sql,
- .set_rptr_shift = ft847_set_rptr_shift,
- .set_rptr_offs = ft847_set_rptr_offs,
+// .set_ctcss_sql = ft847_set_ctcss_sql,
+// .set_dcs_sql = ft847_set_dcs_sql,
+// .set_rptr_shift = ft847_set_rptr_shift,
+// .set_rptr_offs = ft847_set_rptr_offs,
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
commit fe7c465624b7dc1e3c47c0892cf97562000d7469
Author: Mike Black W9MDB <mdb...@ya...>
Date: Tue May 24 07:43:50 2022 -0500
Add FT-650 rig -- same as FT847UNI
diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h
index a1df7a82..771182a8 100644
--- a/include/hamlib/riglist.h
+++ b/include/hamlib/riglist.h
@@ -124,6 +124,7 @@
#define RIG_MODEL_FTDX101MP RIG_MAKE_MODEL(RIG_YAESU, 44)
#define RIG_MODEL_MCHFQRP RIG_MAKE_MODEL(RIG_YAESU, 45)
#define RIG_MODEL_FT450D RIG_MAKE_MODEL(RIG_YAESU, 46)
+#define RIG_MODEL_FT650 RIG_MAKE_MODEL(RIG_YAESU, 47)
/*
diff --git a/rigs/yaesu/ft847.c b/rigs/yaesu/ft847.c
index 9e2262a4..f9383e0b 100644
--- a/rigs/yaesu/ft847.c
+++ b/rigs/yaesu/ft847.c
@@ -368,9 +368,8 @@ static tone_t ft847_ctcss_list[] =
/*
- * ft847 rigs capabilities.
+ * ft847 rig capabilities.
* Notice that some rigs share the same functions.
- * Also this struct is READONLY!
*/
const struct rig_caps ft847_caps =
@@ -523,6 +522,136 @@ const struct rig_caps ft847_caps =
.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
};
+/*
+ * ft600 rigs capabilities.
+ * Notice that some rigs share the same functions.
+ */
+
+const struct rig_caps ft650_caps =
+{
+ RIG_MODEL(RIG_MODEL_FT650),
+ .model_name = "FT-650",
+ .mfg_name = "Yaesu",
+ .version = "20220524.0",
+ .copyright = "LGPL",
+ .status = RIG_STATUS_STABLE,
+ .rig_type = RIG_TYPE_TRANSCEIVER,
+ .ptt_type = RIG_PTT_RIG,
+ .dcd_type = RIG_DCD_RIG,
+ .port_type = RIG_PORT_SERIAL,
+ .serial_rate_min = 4800,
+ .serial_rate_max = 4800,
+ .serial_data_bits = 8,
+ .serial_stop_bits = 2,
+ .serial_parity = RIG_PARITY_NONE,
+ .serial_handshake = RIG_HANDSHAKE_NONE,
+ .write_delay = FT847_WRITE_DELAY,
+ .post_write_delay = FT847_POST_WRITE_DELAY,
+ .timeout = 1000,
+ .retry = 0,
+
+ .has_get_func = RIG_FUNC_NONE,
+ .has_set_func = FT847_FUNC_ALL,
+ .has_get_level = FT847_LEVEL_ALL,
+ .has_set_level = RIG_LEVEL_BAND_SELECT,
+ .has_get_parm = RIG_PARM_NONE,
+ .has_set_parm = RIG_PARM_NONE,
+ .level_gran = {}, /* granularity */
+ .parm_gran = {},
+ .ctcss_list = ft847_ctcss_list,
+ .preamp = { RIG_DBLST_END, }, /* no preamp/att in CAT */
+ .attenuator = { RIG_DBLST_END, },
+ .max_rit = Hz(0),
+ .max_xit = Hz(0),
+ .max_ifshift = Hz(0),
+ .targetable_vfo = RIG_TARGETABLE_FREQ | RIG_TARGETABLE_MODE | RIG_TARGETABLE_TONE | RIG_TARGETABLE_FUNC,
+ .transceive = RIG_TRN_OFF,
+ .bank_qty = 0,
+ .chan_desc_sz = 0,
+
+ .chan_list = { RIG_CHAN_END, }, /* FIXME: memory chan list: 78, but only in clonable mode? */
+
+ .rx_range_list1 = {
+ {MHz(24.5), MHz(56), FT847_ALL_RX_MODES, -1, -1, FT847_VFOS, FT847_ANTS, "EUR"},
+ RIG_FRNG_END,
+ }, /* rx range end */
+
+ .tx_range_list1 = {
+ FRQ_RNG_HF(1, FT847_OTHER_TX_MODES, W(5), W(100), FT847_VFOS, FT847_ANTS),
+ FRQ_RNG_HF(1, FT847_AM_TX_MODES, W(1), W(25), FT847_VFOS, FT847_ANTS),
+
+ FRQ_RNG_6m(1, FT847_OTHER_TX_MODES, W(5), W(100), FT847_VFOS, FT847_ANTS),
+ FRQ_RNG_6m(1, FT847_AM_TX_MODES, W(1), W(25), FT847_VFOS, FT847_ANTS),
+
+ FRQ_RNG_4m(1, FT847_OTHER_TX_MODES, W(1), W(50), FT847_VFOS, FT847_ANTS),
+ FRQ_RNG_4m(1, FT847_AM_TX_MODES, W(1), W(12.5), FT847_VFOS, FT847_ANTS),
+
+ FRQ_RNG_2m(1, FT847_OTHER_TX_MODES, W(1), W(50), FT847_VFOS, FT847_ANTS),
+ FRQ_RNG_2m(1, FT847_AM_TX_MODES, W(1), W(12.5), FT847_VFOS, FT847_ANTS),
+
+ FRQ_RNG_70cm(1, FT847_OTHER_TX_MODES, W(1), W(50), FT847_VFOS, FT847_ANTS),
+ FRQ_RNG_70cm(1, FT847_AM_TX_MODES, W(1), W(12.5), FT847_VFOS, FT847_ANTS),
+
+ RIG_FRNG_END,
+ }, /* tx range end */
+
+ .rx_range_list2 = {
+ {MHz(24.5), MHz(56), FT847_ALL_RX_MODES, -1, -1, FT847_VFOS, FT847_ANTS, "USA"},
+
+ RIG_FRNG_END,
+ }, /* rx range end */
+
+ .tx_range_list2 = {
+ {kHz(24500),kHz(25000), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
+ {kHz(24500),kHz(25000), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
+ {kHz(28000),kHz(29700), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
+ {kHz(28000),kHz(29700), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
+ {kHz(50000),kHz(54000), FT847_OTHER_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
+ {kHz(50000),kHz(54000), FT847_AM_TX_MODES, W(10), W(100), FT847_VFOS, FT847_ANTS},
+ RIG_FRNG_END,
+ }, /* tx range end */
+
+ /* mode/filter list, .remember = order matters! */
+ .filters = {
+ {RIG_MODE_SSB | RIG_MODE_CW | RIG_MODE_CWR, kHz(2.2)},
+ {RIG_MODE_CW | RIG_MODE_CWR, Hz(500)},
+ {RIG_MODE_AM, kHz(9)},
+ {RIG_MODE_AM, kHz(2.2)},
+ {RIG_MODE_FM, kHz(15)},
+ {RIG_MODE_FM, kHz(9)},
+ RIG_FLT_END,
+ },
+
+ .priv = NULL,
+ .rig_init = ft847_init,
+ .rig_cleanup = ft847_cleanup,
+ .rig_open = ft847_open,
+ .rig_close = ft847_close,
+
+ .set_freq = ft847_set_freq, /* set freq */
+ .get_freq = ft847_get_freq, /* get freq */
+ .set_mode = ft847_set_mode, /* set mode */
+ .get_mode = ft847_get_mode, /* get mode */
+ .set_split_vfo = ft847_set_split_vfo,
+ .get_split_vfo = ft847_get_split_vfo,
+ .set_split_freq = ft847_set_split_freq,
+ .get_split_freq = ft847_get_split_freq,
+ .set_split_mode = ft847_set_split_mode,
+ .get_split_mode = ft847_get_split_mode,
+ .set_ptt = ft847_set_ptt, /* set ptt */
+ .get_ptt = ft847_get_ptt, /* get ptt */
+ .get_dcd = ft847_get_dcd, /* get dcd */
+ .get_level = ft847_get_level, /* get level */
+
+ .set_func = ft847_set_func,
+ .set_ctcss_tone = ft847_set_ctcss_tone,
+ .set_ctcss_sql = ft847_set_ctcss_sql,
+ .set_dcs_sql = ft847_set_dcs_sql,
+ .set_rptr_shift = ft847_set_rptr_shift,
+ .set_rptr_offs = ft847_set_rptr_offs,
+ .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
+};
+
const struct rig_caps mchfqrp_caps =
{
RIG_MODEL(RIG_MODEL_MCHFQRP),
@@ -1082,7 +1211,7 @@ static int get_freq_and_mode(RIG *rig, vfo_t vfo, freq_t *freq, rmode_t *mode,
rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo =%s \n",
__func__, rig_strvfo(vfo));
- if (rig->caps->rig_model == RIG_MODEL_FT847UNI)
+ if (rig->caps->rig_model == RIG_MODEL_FT847UNI || rig->caps->rig_model == RIG_MODEL_FT650)
{
if (vfo == RIG_VFO_MAIN)
{
diff --git a/rigs/yaesu/yaesu.c b/rigs/yaesu/yaesu.c
index 1ff2c91f..ffe3061a 100644
--- a/rigs/yaesu/yaesu.c
+++ b/rigs/yaesu/yaesu.c
@@ -119,6 +119,7 @@ DECLARE_INITRIG_BACKEND(yaesu)
rig_register(&ft897d_caps);
rig_register(&ftdx101mp_caps);
rig_register(&mchfqrp_caps);
+ rig_register(&ft650_caps);
return RIG_OK;
}
diff --git a/rigs/yaesu/yaesu.h b/rigs/yaesu/yaesu.h
index 66e96aba..2674fa88 100644
--- a/rigs/yaesu/yaesu.h
+++ b/rigs/yaesu/yaesu.h
@@ -87,5 +87,6 @@ extern const struct rig_caps ft818_caps;
extern const struct rig_caps ftdx10_caps;
extern const struct rig_caps ftdx101mp_caps;
extern const struct rig_caps mchfqrp_caps;
+extern const struct rig_caps ft650_caps;
#endif /* _YAESU_H */
commit 6b76701efca61afbaebabed100ceda2b4c333dc1
Author: Mike Black W9MDB <mdb...@ya...>
Date: Mon May 23 11:44:19 2022 -0500
Put mutex in add2debugmsgsave
diff --git a/src/rig.c b/src/rig.c
index ca6c35c2..43e218da 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -160,6 +160,16 @@ const char hamlib_copyright[231] = /* hamlib 1.2 ABI specifies 231 bytes */
#define LOCK \
+#ifdef PTHREAD
+#define MUTEX(var) static pthread_mutex_t var = PTHREAD_MUTEX_INITIALIZER
+#define MUTEX_LOCK(var) pthread_mutex_lock(var)
+#define MUTEX_UNLOCK(var) pthread_mutex_unlock(var)
+#else
+#define MUTEX(var)
+#define MUTEX_LOCK(var)
+#define MUTEX_UNLOCK(var)
+#endif
+
/*
* Data structure to track the opened rig (by rig_open)
*/
@@ -311,11 +321,14 @@ char debugmsgsave[DEBUGMSGSAVE_SIZE] = "";
char debugmsgsave2[DEBUGMSGSAVE_SIZE] = "";
char debugmsgsave3[DEBUGMSGSAVE_SIZE] = "";
+MUTEX(debugmsgsave);
+
void add2debugmsgsave(const char *s)
{
char *p;
char stmp[DEBUGMSGSAVE_SIZE];
int i, nlines;
+ MUTEX_LOCK(debugmsgsave);
memset(stmp, 0, sizeof(stmp));
p = debugmsgsave;
@@ -359,6 +372,7 @@ void add2debugmsgsave(const char *s)
"%s: debugmsgsave overflow!! len of debugmsgsave=%d, len of add=%d\n", __func__,
(int)strlen(debugmsgsave), (int)strlen(s));
}
+ MUTEX_UNLOCK(debugmsgsave);
}
/**
@@ -6885,16 +6899,6 @@ const char *HAMLIB_API rig_copyright()
return hamlib_copyright2;
}
-#ifdef PTHREAD
-#define MUTEX(var) static pthread_mutex_t var = PTHREAD_MUTEX_INITIALIZER
-#define MUTEX_LOCK(var) pthread_mutex_lock(var)
-#define MUTEX_UNLOCK(var) pthread_mutex_unlock(var)
-#else
-#define MUTEX(var)
-#define MUTEX_LOCK(var)
-#define MUTEX_UNLOCK(var)
-#endif
-
/**
* \brief get a cookie to grab rig control
* \param rig Not used
commit 52736df8b8820929d39e4397db979e48493388bc
Author: Mike Black W9MDB <mdb...@ya...>
Date: Mon May 23 11:40:05 2022 -0500
Fix spelling error
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 1c66d018..8354ec80 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -1401,6 +1401,7 @@ struct filter_list {
#define RIG_FLT_ANY 0
#define RIG_FLT_END {RIG_MODE_NONE, 0}
#define RIG_IS_FLT_END(f) ((f).modes == RIG_MODE_NONE)
+#define DEBUGMSGSAVE_SIZE 24000
//! @endcond
@@ -3272,8 +3273,7 @@ rig_need_debug HAMLIB_PARAMS((enum rig_debug_level_e debug_level));
extern HAMLIB_EXPORT(void)add2debugmsgsave(const char *s);
-// this need to be fairly big to avoid compiler warnings
-#define DEBUGMSGSAVE_SIZE 24000
+// this needs to be fairly big to avoid compiler warnings
extern HAMLIB_EXPORT_VAR(char) debugmsgsave[DEBUGMSGSAVE_SIZE]; // last debug msg
extern HAMLIB_EXPORT_VAR(char) debugmsgsave2[DEBUGMSGSAVE_SIZE]; // last-1 debug msg
// debugmsgsave3 is deprecated
commit c8b2322018d0d5d6e69164ec613b5de3f26e73b1
Author: Mike Black W9MDB <mdb...@ya...>
Date: Mon May 23 10:41:16 2022 -0500
Try to fix random seg fault in add2debugmsgsave
diff --git a/src/rig...
[truncated message content] |
