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

Jump to bottom

Merge from icshwi/master #5

Merged
merged 57 commits into from
Feb 11, 2020
Merged

Merge from icshwi/master #5

merged 57 commits into from
Feb 11, 2020

Conversation

anderssandstrom
Copy link
Collaborator

No description provided.

@anderssandstrom
ecmcAsynPortDriver.cpp::report(): Add call to base class report().
1966cf8
@anderssandstrom
Add default asyn addr for all controller params (addr=0).
6c3395e
@anderssandstrom
Only printout asynPortDriver::report() if details >=3.
2e56a32
@anderssandstrom
Add defualt asyn list. Add soft limit enable in axis status word.
e556d10
@anderssandstrom
Ensure ethercat master macros are availalbe, cleanup of compiler warn…
24c43da 
…ings.

Add check so that the following macros exist in etehrcat master (ecrt.h):
- EC_READ_U64
- EC_WRITE_U64
- EC_READ_S64
- EC_WRITE_S64
- EC_READ_F32
- EC_WRITE_F32
- EC_READ_F64
- EC_WRITE_F64

 Please enter the commit message for your changes. Lines starting
@anderssandstrom
Remove dependencies to asynmotor.
c222de9
@anderssandstrom
Test of new motor rcord interface.. WIP.
857a9f1
@anderssandstrom
ecmcAxisBase: Add asynparam for softlimfwd. Add refresh of diagnostic…
30bbf42 
…bin asyn param.
@anderssandstrom
Merge pull request #7 from icshwi/anders_add_inc
20f7585 
Anders add inc
@anderssandstrom
Add status and control structures for binary communication to motor r…
ee80c5a 
…ecord.
@anderssandstrom
WIP: New command execution concept (execute function in asynDataItem …
2240539 
…for commands from param ax%d.controlbin)
@anderssandstrom
Add motor record model 3 driver.
0439c44
@anderssandstrom
ecmcAxisBase: Allow homing seq 15 (without change velos and accs).
498b53e
@anderssandstrom
Update .gitignore
dd73abc
@anderssandstrom
Rename motor record source files
3909815
@anderssandstrom
Add .dbd to ecmcMotorRecordSupport
ac72617
@anderssandstrom
Rename of motor record files and source
67ff2e8
@anderssandstrom
Motor Record: Rename classes and commands.
f8e4f97
@anderssandstrom
WIP
2aa8a02
@anderssandstrom
Remove unused params in axisBase
12620c7
@anderssandstrom
Working but many minor issues.. WIP..
004472e
@anderssandstrom
ecmcMotorRecordAxis: Some cleanup.
3efc0b3
@anderssandstrom
Use ecmcAxisStatusType in ecmcMotorRecordAxis. Cleanup.
d0a9030
@anderssandstrom
ecmcMotorRecordController, ecmcMotorRecordAxis: More cleanup..
be27b14
@anderssandstrom
ecmcMotorRecordAxis.h: Remove unused includes.
78c52f3
@anderssandstrom
ecmcMotorRecordController.h: Cleanup
1e2bcb7
@anderssandstrom
ecmcMotorRecordAxis.cpp: Change asyn user in asynprints() calls.
dec2e33
@anderssandstrom
Remove asyn octet interface and more
07017fc 
- Remove asyn sync I/O interface conenction
- Add printouts to iocsh command "ecmcMotorRecordCreateController()"
- Use pasynUser for asynPrint() calls
- cleanup
@anderssandstrom
Remove unused code.
095bb7a
@anderssandstrom
ecmcMotorRecordAxis: Minor cleanup.
c1759c6
@anderssandstrom
Add help printout to iocsh command "ecmcMotorRecordCreateAxis".
7103f70
@anderssandstrom
Harmonize help printouts for ecmcMotorRecordCreateController() and ec…
ad32935 
…mcMotorRecordCreateAxis().
@anderssandstrom
ecmcMotorRecordCreateAxis: Add description of axis options in help pr…
4b90a84 
…intout.
@anderssandstrom
ecmcMotorRecordCreateAxis: Reformat help printout.
2583204
@anderssandstrom
Add mutex, fix reset, fix enableAmplifier.
4de09b7 
1. Add mutex to sync motor record with ecmc realtime thread
2. Fix reset functionality.
3. Fix enable amplifier functionality add readback of ecmc axis status
@anderssandstrom
Correct types for attarget_time and poslag_time.
1e2b76e
@anderssandstrom
ecmcOctetIF.c: Remove debug printouts.
5d1711d
@anderssandstrom
ecmcMotorRecordController.Report(): Call report for all axes
de65ecf
@anderssandstrom
WIP
7fe912b
@anderssandstrom
Change asynUser for printouts. Add pollPowerIsOn method
62dc5e9 
Use same asynUser for printouts as ECMC
Add method pollPowerIsOn in ecmcMotorRecordAxis to make autopower on to work like intended.
@anderssandstrom
ecmcMotorRecordAxis.cpp: Add comment.
d6121e5
@anderssandstrom
Add include epicsThread.h
45753d6
@anderssandstrom
Remove e3 makefile.
a79ede9
@anderssandstrom
Call function on ecmc.error.reset param.
3244a51
@anderssandstrom
ecmcAxisBase: Cleanup
58bcb6a
@anderssandstrom
ecmcMotorRecordAxis: Remove polling of scalings, softlimits and more …
dc4e3b8 
…in poll().
@anderssandstrom
ecmcMotorRecordAxis.cpp: Remove motorFlagsDriverUsesEGUString.
5c3cedd
@anderssandstrom
ecmcMotorRecordAxis: Remove scale factor.
e66218b
@anderssandstrom
Use ecmc define for homing sequence index (setPosition=15).
5641e01
@anderssandstrom
ecmcMotorRecordAxis: Some more cleanup
29677f8
@anderssandstrom
Add motor record driver source to Makefile
0a6a393
@anderssandstrom
Merge pull request #8 from icshwi/anders_asyn_motor
d5ee26b 
Anders asyn motor
@anderssandstrom
ecmcMotorRecordController.cpp: Use ECMC_MAX_AXES instead of parameter…
0363133 
… to iocsh-cmd.
@anderssandstrom
ecmcMotorRecordCreateAxis: Add sanity check of axisNo.
bcda8f7
@anderssandstrom
Update RELEASE.md
d368dc2
@anderssandstrom
Update RELEASE.md
f7236c5
@anderssandstrom
Merge pull request #9 from icshwi/anders_use_ecmc_max_axes
5dbd5a4 
Anders use ecmc max axes
@anderssandstrom anderssandstrom merged commit 94002d1 into epics-modules:master Feb 11, 2020
anderssandstrom added a commit that referenced this pull request Aug 19, 2020
@anderssandstrom
Merge pull request #5 from icshwi/master
b5ec435 
Update
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@anderssandstrom