Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
co2ampel
ampel-firmware
Commits
f0ade083
Commit
f0ade083
authored
Apr 24, 2021
by
Eric Duminil
Browse files
co2_sensor: Add _ between words in enum
parent
7b84ec1d
Changes
1
Hide whitespace changes
Inline
Side-by-side
ampel-firmware/co2_sensor.cpp
View file @
f0ade083
...
...
@@ -40,18 +40,18 @@ namespace sensor {
INITIAL
,
BOOTUP
,
READY
,
NEEDSCALIBRATION
,
PREPARECALIBRATION_INSTABLE
,
PREPARECALIBRATION_STABLE
,
NEEDS
_
CALIBRATION
,
PREPARE
_
CALIBRATION_INSTABLE
,
PREPARE
_
CALIBRATION_STABLE
,
CALIBRATION
};
const
char
*
state_names
[]
=
{
"INITIAL"
,
"BOOTUP"
,
"READY"
,
"NEEDSCALIBRATION"
,
"PREPARECALIBRATION_INSTABLE"
,
"PREPARECALIBRATION_STABLE"
,
"NEEDS
_
CALIBRATION"
,
"PREPARE
_
CALIBRATION_INSTABLE"
,
"PREPARE
_
CALIBRATION_STABLE"
,
"CALIBRATION"
};
state
current_state
=
INITIAL
;
void
switchState
(
state
);
...
...
@@ -130,10 +130,10 @@ namespace sensor {
stable_measurements
++
;
Serial
.
print
(
F
(
"Number of stable measurements : "
));
Serial
.
println
(
stable_measurements
);
switchState
(
PREPARECALIBRATION_STABLE
);
switchState
(
PREPARE
_
CALIBRATION_STABLE
);
}
else
{
stable_measurements
=
0
;
switchState
(
PREPARECALIBRATION_INSTABLE
);
switchState
(
PREPARE
_
CALIBRATION_INSTABLE
);
}
previous_co2
=
co2
;
return
(
stable_measurements
==
config
::
enough_stable_measurements
);
...
...
@@ -148,7 +148,7 @@ namespace sensor {
scd30
.
setMeasurementInterval
(
2
);
// [s] The change will only take effect after next measurement.
Serial
.
println
(
F
(
"Waiting until the measurements are stable for at least 2 minutes."
));
Serial
.
println
(
F
(
"It could take a very long time."
));
switchState
(
PREPARECALIBRATION_INSTABLE
);
switchState
(
PREPARE
_
CALIBRATION_INSTABLE
);
}
void
calibrateAndRestart
()
{
...
...
@@ -207,13 +207,13 @@ namespace sensor {
// No special signaling, we want to show the CO2 value
case
READY
:
break
;
case
NEEDSCALIBRATION
:
case
NEEDS
_
CALIBRATION
:
led_effects
::
showWaitingLED
(
color
::
magenta
);
break
;
case
PREPARECALIBRATION_INSTABLE
:
case
PREPARE
_
CALIBRATION_INSTABLE
:
led_effects
::
showWaitingLED
(
color
::
red
);
break
;
case
PREPARECALIBRATION_STABLE
:
case
PREPARE
_
CALIBRATION_STABLE
:
led_effects
::
showWaitingLED
(
color
::
green
);
break
;
// No special signaling here, too.
...
...
@@ -243,7 +243,7 @@ namespace sensor {
// zero ppm but non-zero temperature and non-zero humidity.
Serial
.
println
(
F
(
"Invalid sensor data - CO2 concentration <= 0 ppm"
));
switchState
(
BOOTUP
);
}
else
if
((
current_state
==
PREPARECALIBRATION_INSTABLE
)
||
(
current_state
==
PREPARECALIBRATION_STABLE
))
{
}
else
if
((
current_state
==
PREPARE
_
CALIBRATION_INSTABLE
)
||
(
current_state
==
PREPARE
_
CALIBRATION_STABLE
))
{
// Check for pre-calibration states first, because we do not want to
// leave them before calibration is done.
bool
ready_for_calibration
=
countStableMeasurements
();
...
...
@@ -252,7 +252,7 @@ namespace sensor {
}
}
else
if
(
co2
<
250
)
{
// Sensor should be calibrated.
switchState
(
NEEDSCALIBRATION
);
switchState
(
NEEDS
_
CALIBRATION
);
}
else
{
switchState
(
READY
);
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment