From 4e24dd6eee5e6ed045beeccb924184ca8301e327 Mon Sep 17 00:00:00 2001
From: Stephane Fillod <fillods@users.sf.net>
Date: Tue, 14 Jun 2011 23:18:27 +0200
Subject: [PATCH] set_level/get_level: Improved help "?" to show already
 supported ext_levels
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: Nirgal Vourgère <contact_hamlib@nirgal.com>
---
 tests/rigctl_parse.c | 14 ++++++++++++--
 tests/sprintflst.c   | 28 ++++++++++++++++++++++++++++
 tests/sprintflst.h   |  1 +
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index d11c20e90..f1f32ed24 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -1199,7 +1199,12 @@ declare_proto_rig(set_level)
 	if (!strcmp(arg1, "?")) {
 		char s[SPRINTF_MAX_SIZE];
 		sprintf_level(s, rig->state.has_set_level);
-		fprintf(fout, "%s\n", s);
+		fputs(s, fout);
+		if (rig->caps->set_ext_level) {
+			sprintf_level_ext(s, rig->caps->extlevels);
+			fputs(s, fout);
+		}
+		fputc('\n', fout);
 		return RIG_OK;
 	}
 
@@ -1249,7 +1254,12 @@ declare_proto_rig(get_level)
 	if (!strcmp(arg1, "?")) {
 		char s[SPRINTF_MAX_SIZE];
 		sprintf_level(s, rig->state.has_get_level);
-		fprintf(fout, "%s\n", s);
+		fputs(s, fout);
+		if (rig->caps->get_ext_level) {
+			sprintf_level_ext(s, rig->caps->extlevels);
+			fputs(s, fout);
+		}
+		fputc('\n', fout);
 		return RIG_OK;
 	}
 
diff --git a/tests/sprintflst.c b/tests/sprintflst.c
index f9d1f6cff..94bc5ed0d 100644
--- a/tests/sprintflst.c
+++ b/tests/sprintflst.c
@@ -126,6 +126,34 @@ int sprintf_level(char *str, setting_t level)
 		return len;
 }
 
+int sprintf_level_ext(char *str, const struct confparams *extlevels)
+{
+		int len=0;
+
+		*str = '\0';
+		if (!extlevels)
+				return 0;
+
+		for (; extlevels->token != RIG_CONF_END; extlevels++) {
+				if (!extlevels->name)
+					continue; /* no name */
+				switch (extlevels->type) {
+				case RIG_CONF_CHECKBUTTON:
+				case RIG_CONF_COMBO:
+				case RIG_CONF_NUMERIC:
+				case RIG_CONF_STRING:
+					strcat(str, extlevels->name);
+					strcat(str, " ");
+					len += strlen(extlevels->name) + 1;
+					break;
+				case RIG_CONF_BUTTON:
+					/* ignore case RIG_CONF_BUTTON */
+					break;
+				}
+		}
+		return len;
+}
+
 int sprintf_level_gran(char *str, setting_t level, const gran_t gran[])
 {
 		int i, len=0;
diff --git a/tests/sprintflst.h b/tests/sprintflst.h
index e7ce39ed9..197374ba5 100644
--- a/tests/sprintflst.h
+++ b/tests/sprintflst.h
@@ -33,6 +33,7 @@ extern int sprintf_mode(char *str, rmode_t);
 extern int sprintf_vfo(char *str, vfo_t);
 extern int sprintf_func(char *str, setting_t);
 extern int sprintf_level(char *str, setting_t);
+extern int sprintf_level_ext(char *str, const struct confparams *);
 extern int sprintf_level_gran(char *str, setting_t, const gran_t gran[]);
 extern int sprintf_parm(char *str, setting_t);
 extern int sprintf_parm_gran(char *str, setting_t, const gran_t gran[]);