Commit Graph

2929 Commits

Author SHA1 Message Date
Kevin Peterson 7f888d5d98 Added R7-2-2 to RELEASE.md
(cherry picked from commit da3bfab4c1)
R7-2-2
2021-02-02 12:19:45 -06:00
Kevin Peterson fc5c7e6b47 Merge pull request #174 from EuropeanSpallationSource/motorOms-epicsMutexMustLock
Fixes the problem described here:
https://github.com/epics-modules/motor/issues/172#issuecomment-758139901
(cherry picked from commit ac73654da1)
2021-02-02 11:42:28 -06:00
Kevin Peterson 52e5f82fd2 Merge pull request #162 from EuropeanSpallationSource/motorNewport-070c93e1aa1a4
Update modules/motorNewport/ (travis should work)
(cherry picked from commit d274e15863)
2021-02-01 17:14:23 -06:00
Kevin Peterson 6e91c4d245 Merge pull request #168 from epics-modules/add_shareLib
Add shareLib.h
(cherry picked from commit 173355c5ea)
2021-02-01 14:35:43 -06:00
Kevin Peterson cafd96b0e9 Also omit the patch version from the 'Motor Version' column in index.html R7-2-1 2020-05-14 15:36:55 -05:00
Kevin Peterson 8d6b6cf33d Omit the patch version from the 'Module Version' column in index.html 2020-05-14 15:34:31 -05:00
Kevin Peterson ae9114e96c Updated documentation for R7-2-1 2020-05-14 15:31:02 -05:00
Kevin Peterson 2821af6f71 Updated driver modules to resolve build problems for Windows and
VxWorks:

  motorHytec	R1-0-2
  motorOmsAsyn	R1-0-2
  motorSmarAct	R1-2-1
2020-05-14 15:01:56 -05:00
Kevin Peterson 3f207f6662 Fixed typo R7-2 2020-05-13 17:36:26 -05:00
Kevin Peterson 7fe4b35aa6 Updated the html documentation for version 7.2 2020-05-13 17:31:15 -05:00
Kevin Peterson d472dd10f5 Updated the motor record version to 7.2 2020-05-13 17:30:57 -05:00
Kevin Peterson 57d9f53728 Minor changes to the formatting of RELEASE.md 2020-05-13 17:16:24 -05:00
Kevin Peterson 2508548009 Updated RELEASE.md for R7-2 2020-05-13 17:12:18 -05:00
Kevin Peterson 714478d6b0 Updated driver modules:
motorAcs		R1-1	8c1fd9366435b7b9a34d0d5d84a5ad981b241846
motorAcsTech80		R1-0-1	d7706b0f8189f5d253a4e6a610c34c33115be6f6
motorAerotech		R1-1	3fa94b7429cdf3df88ee0cb02c4c7f46a070ce26
motorAMCI		R1-0-1	4c88334bd8dcd82034ccd126fbc11e9007cd4802
motorAttocube		R1-0-1	cc28182ecdb7d4325f5102be1e4bd4375422e492
motorDeltaTau		R1-0-1	b889129d8b24b7d8e0d74b726850c174d9d4f051
motorFaulhaber		R1-0-1	86dbaa795d651db2bd93f04015b3fa816c812676
motorHytec		R1-0-1	fad4155ff5c0765157edfe96cffbdbea6d336262
motorIms		R1-0-1	cebdb170b91dd4db48f5b4742b7a16528abcf573
motorKohzu		R1-0-1	f406c18bde2f9ec36dd9fee9f7d6576c247b13df
motorMclennan		R1-1	03750269099922d6ac1d12b5c89bece77f4009e2
motorMicos		R2-0	d98d5c2989f4f0c596c64b3daf3e5160bac344b8
motorMicroMo		R1-0-1	c0845b24aa3a603dc9692d79beaeb0e2ea0d532d
motorMicronix		R1-0-1	e2fcf8a4a03a0fd0d9d1c88ef9b242a2aaf306c4
motorMotorSim		R1-1	6e2f64601e5f27ba212fc8e8488ac655cc4bb483
motorMXmotor		R1-0-1	d3efe48cf07f9a3ca5914e629c824e1df6d82094
motorNewFocus		R1-1-1	176006e881fcec8a4ea0b300d5ee908fcfd0d655
motorNewport		R1-1	d7b6818a893feb622c9c7dcafa645095561e965d
motorNPoint		R1-0-1	37ab6f1eddb358987d4c4e2b3479c0058d8c63c6
motorOms		R1-1	c3cfa1628015cd17176ebcd97babd8f78ea03630
motorOmsAsyn		R1-0-1	625c0248460dae6d6804582cf249230668d80c15
motorOriel		R1-0-1	32bbe993211535313aff4c1a3157f9089ed08273
motorParker		R1-1	0d78e498aa9c6e5ce393acac45429f34496523d1
motorPhytron		R1-1	55509f404e8746684d3ac1ba4fe26c98adeab7b6
motorPI			R1-0-1	c58c5a4e3db676dc0744b116a64de67530a087ad
motorPIGCS2		R1-1	b52f98361b055d9505c84cee0099ab08b1de0367
motorPiJena		R1-0-1	535e9ac1590d9b294d05518ae9a0acc824fcafad
motorScriptMotor	R1-1	374a23bae3d0cfe4aa9f268ae5703e43f3d129da
motorSmarAct		R1-2	9ca8f47ae0e814b4d9669e04a76f96f305caab53
motorSmartMotor		R1-0-1	79ea9a72980c04f43b43c56ed9a84cdaea7c7e8b
motorThorLabs		R1-0-1	bffd7c94f6f2dc37485a90e40085f181af2bfeb2
2020-05-13 14:25:33 -05:00
Mark Rivers 84caef3ba4 Merge branch 'master' of github.com:epics-modules/motor 2020-05-11 09:41:55 -05:00
Mark Rivers 700a338fd5 New autoconvert 2020-05-11 09:41:01 -05:00
keenanlang de29f768d1 Add support definition so modules can install iocsh 2020-05-06 13:55:44 -05:00
keenanlang 129e7f075a Install iocsh files 2020-05-06 13:21:37 -05:00
Kevin Peterson 6d121ac66f Updated motorHytec to aaa9af21ec8c2bcc9120a80f9e028f3423c8ca96 2020-03-23 15:20:15 -05:00
Kevin Peterson 7b9abb54d6 Updated motorOmsAsyn to 549bd6dc241ece183ee4544f29ae01e94899acfd 2020-03-23 15:19:10 -05:00
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