Commit 0ab523d

Jason2866lucasssvaz

and

authored

Backport: changes to compile v3.1.x as component of IDF branch release/v5.3 (#11359)

* changes to compile as component of IDF branch release/v5.3 * Update esp32-hal-i2c-slave.c * fix(runners): Use latest ubuntu image --------- Co-authored-by: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>

1 parent dbfde15 commit 0ab523dCopy full SHA for 0ab523d

File tree

3 files changed

-4

lines changed

.github/workflows
- build_py_tools.yml
- push.yml
cores/esp32
- esp32-hal-i2c-slave.c

3 files changed

-4

lines changed

`‎.github/workflows/build_py_tools.yml`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ on:`
`12`	`12`	`jobs:`
`13`	`13`	`find-changed-tools:`
`14`	`14`	`name: Check if tools have been changed`
`15`		`- runs-on: ubuntu-20.04`
	`15`	`+ runs-on: ubuntu-latest`
`16`	`16`	`outputs:`
`17`	`17`	`any_changed: ${{ steps.verify-changed-files.outputs.any_changed }}`
`18`	`18`	`all_changed_files: ${{ steps.verify-changed-files.outputs.all_changed_files }}`
`@@ -55,7 +55,7 @@ jobs:`
`55`	`55`	`strategy:`
`56`	`56`	`fail-fast: false`
`57`	`57`	`matrix:`
`58`		`- os: [windows-latest, macos-latest, ubuntu-20.04, ARM]`
	`58`	`+ os: [windows-latest, macos-latest, ubuntu-latest, ARM]`
`59`	`59`	`include:`
`60`	`60`	`- os: windows-latest`
`61`	`61`	`TARGET: win64`
`@@ -64,7 +64,7 @@ jobs:`
`64`	`64`	`- os: macos-latest`
`65`	`65`	`TARGET: macos`
`66`	`66`	`SEPARATOR: ":"`
`67`		`- - os: ubuntu-20.04`
	`67`	`+ - os: ubuntu-latest`
`68`	`68`	`TARGET: linux-amd64`
`69`	`69`	`SEPARATOR: ":"`
`70`	`70`	`- os: ARM`

`‎.github/workflows/push.yml`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ jobs:`
`237`	`237`	`needs.gen-chunks.outputs.build_all == 'true' \|\|`
`238`	`238`	`needs.gen-chunks.outputs.build_libraries == 'true' \|\|`
`239`	`239`	`needs.gen-chunks.outputs.build_idf == 'true'`
`240`		`- runs-on: ubuntu-20.04`
	`240`	`+ runs-on: ubuntu-latest`
`241`	`241`	`strategy:`
`242`	`242`	`fail-fast: false`
`243`	`243`	`matrix:`

`‎cores/esp32/esp32-hal-i2c-slave.c`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,12 @@ esp_err_t i2cSlaveInit(uint8_t num, int sda, int scl, uint16_t slaveID, uint32_t`
`335`	`335`	`}`
`336`	`336`	`#endif // !defined(CONFIG_IDF_TARGET_ESP32P4)`
`337`	`337`
	`338`	`+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 3)`
	`339`	`+ i2c_ll_set_mode(i2c->dev, I2C_BUS_MODE_SLAVE);`
	`340`	`+ i2c_ll_enable_pins_open_drain(i2c->dev, true);`
	`341`	`+#else`
`338`	`342`	`i2c_ll_slave_init(i2c->dev);`
	`343`	`+#endif`
`339`	`344`	`i2c_ll_slave_set_fifo_mode(i2c->dev, true);`
`340`	`345`	`i2c_ll_set_slave_addr(i2c->dev, slaveID, false);`
`341`	`346`	`i2c_ll_set_tout(i2c->dev, I2C_LL_MAX_TIMEOUT);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 0ab523d

File tree

3 files changed

3 files changed

`‎.github/workflows/build_py_tools.yml`

`‎.github/workflows/push.yml`

`‎cores/esp32/esp32-hal-i2c-slave.c`

0 commit comments