Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Common Library
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
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
Rutherford Experiment Lab Course Online
Common Library
Commits
4c8e29e2
Verified
Commit
4c8e29e2
authored
4 years ago
by
Tobias Triffterer
Browse files
Options
Downloads
Patches
Plain Diff
Add Parameter for Valve Opening to ExperimentState
This was still missing from the collection of the state variables.
parent
ec06e567
No related branches found
No related tags found
No related merge requests found
Pipeline
#2922
passed with stage
in 32 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/experimentstate.h
+2
-0
2 additions, 0 deletions
src/experimentstate.h
with
2 additions
and
0 deletions
src/experimentstate.h
+
2
−
0
View file @
4c8e29e2
...
...
@@ -56,6 +56,7 @@ public:
using
PressureTorr
=
UInt32BoundedDouble
<
0
,
1130
>
;
// 1500 hPa ≈ 1125 Torr, so 1130 Torr as upper limit should make sure that the conversion from hPa to Torr never fails
using
TargetPositionMilliMeter
=
UInt32BoundedDouble
<
14
,
200
>
;
using
AdcConversion
=
GenericBoundedNumeral
<
uint16_t
,
uint16_t
,
0
,
NumberOfAdcChannels
-
1
>
;
using
VacuumValveOpening
=
GenericBoundedNumeral
<
uint8_t
,
uint8_t
,
0
,
10
>
;
uint64_t
id
=
0
;
AdcState
adcState
=
AdcState
::
Stopped
;
...
...
@@ -63,6 +64,7 @@ public:
PressureHectoPascal
pressure
=
PressureHectoPascal
::
minimum
;
TargetPositionMilliMeter
targetPosition
=
TargetPositionMilliMeter
::
minimum
;
AdcConversion
adcThreshold
=
AdcConversion
::
minimum
;
VacuumValveOpening
vacuumValve
=
VacuumValveOpening
::
minimum
;
static
PressureTorr
convertHectoPascalToTorr
(
const
PressureHectoPascal
&
pressure
);
...
...
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