Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
NomadModules
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Instrument Control
NomadModules
Commits
55e754ee
Commit
55e754ee
authored
Apr 17, 2020
by
Franck Cecillon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change prop name
parent
616cc355
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
src/controllers/lss/d17/D17ChopperController.cpp
src/controllers/lss/d17/D17ChopperController.cpp
+8
-4
src/controllers/lss/d17/D17ChopperController.h
src/controllers/lss/d17/D17ChopperController.h
+4
-2
No files found.
src/controllers/lss/d17/D17ChopperController.cpp
View file @
55e754ee
...
...
@@ -39,9 +39,9 @@ D17ChopperController::D17ChopperController(const string& name) :
setFamily
(
family
::
BEAM_PARAMETERS
,
family
::
CHOPPER
);
// Init property
speed
.
init
(
this
,
NOSAVE
|
SPY
,
"actual_speed"
,
"Speed"
);
speed
.
init
(
this
,
NOSAVE
|
SPY
,
"actual_speed"
,
"
wanted_speed"
,
"
Speed"
);
speed
.
setUnit
(
"rpm"
);
phase
.
init
(
this
,
NOSAVE
|
SPY
,
"actual_phase"
,
"Phase"
);
phase
.
init
(
this
,
NOSAVE
|
SPY
,
"actual_phase"
,
"
wanted_phase"
,
"
Phase"
);
/* dir.init(this, SAVE | SCAN, "actual_dir", "wanted_dir", "Wanted dir");
phase.setUnit("~degree");
gear.init(this, SAVE | SCAN, "actual_gear", "wanted_gear", "Wanted Gear");*/
...
...
@@ -52,6 +52,7 @@ D17ChopperController::D17ChopperController(const string& name) :
actualMaster
.
init
(
this
,
SAVE
,
"actual_master"
);
isSync
.
init
(
this
,
NOSAVE
,
"is_sync"
);
// Init drivers
m_NCSDriver
.
init
(
this
,
"ncs_driver"
);
...
...
@@ -59,8 +60,7 @@ D17ChopperController::D17ChopperController(const string& name) :
// General variable for command
registerFunction
(
TYPE
);
cout
<<
" registeur type"
<<
endl
;
}
}
/*
* destructor
...
...
@@ -113,8 +113,12 @@ void D17ChopperController::updateActualStat(int32 ki) {
void
D17ChopperController
::
updateActualSpeed
(
int32
ki
)
{
cout
<<
" updateActualSpeed "
<<
getName
()
<<
" updateActualSpeed for indice ki "
<<
endl
;
if
(
ki
==
chopperIndice
()
)
{
speed
=
m_NCSDriver
->
currentSpeed
.
get
(
ki
);
cout
<<
" updateActualSpeed "
<<
getName
()
<<
" updateActualSpeed speed "
<<
speed
()
<<
endl
;
}
}
...
...
src/controllers/lss/d17/D17ChopperController.h
View file @
55e754ee
...
...
@@ -56,8 +56,8 @@ public:
/*!
* Properties
*/
Property
<
int32
>
speed
;
//! speed property
Property
<
float64
>
phase
;
//! phase property
Property
<
int32
,
SETPOINT
>
speed
;
//! speed property
Property
<
float64
,
SETPOINT
>
phase
;
//! phase property
/*Property<int32, SETPOINT > gear; //! phase property
Property<std::string, SETPOINT> dir; //! phase property*/
...
...
@@ -69,6 +69,8 @@ public:
Property
<
int32
>
actualMaster
;
Property
<
int32
>
isSync
;
// DriverPtr<chopper::ChopperCommon> chopperDriver; //! Chopper driver link (speed card)
// DriverPtr<adsorptiontrough::AdsTroughDriver> m_adsDriver; //! driver link
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment