From f47a3764239a48d8efffc7d11e9d57b54905ffe5 Mon Sep 17 00:00:00 2001 From: Kevin Peterson Date: Thu, 11 Jun 2020 17:30:40 -0500 Subject: [PATCH 1/3] Corrected typo --- docs/motorRecord.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/motorRecord.html b/docs/motorRecord.html index 443f7fda..08c84a76 100644 --- a/docs/motorRecord.html +++ b/docs/motorRecord.html @@ -892,7 +892,7 @@ below. RSTM R/W - Restory Mode + Restore Mode RECCHOICE (0:"Never", 1:"Always", 2:"NearZero", 3:"Conditional")
From 90efeda22a2bc3c7e897547742f067cc1f335d7b Mon Sep 17 00:00:00 2001 From: Kevin Peterson Date: Thu, 11 Jun 2020 17:34:38 -0500 Subject: [PATCH 2/3] Added RSTM to basic_motor_settings.req --- motorApp/Db/basic_motor_settings.req | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/motorApp/Db/basic_motor_settings.req b/motorApp/Db/basic_motor_settings.req index 5b4a1aa8..5e3eb551 100644 --- a/motorApp/Db/basic_motor_settings.req +++ b/motorApp/Db/basic_motor_settings.req @@ -44,4 +44,4 @@ $(P)$(M).PREM $(P)$(M).POST $(P)$(M).FLNK $(P)$(M).RMOD - +$(P)$(M).RSTM From 4e9aae4e3ee56e429e5cb1aa623d56d5cc7e2f33 Mon Sep 17 00:00:00 2001 From: kpetersn Date: Thu, 11 Jun 2020 17:57:16 -0500 Subject: [PATCH 3/3] Allow the RSTM field to be specified when motor records are loaded with dbLoadRecords or dbLoadTemplate --- motorApp/Db/asyn_motor.db | 1 + motorApp/Db/motor.db | 1 + 2 files changed, 2 insertions(+) diff --git a/motorApp/Db/asyn_motor.db b/motorApp/Db/asyn_motor.db index aeb0a430..e7089228 100644 --- a/motorApp/Db/asyn_motor.db +++ b/motorApp/Db/asyn_motor.db @@ -21,6 +21,7 @@ record(motor, "$(P)$(M)") { field(DLLM, "$(DLLM)") field(INIT, "$(INIT)") field(RTRY, "$(RTRY=10)") + field(RSTM, "$(RSTM=NearZero)") field(TWV, "1") field(SDIS, "$(P)$(M)_able.VAL") } diff --git a/motorApp/Db/motor.db b/motorApp/Db/motor.db index 33ad2129..3b6c0e5d 100644 --- a/motorApp/Db/motor.db +++ b/motorApp/Db/motor.db @@ -20,6 +20,7 @@ record(motor, "$(P)$(M)") { field(DHLM, "$(DHLM)") field(DLLM, "$(DLLM)") field(INIT, "$(INIT)") + field(RSTM, "$(RSTM=NearZero)") field(TWV, "1") field(SDIS, "$(P)$(M)_able.VAL") }