Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
usb2
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs
ds
usb2
Commits
2a483c28
Commit
2a483c28
authored
1 year ago
by
Alessio Igor Bogani
Browse files
Options
Downloads
Patches
Plain Diff
Allow commands execution on FAULT state
parent
7828a43e
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
src/USB2.xmi
+0
-3
0 additions, 3 deletions
src/USB2.xmi
src/USB2StateMachine.cpp
+3
-6
3 additions, 6 deletions
src/USB2StateMachine.cpp
with
3 additions
and
9 deletions
src/USB2.xmi
+
0
−
3
View file @
2a483c28
...
...
@@ -41,7 +41,6 @@
<type
xsi:type=
"pogoDsl:VoidType"
/>
</argout>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<excludedStates>
FAULT
</excludedStates>
<excludedStates>
INIT
</excludedStates>
</commands>
<commands
name=
"Read"
description=
""
execMethod=
"read"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
>
...
...
@@ -52,7 +51,6 @@
<type
xsi:type=
"pogoDsl:CharArrayType"
/>
</argout>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<excludedStates>
FAULT
</excludedStates>
<excludedStates>
INIT
</excludedStates>
</commands>
<commands
name=
"ReadUntil"
description=
""
execMethod=
"read_until"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
>
...
...
@@ -63,7 +61,6 @@
<type
xsi:type=
"pogoDsl:CharArrayType"
/>
</argout>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<excludedStates>
FAULT
</excludedStates>
<excludedStates>
INIT
</excludedStates>
</commands>
<attributes
name=
"InputLength"
attType=
"Scalar"
rwType=
"READ"
displayLevel=
"OPERATOR"
polledPeriod=
"0"
maxX=
""
maxY=
""
allocReadMember=
"true"
isDynamic=
"false"
>
...
...
This diff is collapsed.
Click to expand it.
src/USB2StateMachine.cpp
+
3
−
6
View file @
2a483c28
...
...
@@ -114,8 +114,7 @@ bool USB2::is_Reconnections_allowed(TANGO_UNUSED(Tango::AttReqType type))
bool
USB2
::
is_Write_allowed
(
TANGO_UNUSED
(
const
CORBA
::
Any
&
any
))
{
// Compare device state with not allowed states.
if
(
get_state
()
==
Tango
::
FAULT
||
get_state
()
==
Tango
::
INIT
)
if
(
get_state
()
==
Tango
::
INIT
)
{
/*----- PROTECTED REGION ID(USB2::WriteStateAllowed) ENABLED START -----*/
...
...
@@ -134,8 +133,7 @@ bool USB2::is_Write_allowed(TANGO_UNUSED(const CORBA::Any &any))
bool
USB2
::
is_Read_allowed
(
TANGO_UNUSED
(
const
CORBA
::
Any
&
any
))
{
// Compare device state with not allowed states.
if
(
get_state
()
==
Tango
::
FAULT
||
get_state
()
==
Tango
::
INIT
)
if
(
get_state
()
==
Tango
::
INIT
)
{
/*----- PROTECTED REGION ID(USB2::ReadStateAllowed) ENABLED START -----*/
...
...
@@ -154,8 +152,7 @@ bool USB2::is_Read_allowed(TANGO_UNUSED(const CORBA::Any &any))
bool
USB2
::
is_ReadUntil_allowed
(
TANGO_UNUSED
(
const
CORBA
::
Any
&
any
))
{
// Compare device state with not allowed states.
if
(
get_state
()
==
Tango
::
FAULT
||
get_state
()
==
Tango
::
INIT
)
if
(
get_state
()
==
Tango
::
INIT
)
{
/*----- PROTECTED REGION ID(USB2::ReadUntilStateAllowed) ENABLED START -----*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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