From c1147e100b422ea0cb21587442749d258a7d4085 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Wed, 2 Jun 2021 23:18:23 +0200 Subject: [PATCH 1/2] makeword: sync header and implementation --- cores/esp8266/WMath.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/esp8266/WMath.cpp b/cores/esp8266/WMath.cpp index 2cc20b9f50..6176df4952 100644 --- a/cores/esp8266/WMath.cpp +++ b/cores/esp8266/WMath.cpp @@ -77,10 +77,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; } From 73f0f2dee346b3d295cd78a58323884826fe58c4 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Wed, 2 Jun 2021 23:31:33 +0200 Subject: [PATCH 2/2] import declaration --- cores/esp8266/WMath.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cores/esp8266/WMath.cpp b/cores/esp8266/WMath.cpp index 6176df4952..d8dc1f82f2 100644 --- a/cores/esp8266/WMath.cpp +++ b/cores/esp8266/WMath.cpp @@ -23,6 +23,8 @@ $Id$ */ +#include "Arduino.h" + extern "C" { #include }