Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge in epics-motor R7-3 to our master #59

Merged
merged 16 commits into from
Jun 2, 2023
Merged

merge in epics-motor R7-3 to our master #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
541056e
Update vendor to R7-3
rerpha May 24, 2023
384401b
Merge pull request #57 from ISISComputingGroup/update_to_R7_3
rerpha May 24, 2023
f24afad
merge in epics-motor R7-3 to our master
rerpha May 24, 2023
8198386
fix bad merge bits
rerpha May 24, 2023
53c9544
now compiles. had to comment out acs, micos due to linking errors(?) …
rerpha May 25, 2023
ab6bd72
revert configure/RELEASE to upstream, use RELEASE.local where needed
rerpha May 25, 2023
def2f3d
build linmot
rerpha May 25, 2023
7f9a740
add sm300 back
rerpha May 26, 2023
57b13b7
remove CALCMBLAH
rerpha Jun 2, 2023
6af052d
Update to vendor 7.3
FreddieAkeroyd Jun 2, 2023
fa5b001
Re-import vendor 7.3
FreddieAkeroyd Jun 2, 2023
aad6e04
Fix merge issues
FreddieAkeroyd Jun 2, 2023
747845c
Move SM300_extra.db to module
FreddieAkeroyd Jun 2, 2023
b2e368e
Adjust initialisation for new RSTM field
FreddieAkeroyd Jun 2, 2023
3652839
Ignore Db file dir
FreddieAkeroyd Jun 2, 2023
78ba65e
Merge remote-tracking branch 'origin/master' into merge_r7_3_to_master
FreddieAkeroyd Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
164 changes: 0 additions & 164 deletions .ci/travis-prepare.sh
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,21 @@ O.*
/include/
/lib/
/templates/
bin/
/db/
dbd/
html/
include/
/iocsh/
lib/
templates/
cdCommands
envPaths
dllPath*.bat
auto_settings.sav*
auto_positions.sav*
.ccfxprepdir/
*.local
runIOC.bat
runIOC.sh
relPaths.sh
Expand Down
27 changes: 0 additions & 27 deletions .travis.yml
View file
Open in desktop

This file was deleted.

12 changes: 2 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,7 @@ include $(TOP)/configure/CONFIG
DIRS += configure motorApp
motorApp_DEPEND_DIRS = configure

# To build motor examples;
# 1st - uncomment lines below.
# 2nd - uncomment required support module lines at the bottom of
# <motor>/configure/RELEASE.
# 3rd - make clean uninstall
# 4th - make

DIRS += motorExApp iocBoot
motorExApp_DEPEND_DIRS = motorApp
iocBoot_DEPEND_DIRS = motorExApp
DIRS += modules
modules_DEPEND_DIRS = motorApp

include $(TOP)/configure/RULES_TOP
Loading