diff --git a/main/DS4432U.c b/main/DS4432U.c index 450c794..0b3a961 100644 --- a/main/DS4432U.c +++ b/main/DS4432U.c @@ -87,7 +87,7 @@ esp_err_t i2c_master_delete(void) { * @brief Read a sequence of I2C bytes */ static esp_err_t register_read(uint8_t reg_addr, uint8_t *data, size_t len) { - return i2c_master_write_read_device(I2C_MASTER_NUM, DS4432U_SENSOR_ADDR, ®_addr, 1, data, len, I2C_MASTER_TIMEOUT_MS / portTICK_RATE_MS); + return i2c_master_write_read_device(I2C_MASTER_NUM, DS4432U_SENSOR_ADDR, ®_addr, 1, data, len, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS); } /** @@ -97,7 +97,7 @@ static esp_err_t register_write_byte(uint8_t reg_addr, uint8_t data) { int ret; uint8_t write_buf[2] = {reg_addr, data}; - ret = i2c_master_write_to_device(I2C_MASTER_NUM, DS4432U_SENSOR_ADDR, write_buf, sizeof(write_buf), I2C_MASTER_TIMEOUT_MS / portTICK_RATE_MS); + ret = i2c_master_write_to_device(I2C_MASTER_NUM, DS4432U_SENSOR_ADDR, write_buf, sizeof(write_buf), I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS); return ret; } diff --git a/main/EMC2101.c b/main/EMC2101.c index 08b0d54..da620c0 100644 --- a/main/EMC2101.c +++ b/main/EMC2101.c @@ -18,7 +18,7 @@ static const char *TAG = "EMC2101.c"; * @brief Read a sequence of I2C bytes */ static esp_err_t register_read(uint8_t reg_addr, uint8_t *data, size_t len) { - return i2c_master_write_read_device(I2C_MASTER_NUM, EMC2101_I2CADDR_DEFAULT, ®_addr, 1, data, len, I2C_MASTER_TIMEOUT_MS / portTICK_RATE_MS); + return i2c_master_write_read_device(I2C_MASTER_NUM, EMC2101_I2CADDR_DEFAULT, ®_addr, 1, data, len, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS); } /** @@ -28,7 +28,7 @@ static esp_err_t register_write_byte(uint8_t reg_addr, uint8_t data) { int ret; uint8_t write_buf[2] = {reg_addr, data}; - ret = i2c_master_write_to_device(I2C_MASTER_NUM, EMC2101_I2CADDR_DEFAULT, write_buf, sizeof(write_buf), I2C_MASTER_TIMEOUT_MS / portTICK_RATE_MS); + ret = i2c_master_write_to_device(I2C_MASTER_NUM, EMC2101_I2CADDR_DEFAULT, write_buf, sizeof(write_buf), I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS); return ret; } diff --git a/main/INA260.c b/main/INA260.c index 44ede35..f079eaa 100644 --- a/main/INA260.c +++ b/main/INA260.c @@ -18,7 +18,7 @@ static const char *TAG = "INA260.c"; * @brief Read a sequence of I2C bytes */ static esp_err_t register_read(uint8_t reg_addr, uint8_t *data, size_t len) { - return i2c_master_write_read_device(I2C_MASTER_NUM, INA260_I2CADDR_DEFAULT, ®_addr, 1, data, len, I2C_MASTER_TIMEOUT_MS / portTICK_RATE_MS); + return i2c_master_write_read_device(I2C_MASTER_NUM, INA260_I2CADDR_DEFAULT, ®_addr, 1, data, len, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS); } /** @@ -28,7 +28,7 @@ static esp_err_t register_write_byte(uint8_t reg_addr, uint8_t data) { int ret; uint8_t write_buf[2] = {reg_addr, data}; - ret = i2c_master_write_to_device(I2C_MASTER_NUM, INA260_I2CADDR_DEFAULT, write_buf, sizeof(write_buf), I2C_MASTER_TIMEOUT_MS / portTICK_RATE_MS); + ret = i2c_master_write_to_device(I2C_MASTER_NUM, INA260_I2CADDR_DEFAULT, write_buf, sizeof(write_buf), I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS); return ret; } diff --git a/main/oled.c b/main/oled.c index 680c1bc..368bd7a 100644 --- a/main/oled.c +++ b/main/oled.c @@ -289,7 +289,7 @@ bool OLED_status(void) { static esp_err_t write(uint8_t *data, uint8_t len) { int ret; - ret = i2c_master_write_to_device(I2C_MASTER_NUM, 0x3C, data, len, 1000 / portTICK_RATE_MS); + ret = i2c_master_write_to_device(I2C_MASTER_NUM, 0x3C, data, len, 1000 / portTICK_PERIOD_MS); return ret; } \ No newline at end of file diff --git a/main/system.c b/main/system.c index acd2654..7a804ff 100644 --- a/main/system.c +++ b/main/system.c @@ -34,12 +34,12 @@ void init_system(void) { ADC_init(); //DS4432U tests - DS4432U_set_vcore(1.4); + DS4432U_set_vcore(1.2); //Fan Tests EMC2101_init(); - EMC2101_set_fan_speed(0.75); - vTaskDelay(500 / portTICK_RATE_MS); + EMC2101_set_fan_speed(0); + vTaskDelay(500 / portTICK_PERIOD_MS); //oled #ifdef USE_OLED @@ -99,6 +99,6 @@ void SysTask(void *arg) { while(1){ get_stats(); - vTaskDelay(5000 / portTICK_RATE_MS); + vTaskDelay(5000 / portTICK_PERIOD_MS); } } \ No newline at end of file