From f14fa47a92be91577b83d4223f93af6ea9eca313 Mon Sep 17 00:00:00 2001 From: smathis Date: Mon, 8 Jun 2026 13:41:22 +0200 Subject: [PATCH] Renamed MOTOR_MESSAGE_TEXT to MOTOR_ERROR_MESSAGE --- db/sinqMotor.db | 4 ++-- src/sinqController.cpp | 4 ++-- src/sinqController.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/db/sinqMotor.db b/db/sinqMotor.db index 6860018..a314aec 100755 --- a/db/sinqMotor.db +++ b/db/sinqMotor.db @@ -109,11 +109,11 @@ record(ao,"$(INSTR)$(M):RecResolution") { # This record contains messages from the driver (usually error messages). # The macro ERRORMSGSIZE can be used to set the maximum length of the message. # if not provided, a default value of 200 is used. -# This record is coupled to the parameter library via motorErrorMessage -> MOTOR_MESSAGE_TEXT. +# This record is coupled to the parameter library via motorErrorMessage -> MOTOR_ERROR_MESSAGE. record(waveform, "$(INSTR)$(M):ErrorMessage") { alias("$(INSTR)$(M)-MsgTxt") # Old PV name, aliased for backwards compatibility field(DTYP, "asynOctetRead") - field(INP, "@asyn($(CONTROLLER),$(AXIS),1) MOTOR_MESSAGE_TEXT") + field(INP, "@asyn($(CONTROLLER),$(AXIS),1) MOTOR_ERROR_MESSAGE") field(FTVL, "CHAR") field(NELM, "$(ERRORMSGSIZE=200)") # Should be the same as MAXBUF in the driver code field(SCAN, "I/O Intr") diff --git a/src/sinqController.cpp b/src/sinqController.cpp index b288879..e54c08d 100644 --- a/src/sinqController.cpp +++ b/src/sinqController.cpp @@ -176,10 +176,10 @@ sinqController::sinqController(const char *portName, // =========================================================================; - // MOTOR_MESSAGE_TEXT corresponds to the PV definition inside sinqMotor.db. + // MOTOR_ERROR_MESSAGE corresponds to the PV definition inside sinqMotor.db. // This text is used to forward status messages to NICOS and in turn to the // user. - status = createParam("MOTOR_MESSAGE_TEXT", asynParamOctet, + status = createParam("MOTOR_ERROR_MESSAGE", asynParamOctet, &pSinqC_->motorErrorMessage); if (status != asynSuccess) { asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR, diff --git a/src/sinqController.h b/src/sinqController.h index 6148a36..166d727 100644 --- a/src/sinqController.h +++ b/src/sinqController.h @@ -24,7 +24,7 @@ Stefan Mathis, November 2024 #include #define motorMessageIsFromDriverString "MOTOR_MESSAGE_DRIVER" -#define motorMessageTextString "MOTOR_MESSAGE_TEXT" +#define motorMessageTextString "MOTOR_ERROR_MESSAGE" #define IncrementalEncoder "incremental" #define AbsoluteEncoder "absolute" #define NoEncoder "none"