From 0461e5679b0008038c63aae9c8d83af679578c59 Mon Sep 17 00:00:00 2001 From: leo Date: Mon, 21 Mar 2022 23:30:19 +0100 Subject: [PATCH] maj --- CMakeLists.txt | 3 ++- sensirion_i2c_hal.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cb99c6..f42e0da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,2 +1,3 @@ idf_component_register(SRCS "sensirion_common.c" "sensirion_i2c.c" "sensirion_i2c_hal.c" "scd4x_i2c.c" - INCLUDE_DIRS "include") + INCLUDE_DIRS "include" + REQUIRES "driver") diff --git a/sensirion_i2c_hal.c b/sensirion_i2c_hal.c index 5c8fb48..59556ec 100644 --- a/sensirion_i2c_hal.c +++ b/sensirion_i2c_hal.c @@ -106,7 +106,7 @@ int8_t sensirion_i2c_hal_read(uint8_t address, uint8_t* data, uint16_t count) { err = i2c_master_read(cmdLnk, data, count-1, I2C_MASTER_ACK); err = i2c_master_read(cmdLnk, data + count - 1, 1, I2C_MASTER_NACK); err = i2c_master_stop(cmdLnk); - i2c_master_cmd_begin(I2C_NUM_0,cmdLnk,1000 / portTICK_RATE_MS); + i2c_master_cmd_begin(I2C_NUM_0,cmdLnk,1000 / portTICK_PERIOD_MS); i2c_cmd_link_delete(cmdLnk); return err; } @@ -130,7 +130,7 @@ int8_t sensirion_i2c_hal_write(uint8_t address, const uint8_t* data, err = i2c_master_write_byte(cmdLnk, address << 1 | I2C_MASTER_WRITE, true); err = i2c_master_write(cmdLnk, data, count, true); err = i2c_master_stop(cmdLnk); - i2c_master_cmd_begin(I2C_NUM_0,cmdLnk,1000 / portTICK_RATE_MS); /* TODO:non const port */ + i2c_master_cmd_begin(I2C_NUM_0,cmdLnk,1000 / portTICK_PERIOD_MS); /* TODO:non const port */ i2c_cmd_link_delete(cmdLnk); return err; }