Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
LFI_3751
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango devices
MagneticDevices
LFI_3751
Commits
e8da143a
Commit
e8da143a
authored
Aug 20, 2008
by
Nicolas Leclercq
Browse files
Options
Downloads
Patches
Plain Diff
Fixed win32 vc8 compil errors
parent
0aeb0586
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/LFI_3751.cpp
+8
-8
8 additions, 8 deletions
src/LFI_3751.cpp
src/LFI_3751Class.cpp
+3
-3
3 additions, 3 deletions
src/LFI_3751Class.cpp
with
11 additions
and
11 deletions
src/LFI_3751.cpp
+
8
−
8
View file @
e8da143a
...
...
@@ -699,7 +699,7 @@ namespace LFI_3751_ns
{
DEBUG_STREAM
<<
"write_read(): entering... cmd_to_send ="
<<
cmd_to_send
<<
endl
;
Tango
::
DevS
tring
response
=
""
;
std
::
s
tring
response
=
""
;
long
nb_char_written
;
long
readMode
=
2
;
//- SL_LINE : waits for LF (newline set in device Serial)
...
...
@@ -716,7 +716,7 @@ namespace LFI_3751_ns
//omni_thread::sleep(0,50000000);
mySerial
->
command_inout
(
"DevSerReadString"
,
readMode
,
response
);
return
string
(
response
)
;
return
response
;
}
//endtry
...
...
@@ -849,14 +849,14 @@ namespace LFI_3751_ns
if
(
index_point
==
2
)
{
data
=
data
.
substr
(
1
,
index_point
+
3
);
data
=
data
.
insert
(
0
,
'0'
);
formated_data
=
data
.
insert
(
0
,
'0'
);
data
=
data
.
insert
(
0
,
"0"
);
formated_data
=
data
.
insert
(
0
,
"0"
);
}
if
(
index_point
==
3
)
{
data
=
data
.
substr
(
1
,
index_point
+
3
);
formated_data
=
data
.
insert
(
0
,
'0'
);
formated_data
=
data
.
insert
(
0
,
"0"
);
}
if
(
index_point
==
4
)
...
...
@@ -875,14 +875,14 @@ namespace LFI_3751_ns
if
(
index_point
==
1
)
{
data
=
data
.
substr
(
0
,
index_point
+
4
);
data
=
data
.
insert
(
0
,
'0'
);
formated_data
=
data
.
insert
(
0
,
'0'
);
data
=
data
.
insert
(
0
,
"0"
);
formated_data
=
data
.
insert
(
0
,
"0"
);
}
if
(
index_point
==
2
)
{
data
=
data
.
substr
(
0
,
index_point
+
4
);
formated_data
=
data
.
insert
(
0
,
'0'
);
formated_data
=
data
.
insert
(
0
,
"0"
);
}
if
(
index_point
==
3
)
...
...
This diff is collapsed.
Click to expand it.
src/LFI_3751Class.cpp
+
3
−
3
View file @
e8da143a
...
...
@@ -198,7 +198,7 @@ void LFI_3751Class::command_factory()
//+----------------------------------------------------------------------------
Tango
::
DbDatum
LFI_3751Class
::
get_class_property
(
string
&
prop_name
)
{
for
(
int
i
=
0
;
i
<
cl_prop
.
size
()
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
cl_prop
.
size
()
;
i
++
)
if
(
cl_prop
[
i
].
name
==
prop_name
)
return
cl_prop
[
i
];
// if not found, return an empty DbDatum
...
...
@@ -213,7 +213,7 @@ Tango::DbDatum LFI_3751Class::get_class_property(string &prop_name)
//-----------------------------------------------------------------------------
Tango
::
DbDatum
LFI_3751Class
::
get_default_device_property
(
string
&
prop_name
)
{
for
(
int
i
=
0
;
i
<
dev_def_prop
.
size
()
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
dev_def_prop
.
size
()
;
i
++
)
if
(
dev_def_prop
[
i
].
name
==
prop_name
)
return
dev_def_prop
[
i
];
// if not found, return an empty DbDatum
...
...
@@ -229,7 +229,7 @@ Tango::DbDatum LFI_3751Class::get_default_device_property(string &prop_name)
//-----------------------------------------------------------------------------
Tango
::
DbDatum
LFI_3751Class
::
get_default_class_property
(
string
&
prop_name
)
{
for
(
int
i
=
0
;
i
<
cl_def_prop
.
size
()
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
cl_def_prop
.
size
()
;
i
++
)
if
(
cl_def_prop
[
i
].
name
==
prop_name
)
return
cl_def_prop
[
i
];
// if not found, return an empty DbDatum
...
...
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