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
8719717b
Commit
8719717b
authored
1 year ago
by
Carl Philipp Klemm
Browse files
Options
Downloads
Patches
Plain Diff
fix test crashing when no input is given, clean up output prints a bit
parent
b5a9d364
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
coincells.cpp
+1
-1
1 addition, 1 deletion
coincells.cpp
heater.cpp
+1
-0
1 addition, 0 deletions
heater.cpp
test.cpp
+4
-1
4 additions, 1 deletion
test.cpp
with
6 additions
and
2 deletions
coincells.cpp
+
1
−
1
View file @
8719717b
...
@@ -79,7 +79,7 @@ std::vector<std::unique_ptr<CoinCell>> asign_coincells(std::vector<uint16_t> cel
...
@@ -79,7 +79,7 @@ std::vector<std::unique_ptr<CoinCell>> asign_coincells(std::vector<uint16_t> cel
std
::
pair
<
int
,
channel_t
>
addr
=
multiplexers
->
getAddress
(
id
);
std
::
pair
<
int
,
channel_t
>
addr
=
multiplexers
->
getAddress
(
id
);
Log
(
Log
::
INFO
,
false
,
false
)
<<
" Mulitplexer "
<<
addr
.
first
<<
" channel "
<<
Multiplexers
::
chToString
(
addr
.
second
)
<<
", "
;
Log
(
Log
::
INFO
,
false
,
false
)
<<
" Mulitplexer "
<<
addr
.
first
<<
" channel "
<<
Multiplexers
::
chToString
(
addr
.
second
)
<<
", "
;
}
}
Log
(
Log
::
INFO
,
false
)
<<
'\n'
;
Log
(
Log
::
INFO
,
false
,
false
)
<<
'\n'
;
}
}
return
coinCells
;
return
coinCells
;
...
...
This diff is collapsed.
Click to expand it.
heater.cpp
+
1
−
0
View file @
8719717b
...
@@ -74,6 +74,7 @@ void Heaters::recoverDevice(int device)
...
@@ -74,6 +74,7 @@ void Heaters::recoverDevice(int device)
{
{
coincellhell_reset_bus
(
&
devices
[
device
].
device
);
coincellhell_reset_bus
(
&
devices
[
device
].
device
);
coincellhell_disconnect
(
&
devices
[
device
].
device
);
coincellhell_disconnect
(
&
devices
[
device
].
device
);
sleep
(
10
);
ret
=
coincellhell_connect
(
&
devices
[
device
].
device
,
devices
[
device
].
serial
);
ret
=
coincellhell_connect
(
&
devices
[
device
].
device
,
devices
[
device
].
serial
);
if
(
watchdogs
)
if
(
watchdogs
)
coincellhell_enable_watchdog
(
&
devices
[
device
].
device
);
coincellhell_enable_watchdog
(
&
devices
[
device
].
device
);
...
...
This diff is collapsed.
Click to expand it.
test.cpp
+
4
−
1
View file @
8719717b
...
@@ -100,7 +100,10 @@ int main(int argc, char** argv)
...
@@ -100,7 +100,10 @@ int main(int argc, char** argv)
while
(
true
)
while
(
true
)
{
{
std
::
string
line
=
std
::
string
(
readline
(
"> "
));
const
char
*
linePtr
=
readline
(
"> "
);
if
(
!
linePtr
)
continue
;
std
::
string
line
=
std
::
string
(
linePtr
);
if
(
line
.
empty
())
if
(
line
.
empty
())
continue
;
continue
;
...
...
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