Commit 77f5044

authored

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

1 parent 67de199 commit 77f5044Copy full SHA for 77f5044

File tree

2 files changed

-3

lines changed

cores/esp32
- Arduino.h
- WMath.cpp

2 files changed

-3

lines changed

`‎cores/esp32/Arduino.h‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ using std::min;`
`165`	`165`	`using ::round;`
`166`	`166`
`167`	`167`	`uint16_t makeWord(uint16_t w);`
`168`		`-uint16_t makeWord(byte h, byte l);`
	`168`	`+uint16_t makeWord(uint8_t h, uint8_t l);`
`169`	`169`
`170`	`170`	`#define word(...) makeWord(__VA_ARGS__)`
`171`	`171`

`‎cores/esp32/WMath.cpp‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,12 @@ long map(long x, long in_min, long in_max, long out_min, long out_max) {`
`77`	`77`	`return (delta * dividend + (divisor / 2)) / divisor + out_min;`
`78`	`78`	`}`
`79`	`79`
`80`		`-unsignedintmakeWord(unsignedint w)`
	`80`	`+uint16_tmakeWord(uint16_t w)`
`81`	`81`	`{`
`82`	`82`	`return w;`
`83`	`83`	`}`
`84`	`84`
`85`		`-unsignedintmakeWord(unsignedcharh, unsignedchar l)`
	`85`	`+uint16_tmakeWord(uint8_th, uint8_t l)`
`86`	`86`	`{`
`87`	`87`	`return (h << 8) \| l;`
`88`	`88`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 77f5044

File tree

2 files changed

2 files changed

`‎cores/esp32/Arduino.h‎`

`‎cores/esp32/WMath.cpp‎`

0 commit comments