BREAKING - "i2s.h" removed, I2S library added by earlephilhower · Pull Request #8108 · esp8266/Arduino (original) (raw)

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 andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Conversation1 Commits2 Checks0 Files changed

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

An "i2S.h" header was presesnt in prior cores, but this conflicts with the
Arduino standard I2S.h header for the I2S class under Windows (because of
case insensitivity).

Initial 3.0.0 release has a redirect "i2s.h" file in the cores directory to
redirect to the "I2S.h" file in the library, but under Windows this resulted
in the IDE not building the I2S library and link errors.

Remove the offending header. Code will need to mode to including "I2S.h"
instead (which will include both the Arduino class as well as the low-level
definitions).

Fixes #8107

An "i2S.h" header was presesnt in prior cores, but this conflicts with the Arduino standard I2S.h header for the I2S class under Windows (because of case insensitivity).

Initial 3.0.0 release has a redirect "i2s.h" file in the cores directory to redirect to the "I2S.h" file in the library, but under Windows this resulted in the IDE not building the I2S library and link errors.

Remove the offending header. Code will need to mode to including "I2S.h" instead (which will include both the Arduino class as well as the low-level definitions).

Fixes esp8266#8107

@earlephilhower Mind the include guards:
cores/esp8266/core_esp8266_i2s.h:

#ifndef I2S_h
#define I2S_h

libraries/I2S/src/I2S.h:

#ifndef _I2S_H_INCLUDED
#define _I2S_H_INCLUDED

Unique, alright, but not quite the canonical / expected form :-)
Therefore:

--- a/cores/esp8266/core_esp8266_i2s.h
+++ b/cores/esp8266/core_esp8266_i2s.h
@@ -18,8 +18,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#ifndef I2S_h
-#define I2S_h
+#ifndef CORE_ESP8266_I2S_H
+#define CORE_ESP8266_I2S_H
 
 #define I2S_HAS_BEGIN_RXTX_DRIVE_CLOCKS 1