From b51e5466f7a125db873edd1fa9bd3881d7e98aad Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 4 Jul 2011 18:08:19 -0700
Subject: [PATCH 1/1] altos: Shrink help text

Reduce const space taken by command help text.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/ao_adc.c     |  2 +-
 src/ao_cmd.c     | 12 +++++-------
 src/ao_dbg.c     | 12 ++++++------
 src/ao_ignite.c  |  2 +-
 src/ao_log.c     |  4 ++--
 src/ao_storage.c |  8 ++++----
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/ao_adc.c b/src/ao_adc.c
index 48568383..cbeb6a24 100644
--- a/src/ao_adc.c
+++ b/src/ao_adc.c
@@ -162,7 +162,7 @@ ao_adc_dump(void) __reentrant
 }
 
 __code struct ao_cmds ao_adc_cmds[] = {
-	{ ao_adc_dump,	"a\0Display current ADC values" },
+	{ ao_adc_dump,	"a\0Current ADC" },
 	{ 0, NULL },
 };
 
diff --git a/src/ao_cmd.c b/src/ao_cmd.c
index 23346c3d..3f020dc3 100644
--- a/src/ao_cmd.c
+++ b/src/ao_cmd.c
@@ -221,8 +221,6 @@ version(void)
 	printf("software-version %s\n", ao_version);
 }
 
-static const char help_txt[] = "All numbers are in hex";
-
 #define NUM_CMDS	11
 
 static __code struct ao_cmds	*__xdata (ao_cmds[NUM_CMDS]);
@@ -234,7 +232,7 @@ help(void)
 	__xdata uint8_t	cmds;
 	__xdata uint8_t cmd;
 	__code struct ao_cmds * __xdata cs;
-	puts(help_txt);
+
 	for (cmds = 0; cmds < ao_ncmds; cmds++) {
 		cs = ao_cmds[cmds];
 		for (cmd = 0; cs[cmd].func; cmd++)
@@ -302,11 +300,11 @@ ao_cmd(void)
 __xdata struct ao_task ao_cmd_task;
 
 __code struct ao_cmds	ao_base_cmds[] = {
-	{ help,		"?\0Print this message" },
-	{ ao_task_info,	"T\0Show task states" },
-	{ echo,		"E <0 off, 1 on>\0Set command echo mode" },
+	{ help,		"?\0Help" },
+	{ ao_task_info,	"T\0Show tasks" },
+	{ echo,		"E <0 off, 1 on>\0Set echo mode" },
 	{ ao_reboot,	"r eboot\0Reboot" },
-	{ version,	"v\0Show version" },
+	{ version,	"v\0Version" },
 	{ 0,	NULL },
 };
 
diff --git a/src/ao_dbg.c b/src/ao_dbg.c
index 49371560..14a123a2 100644
--- a/src/ao_dbg.c
+++ b/src/ao_dbg.c
@@ -348,12 +348,12 @@ debug_output(void)
 }
 
 __code struct ao_cmds ao_dbg_cmds[7] = {
-	{ debug_enable,	"D\0Enable debug mode" },
-	{ debug_get,	"G <count>\0Get data from debug port" },
-	{ debug_input,	"I <count> <addr>\0Input <count> bytes to target at <addr>" },
-	{ debug_output,	"O <count> <addr>\0Output <count> bytes to target at <addr>" },
-	{ debug_put,	"P <byte> ...\0Put data to debug port" },
-	{ debug_reset,	"R\0Reset target" },
+	{ debug_enable,	"D\0Enable debug" },
+	{ debug_get,	"G <count>\0Get data" },
+	{ debug_input,	"I <count> <addr>\0Input <count> at <addr>" },
+	{ debug_output,	"O <count> <addr>\0Output <count> at <addr>" },
+	{ debug_put,	"P <byte> ...\0Put data" },
+	{ debug_reset,	"R\0Reset" },
 	{ 0, NULL },
 };
 
diff --git a/src/ao_ignite.c b/src/ao_ignite.c
index 7874ee01..8ef83da8 100644
--- a/src/ao_ignite.c
+++ b/src/ao_ignite.c
@@ -165,7 +165,7 @@ ao_ignite_test(void)
 
 __code struct ao_cmds ao_ignite_cmds[] = {
 	{ ao_ignite_manual,	"i <key> {main|drogue}\0Fire igniter. <key> is doit with D&I" },
-	{ ao_ignite_test,	"t\0Test igniter continuity" },
+	{ ao_ignite_test,	"t\0Test igniter" },
 	{ 0,	NULL },
 };
 
diff --git a/src/ao_log.c b/src/ao_log.c
index 433e9c3a..71900490 100644
--- a/src/ao_log.c
+++ b/src/ao_log.c
@@ -262,8 +262,8 @@ ao_log_delete(void) __reentrant
 }
 
 __code struct ao_cmds ao_log_cmds[] = {
-	{ ao_log_list,	"l\0List stored flight logs" },
-	{ ao_log_delete,	"d <flight-number>\0Delete stored flight" },
+	{ ao_log_list,	"l\0List flight logs" },
+	{ ao_log_delete,	"d <flight-number>\0Delete flight" },
 	{ 0,	NULL },
 };
 
diff --git a/src/ao_storage.c b/src/ao_storage.c
index 69183514..6ffca0e5 100644
--- a/src/ao_storage.c
+++ b/src/ao_storage.c
@@ -166,13 +166,13 @@ ao_storage_info(void) __reentrant
 }
 
 __code struct ao_cmds ao_storage_cmds[] = {
-	{ ao_storage_info, "f\0Show storage info" },
-	{ ao_storage_dump, "e <block>\0Dump a block of flash data" },
+	{ ao_storage_info, "f\0Show storage" },
+	{ ao_storage_dump, "e <block>\0Dump flash" },
 #ifdef HAS_STORAGE_DBG
 	{ ao_storage_store, "w <block> <start> <len> <data> ...\0Write data to flash" },
 #endif
-	{ ao_storage_zap, "z <block>\0Erase flash containing <block>" },
-	{ ao_storage_zapall,"Z <key>\0Erase all logs. <key> is doit with D&I" },
+	{ ao_storage_zap, "z <block>\0Erase <block>" },
+	{ ao_storage_zapall,"Z <key>\0Erase all. <key> is doit with D&I" },
 	{ 0, NULL },
 };
 
-- 
2.30.2