Fix map() bug in WMath.cpp

mikee47 · mikee47 · commit df26ca28da0e · 2019-02-20T21:20:34.000Z
Closes SmingHub#1634 Known bug in Arduino core, fixed 18/8/2016 esp8266/Arduino#2408
diff --git a/Sming/Wiring/WMath.cpp b/Sming/Wiring/WMath.cpp
@@ -80,11 +80,11 @@ long random(long howsmall, long howbig)
 
 
 long map(long x, long in_min, long in_max, long out_min, long out_max) {
-    long divisor = (in_max - in_min) + out_min;
+    long divisor = in_max - in_min;
     if(divisor == 0){
         return -1; //AVR returns -1, SAM returns 0
     }
-    return (x - in_min) * (out_max - out_min) / divisor;
+    return ( (x - in_min) * (out_max - out_min) / divisor ) + out_min;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,11 @@ long random(long howsmall, long howbig)`
`80`	`80`
`81`	`81`
`82`	`82`	`long map 6D8D (long x, long in_min, long in_max, long out_min, long out_max) {`
`83`		`- long divisor = (in_max - in_min) + out_min;`
	`83`	`+ long divisor = in_max - in_min;`
`84`	`84`	`if(divisor == 0){`
`85`	`85`	`return -1; //AVR returns -1, SAM returns 0`
`86`	`86`	`}`
`87`		`- return (x - in_min) * (out_max - out_min) / divisor;`
	`87`	`+ return ( (x - in_min) * (out_max - out_min) / divisor ) + out_min;`
`88`	`88`	`}`
`89`	`89`
`90`	`90`