Improved tio output

Added titles and indentation to commands output for clearer separation
when firing commands repeatedly.

Also added print of tio version and quit command hint at launch.
This commit is contained in:
Martin Lund 2016-05-20 19:36:23 +02:00
parent dc455eb0c2
commit 8ddabb1908

View file

@ -32,6 +32,7 @@
#include <termios.h> #include <termios.h>
#include <stdbool.h> #include <stdbool.h>
#include <errno.h> #include <errno.h>
#include "config.h"
#include "tio/tty.h" #include "tio/tty.h"
#include "tio/print.h" #include "tio/print.h"
#include "tio/options.h" #include "tio/options.h"
@ -69,15 +70,18 @@ void handle_command_sequence(char input_char, char previous_char, char *output_c
switch (input_char) switch (input_char)
{ {
case KEY_I: case KEY_I:
tio_printf("TTY device: %s", option.tty_device); tio_printf("Settings information:");
tio_printf("Baudrate: %d", option.baudrate); tio_printf(" TTY device: %s", option.tty_device);
tio_printf("Databits: %d", option.databits); tio_printf(" Baudrate: %d", option.baudrate);
tio_printf("Flow: %s", option.flow); tio_printf(" Databits: %d", option.databits);
tio_printf("Stopbits: %d", option.stopbits); tio_printf(" Flow: %s", option.flow);
tio_printf("Parity: %s", option.parity); tio_printf(" Stopbits: %d", option.stopbits);
tio_printf("Output delay: %d", option.output_delay); tio_printf(" Parity: %s", option.parity);
tio_printf(" Output delay: %d", option.output_delay);
if (option.log) if (option.log)
tio_printf("Log file: %s", option.log_filename); {
tio_printf(" Log file: %s", option.log_filename);
}
*forward = false; *forward = false;
break; break;
case KEY_Q: case KEY_Q:
@ -89,7 +93,8 @@ void handle_command_sequence(char input_char, char previous_char, char *output_c
break; break;
case KEY_S: case KEY_S:
/* Show tx/rx statistics upon ctrl-t s sequence */ /* Show tx/rx statistics upon ctrl-t s sequence */
tio_printf("Sent %ld bytes, received %ld bytes", tx_total, rx_total); tio_printf("Statistics:");
tio_printf(" Sent %ld bytes, received %ld bytes", tx_total, rx_total);
*forward = false; *forward = false;
break; break;
default: default:
@ -116,6 +121,10 @@ void wait_for_tty_device(void)
/* Don't wait first time */ /* Don't wait first time */
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 1; tv.tv_usec = 1;
tio_printf("tio v%s", VERSION);
tio_printf("Press ctrl-t + q to quit");
first = false; first = false;
} else } else
{ {