Skip to content

[SL-UP] Add si7021 support in multi-sensor app for 917SoC #818

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

Draft
arun-silabs wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[SL-UP] Add si7021 support in multi-sensor app for 917SoC #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
123 changes: 119 additions & 4 deletions examples/platform/silabs/Si70xxSensor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,44 @@
* limitations under the License.
*/

#include "Si70xxSensor.h"
#include <lib/support/CodeUtils.h>

#ifdef SLI_SI91X_MCU_INTERFACE
// WiFi SDK (Si91x) includes
#include "sl_si91x_si70xx.h"
#include "sl_si91x_i2c.h"
#include "sl_si91x_driver_gpio.h"
#include "sl_si91x_gpio.h"

/*******************************************************************************
*************************** Defines / Macros ********************************
******************************************************************************/
#define TX_THRESHOLD 0 // tx threshold value
#define RX_THRESHOLD 0 // rx threshold value
#define MODE_0 0 // Initializing GPIO MODE_0 value
#define OUTPUT_VALUE 1 // GPIO output value

/*******************************************************************************
* Function to provide 1 ms Delay
*******************************************************************************/
static void delay(uint32_t idelay)
{
for (uint32_t x = 0; x < 4600 * idelay; x++) //1.002ms delay
{
__NOP();
}
}
#else
// EFR/Simplicity SDK includes
#include "sl_board_control.h"
#include "sl_i2cspm_instances.h"
#include "sl_si70xx.h"
#include <Si70xxSensor.h>
#include <lib/support/CodeUtils.h>
#endif // SLI_SI91X_MCU_INTERFACE

namespace {

constexpr uint16_t kSensorTemperatureOffset = 475;
bool initialized = false;

} // namespace

