Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Michal Rybka
openCanSat-2.0-library
Commits
dd21c33e
Commit
dd21c33e
authored
Sep 25, 2018
by
Markéta Jedličková
Browse files
Improvment of init and transition state for showing temp and pressure
parent
49aa4e8b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/OcsStorage.cpp
View file @
dd21c33e
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
OcsStorage
::
OcsStorage
(
OcsGraphics
&
ocsDesignIn
)
OcsStorage
::
OcsStorage
(
OcsGraphics
&
ocsDesignIn
)
:
isInitalize
(
false
),
:
isInitalize
(
false
),
isTransition
(
false
),
ocsDesign
(
ocsDesignIn
)
ocsDesign
(
ocsDesignIn
)
{
{
}
}
...
@@ -39,6 +40,16 @@ void OcsStorage::Update(message income, uint8_t screenNum)
...
@@ -39,6 +40,16 @@ void OcsStorage::Update(message income, uint8_t screenNum)
maxData
.
pressure
=
income
.
pressure
;
maxData
.
pressure
=
income
.
pressure
;
isInitalize
=
true
;
isInitalize
=
true
;
}
}
else
if
(
this
->
isTransition
==
true
)
{
ocsDesign
.
drawTemp
(
income
.
temperature
);
ocsDesign
.
drawMinTemp
(
minData
.
temperature
);
ocsDesign
.
drawMaxTemp
(
maxData
.
temperature
);
ocsDesign
.
drawPress
(
income
.
pressure
);
ocsDesign
.
drawMinPress
(
minData
.
pressure
);
ocsDesign
.
drawMaxPress
(
maxData
.
pressure
);
isTransition
=
false
;
}
checkTemperature
(
income
.
temperature
);
checkTemperature
(
income
.
temperature
);
checkPressure
(
income
.
pressure
);
checkPressure
(
income
.
pressure
);
...
@@ -85,12 +96,12 @@ void OcsStorage::Update(message income, uint8_t screenNum)
...
@@ -85,12 +96,12 @@ void OcsStorage::Update(message income, uint8_t screenNum)
ocsDesign
.
drawPower
(
power
);
ocsDesign
.
drawPower
(
power
);
this
->
is
Initalize
=
true
;
this
->
is
Transition
=
true
;
}
}
else
if
(
screenNum
==
2
)
else
if
(
screenNum
==
2
)
{
{
this
->
is
Initalize
=
true
;
this
->
is
Transition
=
true
;
}
}
}
}
...
...
src/OcsStorage.h
View file @
dd21c33e
...
@@ -43,6 +43,7 @@ class OcsStorage
...
@@ -43,6 +43,7 @@ class OcsStorage
private:
private:
bool
isInitalize
;
bool
isInitalize
;
bool
isTransition
;
OcsGraphics
ocsDesign
;
OcsGraphics
ocsDesign
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment