Sfoglia il codice sorgente

Updates types in CIP Identity object

CIP Identity object attributes used old style Eip data type defines,
which does not convey the full type information by name. Updates to use
the correct Cip style data types.

Signed-off-by: Martin Melik-Merkumians <melik-merkumians@acin.tuwien.ac.at>
Martin Melik-Merkumians 7 anni fa
parent
commit
9f3901a685
1 ha cambiato i file con 5 aggiunte e 5 eliminazioni
  1. 5 5
      source/src/cip/cipidentity.c

+ 5 - 5
source/src/cip/cipidentity.c

@@ -37,13 +37,13 @@
 
 
 /* attributes in CIP Identity Object */
 /* attributes in CIP Identity Object */
 
 
-EipUint16 vendor_id_ = OPENER_DEVICE_VENDOR_ID; /**< Attribute 1: Vendor ID */
-EipUint16 device_type_ = OPENER_DEVICE_TYPE; /**< Attribute 2: Device Type */
-EipUint16 product_code_ = OPENER_DEVICE_PRODUCT_CODE; /**< Attribute 3: Product Code */
+CipUint vendor_id_ = OPENER_DEVICE_VENDOR_ID; /**< Attribute 1: Vendor ID */
+CipUint device_type_ = OPENER_DEVICE_TYPE; /**< Attribute 2: Device Type */
+CipUint product_code_ = OPENER_DEVICE_PRODUCT_CODE; /**< Attribute 3: Product Code */
 CipRevision revision_ = { OPENER_DEVICE_MAJOR_REVISION,
 CipRevision revision_ = { OPENER_DEVICE_MAJOR_REVISION,
                           OPENER_DEVICE_MINOR_REVISION }; /**< Attribute 4: Revision / USINT Major, USINT Minor */
                           OPENER_DEVICE_MINOR_REVISION }; /**< Attribute 4: Revision / USINT Major, USINT Minor */
-EipUint16 status_ = 0; /**< Attribute 5: Status */
-EipUint32 serial_number_ = 0; /**< Attribute 6: Serial Number, has to be set prior to OpENer initialization */
+CipWord status_ = 0; /**< Attribute 5: Status */
+CipUdint serial_number_ = 0; /**< Attribute 6: Serial Number, has to be set prior to OpENer initialization */
 CipShortString product_name_ = { sizeof(OPENER_DEVICE_NAME) - 1,
 CipShortString product_name_ = { sizeof(OPENER_DEVICE_NAME) - 1,
                                  OPENER_DEVICE_NAME }; /**< Attribute 7: Product Name */
                                  OPENER_DEVICE_NAME }; /**< Attribute 7: Product Name */