diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h index 570a7442..70746109 100644 --- a/cores/esp32/Arduino.h +++ b/cores/esp32/Arduino.h @@ -165,7 +165,7 @@ using std::min; using ::round; uint16_t makeWord(uint16_t w); -uint16_t makeWord(byte h, byte l); +uint16_t makeWord(uint8_t h, uint8_t l); #define word(...) makeWord(__VA_ARGS__) diff --git a/cores/esp32/WMath.cpp b/cores/esp32/WMath.cpp index d7017165..bb75fc8a 100644 --- a/cores/esp32/WMath.cpp +++ b/cores/esp32/WMath.cpp @@ -77,12 +77,12 @@ long map(long x, long in_min, long in_max, long out_min, long out_max) { return (delta * dividend + (divisor / 2)) / divisor + out_min; } -unsigned int makeWord(unsigned int w) +uint16_t makeWord(uint16_t w) { return w; } -unsigned int makeWord(unsigned char h, unsigned char l) +uint16_t makeWord(uint8_t h, uint8_t l) { return (h << 8) | l; }