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
This commit is contained in:
parent
67de199bac
commit
77f504453f
@ -165,7 +165,7 @@ using std::min;
|
|||||||
using ::round;
|
using ::round;
|
||||||
|
|
||||||
uint16_t makeWord(uint16_t w);
|
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__)
|
#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;
|
return (delta * dividend + (divisor / 2)) / divisor + out_min;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int makeWord(unsigned int w)
|
uint16_t makeWord(uint16_t w)
|
||||||
{
|
{
|
||||||
return 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;
|
return (h << 8) | l;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user