Skip to content

Commit

Permalink
Merge branch 'feature/support_i2c_on_c61' into 'master'
Browse files Browse the repository at this point in the history 
feat(i2c): support i2c on esp32-c61

Closes IDF-9296 and IDF-9297

See merge request espressif/esp-idf!32596
  • Loading branch information
@L-KAYA
L-KAYA committed Aug 15, 2024
2 parents e5e1463 + 1397e54 commit eff2e4e
Show file tree
Hide file tree
Showing 27 changed files with 1,306 additions and 158 deletions.
4 changes: 2 additions & 2 deletions components/esp_driver_i2c/test_apps/i2c_test_apps/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |
4 changes: 2 additions & 2 deletions components/esp_lcd/test_apps/i2c_lcd/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |

This test app is used to test LCDs with I2C interface.
4 changes: 2 additions & 2 deletions components/esp_lcd/test_apps/i2c_lcd_legacy/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- |

This test app is used to test LCDs with I2C interface.
3 changes: 0 additions & 3 deletions components/hal/esp32c5/include/hal/i2c_ll.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "soc/soc_caps.h"
#include "hal/misc.h"
#include "hal/assert.h"
#if SOC_I2C_SUPPORTED // TODO: [ESP32C5] IDF-8694
#include "soc/i2c_periph.h"
#include "soc/soc_caps.h"
#include "soc/i2c_struct.h"
Expand Down Expand Up @@ -1240,5 +1239,3 @@ static inline void i2c_ll_get_scl_timing(i2c_dev_t *hw, int *high_period, int *l
#ifdef __cplusplus
}
#endif

#endif // SOC_I2C_SUPPORTED
Loading

0 comments on commit eff2e4e

Please sign in to comment.