Merge pull request #5223 from seppestas/master

theotherjimmy · web-flow · commit 2f25744b07c6 · 2017-10-13T09:22:22.000-05:00
Fix analogin scaling for EFM32 target
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/analogin_api.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/analogin_api.c
@@ -99,8 +99,8 @@ uint16_t analogin_read_u16(analogin_t *obj)
 
 float analogin_read(analogin_t *obj)
 {
-    /* Convert from a uint16 to a float between 0 and 1 by division by 0xFFFF */
-    return analogin_read_u16(obj) / (float) 0xFFFF;
+    /* Convert from a uint16 to a float between 0 and 1 by division by 0xFFF0 */
+    return analogin_read_u16(obj) / (float) 0xFFF0;
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,8 @@ uint16_t analogin_read_u16(analogin_t *obj)`
`99`	`99`
`100`	`100`	`float analogin_read(analogin_t *obj)`
`101`	`101`	`{`
`102`		`- /* Convert from a uint16 to a float between 0 and 1 by division by 0xFFFF */`
`103`		`- return analogin_read_u16(obj) / (float) 0xFFFF;`
	`102`	`+ /* Convert from a uint16 to a float between 0 and 1 by division by 0xFFF0 */`
	`103`	`+ return analogin_read_u16(obj) / (float) 0xFFF0;`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`#endif`