Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SCD4X: API bump and possible low power support #1029

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

SCD4X: API bump and possible low power support #1029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d54598
SCD4X: Bump submodule to master.
Gadgetoid Nov 18, 2024
b79814c
SCD4X: scd4x_get_data_ready_status to scd4x_get_data_ready_flag.
Gadgetoid Nov 18, 2024
185bea2
SCD4X: Support low power periodic measurements.
Gadgetoid Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/scd4x/src
Open in desktop
Submodule src updated 11 files
+16 −0 .github/workflows/embedded_quality_check.yml
+10 −0 .github/workflows/github_release.yml
+0 −38 .gitlab-ci.yml
+1 −1 README.md
+25 −0 sample-implementations/RaspberryPi_Pico/cMakeLists.txt
+77 −0 sample-implementations/RaspberryPi_Pico/main.c
+127 −0 sample-implementations/RaspberryPi_Pico/sensirion_i2c_hal.c
+4 −2 scd4x_i2c.c
+4 −4 scd4x_i2c.h
+10 −1 scd4x_i2c_example_usage.c
+4 −4 tests/scd4x_i2c_test.cpp
2 changes: 2 additions & 0 deletions micropython/modules/breakout_scd41/breakout_scd41.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ static MP_DEFINE_CONST_FUN_OBJ_KW(scd41_init_obj, 0, scd41_init);

// Start/Stop measurement, no args (module-level, so no "self")
static MP_DEFINE_CONST_FUN_OBJ_0(scd41_start_periodic_measurement_obj, scd41_start_periodic_measurement);
static MP_DEFINE_CONST_FUN_OBJ_0(scd41_start_low_power_periodic_measurement_obj, scd41_start_low_power_periodic_measurement);
static MP_DEFINE_CONST_FUN_OBJ_0(scd41_stop_periodic_measurement_obj, scd41_stop_periodic_measurement);
static MP_DEFINE_CONST_FUN_OBJ_0(scd41_get_data_ready_obj, scd41_get_data_ready);

Expand All @@ -30,6 +31,7 @@ static const mp_map_elem_t scd41_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_breakout_scd41) },
{ MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&scd41_init_obj) },
{ MP_ROM_QSTR(MP_QSTR_start), MP_ROM_PTR(&scd41_start_periodic_measurement_obj) },
{ MP_ROM_QSTR(MP_QSTR_start_low_power), MP_ROM_PTR(&scd41_start_low_power_periodic_measurement_obj) },
{ MP_ROM_QSTR(MP_QSTR_stop), MP_ROM_PTR(&scd41_stop_periodic_measurement_obj) },
{ MP_ROM_QSTR(MP_QSTR_measure), MP_ROM_PTR(&scd41_read_measurement_obj) },
{ MP_ROM_QSTR(MP_QSTR_ready), MP_ROM_PTR(&scd41_get_data_ready_obj) },
Expand Down
19 changes: 16 additions & 3 deletions micropython/modules/breakout_scd41/breakout_scd41.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,33 @@ mp_obj_t scd41_start_periodic_measurement() {
return mp_const_none;
}

mp_obj_t scd41_start_low_power_periodic_measurement() {
if(!scd41_initialised) {
mp_raise_msg(&mp_type_RuntimeError, NOT_INITIALISED_MSG);
return mp_const_none;
}
int error = scd4x_start_low_power_periodic_measurement();
if(error) {
mp_raise_msg(&mp_type_RuntimeError, FAIL_MSG);
}

return mp_const_none;
}

mp_obj_t scd41_get_data_ready() {
if(!scd41_initialised) {
mp_raise_msg(&mp_type_RuntimeError, NOT_INITIALISED_MSG);
return mp_const_none;
}
uint16_t data_ready = 0;
int error = scd4x_get_data_ready_status(&data_ready);
bool data_ready = false;
int error = scd4x_get_data_ready_flag(&data_ready);
if(error) {
mp_raise_msg(&mp_type_RuntimeError, READ_FAIL_MSG);
return mp_const_none;
}
// The datasheet doesn't really say *which* bit might be 1 if data is ready...
// so check if the least significant eleven bits are != 0
return (data_ready & 0x7ff) ? mp_const_true : mp_const_false;
return data_ready ? mp_const_true : mp_const_false;
}

mp_obj_t scd41_set_temperature_offset(mp_obj_t offset) {
Expand Down
1 change: 1 addition & 0 deletions micropython/modules/breakout_scd41/breakout_scd41.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Declare the functions we'll make available in Python
extern mp_obj_t scd41_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
extern mp_obj_t scd41_start_periodic_measurement();
extern mp_obj_t scd41_start_low_power_periodic_measurement();
extern mp_obj_t scd41_stop_periodic_measurement();
extern mp_obj_t scd41_read_measurement();
extern mp_obj_t scd41_get_data_ready();
Expand Down