1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-23 21:01:25 +01:00

fix merge error

This commit is contained in:
Harald Barth 2022-06-11 22:23:33 +02:00
parent 7fba96417f
commit 744713769c

View File

@ -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;