CHG: pip:ing, command, lua, from CLI has less output.

This commit is contained in:
iceman1001 2017-10-21 15:01:23 +02:00
parent dc23a6d5ce
commit d15cf5ff2f
2 changed files with 15 additions and 5 deletions

View file

@ -249,13 +249,17 @@ int CmdTune(const char *Cmd)
return CmdTuneSamples(Cmd);
}
int CmdVersion(const char *Cmd)
{
clearCommandBuffer();
int CmdVersion(const char *Cmd) {
bool silent = (Cmd[0] == 's' || Cmd[0] == 'S');
if ( silent )
return 0;
UsbCommand c = {CMD_VERSION};
static UsbCommand resp = {0, {0, 0, 0}};
if (resp.arg[0] == 0 && resp.arg[1] == 0) { // no cached information available
clearCommandBuffer();
SendCommand(&c);
if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
#ifdef __WIN32

View file

@ -160,7 +160,10 @@ void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
rarg.run = 1;
pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
// cache Version information now:
CmdVersion( (script_cmds_file) ? "s" : NULL );
if ( execCommand || script_cmds_file || stdinOnPipe)
CmdVersion("s");
else
CmdVersion("");
}
if (script_cmds_file) {
@ -186,7 +189,10 @@ void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
rarg.run = 1;
pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
// cache Version information now:
CmdVersion( (script_cmds_file) ? "s" : NULL );
if ( execCommand || script_cmds_file || stdinOnPipe)
CmdVersion("s");
else
CmdVersion("");
}
}