From cd0d17d6a546a03dd166eed162f802b4caa8a339 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 23 Jul 2021 13:33:54 +0200 Subject: [PATCH] Also changed license of gloabl headers to LGPL. Moved definition of EC_SDO_INJECTION_TIMEOUT to master.c. --- globals.h | 31 +++++++++++-------------------- master/globals.h | 34 +++++++++++----------------------- master/master.c | 3 +++ 3 files changed, 25 insertions(+), 43 deletions(-) diff --git a/globals.h b/globals.h index b5927729..d2a470e9 100644 --- a/globals.h +++ b/globals.h @@ -1,29 +1,20 @@ /****************************************************************************** * - * $Id$ + * Copyright (C) 2006-2021 Florian Pose, Ingenieurgemeinschaft IgH * - * Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH + * This file is part of the IgH EtherCAT master. * - * This file is part of the IgH EtherCAT Master. + * The file is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation; version 2.1 of the License. * - * The IgH EtherCAT Master is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License version 2, as - * published by the Free Software Foundation. + * This file is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. * - * The IgH EtherCAT Master is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with the IgH EtherCAT Master; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * --- - * - * The license mentioned above concerns the source code only. Using the - * EtherCAT technology and brand is only permitted in compliance with the - * industrial property and similar rights of Beckhoff Automation GmbH. + * You should have received a copy of the GNU Lesser General Public License + * along with this file. If not, see . * *****************************************************************************/ diff --git a/master/globals.h b/master/globals.h index 840a160c..a0c820df 100644 --- a/master/globals.h +++ b/master/globals.h @@ -1,29 +1,20 @@ /****************************************************************************** * - * $Id$ + * Copyright (C) 2006-2021 Florian Pose, Ingenieurgemeinschaft IgH * - * Copyright (C) 2006-2008 Florian Pose, Ingenieurgemeinschaft IgH + * This file is part of the IgH EtherCAT master. * - * This file is part of the IgH EtherCAT Master. + * The file is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation; version 2.1 of the License. * - * The IgH EtherCAT Master is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License version 2, as - * published by the Free Software Foundation. + * This file is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. * - * The IgH EtherCAT Master is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General - * Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with the IgH EtherCAT Master; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * --- - * - * The license mentioned above concerns the source code only. Using the - * EtherCAT technology and brand is only permitted in compliance with the - * industrial property and similar rights of Beckhoff Automation GmbH. + * You should have received a copy of the GNU Lesser General Public License + * along with this file. If not, see . * *****************************************************************************/ @@ -46,9 +37,6 @@ /** Datagram timeout in microseconds. */ #define EC_IO_TIMEOUT 500 -/** SDO injection timeout in microseconds. */ -#define EC_SDO_INJECTION_TIMEOUT 10000 - /** Time to send a byte in nanoseconds. * * t_ns = 1 / (100 MBit/s / 8 bit/byte) = 80 ns/byte diff --git a/master/master.c b/master/master.c index 574862d7..23765330 100644 --- a/master/master.c +++ b/master/master.c @@ -69,6 +69,9 @@ */ #define FORCE_OUTPUT_CORRUPTED 0 +/** SDO injection timeout in microseconds. */ +#define EC_SDO_INJECTION_TIMEOUT 10000 + #ifdef EC_HAVE_CYCLES /** Frame timeout in cycles.