Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
SingleShotAO
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango devices
InputOutput
ADLINK
SingleShotAO
Compare revisions
93bf57bc3cf0bd55cbfd8709bcdd146ed0acf5bd to d0b7b49a9a91574be70eb89e26e316078166a6d0
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
software-control-system/tango-devices/inputoutput/adlink/singleshotao
Select target project
No results found
d0b7b49a9a91574be70eb89e26e316078166a6d0
Select Git revision
Branches
main
Tags
release_0_1
release_1_0_0
release_1_0_1
release_1_0_2
release_1_0_3
release_1_0_4
release_2_0_0
release_2_0_1
release_2_0_2
release_2_0_4
release_2_1_0
v0
13 results
Swap
Target
software-control-system/tango-devices/inputoutput/adlink/singleshotao
Select target project
software-control-system/tango-devices/inputoutput/adlink/singleshotao
1 result
93bf57bc3cf0bd55cbfd8709bcdd146ed0acf5bd
Select Git revision
Branches
main
Tags
release_0_1
release_1_0_0
release_1_0_1
release_1_0_2
release_1_0_3
release_1_0_4
release_2_0_0
release_2_0_1
release_2_0_2
release_2_0_4
release_2_1_0
v0
13 results
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
fix: improve error logging for get_device_property in init_device (logs and status)
· ccb0929d
Alexandre MALFREYT
authored
1 week ago
ccb0929d
fix: handle empty boardType in get_device_property() to improve error handling
· d0b7b49a
Alexandre MALFREYT
authored
1 week ago
d0b7b49a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/SingleShotAO.cpp
+10
-3
10 additions, 3 deletions
src/SingleShotAO.cpp
with
10 additions
and
3 deletions
src/SingleShotAO.cpp
View file @
d0b7b49a
...
...
@@ -267,8 +267,15 @@ void SingleShotAO::init_device()
ERROR_STREAM
<<
"SingleShotAO::init_device::Tango::DevFailed exception caught "
<<
"while trying to read device properties from TANGO database"
<<
std
::
endl
;
ERROR_STREAM
<<
df
<<
std
::
endl
;
m_currStatus
=
"Failed to get property. See log for details"
;
std
::
string
error_msg
=
df
.
errors
[
0
].
desc
;
std
::
istringstream
error_stream
(
error_msg
);
std
::
string
line
;
std
::
getline
(
error_stream
,
line
);
// Read the first line
ERROR_STREAM
<<
line
<<
std
::
endl
;
while
(
std
::
getline
(
error_stream
,
line
))
{
// Read the rest of the lines
ERROR_STREAM
<<
" - "
<<
line
<<
std
::
endl
;
}
m_currStatus
=
error_msg
;
m_state
=
Tango
::
FAULT
;
return
;
}
...
...
@@ -789,7 +796,7 @@ void SingleShotAO::get_device_property()
//- <BoardType> -----------------------
// Case 1 (error): boardType is set to the default value in the database
if
(
boardType
==
boardType_default
)
if
(
boardType
==
boardType_default
||
boardType
==
""
)
{
errorMessages
<<
"Device property <BoardType> is not set (default value "
<<
boardType_default
<<
" needs to be replaced)"
<<
endl
;
critical_properties_missing
=
true
;
...
...
This diff is collapsed.
Click to expand it.