From 44f8be65d8d6d740a6263f33dc7b0389923c5aa0 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Thu, 1 Sep 2022 13:48:42 +0200 Subject: [PATCH] Fixed downloading SDOs via stdin (-). --- tool/CommandDownload.cpp | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/tool/CommandDownload.cpp b/tool/CommandDownload.cpp index 0ee59d32..65e9631e 100644 --- a/tool/CommandDownload.cpp +++ b/tool/CommandDownload.cpp @@ -1,8 +1,6 @@ /***************************************************************************** * - * $Id$ - * - * Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH + * Copyright (C) 2006-2022 Florian Pose, Ingenieurgemeinschaft IgH * * This file is part of the IgH EtherCAT Master. * @@ -183,8 +181,7 @@ void CommandDownload::execute(const StringVector &args) throwCommandException(e.what()); } catch (ios::failure &e) { delete [] data.data; - err << "Invalid value argument '" << args[2] - << "' for type '" << dataType->name << "'!"; + err << "Invalid value for type '" << dataType->name << "'!"; throwInvalidUsageException(err); } @@ -205,25 +202,12 @@ void CommandDownload::execute(const StringVector &args) throwCommandException(e.what()); } catch (ios::failure &e) { delete [] data.data; - err << "Invalid value argument '" << args[2] + err << "Invalid value argument '" << args[valueIndex] << "' for type '" << dataType->name << "'!"; throwInvalidUsageException(err); } } - try { - data.data_size = interpretAsType( - dataType, args[valueIndex], data.data, data.data_size); - } catch (SizeException &e) { - delete [] data.data; - throwCommandException(e.what()); - } catch (ios::failure &e) { - delete [] data.data; - err << "Invalid value argument '" << args[2] - << "' for type '" << dataType->name << "'!"; - throwInvalidUsageException(err); - } - try { m.sdoDownload(&data); } catch (MasterDeviceSdoAbortException &e) {