Skip to content

Commit be753b7

Browse files
author
blue-2357
committed
Add correct definitions for word
fixes: espressif/arduino-esp32#76
1 parent ed5528b commit be753b7

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Diff for: cores/esp32/Arduino.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ extern "C" {
117117

118118
typedef bool boolean;
119119
typedef uint8_t byte;
120-
typedef unsigned int word;
121120

122121
uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
123122
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);
154153
#define _min(a,b) ((a)<(b)?(a):(b))
155154
#define _max(a,b) ((a)>(b)?(a):(b))
156155

156+
uint16_t makeWord(uint16_t w);
157+
uint16_t makeWord(byte h, byte l);
158+
159+
#define word(...) makeWord(__VA_ARGS__)
160+
157161
#include "pins_arduino.h"
158162

159163
#endif /* _ESP32_CORE_ARDUINO_H_ */

0 commit comments

Comments
 (0)