Kevin Peterson
87267646c3
Updated motorHytec to 5d7a72d173d75b70015dff998943014959a93417
2020-03-23 14:27:35 -05:00
Kevin Peterson
af59280dc7
post-prepare.sh: also comment out SUPPORT in motorOms's RELEASE file.
2020-03-20 09:38:52 -05:00
Kevin Peterson
c5ca938b30
Call sed directly rather than using the sedi function from utils.sh
2020-03-20 09:29:17 -05:00
Kevin Peterson
652e779e8a
Don't add SUPPORT to RELEASE.local; Comment out SUPPORT in RELEASE for travis builds
2020-03-20 09:22:07 -05:00
Kevin Peterson
e783af6ff6
Merge pull request #148 from epics-modules/issue147
...
Always rebuild RELEASE.$(EPICS_HOST_ARCH).local. Fixes #147
2020-03-18 12:12:23 -05:00
Kevin Peterson
e7537ea698
Updated motorOms to 7dd9732e9fb2ae5b7050f12adac71647f7b72e80
2020-03-18 11:45:35 -05:00
Kevin Peterson
f5c8c39d0c
Modified post-prepare.sh to copy the RELEASE.local file after modifying it.
2020-03-18 11:29:32 -05:00
Kevin Peterson
d768ef1069
2nd attempt at correcting the path to utils.sh in post-prepare.sh
2020-03-18 11:16:23 -05:00
Kevin Peterson
f96a386ef0
Corrected path to utils.sh in post-prepare.sh
2020-03-18 11:09:37 -05:00
Kevin Peterson
c171e76096
Added .ci-local containing a post-prepare.sh, to allow the travis environment to be modified before building.
2020-03-18 10:57:56 -05:00
Kevin Peterson
16c12ece86
Updated ci-scripts to f5047a9e1105574a4735e28467962ad04740d598
2020-03-18 10:12:25 -05:00
Kevin Peterson
276b189453
Updated motorOms to 671b0acf3632c94dd85d4cdad3d48adbdbb746a5 to hopefully eliminate build problems caused by recent merges.
2020-03-17 14:14:59 -05:00
Kevin Peterson
f761784155
Update motorOms to commit e41f627bf1e0bd840083fed1f224d209af366f6b
2020-03-17 14:02:41 -05:00
Kevin Peterson
ffa6a19382
Converted adls to edl, opi, and ui
2020-03-16 16:26:59 -05:00
Kevin Peterson
725b38e5d7
Merge pull request #155 from epics-modules/154-motorxU-stacking
...
Lower the cosmetic rectangle in motorxU.adl. Fixes #154
2020-03-16 15:23:54 -05:00
Kevin Peterson
f55f22d2ea
Merge pull request #152 from BenBradnick/feature/ci-scripts
...
Add epics-modules ci-scripts for Travis CI
2020-03-16 15:20:19 -05:00
Pete Jemian
bcd11fdba1
Lower the cosmetic rectangle
2020-03-15 15:39:17 -05:00
Benjamin Bradnick
9726ad149c
moved .ci submodule back to master after configure/RELEASE overwrite added
2020-02-19 07:44:48 +00:00
Benjamin Bradnick
6d404d0029
Updated motorOms to master
2020-02-18 21:30:57 +00:00
Benjamin Bradnick
cf186090b7
Add epics-modules ci-scripts for Travis CI
2020-02-14 10:14:02 +00:00
Mark Rivers
855c2540d1
New commits
2020-01-28 16:44:41 -06:00
Mark Rivers
a959dccc2d
Pull in file from SUPPORT/configure
2020-01-28 16:44:03 -06:00
Mark Rivers
bc531bc8fa
Latest converter
2020-01-28 16:43:00 -06:00
Mark Rivers
4a878d29f4
New autoconverted file
2020-01-28 16:42:41 -06:00
Mark Rivers
5642bb1089
Initialize some parameters to avoid errors reading them
2020-01-28 16:32:56 -06:00
Mark Rivers
91e4eb0e91
Merge branch 'issue149'
2020-01-28 16:28:14 -06:00
Mark Rivers
56f0952b4f
New file for autoconvert
2020-01-28 16:18:48 -06:00
Mark Rivers
6768b2514f
Add op
2020-01-28 16:18:18 -06:00
Kevin Peterson
4b188f5d94
Updated motorSmarAct to commit https://github.com/epics-motor/motorSmarAct/commit/b6bd82f8d400015982d223570586213fe27893c2 to recent improvements to the MCS2 driver to allow sending the MCLF and CALx commands
2019-11-06 14:39:01 -06:00
Kevin Peterson
fe8f8159b3
Merge pull request #150 from epics-modules/issue149
...
Reverted the commit that caused issue 149 and updated the driver modules' EXAMPLE_RELEASE.local files to avoid problems when building them outside the motor tree.
Fixes #149
2019-11-04 10:49:44 -06:00
Kevin Peterson
b35358218a
Added $(RELEASE_LOCAL) as a phony target so that it is rebuilt every time, even if changes are not needed. This is preferrably to a dependency rule on a specific release file, because there are many release files that could be used.
2019-10-31 14:26:41 -05:00
Kevin Peterson
b060345333
Reverted commit 6afc350ed8
2019-10-31 14:21:43 -05:00
Kevin Peterson
31957848dc
Updated the driver modules to include the change to EXAMPLE_RELEASE.local that allows them to be built outside of the motor module after commit f0c8a766bc
2019-10-30 18:02:26 -05:00
Kevin Peterson
a8e87030c3
Initialize SUPPORT and EPICS_BASE
2019-10-30 17:12:23 -05:00
Kevin Peterson
f0c8a766bc
Reverted commit ef56405411
2019-10-30 17:11:03 -05:00
Kevin Peterson
6afc350ed8
Added motor's RELEASE file as a dependency of modules/RELEASE.$(EPICS_HOST_ARCH).local
2019-10-22 11:02:40 -05:00
Mark Rivers
1fc606fa1f
Merge branch 'master' of github.com:epics-modules/motor
2019-10-03 07:15:22 -05:00
Mark Rivers
d0690e3f01
Use new scheme for including upper-level RELEASE files
2019-10-03 07:13:07 -05:00
Kevin Peterson
9ba049191a
Merge pull request #146 from EuropeanSpallationSource/190920_send_mess_uses_const_char
...
The 2nd and 3rd parameter in send_mess() can and should
be a 'const char *' instead of just 'char *'.
Modern compilers complain here, so that the signature now
gets the const.
Update drivers from the following list to use the new send_mess():
modules/motorAcs
modules/motorAcsTech80
modules/motorAerotech
modules/motorFaulhaber
modules/motorIms
modules/motorKohzu
modules/motorMclennan
modules/motorMicos
modules/motorMicroMo
modules/motorNewFocus
modules/motorNewport
modules/motorOms
modules/motorOriel
modules/motorPI
modules/motorParker
modules/motorPiJena
modules/motorSmartMotor
modules/motorThorLabs
And while there, fix one more "const char *" in motordrvCom.cc
2019-09-30 11:06:37 -05:00
Torsten Bögershausen
8b43d40d18
send_mess() uses 'const char *' (and more const char*)
...
The 2nd and 3rd parameter in send_mess() can and should
be a 'const char *' instead of just 'char *'.
Modern compilers complain here, so that the signature now
gets the const.
Update drivers from the following list to use the new send_mess():
modules/motorAcs
modules/motorAcsTech80
modules/motorAerotech
modules/motorFaulhaber
modules/motorIms
modules/motorKohzu
modules/motorMclennan
modules/motorMicos
modules/motorMicroMo
modules/motorNewFocus
modules/motorNewport
modules/motorOms
modules/motorOriel
modules/motorPI
modules/motorParker
modules/motorPiJena
modules/motorSmartMotor
modules/motorThorLabs
And while there, fix one more "const char *" in motordrvCom.cc
2019-09-30 13:15:35 +02:00
Kevin Peterson
7408f52884
Merge pull request #143 from kmpeters/issue142
...
Fixes for example IOC travis build problems:
1. Added modbus to the travis config
2. Updated motorOms, motorOmsAsyn, and motorHytec to ignore non-VME architectures for example IOCs
2019-08-28 10:33:27 -05:00
kpetersn
1d9525f19e
Updated motorOms to 49c7fce59bec4198129fa794183d5fc061649bf6
2019-08-28 10:22:18 -05:00
kpetersn
900a8bcc93
Updated motorOmsAsyn to e949e2c51c0766a878dd7f1c322d1144305f06fe
2019-08-28 10:09:16 -05:00
kpetersn
175dba6d87
Updated motorHytec to 7872aebc0f026efca7839e61410bc0a546922a8c
2019-08-28 09:58:30 -05:00
kpetersn
2b47a942fc
Updated motorOms to 67fe88c1b5aeb80216666c36acf6c1b17e102fe7
2019-08-28 09:42:46 -05:00
kpetersn
9b29000341
Updated motorOms to b0c0e464ceeb590fc5a877d7b48437f24b66db97
2019-08-27 16:24:06 -05:00
kpetersn
554a28a0b8
Added modbus to travis config
2019-08-27 15:28:31 -05:00
Kevin Peterson
84fbd88fe7
Merge pull request #141 from epics-modules/issue138
...
Fix for #138 : *.req files fail to install
2019-08-27 15:13:29 -05:00
kpetersn
1a9a123698
Changed REQ to DB so that *.req files get installed when motor is built outside of synApps
2019-08-27 15:01:58 -05:00
Kevin Peterson
690bbe7512
Merge pull request #140 from kmpeters/issue139
...
Include example IOCs in travis builds
This pull request works as intended. The inclusion of the example IOCs currently breaks the non-RTEMS builds, which is expected (these will be resolved with #138 ). The RTEMS build is broken for a different reason, that hasn't been diagnosed yet.
2019-08-27 10:41:44 -05:00