Skip to content

Commit

Permalink
Merge pull request #220 from EuropeanSpallationSource/ueip-no-encoder…
Browse files Browse the repository at this point in the history
…-wrong-monitor

motorRecord.cc: Post ueip if reset to false when encoder missing
  • Loading branch information
kmpeters authored Nov 7, 2024
2 parents f1159c6 + 685e79f commit fbcd32c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 18 deletions.
16 changes: 0 additions & 16 deletions .github/workflows/ci-scripts-build-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,22 +108,6 @@ jobs:
#! set: modules
#! name: "Ub-20 gcc-9 + RT-5.1 beatnik"

- os: ubuntu-18.04
cmp: gcc
configuration: default
base: "7.0"
set: modules
name: "Ub-18 gcc-7"

### g++-8 not found
#!- os: ubuntu-18.04
#! cmp: gcc-8
#! utoolchain: true
#! configuration: default
#! base: "7.0"
#! set: modules
#! name: "Ub-18 gcc-8"

#!- os: ubuntu-20.04
#! cmp: gcc-8
#! utoolchain: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-scripts-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
- name: Run main module tests
run: python .ci/cue.py test
- name: Upload tapfiles Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: tapfiles ${{ matrix.name }}
path: '**/O.*/*.tap'
Expand Down
2 changes: 1 addition & 1 deletion motorApp/MotorSrc/motorRecord.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3664,7 +3664,7 @@ static void process_motor_info(motorRecord * pmr, bool initcall)
if ((pmr->ueip == motorUEIP_Yes) && (!(msta.Bits.EA_PRESENT)))
{
pmr->ueip = motorUEIP_No;
db_post_events(pmr, &pmr->urip, DBE_VAL_LOG);
db_post_events(pmr, &pmr->ueip, DBE_VAL_LOG);
}
if (pmr->ueip == motorUEIP_Yes)
{
Expand Down

0 comments on commit fbcd32c

Please sign in to comment.