From c21d381b28fa6892c9dea75b9be121f70907539d Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Wed, 24 Apr 2013 21:24:22 +0000 Subject: [PATCH] Copyright information banner added to header and updated to PI_GCS2_2013_04_09.tgz --- motorApp/PIGCS2Src/PIC702Controller.cpp | 17 +- motorApp/PIGCS2Src/PIC702Controller.h | 19 +- motorApp/PIGCS2Src/PIE517Controller.cpp | 18 +- motorApp/PIGCS2Src/PIE517Controller.h | 18 +- motorApp/PIGCS2Src/PIE755Controller.cpp | 16 +- motorApp/PIGCS2Src/PIE755Controller.h | 16 +- motorApp/PIGCS2Src/PIGCSController.cpp | 18 +- motorApp/PIGCS2Src/PIGCSController.h | 16 +- motorApp/PIGCS2Src/PIGCSMotorController.cpp | 18 +- motorApp/PIGCS2Src/PIGCSMotorController.h | 18 +- motorApp/PIGCS2Src/PIGCSPiezoController.cpp | 18 +- motorApp/PIGCS2Src/PIGCSPiezoController.h | 18 +- motorApp/PIGCS2Src/PIHexapodController.cpp | 16 +- motorApp/PIGCS2Src/PIHexapodController.h | 16 +- motorApp/PIGCS2Src/PIasynAxis.cpp | 18 +- motorApp/PIGCS2Src/PIasynAxis.h | 21 +- motorApp/PIGCS2Src/PIasynController.cpp | 21 +- motorApp/PIGCS2Src/PIasynController.h | 9 +- motorApp/PIGCS2Src/picontrollererrors.h | 97 ++++++++- motorApp/PIGCS2Src/translateerror.c | 226 +++++++++++++++++++- 20 files changed, 501 insertions(+), 133 deletions(-) diff --git a/motorApp/PIGCS2Src/PIC702Controller.cpp b/motorApp/PIGCS2Src/PIC702Controller.cpp index ef089b3a..95bdf4dd 100644 --- a/motorApp/PIGCS2Src/PIC702Controller.cpp +++ b/motorApp/PIGCS2Src/PIC702Controller.cpp @@ -1,14 +1,21 @@ /* - * PIC702Controller - * - * Author: sra - */ +FILENAME... PIC702Controller.cpp +USAGE... + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* -/* Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau +Created: January 2011 + */ #include "PIC702Controller.h" diff --git a/motorApp/PIGCS2Src/PIC702Controller.h b/motorApp/PIGCS2Src/PIC702Controller.h index 9da50526..9b50da8e 100644 --- a/motorApp/PIGCS2Src/PIC702Controller.h +++ b/motorApp/PIGCS2Src/PIC702Controller.h @@ -1,8 +1,19 @@ /* - * PIC702Controller.h - * - * Author: sra - */ +FILENAME... PIC702Controller.h + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + +Version: $Revision$ +Modified By: $Author$ +Last Modified: $Date$ +HeadURL: $URL$ + +Original Author: Steffen Rau +*/ #ifndef PIC702CONTROLLER_H_ #define PIC702CONTROLLER_H_ diff --git a/motorApp/PIGCS2Src/PIE517Controller.cpp b/motorApp/PIGCS2Src/PIE517Controller.cpp index d48c8a3d..bf282e8d 100644 --- a/motorApp/PIGCS2Src/PIE517Controller.cpp +++ b/motorApp/PIGCS2Src/PIE517Controller.cpp @@ -1,15 +1,19 @@ /* - * PIGCSPiezoController - * - * Created on: 15.12.2010 - * Author: sra - */ - -/* +FILENAME... PIGCSPiezoController + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau +Created: 15.12.2010 */ #include "PIE517Controller.h" diff --git a/motorApp/PIGCS2Src/PIE517Controller.h b/motorApp/PIGCS2Src/PIE517Controller.h index 9ce03dc1..bcb3cd99 100644 --- a/motorApp/PIGCS2Src/PIE517Controller.h +++ b/motorApp/PIGCS2Src/PIE517Controller.h @@ -1,15 +1,19 @@ /* - * PIGCScontroller.h - * - * Created on: 15.12.2010 - * Author: sra - */ - -/* +FILENAME... PIGCScontroller.h + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau +Created: 15.12.2010 */ #ifndef PIE517CONTROLLER_H_ diff --git a/motorApp/PIGCS2Src/PIE755Controller.cpp b/motorApp/PIGCS2Src/PIE755Controller.cpp index d52d5f01..5b9b846a 100644 --- a/motorApp/PIGCS2Src/PIE755Controller.cpp +++ b/motorApp/PIGCS2Src/PIE755Controller.cpp @@ -1,14 +1,18 @@ /* - * PIE755Controller - * - * Author: sra - */ - -/* +FILENAME... PIE755Controller.cpp + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau */ #include "PIE755Controller.h" diff --git a/motorApp/PIGCS2Src/PIE755Controller.h b/motorApp/PIGCS2Src/PIE755Controller.h index 66f5070f..7b698813 100644 --- a/motorApp/PIGCS2Src/PIE755Controller.h +++ b/motorApp/PIGCS2Src/PIE755Controller.h @@ -1,14 +1,18 @@ /* - * PIE755Controller.h - * - * Author: sra - */ - -/* +FILENAME... PIE755Controller.h + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau */ #ifndef PIE755CONTROLLER_H_ diff --git a/motorApp/PIGCS2Src/PIGCSController.cpp b/motorApp/PIGCS2Src/PIGCSController.cpp index f83636bb..3704a157 100644 --- a/motorApp/PIGCS2Src/PIGCSController.cpp +++ b/motorApp/PIGCS2Src/PIGCSController.cpp @@ -1,15 +1,19 @@ /* - * PIGCSController.cpp - * - * Created on: 15.12.2010 - * Author: sra - */ - -/* +FILENAME... PIGCSController.cpp + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau +Created: 15.12.2010 */ #include diff --git a/motorApp/PIGCS2Src/PIGCSController.h b/motorApp/PIGCS2Src/PIGCSController.h index 2f5fa47e..05153829 100644 --- a/motorApp/PIGCS2Src/PIGCSController.h +++ b/motorApp/PIGCS2Src/PIGCSController.h @@ -1,15 +1,19 @@ /* - * PIGCScontroller.h - * - * Created on: 15.12.2010 - * Author: sra - */ +FILENAME... PIGCScontroller.h -/* +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau +Created: 15.12.2010 */ #ifndef PIGCSCONTROLLER_H_ diff --git a/motorApp/PIGCS2Src/PIGCSMotorController.cpp b/motorApp/PIGCS2Src/PIGCSMotorController.cpp index 45d2c01b..3799fe8d 100644 --- a/motorApp/PIGCS2Src/PIGCSMotorController.cpp +++ b/motorApp/PIGCS2Src/PIGCSMotorController.cpp @@ -1,15 +1,19 @@ /* - * PIGCSMotorController.cpp - * - * Created on: 15.12.2010 - * Author: sra - */ - -/* +FILENAME... PIGCSMotorController.cpp + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau +Created: 15.12.2010 */ #include "PIGCSMotorController.h" diff --git a/motorApp/PIGCS2Src/PIGCSMotorController.h b/motorApp/PIGCS2Src/PIGCSMotorController.h index 502e78a1..63cef107 100644 --- a/motorApp/PIGCS2Src/PIGCSMotorController.h +++ b/motorApp/PIGCS2Src/PIGCSMotorController.h @@ -1,15 +1,19 @@ /* - * PIGCScontroller.h - * - * Created on: 15.12.2010 - * Author: sra - */ - -/* +FILENAME... PIGCSMotorController.h + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau +Created: 15.12.2010 */ #ifndef PIGCSMOTORCONTROLLER_H_ diff --git a/motorApp/PIGCS2Src/PIGCSPiezoController.cpp b/motorApp/PIGCS2Src/PIGCSPiezoController.cpp index 804bb9a6..59d071e3 100644 --- a/motorApp/PIGCS2Src/PIGCSPiezoController.cpp +++ b/motorApp/PIGCS2Src/PIGCSPiezoController.cpp @@ -1,15 +1,19 @@ /* - * PIGCSPiezoController - * - * Created on: 15.12.2010 - * Author: sra - */ - -/* +FILENAME... PIGCSPiezoController.cpp + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau +Created: 15.12.2010 */ #include "PIGCSPiezoController.h" diff --git a/motorApp/PIGCS2Src/PIGCSPiezoController.h b/motorApp/PIGCS2Src/PIGCSPiezoController.h index 70b9f29b..1ede7e24 100644 --- a/motorApp/PIGCS2Src/PIGCSPiezoController.h +++ b/motorApp/PIGCS2Src/PIGCSPiezoController.h @@ -1,15 +1,19 @@ /* - * PIGCScontroller.h - * - * Created on: 15.12.2010 - * Author: sra - */ - -/* +FILENAME... PIGCScontroller.h + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau +Created: 15.12.2010 */ #ifndef PIGCSPIEZOCONTROLLER_H_ diff --git a/motorApp/PIGCS2Src/PIHexapodController.cpp b/motorApp/PIGCS2Src/PIHexapodController.cpp index 88634075..aa0deaca 100644 --- a/motorApp/PIGCS2Src/PIHexapodController.cpp +++ b/motorApp/PIGCS2Src/PIHexapodController.cpp @@ -1,14 +1,18 @@ /* - * PIE755Controller - * - * Author: sra - */ - -/* +FILENAME... PIHexapodController.cpp + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau */ #include "PIHexapodController.h" diff --git a/motorApp/PIGCS2Src/PIHexapodController.h b/motorApp/PIGCS2Src/PIHexapodController.h index e2621936..ca62f585 100644 --- a/motorApp/PIGCS2Src/PIHexapodController.h +++ b/motorApp/PIGCS2Src/PIHexapodController.h @@ -1,14 +1,18 @@ /* - * PIE755Controller.h - * - * Author: sra - */ - -/* +FILENAME... PIHexapodController.h + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau */ #ifndef PIHEXAPODCONTROLLER_H_ diff --git a/motorApp/PIGCS2Src/PIasynAxis.cpp b/motorApp/PIGCS2Src/PIasynAxis.cpp index 4b0b4dea..4743ad88 100644 --- a/motorApp/PIGCS2Src/PIasynAxis.cpp +++ b/motorApp/PIGCS2Src/PIasynAxis.cpp @@ -1,17 +1,21 @@ /* -FILENAME... PIasynController.cpp -USAGE... Simulated Motor Support. +FILENAME... PIasynController.cpp +USAGE... + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ -Based on drvMotorSim.c - -Mark Rivers -December 13, 2009 +Original Author: Steffen Rau +Based on drvMotorSim.c, Mark Rivers, December 13, 2009 */ @@ -26,12 +30,12 @@ December 13, 2009 #include #include #include +#include #include #include "PIasynAxis.h" #include "PIasynController.h" #include "PIGCSController.h" -#include //#undef asynPrint //#define asynPrint(user,reason,format...) 0 diff --git a/motorApp/PIGCS2Src/PIasynAxis.h b/motorApp/PIGCS2Src/PIasynAxis.h index 44310c71..3030c55c 100644 --- a/motorApp/PIGCS2Src/PIasynAxis.h +++ b/motorApp/PIGCS2Src/PIasynAxis.h @@ -1,19 +1,22 @@ /* -FILENAME... PIasynController.cpp -USAGE... PI GCS Motor Support. - +FILENAME... PIasynAxis.h +USAGE... PI GCS Motor Support. + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ -Based on drvMotorSim.c +Original Author: Steffen Rau +Created: January 2011 -Mark Rivers -December 13, 2009 - -Steffen Rau, -January 2011 +Based on drvMotorSim.c, Mark Rivers, December 13, 2009 */ diff --git a/motorApp/PIGCS2Src/PIasynController.cpp b/motorApp/PIGCS2Src/PIasynController.cpp index 9e91c96f..e1b229ff 100644 --- a/motorApp/PIGCS2Src/PIasynController.cpp +++ b/motorApp/PIGCS2Src/PIasynController.cpp @@ -1,16 +1,22 @@ /* -FILENAME... PIasynController.cpp -USAGE... PI GCS2 Motor Support. +FILENAME... PIasynController.cpp +USAGE... PI GCS2 Motor Support. + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau +Created: January 2011 -Based on drvMotorSim.c -from Mark Rivers, December 13, 2009 - -Steffen Rau, Physik Instrumente (PI) GmbH & Co KG +Based on drvMotorSim.c, Mark Rivers, December 13, 2009 */ @@ -27,6 +33,7 @@ Steffen Rau, Physik Instrumente (PI) GmbH & Co KG #include #include #include +#include #include #include #include @@ -34,7 +41,6 @@ Steffen Rau, Physik Instrumente (PI) GmbH & Co KG #include "PIasynController.h" #include "PIGCSController.h" #include "PIasynAxis.h" -#include //#undef asynPrint @@ -55,6 +61,7 @@ PIasynController::PIasynController(const char *portName, const char* asynPort, i 1, // autoconnect priority, stackSize) , m_pGCSController( NULL ) + , movesDeferred( 0 ) { createParam(PI_SUP_POSITION_String, asynParamFloat64, &PI_SUP_POSITION); createParam(PI_SUP_TARGET_String, asynParamFloat64, &PI_SUP_TARGET); diff --git a/motorApp/PIGCS2Src/PIasynController.h b/motorApp/PIGCS2Src/PIasynController.h index c0a9cd5f..23e497d5 100644 --- a/motorApp/PIGCS2Src/PIasynController.h +++ b/motorApp/PIGCS2Src/PIasynController.h @@ -1,6 +1,11 @@ /* -FILENAME... PIasynController.cpp -USAGE... Simulated Motor Support. +FILENAME... PIasynController.cpp + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* Version: $Revision$ Modified By: $Author$ diff --git a/motorApp/PIGCS2Src/picontrollererrors.h b/motorApp/PIGCS2Src/picontrollererrors.h index a652ffae..8163bb7b 100644 --- a/motorApp/PIGCS2Src/picontrollererrors.h +++ b/motorApp/PIGCS2Src/picontrollererrors.h @@ -1,14 +1,20 @@ -// PIControllerErrors.h -// -// This file defines symbols for each error code used in C/C++ programs. -// -// This file is automagically generated from the central error code list. -// DO NOT ADD ERROR CODES IN THIS FILE! Use the error list and the generation tool instead! -// -// after generation open file in VS and create the constants with numbers. -// This can be done by performing 2 search/replace actions with regulyr expression activetad: -// search for "\#define:b{:i}:b*{:z}L" replace with "#define \1__\2 \2L\n#define \1 \2L" -// search for "\#define:b{:i}:b*-{:z}L" replace with "#define \1__MINUS\2 -\2L\n#define \1 -\2L" +/* +FILENAME... picontrollererrors.h + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + +Version: $Revision$ +Modified By: $Author$ +Last Modified: $Date$ +HeadURL: $URL$ + +Original Author: Steffen Rau, January 2011 +*/ + #ifndef __PI_CONTROLLER_ERROS_H__ #define __PI_CONTROLLER_ERROS_H__ @@ -715,6 +721,51 @@ #define PI_CNTR_SERVO_LOOP_UNSTABLE__506 506L #define PI_CNTR_SERVO_LOOP_UNSTABLE 506L /**< \ingroup err Servo loop was unstable due to wrong parameter setting and switched off to avoid damage. */ +#define PI_CNTR_NODE_DOES_NOT_EXIST__530 530L +#define PI_CNTR_NODE_DOES_NOT_EXIST 530L /**< \ingroup err + A command refers to a node that does not exist */ +#define PI_CNTR_PARENT_NODE_DOES_NOT_EXIST__531 531L +#define PI_CNTR_PARENT_NODE_DOES_NOT_EXIST 531L /**< \ingroup err + A command refers to a node that has no parent node */ +#define PI_CNTR_NODE_IN_USE__532 532L +#define PI_CNTR_NODE_IN_USE 532L /**< \ingroup err + Attempt to delete a node that is in use */ +#define PI_CNTR_NODE_DEFINITION_IS_CYCLIC__533 533L +#define PI_CNTR_NODE_DEFINITION_IS_CYCLIC 533L /**< \ingroup err + Definition of a node is cyclic */ +#define PI_CNTR_NODE_CHAIN_INVALID__534 534L +#define PI_CNTR_NODE_CHAIN_INVALID 534L /**< \ingroup err + The node chain does not end in the \"0\" node */ +#define PI_CNTR_NODE_DEFINITION_NOT_CONSISTENT__535 535L +#define PI_CNTR_NODE_DEFINITION_NOT_CONSISTENT 535L /**< \ingroup err + The definition of a coordinate transformation is erroneous */ +#define PI_CNTR_HEXAPOD_IN_MOTION__536 536L +#define PI_CNTR_HEXAPOD_IN_MOTION 536L /**< \ingroup err + Transformation cannot be defined as long as Hexapod is in motion */ +#define PI_CNTR_TRANSFORMATION_TYPE_NOT_SUPPORTED__537 537L +#define PI_CNTR_TRANSFORMATION_TYPE_NOT_SUPPORTED 537L /**< \ingroup err + Transformation node cannot be activated */ +#define PI_CNTR_NODE_TYPE_DIFFERS__538 538L +#define PI_CNTR_NODE_TYPE_DIFFERS 538L /**< \ingroup err + A node can only be replaced by a node of the same type */ +#define PI_CNTR_NODE_PARENT_IDENTICAL_TO_CHILD__539 539L +#define PI_CNTR_NODE_PARENT_IDENTICAL_TO_CHILD 539L /**< \ingroup err + A node cannot be linked to itself */ +#define PI_CNTR_NODE_DEFINITION_INCONSISTENT__540 540L +#define PI_CNTR_NODE_DEFINITION_INCONSISTENT 540L /**< \ingroup err + Node definition is erroneous or not complete (replace or delete it) */ +#define PI_CNTR_ZERO_NODE_CANNOT_BE_CHANGED_OR_REPLACED__541 541L +#define PI_CNTR_ZERO_NODE_CANNOT_BE_CHANGED_OR_REPLACED 541L /**< \ingroup err + 0 is the root node and cannot be modified */ +#define PI_CNTR_NODES_NOT_IN_SAME_CHAIN__542 542L +#define PI_CNTR_NODES_NOT_IN_SAME_CHAIN 542L /**< \ingroup err + The nodes are not part of the same chain */ +#define PI_CNTR_NODE_MEMORY_FULL__543 543L +#define PI_CNTR_NODE_MEMORY_FULL 543L /**< \ingroup err + Unused nodes must be deleted before new nodes can be stored */ +#define PI_CNTR_PIVOT_POINT_FEATURE_NOT_SUPPORTED__544 544L +#define PI_CNTR_PIVOT_POINT_FEATURE_NOT_SUPPORTED 544L /**< \ingroup err + With some transformations pivot point usage is not supported */ #define PI_CNTR_UNKNOWN_ERROR__555 555L #define PI_CNTR_UNKNOWN_ERROR 555L /**< \ingroup err BasMac: unknown controller error */ @@ -733,6 +784,9 @@ #define PI_CNTR_INPUT_OUT_OF_RANGE__606 606L #define PI_CNTR_INPUT_OUT_OF_RANGE 606L /**< \ingroup err Maximum value of input signal has been exceeded */ +#define PI_CNTR_NO_INTEGER__607 607L +#define PI_CNTR_NO_INTEGER 607L /**< \ingroup err + Value is not integer */ #define PI_CNTR_TOO_MANY_NESTED_MACROS__1000 1000L #define PI_CNTR_TOO_MANY_NESTED_MACROS 1000L /**< \ingroup err Too many nested macros */ @@ -793,6 +847,9 @@ #define PI_CNTR_PROFILE_UNKNOWN_CLUSTER_IDENTIFIER__1073 1073L #define PI_CNTR_PROFILE_UNKNOWN_CLUSTER_IDENTIFIER 1073L /**< \ingroup err Unknown cluster identifier */ +#define PI_CNTR_TOO_MANY_TCP_CONNECTIONS_OPEN__1090 1090L +#define PI_CNTR_TOO_MANY_TCP_CONNECTIONS_OPEN 1090L /**< \ingroup err + There are too many open tcpip connections */ #define PI_CNTR_ALREADY_HAS_SERIAL_NUMBER__2000 2000L #define PI_CNTR_ALREADY_HAS_SERIAL_NUMBER 2000L /**< \ingroup err Controller already has a serial number */ @@ -865,6 +922,24 @@ #define PI_CNTR_AXIS_NOT_CONFIGURED__5200 5200L #define PI_CNTR_AXIS_NOT_CONFIGURED 5200L /**< \ingroup err Axis must be configured for this action */ +#define PI_CNTR_SENSOR_ABS_INVALID_VALUE__6000 6000L +#define PI_CNTR_SENSOR_ABS_INVALID_VALUE 6000L /**< \ingroup err + Invalid preset value of absolute sensor */ +#define PI_CNTR_SENSOR_ABS_WRITE_ERROR__6001 6001L +#define PI_CNTR_SENSOR_ABS_WRITE_ERROR 6001L /**< \ingroup err + Error while writing to sensor */ +#define PI_CNTR_SENSOR_ABS_READ_ERROR__6002 6002L +#define PI_CNTR_SENSOR_ABS_READ_ERROR 6002L /**< \ingroup err + Error while reading from sensor */ +#define PI_CNTR_SENSOR_ABS_CRC_ERROR__6003 6003L +#define PI_CNTR_SENSOR_ABS_CRC_ERROR 6003L /**< \ingroup err + Checksum error of absolute sensor */ +#define PI_CNTR_SENSOR_ABS_ERROR__6004 6004L +#define PI_CNTR_SENSOR_ABS_ERROR 6004L /**< \ingroup err + General error of absolute sensor */ +#define PI_CNTR_SENSOR_ABS_OVERFLOW__6005 6005L +#define PI_CNTR_SENSOR_ABS_OVERFLOW 6005L /**< \ingroup err + Overflow of absolute sensor position */ // // End of Controller Errors ////////////////////////////////////////////////// diff --git a/motorApp/PIGCS2Src/translateerror.c b/motorApp/PIGCS2Src/translateerror.c index b13f4fb7..c464c1fd 100644 --- a/motorApp/PIGCS2Src/translateerror.c +++ b/motorApp/PIGCS2Src/translateerror.c @@ -1,17 +1,18 @@ /* - * TranslateErrors.c - * - * - * This file is automagically generated from the central error code list. - * DO NOT ADD ERROR CODES IN THIS FILE! Use the error list and the generation tool instead! - * - */ - -/* +FILENAME... translateerror.c + +************************************************************************* +* Copyright (c) 2011-2013 Physik Instrumente (PI) GmbH & Co. KG +* This file is distributed subject to the EPICS Open License Agreement +* found in the file LICENSE that is included with this distribution. +************************************************************************* + Version: $Revision$ Modified By: $Author$ Last Modified: $Date$ HeadURL: $URL$ + +Original Author: Steffen Rau */ #include @@ -2120,6 +2121,141 @@ BOOL TranslatePIError(const int error, char* szBuffer, const int maxlen) } break; } + case(PI_CNTR_NODE_DOES_NOT_EXIST): /* 530 */ + { + if (strlen("A command refers to a node that does not exist")