]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 406979e ed22949)
Merge branch 'bugfix/ticks_to_wait_for_uart_and_i2c' into 'master'
authorAngus Gratton <angus@espressif.com>
Tue, 11 Jun 2019 00:41:44 +0000 (08:41 +0800)
committerAngus Gratton <angus@espressif.com>
Tue, 11 Jun 2019 00:41:44 +0000 (08:41 +0800)
driver: Fix ticks_to_wait for uart and i2c

Closes IDFGH-964

See merge request idf/esp-idf!5021

1  2 
components/driver/i2c.c patch | diff1 | diff2 | blob | history
components/driver/test/test_i2c.c patch | diff1 | diff2 | blob | history
components/driver/uart.c patch | diff1 | diff2 | blob | history

diff --cc components/driver/i2c.c
Simple merge
diff --cc components/driver/test/test_i2c.c
Simple merge
diff --cc components/driver/uart.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.