Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cbmroot
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
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
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
Computing
cbmroot
Merge requests
!1799
online: Print equipment id in hex.
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
online: Print equipment id in hex.
fweig/cbmroot:eqid-hex
into
master
Overview
1
Commits
1
Pipelines
2
Changes
1
Merged
Felix Weiglhofer
requested to merge
fweig/cbmroot:eqid-hex
into
master
10 months ago
Overview
1
Commits
1
Pipelines
2
Changes
1
Expand
0
0
Merge request reports
Viewing commit
ff96893e
Show latest version
1 file
+
4
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
ff96893e
online: Print equipment id in hex.
· ff96893e
Felix Weiglhofer
authored
10 months ago
algo/unpack/CommonUnpacker.h
+
4
−
2
Options
@@ -110,11 +110,13 @@ namespace cbm::algo
if
(
algo
==
fAlgos
.
end
())
{
if
(
!
Contains
(
legalEqIds
,
msDesc
.
eq_id
))
{
L_
(
error
)
<<
"Invalid equip id "
<<
int
{
msDesc
.
eq_id
}
<<
" for subsystem "
<<
ToString
(
subsystem
);
L_
(
error
)
<<
"Invalid equip id "
<<
std
::
hex
<<
int
{
msDesc
.
eq_id
}
<<
std
::
dec
<<
" for subsystem "
<<
ToString
(
subsystem
);
monitorOut
.
errInvalidEqId
++
;
}
else
{
L_
(
error
)
<<
"Invalid system version "
<<
int
{
msDesc
.
sys_ver
}
<<
" for subsystem "
<<
ToString
(
subsystem
);
L_
(
error
)
<<
"Invalid system version "
<<
std
::
hex
<<
int
{
msDesc
.
sys_ver
}
<<
std
::
dec
<<
" for subsystem "
<<
ToString
(
subsystem
);
monitorOut
.
errInvalidSysVer
++
;
}
continue
;
Loading