From 4f6c5f829bc6abfec19bc25f07e1c2d38b58ce58 Mon Sep 17 00:00:00 2001 From: Henrik Brix Andersen Date: Wed, 18 Sep 2019 13:45:29 +0200 Subject: [PATCH] Remove whitespace at end-of-line and avoid mixed line-endings in generated files. --- EDSTest/Profiles/DS301_profile.xml | 298 ++++++------- EDSTest/Profiles/DSP302-NMTMaster.xml | 588 +++++++++++++------------- libEDSsharp/CanOpenNodeExporter.cs | 20 +- libEDSsharp/eds.cs | 6 +- 4 files changed, 456 insertions(+), 456 deletions(-) diff --git a/EDSTest/Profiles/DS301_profile.xml b/EDSTest/Profiles/DS301_profile.xml index cf9e9999..b0988771 100644 --- a/EDSTest/Profiles/DS301_profile.xml +++ b/EDSTest/Profiles/DS301_profile.xml @@ -2,28 +2,28 @@ - bit 0-15: Device profile number + bit 0-15: Device profile number bit 16-31: Additional information - bit 0: generic error -bit 1: current -bit 2: voltage -bit 3: temperature -bit 4: communication error (overrun, error state) -bit 5: device profile specific -bit 6: Reserved (always 0) + bit 0: generic error +bit 1: current +bit 2: voltage +bit 3: temperature +bit 4: communication error (overrun, error state) +bit 5: device profile specific +bit 6: Reserved (always 0) bit 7: manufacturer specific bit 0-31: Not used by stack (available for user) - Number of Errors -bit 0-7: Zero can be written to erase error history - -Standard Error Field -bit 0-15: Error code as transmited in the Emergency object + Number of Errors +bit 0-7: Zero can be written to erase error history + +Standard Error Field +bit 0-15: Error code as transmited in the Emergency object bit 16-31: Manufacturer specific additional information @@ -37,9 +37,9 @@ bit 16-31: Manufacturer specific additional information - bit 0-10: COB-ID for SYNC object -bit 11-29: set to 0 -bit 30: 1(0) - node generates (does NOT generate) SYNC object + bit 0-10: COB-ID for SYNC object +bit 11-29: set to 0 +bit 30: 1(0) - node generates (does NOT generate) SYNC object bit 31: set to 0 @@ -58,16 +58,16 @@ bit 31: set to 0 Name of the software version as string. - The objects at index 100Ch and 100Dh include the guard time in milliseconds and the life time factor. - -The life time factor multiplied with the guard time gives the life time for the Life Guarding Protocol. It is - + The objects at index 100Ch and 100Dh include the guard time in milliseconds and the life time factor. + +The life time factor multiplied with the guard time gives the life time for the Life Guarding Protocol. It is + 0 if not used. - The life time factor multiplied with the guard time gives the life time for the node guarding protocol. It is - + The life time factor multiplied with the guard time gives the life time for the node guarding protocol. It is + 0 if not used. @@ -82,33 +82,33 @@ The life time factor multiplied with the guard time gives the life time for the - Index 1012h defines the COB-ID of the Time-Stamp Object (TIME). Further, it defines whether the - + Index 1012h defines the COB-ID of the Time-Stamp Object (TIME). Further, it defines whether the + device consumes the TIME or whether the device generates the TIME. - This object contains a time stamp with a resolution of 1 µs (see 9.3.2). It can be mapped into a PDO in - -order to define a high resolution time stamp message. (Note that the data type of the standard time - + This object contains a time stamp with a resolution of 1 µs (see 9.3.2). It can be mapped into a PDO in + +order to define a high resolution time stamp message. (Note that the data type of the standard time + stamp message (TIME) is fixed). Further application specific use is encouraged. - bit 0-10: COB-ID -bit 11-30: set to 0 for 11 bit COB-ID + bit 0-10: COB-ID +bit 11-30: set to 0 for 11 bit COB-ID bit 31: 0(1) - node uses (does NOT use) Emergency object bit 0-15: Inhibit time of emergency message in 100µs - max sub-index - -Consumer Heartbeat Time -bit 0-15: Heartbeat consumer time in ms (0 = node is not monitored) -bit 16-23: Node ID + max sub-index + +Consumer Heartbeat Time +bit 0-15: Heartbeat consumer time in ms (0 = node is not monitored) +bit 16-23: Node ID bit 24-31: set to 0 @@ -120,19 +120,19 @@ bit 24-31: set to 0 bit 0-15: Heartbeat producer time in ms (0 = disable transmission) - max sub-index - -Vendor-ID -bit 0-31: Assigned by CiA - -Product code -bit 0-31: Manufacturer specific - -Revision number -bit 0-15: Minor revision num. (CANopen behavior has not changed) -bit 16-31: Major revision number (CANopen behavior has changed) - -Serial number + max sub-index + +Vendor-ID +bit 0-31: Assigned by CiA + +Product code +bit 0-31: Manufacturer specific + +Revision number +bit 0-15: Minor revision num. (CANopen behavior has not changed) +bit 16-31: Major revision number (CANopen behavior has changed) + +Serial number bit 0-31: Manufacturer specific @@ -141,25 +141,25 @@ bit 0-31: Manufacturer specific - If value is zero, then SYNC message is transmitted with data length 0. - -If Value is from 2 to 240, then SYNC message has one data byte, which contains the counter. - + If value is zero, then SYNC message is transmitted with data length 0. + +If Value is from 2 to 240, then SYNC message has one data byte, which contains the counter. + Other values are reserved. - If error is detected and operating NMT state is NMT operational, this object defines behavior of the device. - -Value definition for all subindexes: - 0x00 - if operational, switch to NMT pre-operational - 0x01 - do nothing - 0x02 - switch to NMT stopped - -01 - Communication error - bus off or Heartbeat consumer error. -02 - Communication other error (critical errors - see 'Error status bits') except CAN bus passive but including bus off or Heartbeat consumer. -03 - Communication passive - any communication error including CAN bus passive. -04 - Generic error (critical errors - see 'Error status bits'). -05 - Device profile error - bit 5 in error register is set. + If error is detected and operating NMT state is NMT operational, this object defines behavior of the device. + +Value definition for all subindexes: + 0x00 - if operational, switch to NMT pre-operational + 0x01 - do nothing + 0x02 - switch to NMT stopped + +01 - Communication error - bus off or Heartbeat consumer error. +02 - Communication other error (critical errors - see 'Error status bits') except CAN bus passive but including bus off or Heartbeat consumer. +03 - Communication passive - any communication error including CAN bus passive. +04 - Generic error (critical errors - see 'Error status bits'). +05 - Device profile error - bit 5 in error register is set. 06 - Manufacturer specific error - bit 7 in error register is set. @@ -170,47 +170,47 @@ Value definition for all subindexes: - 0x1200 SDO server parameter -max sub-index - -COB-ID client to server (Receive SDO) -bit 0-31: 0x00000600 + Node ID - -COB-ID server to client (Transmit SDO) -bit 0-31: 0x00000580 + Node ID - - - -0x1201 - 0x127F SDO server parameter -max sub-index - -COB-ID client to server (Receive SDO) -bit 0-10: COB_ID -bit 11-30: Set to 0 -bit 31*: 0(1) - node uses (does NOT use) SDO - -COB-ID server to client (Transmit SDO) -bit 0-31: same as previous - -Node-ID of the SDO client + 0x1200 SDO server parameter +max sub-index + +COB-ID client to server (Receive SDO) +bit 0-31: 0x00000600 + Node ID + +COB-ID server to client (Transmit SDO) +bit 0-31: 0x00000580 + Node ID + + + +0x1201 - 0x127F SDO server parameter +max sub-index + +COB-ID client to server (Receive SDO) +bit 0-10: COB_ID +bit 11-30: Set to 0 +bit 31*: 0(1) - node uses (does NOT use) SDO + +COB-ID server to client (Transmit SDO) +bit 0-31: same as previous + +Node-ID of the SDO client bit 0-7: Node ID (optional) - 0x1280 - 0x12FF SDO client parameter -max sub-index - -COB-ID client to server (Transmit SDO) -bit 0-10: COB_ID -bit 11-30: Set to 0 -bit 31: 0(1) - node uses (does NOT use) SDO - -COB-ID server to client (Receive SDO) -bit 0-31: same as previous - -Node-ID of the SDO server + 0x1280 - 0x12FF SDO client parameter +max sub-index + +COB-ID client to server (Transmit SDO) +bit 0-10: COB_ID +bit 11-30: Set to 0 +bit 31: 0(1) - node uses (does NOT use) SDO + +COB-ID server to client (Receive SDO) +bit 0-31: same as previous + +Node-ID of the SDO server 0-7: Node ID @@ -218,31 +218,31 @@ Node-ID of the SDO server - 0x1400 - 0x15FF RPDO communication parameter -max sub-index - -COB-ID -bit 0-10: COB-ID for PDO, to change it bit 31 must be set -bit 11-29: set to 0 for 11 bit COB-ID -bit 30: 0(1) - rtr are allowed (are NOT allowed) for PDO -bit 31: 0(1) - node uses (does NOT use) PDO - -Transmission type -value = 0-240: reciving is synchronous, process after next reception of SYNC object -value = 241-253: not used -value = 254: manufacturer specific + 0x1400 - 0x15FF RPDO communication parameter +max sub-index + +COB-ID +bit 0-10: COB-ID for PDO, to change it bit 31 must be set +bit 11-29: set to 0 for 11 bit COB-ID +bit 30: 0(1) - rtr are allowed (are NOT allowed) for PDO +bit 31: 0(1) - node uses (does NOT use) PDO + +Transmission type +value = 0-240: reciving is synchronous, process after next reception of SYNC object +value = 241-253: not used +value = 254: manufacturer specific value = 255: asynchronous - 0x1600 - 0x17FF RPDO mapping parameter (To change mapping, 'Number of mapped objects' must be set to 0) -Number of mapped objects - -mapped object (subindex 1...8) -bit 0-7: data length in bits -bit 8-15: subindex from OD + 0x1600 - 0x17FF RPDO mapping parameter (To change mapping, 'Number of mapped objects' must be set to 0) +Number of mapped objects + +mapped object (subindex 1...8) +bit 0-7: data length in bits +bit 8-15: subindex from OD bit 16-31: index from OD @@ -255,31 +255,31 @@ bit 16-31: index from OD - 0x1800 - 0x19FF TPDO communication parameter -max sub-index - -COB-ID -bit 0-10: COB-ID for PDO, to change it bit 31 must be set -bit 11-29: set to 0 for 11 bit COB-ID -bit 30: 0(1) - rtr are allowed (are NOT allowed) for PDO -bit 31: 0(1) - node uses (does NOT use) PDO - -Transmission type -value = 0: transmiting is synchronous, specification in device profile -value = 1-240: transmiting is synchronous after every N-th SYNC object -value = 241-251: not used -value = 252-253: Transmited only on reception of Remote Transmission Request -value = 254: manufacturer specific -value = 255: asinchronous, specification in device profile - -inhibit time -bit 0-15: Minimum time between transmissions of the PDO in 100µs. Zero disables functionality. - -event timer -bit 0-15: Time between periodic transmissions of the PDO in ms. Zero disables functionality. - -SYNC start value -value = 0: Counter of the SYNC message shall not be processed. + 0x1800 - 0x19FF TPDO communication parameter +max sub-index + +COB-ID +bit 0-10: COB-ID for PDO, to change it bit 31 must be set +bit 11-29: set to 0 for 11 bit COB-ID +bit 30: 0(1) - rtr are allowed (are NOT allowed) for PDO +bit 31: 0(1) - node uses (does NOT use) PDO + +Transmission type +value = 0: transmiting is synchronous, specification in device profile +value = 1-240: transmiting is synchronous after every N-th SYNC object +value = 241-251: not used +value = 252-253: Transmited only on reception of Remote Transmission Request +value = 254: manufacturer specific +value = 255: asinchronous, specification in device profile + +inhibit time +bit 0-15: Minimum time between transmissions of the PDO in 100µs. Zero disables functionality. + +event timer +bit 0-15: Time between periodic transmissions of the PDO in ms. Zero disables functionality. + +SYNC start value +value = 0: Counter of the SYNC message shall not be processed. value = 1-240: The SYNC message with the counter value equal to this value shall be regarded as the first received SYNC message. @@ -289,12 +289,12 @@ value = 1-240: The SYNC message with the counter value equal to this value sha - 0x1A00 - 0x1BFF TPDO mapping parameter. (To change mapping, 'Number of mapped objects' must be set to 0). -Number of mapped objects - -mapped object (subindex 1...8) -bit 0-7: data length in bits -bit 8-15: subindex from OD + 0x1A00 - 0x1BFF TPDO mapping parameter. (To change mapping, 'Number of mapped objects' must be set to 0). +Number of mapped objects + +mapped object (subindex 1...8) +bit 0-7: data length in bits +bit 8-15: subindex from OD bit 16-31: index from OD diff --git a/EDSTest/Profiles/DSP302-NMTMaster.xml b/EDSTest/Profiles/DSP302-NMTMaster.xml index dc172194..8ac064d2 100644 --- a/EDSTest/Profiles/DSP302-NMTMaster.xml +++ b/EDSTest/Profiles/DSP302-NMTMaster.xml @@ -1,295 +1,295 @@ - - - - - This object configures the start-up behavior of a device that is able to perform the NMT. The -value has the following interpretation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - New Product - - - - - - - - - - - - + + + + + This object configures the start-up behavior of a device that is able to perform the NMT. The +value has the following interpretation: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + New Product + + + + + + + + + + + + \ No newline at end of file diff --git a/libEDSsharp/CanOpenNodeExporter.cs b/libEDSsharp/CanOpenNodeExporter.cs index 84aecbe2..597055a4 100644 --- a/libEDSsharp/CanOpenNodeExporter.cs +++ b/libEDSsharp/CanOpenNodeExporter.cs @@ -332,27 +332,27 @@ CANopen Object Dictionary. This file is part of CANopenNode, an open source CANopen Stack. Project home page is . For more information on CANopen see . - + CANopenNode is free and open source software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. - + This program 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 this program. If not, see . - + Following clarification and special exception to the GNU General Public License is included to the distribution terms of CANopenNode: - + Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License cover the whole combination. - + As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these @@ -364,9 +364,9 @@ not derived from or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obliged to do so. If you do not wish to do so, delete this exception statement from your version. - + This file was automatically generated with libedssharp Object"); - + file.Write(" Dictionary Editor v" + this.gitVersion); file.WriteLine(@" DON'T EDIT THIS FILE MANUALLY !!!! @@ -399,8 +399,8 @@ CANopen DATA TYPES typedef int16_t INTEGER16; typedef int32_t INTEGER32; typedef int64_t INTEGER64; - typedef float32_t REAL32; - typedef float64_t REAL64; + typedef float32_t REAL32; + typedef float64_t REAL64; typedef char_t VISIBLE_STRING; typedef oChar_t OCTET_STRING; diff --git a/libEDSsharp/eds.cs b/libEDSsharp/eds.cs index 27cf8f4a..ac2e45af 100644 --- a/libEDSsharp/eds.cs +++ b/libEDSsharp/eds.cs @@ -2528,7 +2528,7 @@ max sub-index bit 11 - 29: set to 0 for 11 bit COB - ID bit 30: 0(1) - rtr are allowed(are NOT allowed) for PDO bit 31: 0(1) - node uses(does NOT use) PDO - + Transmission type value = 0 - 240: receiving is synchronous, process after next reception of SYNC object value = 241 - 253: not used @@ -2563,7 +2563,7 @@ max sub-index bit 11 - 29: set to 0 for 11 bit COB - ID bit 30: 0(1) - rtr are allowed(are NOT allowed) for PDO bit 31: 0(1) - node uses(does NOT use) PDO - + Transmission type value = 0: transmitting is synchronous, specification in device profile value = 1 - 240: transmitting is synchronous after every N - th SYNC object @@ -2571,7 +2571,7 @@ Transmission type value = 252 - 253: Transmitted only on reception of Remote Transmission Request value = 254: manufacturer specific value = 255: asynchronous, specification in device profile - + inhibit time bit 0 - 15: Minimum time between transmissions of the PDO in 100µs.Zero disables functionality.