Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
firmware
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
Container Registry
Model registry
Operate
Environments
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
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
François Revol
firmware
Commits
fb151be2
Commit
fb151be2
authored
4 years ago
by
schneider
Browse files
Options
Downloads
Patches
Plain Diff
fix(bsec): Read CO2 and total breath voc into cache
parent
92274b0b
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
epicardium/modules/bsec.c
+28
-9
28 additions, 9 deletions
epicardium/modules/bsec.c
with
28 additions
and
9 deletions
epicardium/modules/bsec.c
+
28
−
9
View file @
fb151be2
...
...
@@ -18,9 +18,9 @@
#include
<stdio.h>
TaskHandle_t
bsec_task_id
;
static
struct
bme680_sensor_data
last_bme680_data
;
static
int64_t
last_bme680_timestamp
;
static
bool
bsec_task_active
;
static
struct
bsec_sensor_data
last_bsec_data
;
#define ULP 0
// From generic_18v_3s_4d/bsec_serialized_configurations_iaq.c
...
...
@@ -102,13 +102,22 @@ void output_ready(
float
co2_equivalent
,
float
breath_voc_equivalent
)
{
last_bme680_data
.
temperature
=
temperature
;
last_bme680_data
.
humidity
=
humidity
;
last_bme680_data
.
pressure
=
pressure
/
100
.;
last_bme680_data
.
gas_resistance
=
gas
;
last_bsec_data
.
temperature
=
temperature
;
last_bsec_data
.
humidity
=
humidity
;
last_bsec_data
.
pressure
=
pressure
/
100
.;
last_bsec_data
.
gas_resistance
=
gas
;
last_bsec_data
.
timestamp
=
timestamp
;
last_bsec_data
.
accuracy
=
iaq_accuracy
;
last_bsec_data
.
indoor_air_quality
=
iaq
;
last_bsec_data
.
static_indoor_air_quality
=
static_iaq
;
last_bsec_data
.
co2_equivalent
=
co2_equivalent
;
last_bsec_data
.
breath_voc_equivalent
=
breath_voc_equivalent
;
__sync_synchronize
();
last_bme680_timestamp
=
timestamp
;
return
;
printf
(
"bosch data time: %u, iaq: %u, iaq_a: %u, temp10: %u, hum10: %u, pres: %u, raw_temp10: %u, raw_hum10: %u, gas: %u, static_iaq: %u, co21e
6
: %u, breath_voc1e
6
: %u
\n
"
,
printf
(
"bosch data time: %u, iaq: %u, iaq_a: %u, temp10: %u, hum10: %u, pres: %u, raw_temp10: %u, raw_hum10: %u, gas: %u, static_iaq: %u, co21e
3
: %u, breath_voc1e
3
: %u
\n
"
,
(
unsigned
int
)(
timestamp
/
1e6
),
(
unsigned
int
)(
iaq
),
(
unsigned
int
)(
iaq_accuracy
),
...
...
@@ -119,8 +128,8 @@ void output_ready(
(
unsigned
int
)(
raw_humidity
*
10
),
(
unsigned
int
)(
gas
),
(
unsigned
int
)(
static_iaq
),
(
unsigned
int
)(
co2_equivalent
*
1e
6
),
(
unsigned
int
)(
breath_voc_equivalent
*
1e
6
));
(
unsigned
int
)(
co2_equivalent
*
1e
3
),
(
unsigned
int
)(
breath_voc_equivalent
*
1e
3
));
}
static
uint32_t
bsec_load
(
char
*
path
,
uint8_t
*
buffer
,
uint32_t
n_buffer
)
...
...
@@ -302,9 +311,19 @@ int bsec_read_bme680(struct bme680_sensor_data *data)
if
(
!
bsec_task_active
)
{
return
BME680_E_COM_FAIL
;
}
if
(
data
==
NULL
)
{
return
-
EFAULT
;
}
while
(
last_bme680_timestamp
==
0
)
vTaskDelay
(
pdMS_TO_TICKS
(
10
));
*
data
=
last_bme680_data
;
data
->
temperature
=
last_bsec_data
.
temperature
;
data
->
humidity
=
last_bsec_data
.
humidity
;
data
->
pressure
=
last_bsec_data
.
pressure
;
data
->
gas_resistance
=
last_bsec_data
.
gas_resistance
;
return
BME680_OK
;
}
...
...
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