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.

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 OpenTherm conflicting symbols #13254

Merged

Conversation

barbudor
Copy link
Contributor

@barbudor barbudor commented Oct 1, 2021

Description:

Following discussion on Discord it appears that OpenTherm and NimBLE are conflicting on a few symbols like READ and WRITE
So I prepended OPTH_ on every symbols just to be safe

Checklist:

  • The pull request is done against the latest development branch
  • Only relevant files were touched
  • Only one feature/fix was added per PR and the code change compiles without warnings
  • The code change is tested and works with Tasmota core ESP8266 V.2.7.4.9
  • The code change is tested and works with Tasmota core ESP32 V.1.0.7.4
  • I accept the CLA.

NOTE: The code change must pass CI tests. Your PR cannot be merged unless tests pass

@arendst arendst merged commit 9602917 into arendst:development Oct 1, 2021
@barbudor barbudor deleted the opentherm_conflicting_symbols branch October 2, 2021 19:18
@ascillato2 ascillato2 added the hacktoberfest-accepted Type - Issue approved for Hacktoberfest Challenge label Oct 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hacktoberfest-accepted Type - Issue approved for Hacktoberfest Challenge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants