Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
CoincellExperimentController
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Klemm, Carl Philipp
CoincellExperimentController
Commits
b5a9d364
Commit
b5a9d364
authored
1 year ago
by
Carl Philipp Klemm
Browse files
Options
Downloads
Patches
Plain Diff
skip some msurements on devices where paramters dont vary
parent
855df9d6
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
expirament.cpp
+18
-9
18 additions, 9 deletions
expirament.cpp
expirament.h
+1
-1
1 addition, 1 deletion
expirament.h
with
19 additions
and
10 deletions
expirament.cpp
+
18
−
9
View file @
b5a9d364
...
@@ -89,10 +89,21 @@ bool Expirament::run(size_t startstep, size_t substep)
...
@@ -89,10 +89,21 @@ bool Expirament::run(size_t startstep, size_t substep)
return
true
;
return
true
;
}
}
bool
Expirament
::
takeMesurements
()
bool
Expirament
::
takeMesurements
(
bool
onlyTVariing
)
{
{
for
(
size_t
i
=
0
;
i
<
coinCells
->
size
();
++
i
)
for
(
size_t
i
=
0
;
i
<
coinCells
->
size
();
++
i
)
{
{
if
(
onlyTVariing
)
{
switch
(
i
)
{
case
0
...
10
:
break
;
default:
Log
(
Log
::
INFO
)
<<
"Skipping EIS for cell "
<<
i
<<
" as we are only mesureing cells with varieng temperature"
;
continue
;
}
}
std
::
stringstream
userstrss
;
std
::
stringstream
userstrss
;
std
::
stringstream
filenamess
;
std
::
stringstream
filenamess
;
...
@@ -141,7 +152,7 @@ bool Expirament::heatMeasureSeq(float fraction)
...
@@ -141,7 +152,7 @@ bool Expirament::heatMeasureSeq(float fraction)
std
::
this_thread
::
sleep_for
(
std
::
chrono
::
seconds
(
120
));
std
::
this_thread
::
sleep_for
(
std
::
chrono
::
seconds
(
120
));
Log
(
Log
::
INFO
)
<<
"Takeing mesurements"
;
Log
(
Log
::
INFO
)
<<
"Takeing mesurements"
;
ret
=
takeMesurements
();
ret
=
takeMesurements
(
fraction
!=
0.0f
);
if
(
!
ret
)
if
(
!
ret
)
{
{
Log
(
Log
::
ERROR
)
<<
"Takeing mesurements failed in globalsetp "
<<
globalstep
;
Log
(
Log
::
ERROR
)
<<
"Takeing mesurements failed in globalsetp "
<<
globalstep
;
...
@@ -248,13 +259,13 @@ void Expirament::setTemperatures(float fraction)
...
@@ -248,13 +259,13 @@ void Expirament::setTemperatures(float fraction)
coinCells
->
at
(
i
)
->
setTemperature
(
35
+
10
*
fraction
);
coinCells
->
at
(
i
)
->
setTemperature
(
35
+
10
*
fraction
);
break
;
break
;
case
11
...
13
:
case
11
...
13
:
coinCells
->
at
(
i
)
->
setTemperature
(
35
+
10
*
fraction
);
coinCells
->
at
(
i
)
->
setTemperature
(
35
);
break
;
break
;
case
14
...
17
:
case
14
...
17
:
coinCells
->
at
(
i
)
->
setTemperature
(
5
5
);
coinCells
->
at
(
i
)
->
setTemperature
(
4
5
);
break
;
break
;
case
18
...
20
:
case
18
...
20
:
coinCells
->
at
(
i
)
->
setTemperature
(
3
5
);
coinCells
->
at
(
i
)
->
setTemperature
(
5
5
);
break
;
break
;
default:
default:
break
;
break
;
...
@@ -285,8 +296,7 @@ bool Expirament::charge(float fraction, bool all)
...
@@ -285,8 +296,7 @@ bool Expirament::charge(float fraction, bool all)
switch
(
i
)
switch
(
i
)
{
{
case
0
...
3
:
case
0
...
3
:
case
7
...
10
:
case
7
...
20
:
case
14
...
17
:
{
{
bool
ret
=
coinCells
->
at
(
i
)
->
setConnected
(
true
);
bool
ret
=
coinCells
->
at
(
i
)
->
setConnected
(
true
);
if
(
!
ret
)
if
(
!
ret
)
...
@@ -350,8 +360,7 @@ bool Expirament::capacityMesureCycle()
...
@@ -350,8 +360,7 @@ bool Expirament::capacityMesureCycle()
switch
(
i
)
switch
(
i
)
{
{
case
0
...
3
:
case
0
...
3
:
case
7
...
10
:
case
7
...
20
:
case
14
...
17
:
ret
=
chargeCellToVoltage
(
i
,
coinCells
->
at
(
i
)
->
getFullVoltage
(),
ret
=
chargeCellToVoltage
(
i
,
coinCells
->
at
(
i
)
->
getFullVoltage
(),
"single_cell_charge_"
+
std
::
to_string
(
getGlobalstep
())
+
"_"
);
"single_cell_charge_"
+
std
::
to_string
(
getGlobalstep
())
+
"_"
);
if
(
!
ret
)
if
(
!
ret
)
...
...
This diff is collapsed.
Click to expand it.
expirament.h
+
1
−
1
View file @
b5a9d364
...
@@ -31,7 +31,7 @@ private:
...
@@ -31,7 +31,7 @@ private:
void
setTemperatures
(
float
fraction
);
void
setTemperatures
(
float
fraction
);
bool
takeMesurements
();
bool
takeMesurements
(
bool
onlyTVariing
=
false
);
bool
heatMeasureSeq
(
float
fraction
);
bool
heatMeasureSeq
(
float
fraction
);
...
...
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