修改支持历史记录和变量个数支持0个

This commit is contained in:
hqm 2023-07-03 21:05:19 +08:00
parent 278e20ec83
commit 579b3b92d0
3 changed files with 24 additions and 20 deletions

View File

@ -9,9 +9,9 @@ extern "C" {
#define XCMD_PRINT_BUF_MAX_LENGTH (64) /* xcmd_print缓存 */
#define XCMD_HISTORY_BUF_SZIE (128) /* 支持的历史记录缓存大小实际历史记录个数取决于记录的命令长度建议内存较小的单片机设置为0 */
#define XCMD_HISTORY_BUF_SZIE (0) /* 支持的历史记录缓存大小实际历史记录个数取决于记录的命令长度建议内存较小的单片机设置为0 */
#define XCMD_PARAM_MAX_NUM (8) /* 支持输入的参数个数 */
#define XCMD_PARAM_MAX_NUM (6) /* 支持输入的参数个数 */
#if XCMD_PRINT_BUF_MAX_LENGTH < (XCMD_LINE_MAX_LENGTH+32)
#undef XCMD_PRINT_BUF_MAX_LENGTH

View File

@ -6,6 +6,7 @@
#include "xcmd_cmds.h"
#include "xcmd_keys.h"
#ifndef ENABLE_XCMD_EXPORT
static struct
{
xcmd_t head;
@ -15,6 +16,7 @@ static struct
{
xcmd_key_t head;
} g_key_list;
#endif
int xcmd_key_register(xcmd_key_t *keys, uint16_t number)
{

View File

@ -17,15 +17,15 @@ extern "C"
#endif
typedef int (*cmd_func_t)(int, char **);
typedef struct cmd
{
const char *name;
cmd_func_t func;
const char *help;
#ifndef ENABLE_XCMD_EXPORT
struct cmd *next;
#endif
} xcmd_t;
typedef xcmd_t xcmd_key_t;
#ifndef XCMD_PARAM_MAX_NUM
@ -63,16 +63,18 @@ typedef xcmd_t xcmd_key_t;
xcmd_cmd_##_name = { \
.name = #_name, \
.func = _func, \
.help = _help};
.help = _help, \
.next = NULL};
#define XCMD_EXPORT_KEY(_key, _func, _help) XCMD_USED const xcmd_key_t XCMD_SECTION("_xcmd_key_list") \
xcmd_key_##_key = { \
.key = _key, \
.name = _key, \
.func = _func, \
.help = _help};
extern xcmd_t _xcmd_cmd_list_start;
extern xcmd_t _xcmd_cmd_list_end;
extern xcmd_key_t _xcmd_key_list_start;
extern xcmd_key_t _xcmd_key_list_end;
.help = _help, \
.next = NULL};
extern xcmd_t _xcmd_cmd_list_start;
extern xcmd_t _xcmd_cmd_list_end;
extern xcmd_key_t _xcmd_key_list_start;
extern xcmd_key_t _xcmd_key_list_end;
#define XCMD_CMD_FOR_EACH(pos) for ((pos) = &_xcmd_cmd_list_start; (pos) < &_xcmd_cmd_list_end; ++(pos))
#define XCMD_KEY_FOR_EACH(pos) for ((pos) = &_xcmd_key_list_start; (pos) < &_xcmd_key_list_end; ++(pos))
#else
@ -105,7 +107,7 @@ typedef struct xcmd
{
xnr_io_t io;
xnr_key_t key;
#if XCMD_VAR_NUM!=0
#if XCMD_VAR_NUM != 0
xnr_var_tab_t var_tab;
xnr_var_t var_buf[XCMD_VAR_NUM];
#endif
@ -129,7 +131,7 @@ void xcmd_reg_pre_cmd_cbk(xcmder_t *xcmder, cmd_func_t cbk);
void xcmd_reg_after_cmd_cbk(xcmder_t *xcmder, cmd_func_t cbk);
int xcmd_exec(xcmder_t *xcmder, char *str);
int xcmd_getopt(xcmder_t *xcmder, int argc, char * const argv[], const char *optstring);
int xcmd_getopt(xcmder_t *xcmder, int argc, char *const argv[], const char *optstring);
int xcmd_key_register(xcmd_key_t *keys, uint16_t number);
int xcmd_unregister_key(char *key);