Mercurial > co2meter / file diff

--- a/main/u8g2_esp32_hal.c	Tue Sep 26 14:59:06 2023 +0200
+++ b/main/u8g2_esp32_hal.c	Tue Sep 26 15:10:25 2023 +0200
@@ -23,8 +23,6 @@
 static u8g2_esp32_hal_t    u8g2_esp32_hal;		///< HAL state data.
 static bool		   initialized = false;
 
-#undef ESP_ERROR_CHECK
-#define ESP_ERROR_CHECK(x)   do { esp_err_t rc = (x); if (rc != ESP_OK) { ESP_LOGE("err", "esp_err_t = %d", rc); assert(0 && #x);} } while(0);
 
 /*
  * Initialze the ESP32 HAL.
@@ -124,13 +122,14 @@
 		    break;
 		}
 
-		i2c_config_t conf;
-		conf.mode = I2C_MODE_MASTER;
-		conf.sda_io_num = u8g2_esp32_hal.sda;
-		conf.sda_pullup_en = GPIO_PULLUP_ENABLE;
-		conf.scl_io_num = u8g2_esp32_hal.scl;
-		conf.scl_pullup_en = GPIO_PULLUP_ENABLE;
-		conf.master.clk_speed = I2C_MASTER_FREQ_HZ;
+		i2c_config_t conf = {
+		    .mode = I2C_MODE_MASTER,
+		    .sda_io_num = u8g2_esp32_hal.sda,
+		    .sda_pullup_en = GPIO_PULLUP_ENABLE,
+		    .scl_io_num = u8g2_esp32_hal.scl,
+		    .scl_pullup_en = GPIO_PULLUP_ENABLE,
+		    .master.clk_speed = I2C_MASTER_FREQ_HZ,
+		};
 		ESP_ERROR_CHECK(i2c_param_config(I2C_MASTER_NUM, &conf));
 		ESP_LOGI(TAG, "I2C gpio_sda: %d gpio_scl: %d clk_speed: %d master_num: %d",
 			u8g2_esp32_hal.sda, u8g2_esp32_hal.scl, I2C_MASTER_FREQ_HZ, I2C_MASTER_NUM);
@@ -163,7 +162,7 @@
 	case U8X8_MSG_BYTE_END_TRANSFER: {
 		ESP_LOGD(TAG, "End I2C transfer.");
 		ESP_ERROR_CHECK(i2c_master_stop(handle_i2c));
-		ESP_ERROR_CHECK(i2c_master_cmd_begin(I2C_MASTER_NUM, handle_i2c, I2C_TIMEOUT_MS / portTICK_RATE_MS));
+		i2c_master_cmd_begin(I2C_MASTER_NUM, handle_i2c, I2C_TIMEOUT_MS / portTICK_PERIOD_MS);
 		i2c_cmd_link_delete(handle_i2c);
 		break;
 	}