From 5bdda0aa15dec98e6f56bc12ca2c5ff17b5800c6 Mon Sep 17 00:00:00 2001 From: Boyd Date: Thu, 18 Apr 2024 19:28:41 -0700 Subject: [PATCH] Remove map and makeWord from WMath.cpp Resolves conflict due to these functions already being defined in the Arduino API files: Common.h/Common.cpp found in the api folder. --- cores/arduino/WMath.cpp | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/cores/arduino/WMath.cpp b/cores/arduino/WMath.cpp index 9685f915..23d5493a 100644 --- a/cores/arduino/WMath.cpp +++ b/cores/arduino/WMath.cpp @@ -47,18 +47,3 @@ extern long random(long howsmall, long howbig) return random(diff) + howsmall; } - -extern long map(long x, long in_min, long in_max, long out_min, long out_max) -{ - return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; -} - -extern uint16_t makeWord(uint16_t w) -{ - return w ; -} - -extern uint16_t makeWord(uint8_t h, uint8_t l) -{ - return (h << 8) | l ; -}