From 6161e550c1a895b2c760ea76af17c46695b7386c Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Thu, 9 Mar 2023 21:19:35 +0100 Subject: [PATCH] main: deduplicate messages about board's default cable/user's selection, display warn always instead of when verbose mode is set. --- src/main.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index d494c94..2667bd5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -161,10 +161,8 @@ int main(int argc, char **argv) } /* search for cable */ auto t = cable_list.find(board->cable_name); - if (t == cable_list.end()) { - cout << "Board " << args.board << " has not default cable" << endl; - } else { - if (args.cable[0] == '-') { // no use selection + if (t != cable_list.end()) { + if (args.cable[0] == '-') { // no user selection args.cable = (*t).first; // use board default cable } else { cout << "Board default cable overridden with " << args.cable << endl; @@ -187,8 +185,7 @@ int main(int argc, char **argv) } if (args.cable[0] == '-') { /* if no board and no cable */ - if (args.verbose > 0) - cout << "No cable or board specified: using direct ft2232 interface" << endl; + printWarn("No cable or board specified: using direct ft2232 interface"); args.cable = "ft2232"; }