mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
refactor(console): Enable astyle formatting
This commit is contained in:
parent
fe3fd4ae43
commit
0bfaf775c1
@ -250,22 +250,22 @@ static struct {
|
|||||||
|
|
||||||
static void print_arg_help(cmd_item_t *it)
|
static void print_arg_help(cmd_item_t *it)
|
||||||
{
|
{
|
||||||
/* First line: command name and hint
|
/* First line: command name and hint
|
||||||
* Pad all the hints to the same column
|
* Pad all the hints to the same column
|
||||||
*/
|
*/
|
||||||
const char *hint = (it->hint) ? it->hint : "";
|
const char *hint = (it->hint) ? it->hint : "";
|
||||||
printf("%-s %s\n", it->command, hint);
|
printf("%-s %s\n", it->command, hint);
|
||||||
/* Second line: print help.
|
/* Second line: print help.
|
||||||
* Argtable has a nice helper function for this which does line
|
* Argtable has a nice helper function for this which does line
|
||||||
* wrapping.
|
* wrapping.
|
||||||
*/
|
*/
|
||||||
printf(" "); // arg_print_formatted does not indent the first line
|
printf(" "); // arg_print_formatted does not indent the first line
|
||||||
arg_print_formatted(stdout, 2, 78, it->help);
|
arg_print_formatted(stdout, 2, 78, it->help);
|
||||||
/* Finally, print the list of arguments */
|
/* Finally, print the list of arguments */
|
||||||
if (it->argtable) {
|
if (it->argtable) {
|
||||||
arg_print_glossary(stdout, (void **) it->argtable, " %12s %s\n");
|
arg_print_glossary(stdout, (void **) it->argtable, " %12s %s\n");
|
||||||
}
|
}
|
||||||
printf("\n");
|
printf("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static int help_command(int argc, char **argv)
|
static int help_command(int argc, char **argv)
|
||||||
@ -322,7 +322,7 @@ esp_err_t esp_console_register_help_command(void)
|
|||||||
esp_console_cmd_t command = {
|
esp_console_cmd_t command = {
|
||||||
.command = "help",
|
.command = "help",
|
||||||
.help = "Print the summary of all registered commands if no arguments "
|
.help = "Print the summary of all registered commands if no arguments "
|
||||||
"are given, otherwise print summary of given command.",
|
"are given, otherwise print summary of given command.",
|
||||||
.func = &help_command,
|
.func = &help_command,
|
||||||
.argtable = &help_args
|
.argtable = &help_args
|
||||||
};
|
};
|
||||||
|
@ -78,7 +78,7 @@ typedef struct {
|
|||||||
*/
|
*/
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int channel; //!< UART channel number (count from zero)
|
int channel; //!< UART channel number (count from zero)
|
||||||
int baud_rate; //!< Comunication baud rate
|
int baud_rate; //!< Communication baud rate
|
||||||
int tx_gpio_num; //!< GPIO number for TX path, -1 means using default one
|
int tx_gpio_num; //!< GPIO number for TX path, -1 means using default one
|
||||||
int rx_gpio_num; //!< GPIO number for RX path, -1 means using default one
|
int rx_gpio_num; //!< GPIO number for RX path, -1 means using default one
|
||||||
} esp_console_dev_uart_config_t;
|
} esp_console_dev_uart_config_t;
|
||||||
|
@ -83,7 +83,7 @@ esp_err_t esp_console_new_repl_usb_cdc(const esp_console_dev_usb_cdc_config_t *d
|
|||||||
|
|
||||||
/* spawn a single thread to run REPL */
|
/* spawn a single thread to run REPL */
|
||||||
if (xTaskCreatePinnedToCore(esp_console_repl_task, "console_repl", repl_config->task_stack_size,
|
if (xTaskCreatePinnedToCore(esp_console_repl_task, "console_repl", repl_config->task_stack_size,
|
||||||
cdc_repl, repl_config->task_priority, &cdc_repl->repl_com.task_hdl, repl_config->task_core_id) != pdTRUE) {
|
cdc_repl, repl_config->task_priority, &cdc_repl->repl_com.task_hdl, repl_config->task_core_id) != pdTRUE) {
|
||||||
ret = ESP_FAIL;
|
ret = ESP_FAIL;
|
||||||
goto _exit;
|
goto _exit;
|
||||||
}
|
}
|
||||||
@ -160,7 +160,7 @@ esp_err_t esp_console_new_repl_usb_serial_jtag(const esp_console_dev_usb_serial_
|
|||||||
|
|
||||||
/* spawn a single thread to run REPL */
|
/* spawn a single thread to run REPL */
|
||||||
if (xTaskCreatePinnedToCore(esp_console_repl_task, "console_repl", repl_config->task_stack_size,
|
if (xTaskCreatePinnedToCore(esp_console_repl_task, "console_repl", repl_config->task_stack_size,
|
||||||
usb_serial_jtag_repl, repl_config->task_priority, &usb_serial_jtag_repl->repl_com.task_hdl, repl_config->task_core_id) != pdTRUE) {
|
usb_serial_jtag_repl, repl_config->task_priority, &usb_serial_jtag_repl->repl_com.task_hdl, repl_config->task_core_id) != pdTRUE) {
|
||||||
ret = ESP_FAIL;
|
ret = ESP_FAIL;
|
||||||
goto _exit;
|
goto _exit;
|
||||||
}
|
}
|
||||||
@ -217,7 +217,7 @@ esp_err_t esp_console_new_repl_uart(const esp_console_dev_uart_config_t *dev_con
|
|||||||
#elif SOC_UART_SUPPORT_XTAL_CLK
|
#elif SOC_UART_SUPPORT_XTAL_CLK
|
||||||
uart_sclk_t clk_source = UART_SCLK_XTAL;
|
uart_sclk_t clk_source = UART_SCLK_XTAL;
|
||||||
#else
|
#else
|
||||||
#error "No UART clock source is aware of DFS"
|
#error "No UART clock source is aware of DFS"
|
||||||
#endif // SOC_UART_SUPPORT_xxx
|
#endif // SOC_UART_SUPPORT_xxx
|
||||||
const uart_config_t uart_config = {
|
const uart_config_t uart_config = {
|
||||||
.baud_rate = dev_config->baud_rate,
|
.baud_rate = dev_config->baud_rate,
|
||||||
@ -262,7 +262,7 @@ esp_err_t esp_console_new_repl_uart(const esp_console_dev_uart_config_t *dev_con
|
|||||||
/* Spawn a single thread to run REPL, we need to pass `uart_repl` to it as
|
/* Spawn a single thread to run REPL, we need to pass `uart_repl` to it as
|
||||||
* it also requires the uart channel. */
|
* it also requires the uart channel. */
|
||||||
if (xTaskCreatePinnedToCore(esp_console_repl_task, "console_repl", repl_config->task_stack_size,
|
if (xTaskCreatePinnedToCore(esp_console_repl_task, "console_repl", repl_config->task_stack_size,
|
||||||
uart_repl, repl_config->task_priority, &uart_repl->repl_com.task_hdl, repl_config->task_core_id) != pdTRUE) {
|
uart_repl, repl_config->task_priority, &uart_repl->repl_com.task_hdl, repl_config->task_core_id) != pdTRUE) {
|
||||||
ret = ESP_FAIL;
|
ret = ESP_FAIL;
|
||||||
goto _exit;
|
goto _exit;
|
||||||
}
|
}
|
||||||
|
@ -51,7 +51,7 @@ static void prepare_input_stream(void)
|
|||||||
assert(tcgetattr(stdin_fileno, &s_orig_termios) == 0);
|
assert(tcgetattr(stdin_fileno, &s_orig_termios) == 0);
|
||||||
struct termios raw = s_orig_termios;
|
struct termios raw = s_orig_termios;
|
||||||
raw.c_iflag |= ICRNL; // we translate to NL because linenoise expects NL
|
raw.c_iflag |= ICRNL; // we translate to NL because linenoise expects NL
|
||||||
raw.c_lflag &= ~(ECHO | ICANON); // turn off echo and cononical mode
|
raw.c_lflag &= ~(ECHO | ICANON); // turn off echo and canonical mode
|
||||||
assert(tcsetattr(stdin_fileno, TCSAFLUSH, &raw) == 0);
|
assert(tcsetattr(stdin_fileno, TCSAFLUSH, &raw) == 0);
|
||||||
|
|
||||||
// Make sure user does not end up with a broken terminal
|
// Make sure user does not end up with a broken terminal
|
||||||
|
@ -47,5 +47,5 @@ void esp_console_repl_task(void *args);
|
|||||||
esp_err_t esp_console_common_init(size_t max_cmdline_length, esp_console_repl_com_t *repl_com);
|
esp_err_t esp_console_common_init(size_t max_cmdline_length, esp_console_repl_com_t *repl_com);
|
||||||
esp_err_t esp_console_setup_prompt(const char *prompt, esp_console_repl_com_t *repl_com);
|
esp_err_t esp_console_setup_prompt(const char *prompt, esp_console_repl_com_t *repl_com);
|
||||||
esp_err_t esp_console_setup_history(const char *history_path,
|
esp_err_t esp_console_setup_history(const char *history_path,
|
||||||
uint32_t max_history_len,
|
uint32_t max_history_len,
|
||||||
esp_console_repl_com_t *repl_com);
|
esp_console_repl_com_t *repl_com);
|
||||||
|
@ -40,7 +40,7 @@ size_t esp_console_split_argv(char *line, char **argv, size_t argv_size)
|
|||||||
char *next_arg_start = line;
|
char *next_arg_start = line;
|
||||||
char *out_ptr = line;
|
char *out_ptr = line;
|
||||||
for (char *in_ptr = line; argc < argv_size - 1; ++in_ptr) {
|
for (char *in_ptr = line; argc < argv_size - 1; ++in_ptr) {
|
||||||
int char_in = (unsigned char) *in_ptr;
|
int char_in = (unsigned char) * in_ptr;
|
||||||
if (char_in == 0) {
|
if (char_in == 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -80,7 +80,7 @@ size_t esp_console_split_argv(char *line, char **argv, size_t argv_size)
|
|||||||
} else {
|
} else {
|
||||||
/* unrecognized escape character, skip */
|
/* unrecognized escape character, skip */
|
||||||
}
|
}
|
||||||
state = (split_state_t) (state & (~SS_FLAG_ESCAPE));
|
state = (split_state_t)(state & (~SS_FLAG_ESCAPE));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SS_ARG:
|
case SS_ARG:
|
||||||
|
@ -25,8 +25,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
const char *in;
|
const char *in;
|
||||||
const char *out;
|
const char *out;
|
||||||
} cmd_context_t;
|
} cmd_context_t;
|
||||||
|
|
||||||
static esp_console_repl_t *s_repl = NULL;
|
static esp_console_repl_t *s_repl = NULL;
|
||||||
@ -239,8 +239,8 @@ TEST_CASE("esp console test with context", "[console]")
|
|||||||
};
|
};
|
||||||
|
|
||||||
cmd_context_t context1 = {
|
cmd_context_t context1 = {
|
||||||
.in = "c2",
|
.in = "c2",
|
||||||
.out = NULL,
|
.out = NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
const esp_console_cmd_t cmd0 = {
|
const esp_console_cmd_t cmd0 = {
|
||||||
@ -252,11 +252,11 @@ TEST_CASE("esp console test with context", "[console]")
|
|||||||
};
|
};
|
||||||
|
|
||||||
const esp_console_cmd_t cmd1 = {
|
const esp_console_cmd_t cmd1 = {
|
||||||
.command = "hello-c2",
|
.command = "hello-c2",
|
||||||
.help = "Print Hello World in context c2",
|
.help = "Print Hello World in context c2",
|
||||||
.hint = NULL,
|
.hint = NULL,
|
||||||
.func_w_context = do_hello_cmd_with_context,
|
.func_w_context = do_hello_cmd_with_context,
|
||||||
.context = &context1,
|
.context = &context1,
|
||||||
};
|
};
|
||||||
|
|
||||||
TEST_ESP_OK(esp_console_cmd_register(&cmd0));
|
TEST_ESP_OK(esp_console_cmd_register(&cmd0));
|
||||||
|
@ -49,7 +49,6 @@ components_not_formatted_temporary:
|
|||||||
- "/components/bootloader/"
|
- "/components/bootloader/"
|
||||||
- "/components/bt/"
|
- "/components/bt/"
|
||||||
- "/components/cmock/"
|
- "/components/cmock/"
|
||||||
- "/components/console/"
|
|
||||||
- "/components/efuse/"
|
- "/components/efuse/"
|
||||||
- "/components/esp_coex/"
|
- "/components/esp_coex/"
|
||||||
- "/components/esp_eth/"
|
- "/components/esp_eth/"
|
||||||
|
Loading…
Reference in New Issue
Block a user