Skip to content

IDF master #11204

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

Merged
merged 11 commits into from
Apr 23, 2025
Merged

IDF master #11204

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
60b2868
IDF master a3864c08
me-no-dev Mar 31, 2025
b27b1ec
IDF master 5c51472e
me-no-dev Apr 2, 2025
d9f4f0a
IDF master a25e7ab5
me-no-dev Apr 7, 2025
b840be4
IDF master 1c468f68
me-no-dev Apr 9, 2025
bd444c3
fix(esp-now): Update TX Callback
me-no-dev Apr 15, 2025
42c876b
IDF master e9bdd395
me-no-dev Apr 15, 2025
6e92e38
IDF master d930a386
me-no-dev Apr 18, 2025
0f5ab9f
Merge branch 'release/v3.3.x' of https://github.com/espressif/arduino…
me-no-dev Apr 21, 2025
4b24b3b
Merge branch 'release/v3.3.x' of https://github.com/espressif/arduino…
me-no-dev Apr 22, 2025
977ab1d
i2c_ll_enable_arbitration(i2c->dev, true) (#11271)
Jason2866 Apr 22, 2025
1e69910
Revert "i2c_ll_enable_arbitration(i2c->dev, true) (#11271)"
me-no-dev Apr 23, 2025
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
Prev Previous commit
Next Next commit
i2c_ll_enable_arbitration(i2c->dev, true) (#11271)
  • Loading branch information
@Jason2866
Jason2866 authored Apr 22, 2025
commit 977ab1de0a677669a4f847806ae03dc5b55a252c
5 changes: 5 additions & 0 deletions cores/esp32/esp32-hal-i2c-slave.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,11 +337,16 @@ esp_err_t i2cSlaveInit(uint8_t num, int sda, int scl, uint16_t slaveID, uint32_t
}
#endif // !defined(CONFIG_IDF_TARGET_ESP32P4)

#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)
i2c_ll_enable_arbitration(i2c->dev, true);
i2c_ll_enable_fifo_mode(i2c->dev, true);
#else
i2c_ll_slave_init(i2c->dev);
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
i2c_ll_enable_fifo_mode(i2c->dev, true);
#else
i2c_ll_slave_set_fifo_mode(i2c->dev, true);
#endif
#endif
i2c_ll_set_slave_addr(i2c->dev, slaveID, false);
i2c_ll_set_tout(i2c->dev, I2C_LL_MAX_TIMEOUT);
Expand Down
Loading