Merge GitHub PR #1884

rigs/dummy/dummy.c

@@ -430,6 +430,10 @@ static int dummy_get_conf(RIG *rig, hamlib_token_t token, char *val)
         strcpy(val, priv->magic_conf);
         break;
 
+    case TOK_CFG_STATIC_DATA:
+        SNPRINTF(val, 128, "%d", priv->static_data);
+        break;
+
     default:
         RETURNFUNC(-RIG_EINVAL);
     }

src/conf.c

@@ -81,13 +81,13 @@ static const struct confparams frontend_cfg_params[] =
         "1", RIG_CONF_NUMERIC, { .n = { 0, 100, 1 } }
     },
     {
-        TOK_RANGE_SELECTED, "Selected range list", "Range list#",
-        "The tx/rx range list in use",
+        TOK_RANGE_SELECTED, "range_list_number", "Range list number",
+        "The tx/rx range list number in use",
         "0", RIG_CONF_NUMERIC, { .n = { 1, 5, 1 } }
     },
     {
-        TOK_RANGE_NAME, "Selected range list", "Range list name",
-        "The tx/rx range list name",
+        TOK_RANGE_NAME, "range_list_name", "Range list name",
+        "The tx/rx range list name in use",
         "Default", RIG_CONF_STRING
     },
     {
@@ -1221,6 +1221,12 @@ static int frontend_get_conf2(RIG *rig, hamlib_token_t token, char *val,
         SNPRINTF(val, val_len, "%g", rs->lo_freq);
         break;
 
+    case TOK_RANGE_SELECTED:
+        return -RIG_ENAVAIL;
+
+    case TOK_RANGE_NAME:
+        return -RIG_ENAVAIL;
+
     case TOK_CACHE_TIMEOUT:
         SNPRINTF(val, val_len, "%d", rig_get_cache_timeout_ms(rig, HAMLIB_CACHE_ALL));
         break;
@@ -1257,10 +1263,22 @@ static int frontend_get_conf2(RIG *rig, hamlib_token_t token, char *val,
         SNPRINTF(val, val_len, "%d", rs->twiddle_rit);
         break;
 
+    case TOK_OFFSET_VFOA:
+        SNPRINTF(val, val_len, "%g", rs->offset_vfoa);
+        break;
+
+    case TOK_OFFSET_VFOB:
+        SNPRINTF(val, val_len, "%g", rs->offset_vfob);
+        break;
+
     case TOK_ASYNC:
         SNPRINTF(val, val_len, "%d", rs->async_data_enabled);
         break;
 
+    case TOK_TUNER_CONTROL_PATHNAME:
+        SNPRINTF(val, val_len, "%s", rs->tuner_control_pathname);
+        break;
+
     case TOK_TIMEOUT_RETRY:
         SNPRINTF(val, val_len, "%d", rp->timeout_retry);
         break;
@@ -1281,6 +1299,10 @@ static int frontend_get_conf2(RIG *rig, hamlib_token_t token, char *val,
         SNPRINTF(val, val_len, "%d", rs->multicast_cmd_port);
         break;
 
+    case TOK_FREQ_SKIP:
+        SNPRINTF(val, val_len, "%d", rs->freq_skip);
+        break;
+
     default:
         return -RIG_EINVAL;
     }

tests/rigctl_parse.c

@@ -6048,7 +6048,7 @@ declare_proto_rig(get_conf)
 
     if (arg1 == NULL || arg1[0] == '?')
     {
-        dumpconf_list(rig, stdout);
+        dumpconf_list(rig, fout);
         debugmsgsave[0] = 0;
         debugmsgsave2[0] = 0;
         return RIG_OK;