jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add correct definitions for word

Browse Source 
fixes: https://github.com/espressif/arduino-esp32/issues/76
This commit is contained in:
me-no-dev 2016-12-05 22:50:51 +02:00
parent ee36407b43
commit 6dc34077c4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cores/esp32/Arduino.h
View File

@ -117,7 +117,6 @@ extern "C" {
typedef bool boolean; typedef bool boolean;
typedef uint8_t byte; typedef uint8_t byte;
typedef unsigned int word;
uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder); uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val); void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
@ -154,6 +153,11 @@ long map(long, long, long, long, long);
#define _min(a,b) ((a)<(b)?(a):(b)) #define _min(a,b) ((a)<(b)?(a):(b))
#define _max(a,b) ((a)>(b)?(a):(b)) #define _max(a,b) ((a)>(b)?(a):(b))
uint16_t makeWord(uint16_t w);
uint16_t makeWord(byte h, byte l);
#define word(...) makeWord(__VA_ARGS__)
#include "pins_arduino.h" #include "pins_arduino.h"
#endif /* _ESP32_CORE_ARDUINO_H_ */ #endif /* _ESP32_CORE_ARDUINO_H_ */