From 744713769c830e08aa271bb03105eebb2d404a38 Mon Sep 17 00:00:00 2001
From: Harald Barth <haba@kth.se>
Date: Sat, 11 Jun 2022 22:23:33 +0200
Subject: [PATCH] fix merge error

---
 MotorDriver.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MotorDriver.h b/MotorDriver.h
index a66b3aa..fe262f1 100644
--- a/MotorDriver.h
+++ b/MotorDriver.h
@@ -113,9 +113,9 @@ class MotorDriver {
     virtual int  getCurrentRaw();
     virtual int getCurrentRawInInterrupt();
     virtual unsigned int raw2mA( int raw);
+    virtual unsigned int mA2raw( unsigned int mA);
     inline bool brakeCanPWM() {
       return ((brakePin!=UNUSED_PIN) && (digitalPinToTimer(brakePin)));
-    virtual unsigned int mA2raw( unsigned int mA);
     }
     inline int getRawCurrentTripValue() {
 	    return rawCurrentTripValue;