From 12e0b5fce519c3da5c8f8a1f04490a4b95e9a773 Mon Sep 17 00:00:00 2001 From: armink Date: Thu, 8 Dec 2016 10:26:54 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E3=80=90=E5=AE=8C=E5=96=84=E3=80=91E?= =?UTF-8?q?NV=20=E4=B8=AD=20RT-Thread=20=E5=B9=B3=E5=8F=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=20Demo=20=E4=B8=AD=E7=9A=84=20Finsh=20=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: armink --- .../stm32f10x/rtt/app/src/user_finsh_cmd.c | 41 --------------- .../rtt/components/easyflash/port/ef_port.c | 51 +++++++++++++++++++ demo/env/stm32f4xx/app/src/user_finsh_cmd.c | 41 --------------- .../components/easyflash/port/ef_port.c | 51 +++++++++++++++++++ 4 files changed, 102 insertions(+), 82 deletions(-) diff --git a/demo/env/stm32f10x/rtt/app/src/user_finsh_cmd.c b/demo/env/stm32f10x/rtt/app/src/user_finsh_cmd.c index 9d70a42..969d222 100644 --- a/demo/env/stm32f10x/rtt/app/src/user_finsh_cmd.c +++ b/demo/env/stm32f10x/rtt/app/src/user_finsh_cmd.c @@ -20,44 +20,3 @@ void get_cpuusage(void) { rt_kprintf("The CPU usage is %d.%d% now.\n", cpu_usage_major, cpu_usage_minor); } MSH_CMD_EXPORT(get_cpuusage, Get control board cpu usage); - -void setenv(uint8_t argc, char **argv) { - uint8_t i; - char c_value = NULL; - char *value = &c_value; - if (argc > 3) { - /* environment variable value string together */ - for (i = 0; i < argc - 2; i++) { - argv[2 + i][rt_strlen(argv[2 + i])] = ' '; - } - } - if (argc == 1) { - ef_set_env(value, value); - } else if (argc == 2) { - ef_set_env(argv[1], value); - } else { - ef_set_env(argv[1], argv[2]); - } -} -MSH_CMD_EXPORT(setenv, Set an envrionment variable.); - -void printenv(uint8_t argc, char **argv) { - ef_print_env(); -} -MSH_CMD_EXPORT(printenv, Print all envrionment variables.); - -void saveenv(uint8_t argc, char **argv) { - ef_save_env(); -} -MSH_CMD_EXPORT(saveenv, Save all envrionment variables to flash.); - -void getvalue(uint8_t argc, char **argv) { - char *value = NULL; - value = ef_get_env(argv[1]); - if (value) { - rt_kprintf("The %s value is %s.\n", argv[1], value); - } else { - rt_kprintf("Can't find %s.\n", argv[1]); - } -} -MSH_CMD_EXPORT(getvalue, Get an envrionment variable by name.); diff --git a/demo/env/stm32f10x/rtt/components/easyflash/port/ef_port.c b/demo/env/stm32f10x/rtt/components/easyflash/port/ef_port.c index 7c81b62..f0e0007 100644 --- a/demo/env/stm32f10x/rtt/components/easyflash/port/ef_port.c +++ b/demo/env/stm32f10x/rtt/components/easyflash/port/ef_port.c @@ -233,3 +233,54 @@ void ef_print(const char *format, ...) { rt_kprintf("%s", log_buf); va_end(args); } + +#if defined(RT_USING_FINSH) && defined(FINSH_USING_MSH) +#include +#if defined(EF_USING_ENV) +void setenv(uint8_t argc, char **argv) { + uint8_t i; + char c_value = NULL; + char *value = &c_value; + if (argc > 3) { + /* environment variable value string together */ + for (i = 0; i < argc - 2; i++) { + argv[2 + i][rt_strlen(argv[2 + i])] = ' '; + } + } + if (argc == 1) { + ef_set_env(value, value); + } else if (argc == 2) { + ef_set_env(argv[1], value); + } else { + ef_set_env(argv[1], argv[2]); + } +} +MSH_CMD_EXPORT(setenv, Set an envrionment variable.); + +void printenv(uint8_t argc, char **argv) { + ef_print_env(); +} +MSH_CMD_EXPORT(printenv, Print all envrionment variables.); + +void saveenv(uint8_t argc, char **argv) { + ef_save_env(); +} +MSH_CMD_EXPORT(saveenv, Save all envrionment variables to flash.); + +void getvalue(uint8_t argc, char **argv) { + char *value = NULL; + value = ef_get_env(argv[1]); + if (value) { + rt_kprintf("The %s value is %s.\n", argv[1], value); + } else { + rt_kprintf("Can't find %s.\n", argv[1]); + } +} +MSH_CMD_EXPORT(getvalue, Get an envrionment variable by name.); + +void resetenv(uint8_t argc, char **argv) { + ef_env_set_default(); +} +MSH_CMD_EXPORT(resetenv, Reset all envrionment variable to default.); +#endif /* defined(EF_USING_ENV) */ +#endif /* defined(RT_USING_FINSH) && defined(FINSH_USING_MSH) */ diff --git a/demo/env/stm32f4xx/app/src/user_finsh_cmd.c b/demo/env/stm32f4xx/app/src/user_finsh_cmd.c index 020a9fe..e3f701d 100644 --- a/demo/env/stm32f4xx/app/src/user_finsh_cmd.c +++ b/demo/env/stm32f4xx/app/src/user_finsh_cmd.c @@ -20,44 +20,3 @@ void get_cpuusage(void) { rt_kprintf("The CPU usage is %d.%d% now.\n", cpu_usage_major, cpu_usage_minor); } MSH_CMD_EXPORT(get_cpuusage, Get control board cpu usage); - -void setenv(uint8_t argc, char **argv) { - uint8_t i; - char c_value = NULL; - char *value = &c_value; - if (argc > 3) { - /* environment variable value string together */ - for (i = 0; i < argc - 2; i++) { - argv[2 + i][rt_strlen(argv[2 + i])] = ' '; - } - } - if (argc == 1) { - ef_set_env(value, value); - } else if (argc == 2) { - ef_set_env(argv[1], value); - } else { - ef_set_env(argv[1], argv[2]); - } -} -MSH_CMD_EXPORT(setenv, Set an envrionment variable.); - -void printenv(uint8_t argc, char **argv) { - ef_print_env(); -} -MSH_CMD_EXPORT(printenv, Print all envrionment variables.); - -void saveenv(uint8_t argc, char **argv) { - ef_save_env(); -} -MSH_CMD_EXPORT(saveenv, Save all envrionment variables to flash.); - -void getvalue(uint8_t argc, char **argv) { - char *value = NULL; - value = ef_get_env(argv[1]); - if (value) { - rt_kprintf("The %s value is %s.\n", argv[1], value); - } else { - rt_kprintf("Can't find %s.\n", argv[1]); - } -} -MSH_CMD_EXPORT(getvalue, Get an envrionment variable by name.); diff --git a/demo/env/stm32f4xx/components/easyflash/port/ef_port.c b/demo/env/stm32f4xx/components/easyflash/port/ef_port.c index cd6427b..f808ac7 100644 --- a/demo/env/stm32f4xx/components/easyflash/port/ef_port.c +++ b/demo/env/stm32f4xx/components/easyflash/port/ef_port.c @@ -364,3 +364,54 @@ void ef_print(const char *format, ...) { rt_kprintf("%s", log_buf); va_end(args); } + +#if defined(RT_USING_FINSH) && defined(FINSH_USING_MSH) +#include +#if defined(EF_USING_ENV) +void setenv(uint8_t argc, char **argv) { + uint8_t i; + char c_value = NULL; + char *value = &c_value; + if (argc > 3) { + /* environment variable value string together */ + for (i = 0; i < argc - 2; i++) { + argv[2 + i][rt_strlen(argv[2 + i])] = ' '; + } + } + if (argc == 1) { + ef_set_env(value, value); + } else if (argc == 2) { + ef_set_env(argv[1], value); + } else { + ef_set_env(argv[1], argv[2]); + } +} +MSH_CMD_EXPORT(setenv, Set an envrionment variable.); + +void printenv(uint8_t argc, char **argv) { + ef_print_env(); +} +MSH_CMD_EXPORT(printenv, Print all envrionment variables.); + +void saveenv(uint8_t argc, char **argv) { + ef_save_env(); +} +MSH_CMD_EXPORT(saveenv, Save all envrionment variables to flash.); + +void getvalue(uint8_t argc, char **argv) { + char *value = NULL; + value = ef_get_env(argv[1]); + if (value) { + rt_kprintf("The %s value is %s.\n", argv[1], value); + } else { + rt_kprintf("Can't find %s.\n", argv[1]); + } +} +MSH_CMD_EXPORT(getvalue, Get an envrionment variable by name.); + +void resetenv(uint8_t argc, char **argv) { + ef_env_set_default(); +} +MSH_CMD_EXPORT(resetenv, Reset all envrionment variable to default.); +#endif /* defined(EF_USING_ENV) */ +#endif /* defined(RT_USING_FINSH) && defined(FINSH_USING_MSH) */