namespace Si70xxSensor {
Expand All @@ -36,13 +63,89 @@ sl_status_t Init()
{
sl_status_t status = SL_STATUS_OK;

#ifdef SLI_SI91X_MCU_INTERFACE
// WiFi SDK (Si91x) implementation
sl_i2c_config_t i2c_config;
i2c_config.mode = SL_I2C_LEADER_MODE;
i2c_config.transfer_type = SL_I2C_USING_NON_DMA;
i2c_config.operating_mode = SL_I2C_STANDARD_MODE;
i2c_config.i2c_callback = NULL;

#if defined(SENSOR_ENABLE_GPIO_MAPPED_TO_UULP)
if (sl_si91x_gpio_driver_get_uulp_npss_pin(SENSOR_ENABLE_GPIO_PIN) != 1) {
// Enable GPIO ULP_CLK
status = sl_si91x_gpio_driver_enable_clock((sl_si91x_gpio_select_clock_t)ULPCLK_GPIO);
VerifyOrReturnError(status == SL_STATUS_OK, status);
// Set NPSS GPIO pin MUX
status = sl_si91x_gpio_driver_set_uulp_npss_pin_mux(SENSOR_ENABLE_GPIO_PIN, NPSS_GPIO_PIN_MUX_MODE0);
VerifyOrReturnError(status == SL_STATUS_OK, status);
// Set NPSS GPIO pin direction
status =
sl_si91x_gpio_driver_set_uulp_npss_direction(SENSOR_ENABLE_GPIO_PIN, (sl_si91x_gpio_direction_t)GPIO_OUTPUT);
VerifyOrReturnError(status == SL_STATUS_OK, status);
// Set UULP GPIO pin
status = sl_si91x_gpio_driver_set_uulp_npss_pin_value(SENSOR_ENABLE_GPIO_PIN, GPIO_PIN_SET);
VerifyOrReturnError(status == SL_STATUS_OK, status);
}
#else
sl_gpio_t sensor_enable_port_pin = { SENSOR_ENABLE_GPIO_PORT, SENSOR_ENABLE_GPIO_PIN };
uint8_t pin_value;

status = sl_gpio_driver_get_pin(&sensor_enable_port_pin, &pin_value);
VerifyOrReturnError(status == SL_STATUS_OK, status);
if (pin_value != 1) {
// Enable GPIO CLK
#ifdef SENSOR_ENABLE_GPIO_MAPPED_TO_ULP
status = sl_si91x_gpio_driver_enable_clock((sl_si91x_gpio_select_clock_t)ULPCLK_GPIO);
#else
status = sl_si91x_gpio_driver_enable_clock((sl_si91x_gpio_select_clock_t)M4CLK_GPIO);
#endif
VerifyOrReturnError(status == SL_STATUS_OK, status);

// Set the pin mode for GPIO pins.
status = sl_gpio_driver_set_pin_mode(&sensor_enable_port_pin, MODE_0, OUTPUT_VALUE);
VerifyOrReturnError(status == SL_STATUS_OK, status);
// Select the direction of GPIO pin whether Input/ Output
status = sl_si91x_gpio_driver_set_pin_direction(SENSOR_ENABLE_GPIO_PORT,
SENSOR_ENABLE_GPIO_PIN,
(sl_si91x_gpio_direction_t)GPIO_OUTPUT);
VerifyOrReturnError(status == SL_STATUS_OK, status);
// Set GPIO pin
status = sl_gpio_driver_set_pin(&sensor_enable_port_pin); // Set ULP GPIO pin
VerifyOrReturnError(status == SL_STATUS_OK, status);
}
#endif

/* Wait for sensor to become ready */
delay(80);

// Initialize I2C bus
status = sl_i2c_driver_init(SI70XX_I2C_INSTANCE, &i2c_config);
VerifyOrReturnError(status == SL_I2C_SUCCESS, status);
status = sl_i2c_driver_configure_fifo_threshold(SI70XX_I2C_INSTANCE, TX_THRESHOLD, RX_THRESHOLD);
VerifyOrReturnError(status == SL_I2C_SUCCESS, status);
// reset the sensor
status = sl_si91x_si70xx_reset(SI70XX_I2C_INSTANCE, SI70XX_SLAVE_ADDR);
VerifyOrReturnError(status == SL_STATUS_OK, status);
// Wait for sensor to recover after reset (Si70xx needs ~15ms to recover)
delay(20);
// Initializes sensor and reads electronic ID 1st byte
status = sl_si91x_si70xx_init(SI70XX_I2C_INSTANCE, SI70XX_SLAVE_ADDR, SL_EID_FIRST_BYTE);
VerifyOrReturnError(status == SL_STATUS_OK, status);
// Initializes sensor and reads electronic ID 2nd byte
status = sl_si91x_si70xx_init(SI70XX_I2C_INSTANCE, SI70XX_SLAVE_ADDR, SL_EID_SECOND_BYTE);
VerifyOrReturnError(status == SL_STATUS_OK, status);
initialized = true;
#else
// EFR/Simplicity SDK implementation
status = sl_board_enable_sensor(SL_BOARD_SENSOR_RHT);
VerifyOrReturnError(status == SL_STATUS_OK, status);

status = sl_si70xx_init(sl_i2cspm_sensor, SI7021_ADDR);
VerifyOrReturnError(status == SL_STATUS_OK, status);

initialized = true;
#endif // SLI_SI91X_MCU_INTERFACE
return status;
}

Expand All @@ -54,12 +157,24 @@ sl_status_t GetSensorData(uint16_t & relativeHumidity, int16_t & temperature)
int32_t tempTemperature = 0;
uint32_t tempHumidity = 0;

#ifdef SLI_SI91X_MCU_INTERFACE
// WiFi SDK (Si91x) implementation
// Reads humidity measurement from sensor
status = sl_si91x_si70xx_measure_rh_and_temp(SI70XX_I2C_INSTANCE, SI70XX_SLAVE_ADDR, &tempHumidity, &tempTemperature);
VerifyOrReturnError(status == SL_STATUS_OK, status);

// Sensor precision is X. We need to multiply by 100 to change the precision to centiX to fit with the cluster attributes precision.
temperature = static_cast<int16_t>(tempTemperature * 100) - kSensorTemperatureOffset;
relativeHumidity = static_cast<uint16_t>(tempHumidity * 100);
#else
// EFR/Simplicity SDK implementation
status = sl_si70xx_measure_rh_and_temp(sl_i2cspm_sensor, SI7021_ADDR, &tempHumidity, &tempTemperature);
VerifyOrReturnError(status == SL_STATUS_OK, status);

// Sensor precision is milliX. We need to reduce to change the precision to centiX to fit with the cluster attributes presicion.
temperature = static_cast<int16_t>(tempTemperature / 10) - kSensorTemperatureOffset;
relativeHumidity = static_cast<uint16_t>(tempHumidity / 10);
#endif // SLI_SI91X_MCU_INTERFACE

return status;
}
Expand Down
8 changes: 4 additions & 4 deletions src/platform/silabs/SiWx/SiWxPlatformInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ inline void sl_si91x_btn_event_handler()
void sl_si91x_uart_power_requirement_handler()
{
#ifdef ENABLE_CHIP_SHELL
#ifdef RTE_UULP_GPIO_1_PIN
// Checking the UULP PIN 1 status to reinit the UART and not allow the device to go to sleep
if (sl_si91x_gpio_get_uulp_npss_pin(RTE_UULP_GPIO_1_PIN))
#ifdef RTE_UULP_GPIO_3_PIN
// Checking the UULP PIN 3 status to reinit the UART and not allow the device to go to sleep
if (sl_si91x_gpio_get_uulp_npss_pin(RTE_UULP_GPIO_3_PIN))
{
if (!ps_requirement_added)
{
Expand All @@ -120,7 +120,7 @@ void sl_si91x_uart_power_requirement_handler()
ps_requirement_added = false;
}
}
#endif // RTE_UULP_GPIO_1_PIN
#endif // RTE_UULP_GPIO_3_PIN
#endif // ENABLE_CHIP_SHELL
}

Expand Down
Loading