From 50692d6daa2e4660543f9fca17f6a73e8be9f854 Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Mon, 28 Nov 2005 16:11:10 +0000 Subject: [PATCH] Malcolm Walters (Diamond) bug fixes for; - get_units() returned wrong units for VMAX. - get_graphic_double() and get_control_double() returned incorrect values for VELO. --- motorApp/MotorSrc/motorRecord.cc | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/motorApp/MotorSrc/motorRecord.cc b/motorApp/MotorSrc/motorRecord.cc index 22b7d70d..1594de64 100644 --- a/motorApp/MotorSrc/motorRecord.cc +++ b/motorApp/MotorSrc/motorRecord.cc @@ -2,9 +2,9 @@ FILENAME... motorRecord.cc USAGE... Motor Record Support. -Version: $Revision: 1.26 $ +Version: $Revision: 1.27 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2005-10-11 20:56:13 $ +Last Modified: $Date: 2005-11-28 16:11:10 $ */ /* @@ -78,10 +78,14 @@ Last Modified: $Date: 2005-10-11 20:56:13 $ * - Avoid STUP errors from devices that do not have "GET_INFO" * command (e.g. Soft Channel). * .25 10-11-05 rls - CDIR not set correctly when jogging with DIR="Neg". + * .26 11-23-05 rls - Malcolm Walters bug fixes for; + * - get_units() returned wrong units for VMAX. + * - get_graphic_double() and get_control_double() returned + * incorrect values for VELO. * */ -#define VERSION 5.7 +#define VERSION 5.8 #include #include @@ -2748,6 +2752,7 @@ static long get_units(const DBADDR *paddr, char *units) { case motorRecordVELO: + case motorRecordVMAX: case motorRecordBVEL: case motorRecordVBAS: strncpy(s, pmr->egu, DB_UNITS_SIZE); @@ -2820,6 +2825,11 @@ static long get_graphic_double(const DBADDR *paddr, struct dbr_grDouble * pgd) } break; + case motorRecordVELO: + pgd->upper_disp_limit = pmr->vmax; + pgd->lower_disp_limit = pmr->vbas; + break; + default: recGblGetGraphicDouble((dbAddr *) paddr, pgd); break; @@ -2866,6 +2876,11 @@ static long } break; + case motorRecordVELO: + pcd->upper_ctrl_limit = pmr->vmax; + pcd->lower_ctrl_limit = pmr->vbas; + break; + default: recGblGetControlDouble((dbAddr *) paddr, pcd); break;