[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 35c1d9c3bf07bdaa19450a7a271ca32e8979cc77

[Michael B. <mdb...@us...>]

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  35c1d9c3bf07bdaa19450a7a271ca32e8979cc77 (commit)
       via  1e6bce288f284fba4db4ab376dbbd0edcaa065f3 (commit)
       via  18e9d56b4745097be56ac3899e4237afbf3f1736 (commit)
      from  5d2f5012c0623411be02308167a85cab64a7e328 (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 35c1d9c3bf07bdaa19450a7a271ca32e8979cc77
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sat Dec 26 08:49:17 2020 -0600

    Fix g313_caps undefined referenced when _WIN32 is not defined
    https://github.com/Hamlib/Hamlib/issues/479

diff --git a/rigs/winradio/winradio.h b/rigs/winradio/winradio.h
index 5174211e..5aa88507 100644
--- a/rigs/winradio/winradio.h
+++ b/rigs/winradio/winradio.h
@@ -59,6 +59,8 @@ extern const struct rig_caps wr3500_caps;
 extern const struct rig_caps wr3700_caps;
 extern const struct rig_caps g303_caps;
 extern const struct rig_caps g305_caps;
+#ifdef _WIN32
 extern const struct rig_caps g313_caps;
+#endif
 
 #endif /* _WINRADIO_H */

commit 1e6bce288f284fba4db4ab376dbbd0edcaa065f3
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Dec 24 23:15:42 2020 -0600

    Add C4FM mode to flrig.c
    https://github.com/Hamlib/Hamlib/issues/478

diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 5dc4f823..b4df56df 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -55,7 +55,8 @@
                      RIG_MODE_RTTY | RIG_MODE_RTTYR |\
                      RIG_MODE_PKTLSB | RIG_MODE_PKTUSB |\
                      RIG_MODE_SSB | RIG_MODE_LSB | RIG_MODE_USB |\
-             RIG_MODE_FM | RIG_MODE_WFM | RIG_MODE_FMN |RIG_MODE_PKTFM )
+                     RIG_MODE_FM | RIG_MODE_WFM | RIG_MODE_FMN | RIG_MODE_PKTFM |\
+                     RIG_MODE_C4FM)
 
 #define FLRIG_LEVELS (RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_MICGAIN | RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER_METER | RIG_LEVEL_RFPOWER_METER_WATTS)
 
@@ -207,6 +208,7 @@ static struct s_modeMap modeMap[] =
     {RIG_MODE_CWR, NULL},
     {RIG_MODE_RTTY, NULL},
     {RIG_MODE_RTTYR, NULL},
+    {RIG_MODE_C4FM, NULL},
     {0, NULL}
 };
 
@@ -906,6 +908,7 @@ static int flrig_open(RIG *rig)
         else if (streq(p, "W-FM")) { modeMapAdd(&modes, RIG_MODE_WFM, p); }
         else if (streq(p, "WFM")) { modeMapAdd(&modes, RIG_MODE_WFM, p); }
         else if (streq(p, "UCW")) { modeMapAdd(&modes, RIG_MODE_CW, p); }
+        else if (streq(p, "C4FM")) { modeMapAdd(&modes, RIG_MODE_C4FM, p); }
         else { rig_debug(RIG_DEBUG_ERR, "%s: Unknown mode (new?) for this rig='%s'\n", __func__, p); }
     }
 
diff --git a/rigs/dummy/flrig.h b/rigs/dummy/flrig.h
index ad0e0f74..b46ceeb7 100644
--- a/rigs/dummy/flrig.h
+++ b/rigs/dummy/flrig.h
@@ -28,7 +28,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20201217"
+#define BACKEND_VER "20201224"
 
 #define EOM "\r"
 #define TRUE 1

commit 18e9d56b4745097be56ac3899e4237afbf3f1736
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Tue Dec 22 17:01:06 2020 -0600

    Add some debug for set_mode stuff

diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index c366f3b1..73370375 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -637,7 +637,7 @@ rmode_t kenwood2rmode(unsigned char mode, const rmode_t mode_table[])
 
 char rmode2kenwood(rmode_t mode, const rmode_t mode_table[])
 {
-    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called, mode=%s\n", __func__, rig_strrmode(mode));
 
     if (mode != RIG_MODE_NONE)
     {
@@ -647,6 +647,7 @@ char rmode2kenwood(rmode_t mode, const rmode_t mode_table[])
         {
             if (mode_table[i] == mode)
             {
+                rig_debug(RIG_DEBUG_VERBOSE, "%s: returning %d\n", __func__, i);
                 return i;
             }
         }
@@ -1839,7 +1840,7 @@ int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
     struct kenwood_priv_caps *caps = kenwood_caps(rig);
 
 
-    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called, vfo=%s, mode=%s, width=%d\n", __func__, rig_strvfo(vfo), rig_strrmode(mode), (int)width);
 
     if (RIG_IS_TS590S || RIG_IS_TS590SG || RIG_IS_TS950S || RIG_IS_TS950SDX)
     {
@@ -1891,6 +1892,7 @@ int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
     {
         c = 'A' + kmode - 10;
     }
+    rig_debug(RIG_DEBUG_VERBOSE, "%s: kmode=%d, cmode=%c\n", __func__, kmode, c);
 
     if (RIG_IS_TS990S)
     {
diff --git a/src/rig.c b/src/rig.c
index 0a3a4cc5..6f2771ee 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -1727,7 +1727,7 @@ int HAMLIB_API rig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
     const struct rig_caps *caps;
     int retcode;
 
-    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called, vfo=%s, mode=%s, width=%d\n", __func__, rig_strvfo(vfo), rig_strrmode(mode), (int)width);
 
     if (CHECK_RIG_ARG(rig))
     {

-----------------------------------------------------------------------

Summary of changes:
 rigs/dummy/flrig.c       | 5 ++++-
 rigs/dummy/flrig.h       | 2 +-
 rigs/kenwood/kenwood.c   | 6 ++++--
 rigs/winradio/winradio.h | 2 ++
 src/rig.c                | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries