From 77f504453fa459c945816cbaab9fd6c00d25d832 Mon Sep 17 00:00:00 2001
From: "Dirk O. Kaar" <19971886+dok-net@users.noreply.github.com>
Date: Wed, 9 Jun 2021 11:40:08 +0200
Subject: [PATCH] WMath.cpp doesn't include Arduino.h, where makeWord(h, l) is
 declared, common denominator type therefore is uint8_t, which is in use
 already in Arduino.h, too. (#5230)

Fixes #5229
---
 cores/esp32/Arduino.h | 2 +-
 cores/esp32/WMath.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h
index 570a74425..70746109b 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 d70171655..bb75fc8a2 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;
 }
-- 
GitLab