From 22a5f411d0493937a21e261874a8fbaf67c33d2a Mon Sep 17 00:00:00 2001
From: pascallanger <planger@mathworks.com>
Date: Sun, 16 Oct 2016 23:12:28 +0200
Subject: [PATCH] Move map redefinition to arduino.ino

---
 Multiprotocol/Arduino.ino | 12 ++++++++++++
 Multiprotocol/Convert.ino | 13 -------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Multiprotocol/Arduino.ino b/Multiprotocol/Arduino.ino
index bd9434e..acfb69f 100644
--- a/Multiprotocol/Arduino.ino
+++ b/Multiprotocol/Arduino.ino
@@ -17,6 +17,18 @@
 /************************************/
 /**  Arduino replacement routines  **/
 /************************************/
+// replacement map()
+int16_t map( int16_t x, int16_t in_min, int16_t in_max, int16_t out_min, int16_t out_max)
+{
+//  return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+	long y ;
+	x -= in_min ;
+	y = out_max - out_min ;
+	y *= x ;
+	x = y / (in_max - in_min) ;
+	return x  + out_min ;
+}
+
 // replacement millis() and micros()
 // These work polled, no interrupts
 // micros() MUST be called at least once every 32 milliseconds
diff --git a/Multiprotocol/Convert.ino b/Multiprotocol/Convert.ino
index 6ff62b9..07e7b2c 100644
--- a/Multiprotocol/Convert.ino
+++ b/Multiprotocol/Convert.ino
@@ -15,19 +15,6 @@
 /************************/
 /**  Convert routines  **/
 /************************/
-#ifndef STM32_BOARD
-int16_t map( int16_t x, int16_t in_min, int16_t in_max, int16_t out_min, int16_t out_max)
-{
-//  return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
-	long y ;
-	x -= in_min ;
-	y = out_max - out_min ;
-	y *= x ;
-	x = y / (in_max - in_min) ;
-	return x  + out_min ;
-}
-#endif
-
 // Channel value is converted to 8bit values full scale
 uint8_t convert_channel_8b(uint8_t num)
 {