noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for map() function - supplied by @Pito

This commit is contained in:
Roger Clark 2017-09-03 11:00:16 +10:00
parent 23fa7b7c34
commit b1e1782019
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
STM32F1/cores/maple/wirish_math.h
View File

@ -79,9 +79,10 @@ long random(long min, long max);
* @param toEnd the end of the value's mapped range. * @param toEnd the end of the value's mapped range.
* @return the mapped value. * @return the mapped value.
*/ */
static inline long map(long value, long fromStart, long fromEnd, // Fix by Pito 9/2017
long toStart, long toEnd) { static inline int32_t map(int32_t value, int32_t fromStart, int32_t fromEnd,
return (value - fromStart) * (toEnd - toStart) / (fromEnd - fromStart) + int32_t toStart, int32_t toEnd) {
return ((int64_t)(value - fromStart) * (toEnd - toStart)) / (fromEnd - fromStart) +
toStart; toStart;
} }

7
STM32F4/cores/maple/wirish_math.h
View File

@ -78,9 +78,10 @@ long random(long min, long max);
* @param toEnd the end of the value's mapped range. * @param toEnd the end of the value's mapped range.
* @return the mapped value. * @return the mapped value.
*/ */
static inline long map(long value, long fromStart, long fromEnd, // Fix by Pito 9/2017
long toStart, long toEnd) { static inline int32_t map(int32_t value, int32_t fromStart, int32_t fromEnd,
return (value - fromStart) * (toEnd - toStart) / (fromEnd - fromStart) + int32_t toStart, int32_t toEnd) {
return ((int64_t)(value - fromStart) * (toEnd - toStart)) / (fromEnd - fromStart) +
toStart; toStart;
} }