jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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)

Browse Source 
Fixes #5229
This commit is contained in:
Dirk O. Kaar 2021-06-09 11:40:08 +02:00 committed by GitHub
parent 67de199bac
commit 77f504453f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cores/esp32/Arduino.h
View File

@ -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__)

4
cores/esp32/WMath.cpp
View File

@ -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;
} }