Skip to content

[2.0.0] Fix issue with init I2C for esp32 S2 #4776

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.

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 175 commits into from
Mar 31, 2021
Merged
Changes from all commits
Commits
Show all changes
175 commits
Select commit Hold shift + click to select a range
1bf59ac
Initial IDF-4.0 port
me-no-dev Jan 25, 2020
9667957
Update CMakeLists.txt
me-no-dev Jan 25, 2020
ee535ef
Update package_esp32_index.template.json
me-no-dev Jan 27, 2020
92db973
make ETH work
me-no-dev Jan 27, 2020
f14a853
get smart config to work as well
me-no-dev Jan 27, 2020
970fef6
Pass ethernet events to the main handler
me-no-dev Jan 27, 2020
ebe0d9a
Add fixes
me-no-dev Apr 6, 2020
0a26224
Initial Commit
me-no-dev May 9, 2020
c6b03a3
Add S2 variant
me-no-dev May 11, 2020
96b9e89
Update esp32-hal-gpio.c
me-no-dev May 11, 2020
5570003
Update CameraWebServer.ino
me-no-dev May 11, 2020
d9c7b58
some compile fixes
me-no-dev May 11, 2020
3735cfe
Update app_httpd.cpp
me-no-dev May 11, 2020
c070e71
fix cmake check
me-no-dev May 11, 2020
2326f91
fix provision compilation
me-no-dev May 11, 2020
7e06b32
try s2 ci
me-no-dev May 11, 2020
bcae3a4
Update on-push.sh
me-no-dev May 11, 2020
d3c5f26
Update ResetReason.ino
me-no-dev May 11, 2020
5784081
disable BT Serial examples for S2
me-no-dev May 11, 2020
a0b8025
Update TouchRead.ino
me-no-dev May 11, 2020
d349cdc
Update SPI_Multiple_Buses.ino
me-no-dev May 11, 2020
fbac930
skip some examples
me-no-dev May 11, 2020
2fcb386
Create .skip.esp32s2
me-no-dev May 11, 2020
d64a825
Update SD_Update.ino
me-no-dev May 11, 2020
66b3e68
Update esp32-hal-i2c.c
me-no-dev May 11, 2020
cd9f890
skip more examples
me-no-dev May 11, 2020
edee32a
Update WiFiTelnetToSerial.ino
me-no-dev May 11, 2020
92772e2
Update on-push.sh
me-no-dev May 11, 2020
bcadf08
Update on-push.sh
me-no-dev May 12, 2020
4aefc0e
try pio again
me-no-dev May 12, 2020
d2bf40c
Update platformio-build-esp32.py
me-no-dev May 12, 2020
f6d705f
Update platformio-build-esp32.py
me-no-dev May 12, 2020
bac6aec
Update on-push.sh
me-no-dev May 12, 2020
40665ea
try outputing the map
me-no-dev May 12, 2020
df0c8ae
how about now?
me-no-dev May 12, 2020
703ce7e
does not work
me-no-dev May 12, 2020
39c1de2
new try at pio
me-no-dev May 12, 2020
55eca68
fix py script
me-no-dev May 12, 2020
986b2a2
Update install-platformio-esp32.sh
me-no-dev May 12, 2020
3f89e22
Update on-push.sh
me-no-dev May 12, 2020
0c5f0f8
fix peripherals
me-no-dev May 13, 2020
77015e0
fix compile errors for esp32
me-no-dev May 13, 2020
ce64a26
Add I2C IDF Wrapper
me-no-dev May 13, 2020
4b9f702
Update HardwareSerial.cpp
me-no-dev May 13, 2020
61132a7
Fix Serial
me-no-dev May 13, 2020
92aa3b5
Update esp32-hal-uart.c
me-no-dev May 14, 2020
5abe013
Update esp32-hal-uart.c
me-no-dev May 14, 2020
a761281
Fix PSRAM support
me-no-dev May 14, 2020
ecc9606
fix WiFi
me-no-dev May 17, 2020
1f20467
fix some examples
me-no-dev May 17, 2020
146c493
fix wrong bootloader path in pio scripts
me-no-dev May 17, 2020
dd64404
more example fixes
me-no-dev May 17, 2020
ae27682
Update WiFiClientEvents.ino
me-no-dev May 17, 2020
d1e7aef
Update WiFiBlueToothSwitch.ino
me-no-dev May 17, 2020
59264b0
Update WiFiProv.ino
me-no-dev May 17, 2020
90e77cd
Update WPS.ino
me-no-dev May 17, 2020
87c9a8a
some i2c fixes
me-no-dev May 17, 2020
131c87b
Update main.cpp
me-no-dev May 17, 2020
3397208
Update esp32-hal-gpio.c
me-no-dev May 17, 2020
99b5be0
Disable IRAM ISRs and functions by default
me-no-dev May 18, 2020
67e7706
update idf libs, disable WDT on S2, use malloc for PSRAM
me-no-dev May 18, 2020
895fba0
fix issue with rtc wdt
me-no-dev May 18, 2020
b499bef
fix psram always init
me-no-dev May 18, 2020
dc707a3
add psram to malloc only if interrupts are not in IRAM
me-no-dev May 18, 2020
604abf0
Disable modem sleep by default on S2 for now.
me-no-dev May 18, 2020
5dbcf20
Pull latest IDF and enable TinyUSB
me-no-dev May 30, 2020
8ac2a69
Add support for no-stub usb s2 flashing
me-no-dev May 30, 2020
f2e1016
Update TinyUSB
me-no-dev May 30, 2020
76637cb
Once again
me-no-dev May 30, 2020
908ee03
hopefully all is here now
me-no-dev May 30, 2020
832edd2
try to fix linking errors
me-no-dev May 30, 2020
c32a9be
what if functions are in the core?
me-no-dev May 30, 2020
9612ac8
how about now?
me-no-dev May 30, 2020
eda6870
what happened to no-stub?
me-no-dev May 30, 2020
298a6f8
Update CMakeLists.txt
me-no-dev May 30, 2020
5a2580d
Fix swapped USB pins issue
me-no-dev May 30, 2020
1f53f28
Update pins_arduino.h
me-no-dev May 31, 2020
1468787
TinyUSB adjust
me-no-dev Jun 1, 2020
232ab09
change endpoints
me-no-dev Jun 1, 2020
93c97aa
again
me-no-dev Jun 1, 2020
0df54ea
Try custom device descriptors
me-no-dev Jun 1, 2020
e094e19
Add missing DFU driver
me-no-dev Jun 1, 2020
cf713a8
Update libtinyusb.a
me-no-dev Jun 1, 2020
06125d2
Fixing static IP configuration so it doesn't get overwritten by DHCP …
atanisoft Jun 22, 2020
1e48761
Fix GPIO Interrupts
me-no-dev Jun 22, 2020
7611f48
Update TinyUSB Lib
me-no-dev Jun 28, 2020
47b34df
Update IDF Libs
me-no-dev Jun 28, 2020
f43352b
Add TinyUSB HAL and CDC
me-no-dev Jun 29, 2020
1b67e41
Add files to cmakelists and disconnect CDC if unplugged
me-no-dev Jun 29, 2020
1879a5c
Update CMakeLists.txt
me-no-dev Jun 29, 2020
6cd0d7c
Fix DTR/RTS state for ESP32S2 native USB
me-no-dev Jun 29, 2020
ec7a51b
Fix compilation issues
me-no-dev Jun 29, 2020
e9f1b5e
Update libtinyusb.a
me-no-dev Jun 29, 2020
c6c3be1
Update USBCDC.cpp
me-no-dev Jun 30, 2020
c9ae74f
Update TinyUSB
me-no-dev Jul 1, 2020
7f54a35
Change driver attach api and remove DFU from CDC
me-no-dev Jul 1, 2020
29e3d0e
Handle persistent reboot better in CDC
me-no-dev Jul 2, 2020
8cc9e95
Add debug output to CDC
me-no-dev Jul 2, 2020
e687951
Some CDC and BTSerial compatibility fixes
me-no-dev Jul 14, 2020
e325872
Update USB.cpp
me-no-dev Jul 18, 2020
2a94977
Update tinyusb
me-no-dev Jul 19, 2020
4967f19
Add support for custom VID/PID and Board name to show in ArduinoIDE p…
me-no-dev Jul 22, 2020
1a7a928
Add option USB CDC to be used for Serial (starting USB early)
me-no-dev Jul 22, 2020
d777949
Create USB_NOT.h
me-no-dev Jul 22, 2020
681b121
Improve CDC Logging support
me-no-dev Jul 22, 2020
31ab456
Update CMakeLists.txt
me-no-dev Jul 22, 2020
17581ec
Added UM FeatherS2 and UM ProS2 boards to boards.txt (#4188)
UnexpectedMaker Jul 23, 2020
9e2b2bf
Update HardwareSerial.h
me-no-dev Jul 23, 2020
e25ef9e
Update CMakeLists.txt
me-no-dev Jul 23, 2020
0ac788f
Add option to select the core used for Arduino and it's events
me-no-dev Aug 16, 2020
86c87aa
Some fixes
me-no-dev Aug 22, 2020
394c32d
Update IDF, tools and toolchains
me-no-dev Aug 24, 2020
537384d
Update platform.txt
me-no-dev Aug 31, 2020
ad07421
Update install-platformio-esp32.sh
me-no-dev Aug 31, 2020
7f2bf4e
Update platform.txt
me-no-dev Sep 1, 2020
470cbed
Update boards.txt
me-no-dev Sep 4, 2020
1ded874
Update USB.cpp
me-no-dev Sep 23, 2020
fa852c9
Update WiFiMulti.cpp (#4099)
atanisoft Sep 30, 2020
bae722f
Makes ethernet get an IP when connected (#4234)
copercini Oct 1, 2020
8c85642
Add board microS2 (#4314)
microdev1 Oct 2, 2020
1000013
Added ESP32-Wrover-Kit with distinct build.board (#4118)
tobozo Oct 2, 2020
f8b72db
Try with speed optimization as opposed to debug. Coremark 240 -> 430
me-no-dev Oct 11, 2020
57c96aa
Add camera support
me-no-dev Oct 12, 2020
064aa69
Update platform.txt
me-no-dev Oct 12, 2020
8900e8f
Update .gitignore
me-no-dev Oct 13, 2020
659e9a5
Update IDF and Tools
me-no-dev Oct 13, 2020
cf93d47
Make esp32-hal-tinyusb.h conditional on tinyusb (#4155)
bobobo1618 Oct 14, 2020
9a37a02
Fix Arduino PIN counts
me-no-dev Oct 14, 2020
2d0b8c7
Update IDF and Camera
me-no-dev Oct 14, 2020
6ffe081
Update IDF master to 357a27760
me-no-dev Nov 2, 2020
8ae5be5
Add esp-rainmaker support for ESP32
me-no-dev Nov 3, 2020
b76c952
Adding LITTLEFS after esp_littlefs (IDF) is built-in (#4483)
lorol Nov 3, 2020
5e3189f
fix some merge errors
me-no-dev Nov 3, 2020
37af4c9
more fixes
me-no-dev Nov 3, 2020
a07f3c1
Add missing config
me-no-dev Nov 4, 2020
72c25f2
Update WiFiProv.ino
me-no-dev Nov 4, 2020
976aca4
more fixes
me-no-dev Nov 4, 2020
a4aaec6
Merge branch 'master' into idf-release/v4.2
me-no-dev Nov 4, 2020
ec5ec74
skip bt tests for esp32s2
me-no-dev Nov 4, 2020
1bb7abe
Make setHostname return true
me-no-dev Nov 5, 2020
78783c5
fix psram init
me-no-dev Nov 6, 2020
8767419
Merge branch 'master' into idf-release/v4.2
me-no-dev Nov 6, 2020
591c438
RE: Change check for BT_ENABLE to really be a check for BLUEDROID_ENA…
me-no-dev Nov 6, 2020
ef5c73f
Merge branch 'master' into idf-release/v4.2
me-no-dev Nov 6, 2020
e55d657
Try to free some memory
me-no-dev Nov 6, 2020
f1cbd3b
Create esp_arduino_version.h
me-no-dev Nov 6, 2020
70bd58b
Update Arduino.h
me-no-dev Nov 6, 2020
ca64056
Merge branch 'master' into idf-release/v4.2
me-no-dev Nov 6, 2020
2063a60
Merge branch 'master' into idf-release/v4.2
me-no-dev Nov 9, 2020
2d0e772
add 2 variants (#4514)
ladyada Nov 10, 2020
5d62ba5
Idf release/v4.2 - corrections of LITTLEFS and tools (#4515)
lorol Nov 10, 2020
9debb9f
Merge branch 'master' into idf-release/v4.2
me-no-dev Nov 10, 2020
a2e0e86
Provisioning Fixes (#4522)
sweetymhaiske Nov 12, 2020
91025f8
Merge branch 'master' into idf-release/v4.2
me-no-dev Nov 15, 2020
29e3b64
Update IDF to 494a124d9
me-no-dev Nov 15, 2020
f7fe024
Allow custom variants directory
loick111 Nov 15, 2020
934553d
Updated SD_MMC init to match changes upstream
lbernstone Nov 15, 2020
104d28b
Merge pull request #4540 from loick111/feature/custom_variants_dir_id…
me-no-dev Nov 15, 2020
e5555c7
Fix deprecated vref function
lbernstone Nov 15, 2020
5647331
Merge pull request #4541 from lbernstone/SD_MMC_v4.2
me-no-dev Nov 15, 2020
1eb2c6d
Merge pull request #4542 from lbernstone/adc_vref
me-no-dev Nov 15, 2020
e0f8b84
Merge branch 'master' into idf-release/v4.2
me-no-dev Nov 15, 2020
cbafe67
Fix PSRAM on S2
me-no-dev Nov 16, 2020
5b5b61c
rework persist reboot
me-no-dev Nov 17, 2020
a25ccb2
Fix Wire.begin causing divide by zero
me-no-dev Nov 17, 2020
b565149
Ignore mklittlefs
me-no-dev Nov 18, 2020
93c6226
Separate Provisioning library from WiFi library to avoid unnecessary …
sweetymhaiske Nov 18, 2020
c1b06cc
Fix possible race condition in uart attach (#4569)
lbernstone Dec 1, 2020
9bc8420
Update boards.txt
me-no-dev Dec 1, 2020
7d3f499
Update esptool for Big Sur
me-no-dev Dec 7, 2020
71e2142
ESP-IDF update to 2bfdd036b and ESP-DSP
me-no-dev Jan 12, 2021
c26b634
Fix issue with init I2C in arduino as component
chegewara Feb 5, 2021
ce82ba1
Fix I2C init for esp32 S2
chegewara Feb 20, 2021
a8bf41f
Merge branch 'v2-s2' into idf-release/v4.2
me-no-dev Mar 31, 2021
212ae00
Update esp32-hal-timer.c
me-no-dev Mar 31, 2021
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
2 changes: 1 addition & 1 deletion cores/esp32/esp32-hal-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -1816,7 +1816,7 @@ i2c_t * i2cInit(uint8_t i2c_num, int8_t sda, int8_t scl, uint32_t clk_speed){
i2c_driver_delete((i2c_port_t)i2c_num);
}

i2c_config_t conf;
i2c_config_t conf = { };
conf.mode = I2C_MODE_MASTER;
conf.scl_io_num = (gpio_num_t)scl;
conf.sda_io_num = (gpio_num_t)sda;
Expand Down