Skip to content
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

Fix esp-idf v5.3 compilation error with ESP32C6 #595

Merged
merged 2 commits into from
Jul 26, 2024
Merged

Fix esp-idf v5.3 compilation error with ESP32C6 #595

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b261c62
Fix esp-idf 5.3 compilation error with ESP32C6
tobozo Jul 26, 2024
18bc276
Update common.cpp
tobozo Jul 26, 2024
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
7 changes: 5 additions & 2 deletions src/lgfx/v1/platforms/esp32/common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ Original Source:
#include <soc/i2c_reg.h>
#include <soc/i2c_struct.h>
#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0))
#include <soc/syscon_reg.h>
//#include <soc/syscon_reg.h>
#if __has_include(<soc/syscon_reg.h>)
#include <soc/syscon_reg.h>
#endif
#else
#if __has_include (<soc/apb_ctrl_reg.h>)
#include <soc/apb_ctrl_reg.h>
Expand Down Expand Up @@ -669,7 +672,7 @@ namespace lgfx

static i2c_dev_t* getDev(int num)
{
#if SOC_I2C_NUM == 1
#if SOC_I2C_NUM == 1 || defined CONFIG_IDF_TARGET_ESP32C6
return &I2C0;
#else
return num == 0 ? &I2C0 : &I2C1;
Expand Down