Skip to content

makeword: sync header and implementation #8097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 2, 2021
Merged

makeword: sync header and implementation #8097

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1147e1
makeword: sync header and implementation
d-a-v Jun 2, 2021
73f0f2d
import declaration
d-a-v Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cores/esp8266/WMath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
$Id$
*/

#include "Arduino.h"

extern "C" {
#include <stdlib.h>
}
Expand Down Expand Up @@ -77,10 +79,10 @@ 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(byte h, byte l) {
return (h << 8) | l;
}