diff --git a/.ci b/.ci index 57646016..20f8e053 160000 --- a/.ci +++ b/.ci @@ -1 +1 @@ -Subproject commit 576460163031255c09948566dd2f2409d86ab8d4 +Subproject commit 20f8e053931fdef8a9413cc6229286c5d9ed152f diff --git a/.ci-local/defaults.set b/.ci-local/defaults.set deleted file mode 100644 index d9527915..00000000 --- a/.ci-local/defaults.set +++ /dev/null @@ -1,40 +0,0 @@ -# EPICS Base -BASE=7.0 -BASE_DIRNAME=base -BASE_REPONAME=epics-base -BASE_REPOOWNER=epics-base -BASE_VARNAME=EPICS_BASE - -PVDATA_DIRNAME=pvData -PVDATA_REPONAME=pvDataCPP -PVDATA_REPOOWNER=epics-base - -PVACCESS_DIRNAME=pvAccess -PVACCESS_REPONAME=pvAccessCPP -PVACCESS_REPOOWNER=epics-base - -NTYPES_DIRNAME=normativeTypes -NTYPES_REPONAME=normativeTypesCPP -NTYPES_REPOOWNER=epics-base - -# Sequencer -#SNCSEQ_REPOURL=https://www-csr.bessy.de/control/SoftDist/sequencer/repo/branch-2-2.git -# Use Michael Davidsaver's mirror while bessy.de is down -SNCSEQ_REPOURL=https://github.com/mdavidsaver/sequencer-mirror.git -SNCSEQ_DEPTH=0 -SNCSEQ_DIRNAME=seq - -# StreamDevice -STREAM_REPONAME=StreamDevice -STREAM_REPOOWNER=paulscherrerinstitute - -# The default settings also work (and are tested) for: -# asyn -# std -# calc -# autosave -# busy -# sscan -# iocStats -# motor -# ipac diff --git a/.github/workflows/ci-scripts-build-full.yml b/.github/workflows/ci-scripts-build-full.yml index a0fae509..aba7fdbc 100644 --- a/.github/workflows/ci-scripts-build-full.yml +++ b/.github/workflows/ci-scripts-build-full.yml @@ -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 diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index d6252750..75bd28d8 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -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' diff --git a/motorApp/MotorSrc/motorRecord.cc b/motorApp/MotorSrc/motorRecord.cc index 7c61ee65..ef124381 100644 --- a/motorApp/MotorSrc/motorRecord.cc +++ b/motorApp/MotorSrc/motorRecord.cc @@ -4965,7 +4965,7 @@ static long readBackPosition(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) {