Merge GitHub PR #1807

include/hamlib/rig.h

@@ -1417,7 +1417,7 @@ typedef uint64_t rmode_t;
 #define    RIG_MODE_LSBD1     CONSTANT_64BIT_FLAG (43)  /*!< \c LSB-D1 for some rigs */
 #define    RIG_MODE_LSBD2     CONSTANT_64BIT_FLAG (44)  /*!< \c LSB-D1 for some rigs */
 #define    RIG_MODE_LSBD3     CONSTANT_64BIT_FLAG (45)  /*!< \c LSB-D1 for some rigs */
-#define    RIG_MODE_BIT46     CONSTANT_64BIT_FLAG (46)  /*!< \c reserved for future expansion */
+#define    RIG_MODE_WFMS      CONSTANT_64BIT_FLAG (46)  /*!< \c broadcast wide FM stereo for some rigs */
 #define    RIG_MODE_BIT47     CONSTANT_64BIT_FLAG (47)  /*!< \c reserved for future expansion */
 #define    RIG_MODE_BIT48     CONSTANT_64BIT_FLAG (48)  /*!< \c reserved for future expansion */
 #define    RIG_MODE_BIT49     CONSTANT_64BIT_FLAG (49)  /*!< \c reserved for future expansion */

include/hamlib/riglist.h

@@ -88,6 +88,7 @@
 #define RIG_MODEL_ACLOG RIG_MAKE_MODEL(RIG_DUMMY, 8)
 #define RIG_MODEL_SDRSHARP RIG_MAKE_MODEL(RIG_DUMMY, 9)
 #define RIG_MODEL_QUISK RIG_MAKE_MODEL(RIG_DUMMY, 10)
+#define RIG_MODEL_GQRX RIG_MAKE_MODEL(RIG_DUMMY, 11)
 
 /*
  * Yaesu

rigs/drake/drake.c

@@ -1045,7 +1045,7 @@ int drake_set_chan(RIG *rig, vfo_t vfo, const channel_t *chan)
     char    mdbuf[16];
     char    ackbuf[BUFSZ];
     int     ack_len;
-    vfo_t   old_vfo;
+    vfo_t   old_vfo = RIG_VFO_A;
     int     old_chan;
     int     retval;
     value_t dummy;
@@ -1122,7 +1122,7 @@ int drake_set_chan(RIG *rig, vfo_t vfo, const channel_t *chan)
  */
 int drake_get_chan(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
 {
-    vfo_t   old_vfo;
+    vfo_t   old_vfo = RIG_VFO_A;
     int     old_chan;
     int     retval;
     const struct drake_priv_data *priv = STATE(rig)->priv;

rigs/dummy/Android.mk

@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := dummy.c rot_dummy.c netrigctl.c netrotctl.c flrig.c trxmanager.c dummy_common.c sdrsharp.c
+LOCAL_SRC_FILES := dummy.c rot_dummy.c netrigctl.c netrotctl.c flrig.c trxmanager.c dummy_common.c sdrsharp.c gqrx.c
 LOCAL_MODULE := dummy
 
 LOCAL_CFLAGS := 

rigs/dummy/Makefile.am

@@ -1,4 +1,4 @@
-DUMMYSRC = dummy_common.c dummy_common.h dummy.c dummy.h rot_dummy.c rot_dummy.h rot_pstrotator.c rot_pstrotator.h netrigctl.c netrotctl.c flrig.c flrig.h trxmanager.c trxmanager.h amp_dummy.c amp_dummy.h netampctl.c tci1x.c aclog.c sdrsharp.c quisk.c
+DUMMYSRC = dummy_common.c dummy_common.h dummy.c dummy.h rot_dummy.c rot_dummy.h rot_pstrotator.c rot_pstrotator.h netrigctl.c netrotctl.c flrig.c flrig.h trxmanager.c trxmanager.h amp_dummy.c amp_dummy.h netampctl.c tci1x.c aclog.c sdrsharp.c quisk.c gqrx.c
 
 noinst_LTLIBRARIES = libhamlib-dummy.la
 libhamlib_dummy_la_SOURCES = $(DUMMYSRC)

rigs/dummy/dummy.c

@@ -2828,6 +2828,7 @@ DECLARE_INITRIG_BACKEND(dummy)
     rig_register(&aclog_caps);
     rig_register(&sdrsharp_caps);
     rig_register(&quisk_caps);
+    rig_register(&gqrx_caps);
 //    rig_register(&tci1x_caps);
     return RIG_OK;
 }

rigs/dummy/dummy.h

@@ -48,6 +48,7 @@ extern struct rig_caps tci1x_caps;
 extern struct rig_caps aclog_caps;
 extern struct rig_caps sdrsharp_caps;
 extern struct rig_caps quisk_caps;
+extern struct rig_caps gqrx_caps;
 
 int netrigctl_get_vfo_mode(RIG *);