Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
Icepap
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Accelerators
Motion
Icepap
Commits
a0388afd
Commit
a0388afd
authored
2 years ago
by
Nicolas Tappret
Browse files
Options
Downloads
Patches
Plain Diff
remove stop code abord in the state status
parent
3ff762ae
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+4
-0
4 additions, 0 deletions
CHANGELOG.md
icepapmotor/IcePapMotor.cpp
+2
-2
2 additions, 2 deletions
icepapmotor/IcePapMotor.cpp
with
6 additions
and
2 deletions
CHANGELOG.md
+
4
−
0
View file @
a0388afd
...
...
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on
[
Keep a Changelog
](
http://keepachangelog.com/en/1.0.0/
)
and this project adheres to
[
Semantic Versioning
](
http://semver.org/spec/v2.0.0.html
)
.
## [1.3.1] - 26-07-2022
### modified
*
finaly remove stopcode for abort stopcode only
## [1.3.0] - 07-07-2022
### added
*
add attribute steps motor read only
...
...
This diff is collapsed.
Click to expand it.
icepapmotor/IcePapMotor.cpp
+
2
−
2
View file @
a0388afd
...
...
@@ -1900,7 +1900,7 @@ Tango::DevString IcePapMotor::raw_com(Tango::DevString argin)
string
creply
;
sendcmd
(
argin
,
&
creply
);
argout
=
Tango
::
string_dup
(
creply
.
c_str
());
/*----- PROTECTED REGION END -----*/
// IcePapMotor::raw_com
return
argout
;
}
...
...
@@ -2182,7 +2182,7 @@ void IcePapMotor::CheckState()
sendboardcmd
(
"?WARNING"
,
&
stw01
);
msg
<<
stw01
<<
endl
;
}
if
(
AxisStopCode
!=
STOPCODE_NO_ERROR
)
{
if
(
AxisStopCode
!=
STOPCODE_NO_ERROR
&&
AxisStopCode
!=
STOPCODE_ABORT_CMD
)
{
if
(
stopCodeMessage
.
find
(
AxisStopCode
)
==
stopCodeMessage
.
end
()){
//if AxisStopCode not find put to UNKNOWN CODE
AxisStopCode
=
STOPCODE_UNKNOWN_CODE
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment