Merge branch 'origin/ueip-no-encoder-wrong-monitor' into HEAD

Conflicts: motorApp/MotorSrc/motorRecord.cc
tboegi · Oct 22, 2024 · a281534 · a281534
2 parents da12f7e + 685e79f
commit a281534
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 59 deletions.
diff --git a/.ci b/.ci
diff --git a/.ci-local/defaults.set b/.ci-local/defaults.set
diff --git 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
@@ -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
@@ -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)
     {
+9 −10		.appveyor.yml
+40 −83		.github/workflows/build-and-test.yml
+47 −11		README.md
+2 −5		appveyor/.appveyor.yml.example-full
+3 −5		appveyor/.appveyor.yml.example-mini
+2 −2		appveyor/README.md
+47 −0		centos6-eol.repo
+87 −12		cue-test.py
+336 −94		cue.py
+1 −1		defaults.set
+2 −2		github-actions/README.md
+54 −26		github-actions/ci-scripts-build.yml.example-full
+1 −1		test01.set