Unverified Commit 77f50445 authored by Dirk O. Kaar's avatar Dirk O. Kaar Committed by GitHub

WMath.cpp doesn't include Arduino.h, where makeWord(h, l) is declared, common...

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
parent 67de199b
......@@ -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__)
......
......@@ -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;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment